diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java index 924f91dd8d..6b113e7e08 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java @@ -106,7 +106,7 @@ import java.util.concurrent.atomic.AtomicReference; try { reconfigureProcessingForPendingMediaItem(); } catch (AudioProcessor.UnhandledAudioFormatException e) { - throw ExportException.createForAudioProcessing(e, e.inputAudioFormat); + throw ExportException.createForAudioProcessing(e, "AudioGraph reconfiguration"); } } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java index a9fac0dab4..2018d9b6df 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java @@ -60,7 +60,7 @@ import org.checkerframework.dataflow.qual.Pure; try { audioGraph = new AudioGraph(firstExporterInputFormat, firstEditedMediaItem); } catch (AudioProcessor.UnhandledAudioFormatException e) { - throw ExportException.createForAudioProcessing(e, e.inputAudioFormat); + throw ExportException.createForAudioProcessing(e, "AudioGraph initialization"); } encoderInputAudioFormat = audioGraph.getOutputAudioFormat(); checkState(!encoderInputAudioFormat.equals(AudioFormat.NOT_SET)); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExportException.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExportException.java index 73ec7aa385..b8a084b2b3 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExportException.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExportException.java @@ -23,7 +23,7 @@ import androidx.annotation.Nullable; import androidx.media3.common.Format; import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.VideoFrameProcessor; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; +import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException; import androidx.media3.common.util.Clock; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; @@ -283,14 +283,15 @@ public final class ExportException extends Exception { /** * Creates an instance for an audio processing related exception. * - * @param cause The cause of the failure. - * @param audioFormat The {@link AudioFormat} used. + * @param exception The cause of the failure. + * @param details The details associated with this exception. * @return The created instance. */ - public static ExportException createForAudioProcessing(Throwable cause, AudioFormat audioFormat) { + public static ExportException createForAudioProcessing( + UnhandledAudioFormatException exception, String details) { return new ExportException( - "Audio processing error, audio_format=" + audioFormat, - cause, + "Audio error: " + details + ", audioFormat=" + exception.inputAudioFormat, + exception, ERROR_CODE_AUDIO_PROCESSING_FAILED); }