From c37317222ca0e51cf7c1c605ac0e7e29b5c9985c Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Tue, 6 Dec 2022 17:08:36 +0000 Subject: [PATCH] Transformer: Rename error code from output to encoding format. Rename ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED to ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED. This makes the error code more consistent with ERROR_CODE_DECODING_FAILED on the decoding side. Also, the error code is in the "Encoding errors (4xxx)" section, so muxer errors probably should be in the "Muxer errors (7xxx)" section instead. Additionally, no muxer errors currently seem to use ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED, so this should be a safe change. PiperOrigin-RevId: 493322880 --- .../media3/transformer/BaseSamplePipeline.java | 2 +- .../androidx/media3/transformer/DefaultCodec.java | 2 +- .../media3/transformer/DefaultEncoderFactory.java | 2 +- .../media3/transformer/TransformationException.java | 12 ++++++------ .../transformer/DefaultEncoderFactoryTest.java | 4 ++-- .../media3/transformer/TransformerEndToEndTest.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/BaseSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/BaseSamplePipeline.java index 85d8dbb44f..6bb0b226f5 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/BaseSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/BaseSamplePipeline.java @@ -47,7 +47,7 @@ import androidx.media3.decoder.DecoderInputBuffer; /* isDecoder= */ false, requestedEncoderFormat, /* mediaCodecName= */ null, - TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } @Override diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java index efb194a522..2bc48d7b24 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java @@ -407,7 +407,7 @@ public final class DefaultCodec implements Codec { mediaCodecName, isDecoder ? TransformationException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED - : TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + : TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } return TransformationException.createForUnexpected(cause); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index 8ddc206823..40a3b9f392 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -669,7 +669,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { @RequiresNonNull("#1.sampleMimeType") private static TransformationException createTransformationException(Format format) { return createTransformationException( - format, TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + format, TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } @RequiresNonNull("#1.sampleMimeType") diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java index beb8044630..26fac85af4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java @@ -68,7 +68,7 @@ public final class TransformationException extends Exception { ERROR_CODE_DECODING_FORMAT_UNSUPPORTED, ERROR_CODE_ENCODER_INIT_FAILED, ERROR_CODE_ENCODING_FAILED, - ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED, + ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED, ERROR_CODE_HDR_ENCODING_UNSUPPORTED, ERROR_CODE_FRAME_PROCESSING_FAILED, ERROR_CODE_AUDIO_PROCESSING_FAILED, @@ -148,12 +148,12 @@ public final class TransformationException extends Exception { /** Caused by a failure while trying to encode media samples. */ public static final int ERROR_CODE_ENCODING_FAILED = 4002; /** - * Caused by the output format for a track not being supported. + * Caused by trying to encode content whose format is not supported. * * - *

Supported output formats are limited by the muxer's capabilities and the {@linkplain - * Codec.DecoderFactory encoders} available. + *

Supported output formats are limited by the {@linkplain Codec.DecoderFactory encoders} + * available. */ - public static final int ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED = 4003; + public static final int ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED = 4003; /** Caused by the encoder not supporting HDR formats. */ public static final int ERROR_CODE_HDR_ENCODING_UNSUPPORTED = 4004; @@ -190,7 +190,7 @@ public final class TransformationException extends Exception { .put("ERROR_CODE_HDR_DECODING_UNSUPPORTED", ERROR_CODE_HDR_DECODING_UNSUPPORTED) .put("ERROR_CODE_ENCODER_INIT_FAILED", ERROR_CODE_ENCODER_INIT_FAILED) .put("ERROR_CODE_ENCODING_FAILED", ERROR_CODE_ENCODING_FAILED) - .put("ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED", ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED) + .put("ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED", ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED) .put("ERROR_CODE_HDR_ENCODING_UNSUPPORTED", ERROR_CODE_HDR_ENCODING_UNSUPPORTED) .put("ERROR_CODE_FRAME_PROCESSING_FAILED", ERROR_CODE_FRAME_PROCESSING_FAILED) .put("ERROR_CODE_AUDIO_PROCESSING_FAILED", ERROR_CODE_AUDIO_PROCESSING_FAILED) diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java index cb6d3dfb3d..fb993c8789 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java @@ -16,7 +16,7 @@ package androidx.media3.transformer; -import static androidx.media3.transformer.TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED; +import static androidx.media3.transformer.TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; @@ -113,7 +113,7 @@ public class DefaultEncoderFactoryTest { assertThrows( TransformationException.class, () -> encoderFactory.createForVideoEncoding(requestedVideoFormat)); - assertThat(transformationException.errorCode).isEqualTo(ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + assertThat(transformationException.errorCode).isEqualTo(ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } @Test diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerEndToEndTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerEndToEndTest.java index 0380552f48..249c261d68 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerEndToEndTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerEndToEndTest.java @@ -450,7 +450,7 @@ public final class TransformerEndToEndTest { assertThat(exception).hasCauseThat().isInstanceOf(IllegalArgumentException.class); assertThat(exception.errorCode) - .isEqualTo(TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + .isEqualTo(TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } @Test