From e9a3077371cd98e137aa1f98898ea09fc14f5345 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 --- .../exoplayer2/transformer/BaseSamplePipeline.java | 2 +- .../android/exoplayer2/transformer/DefaultCodec.java | 2 +- .../transformer/DefaultEncoderFactory.java | 2 +- .../transformer/TransformationException.java | 12 ++++++------ .../transformer/DefaultEncoderFactoryTest.java | 4 ++-- .../transformer/TransformerEndToEndTest.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java index b3d6b41c73..ead5163ec4 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java @@ -47,7 +47,7 @@ import com.google.android.exoplayer2.util.MimeTypes; /* isDecoder= */ false, requestedEncoderFormat, /* mediaCodecName= */ null, - TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED); + TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED); } @Override diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java index a8fcffeaa5..86585eee02 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java @@ -405,7 +405,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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactory.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactory.java index a9f4c93c9e..e821147b9b 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactory.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactory.java @@ -667,7 +667,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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java index eb670271a0..9adb978738 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java @@ -66,7 +66,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, @@ -146,12 +146,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; @@ -188,7 +188,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/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactoryTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactoryTest.java index 68c80b359e..9dfb0d9582 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactoryTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/DefaultEncoderFactoryTest.java @@ -17,7 +17,7 @@ package com.google.android.exoplayer2.transformer; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; -import static com.google.android.exoplayer2.transformer.TransformationException.ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED; +import static com.google.android.exoplayer2.transformer.TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED; 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/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java index 4b04293823..e75fa9f8a8 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerEndToEndTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/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