- * May be passed to {@link MediaCodec#createByCodecName(String)} to create an instance of the + * + *
May be passed to {@link MediaCodec#createByCodecName(String)} to create an instance of the * decoder. */ public final String name; @@ -300,11 +326,12 @@ public final class MediaCodecInfo { } /** - * Returns whether it may be possible to adapt to playing a different format when the codec is - * configured to play media in the specified {@code format}. For adaptation to succeed, the codec - * must also be configured with appropriate maximum values and {@link - * #isSeamlessAdaptationSupported(Format, Format, boolean)} must return {@code true} for the - * old/new formats. + * Returns whether it may be possible to adapt an instance of this decoder to playing a different + * format when the codec is configured to play media in the specified {@code format}. + * + *
For adaptation to succeed, the codec must also be configured with appropriate maximum values + * and {@link #isSeamlessAdaptationSupported(Format, Format, boolean)} must return {@code true} + * for the old/new formats. * * @param format The format of media for which the decoder will be configured. * @return Whether adaptation may be possible @@ -319,36 +346,66 @@ public final class MediaCodecInfo { } /** - * Returns whether it is possible to adapt the decoder seamlessly from {@code oldFormat} to {@code - * newFormat}. If {@code newFormat} may not be completely populated, pass {@code false} for {@code - * isNewFormatComplete}. + * Returns whether it is possible to adapt an instance of this decoder seamlessly from {@code + * oldFormat} to {@code newFormat}. If {@code newFormat} may not be completely populated, pass + * {@code false} for {@code isNewFormatComplete}. + * + *
For adaptation to succeed, the codec must also be configured with maximum values that are + * compatible with the new format. * * @param oldFormat The format being decoded. * @param newFormat The new format. * @param isNewFormatComplete Whether {@code newFormat} is populated with format-specific * metadata. * @return Whether it is possible to adapt the decoder seamlessly. + * @deprecated Use {@link #canKeepCodec}. */ + @Deprecated public boolean isSeamlessAdaptationSupported( Format oldFormat, Format newFormat, boolean isNewFormatComplete) { + if (!isNewFormatComplete && oldFormat.colorInfo != null && newFormat.colorInfo == null) { + newFormat = newFormat.buildUpon().setColorInfo(oldFormat.colorInfo).build(); + } + @KeepCodecResult int keepCodecResult = canKeepCodec(oldFormat, newFormat); + return keepCodecResult == KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION + || keepCodecResult == KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION; + } + + /** + * Returns the extent to which it's possible to adapt an instance of this decoder that's currently + * decoding {@code oldFormat} to decode {@code newFormat} instead. + * + *
For adaptation to succeed, the codec must also be configured with maximum values that are
+ * compatible with the new format.
+ *
+ * @param oldFormat The format being decoded.
+ * @param newFormat The new format.
+ * @return The extent to which it's possible to adapt an instance of the decoder.
+ */
+ @KeepCodecResult
+ public int canKeepCodec(Format oldFormat, Format newFormat) {
if (!Util.areEqual(oldFormat.sampleMimeType, newFormat.sampleMimeType)) {
- return false;
+ return KEEP_CODEC_RESULT_NO;
}
if (isVideo) {
- return oldFormat.rotationDegrees == newFormat.rotationDegrees
+ if (oldFormat.rotationDegrees == newFormat.rotationDegrees
&& (adaptive
|| (oldFormat.width == newFormat.width && oldFormat.height == newFormat.height))
- && ((!isNewFormatComplete && newFormat.colorInfo == null)
- || Util.areEqual(oldFormat.colorInfo, newFormat.colorInfo));
+ && Util.areEqual(oldFormat.colorInfo, newFormat.colorInfo)) {
+ return oldFormat.initializationDataEquals(newFormat)
+ ? KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION
+ : KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION;
+ }
} else {
if (oldFormat.channelCount != newFormat.channelCount
- || oldFormat.sampleRate != newFormat.sampleRate) {
- return false;
+ || oldFormat.sampleRate != newFormat.sampleRate
+ || oldFormat.pcmEncoding != newFormat.pcmEncoding) {
+ return KEEP_CODEC_RESULT_NO;
}
// Check whether we're adapting between two xHE-AAC formats, for which adaptation is possible
- // without reconfiguration.
+ // without reconfiguration or flushing.
if (MimeTypes.AUDIO_AAC.equals(mimeType)) {
@Nullable
Pair The default implementation returns {@link #KEEP_CODEC_RESULT_NO}.
+ * The default implementation returns {@link MediaCodecInfo#KEEP_CODEC_RESULT_NO}.
*
* @param codec The existing {@link MediaCodec} instance.
* @param codecInfo A {@link MediaCodecInfo} describing the decoder.
@@ -1582,7 +1562,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
* @param newFormat The new {@link Format}.
* @return Whether the instance can be kept, and if it can whether it requires reconfiguration.
*/
- protected @KeepCodecResult int canKeepCodec(
+ @KeepCodecResult
+ protected int canKeepCodec(
MediaCodec codec, MediaCodecInfo codecInfo, Format oldFormat, Format newFormat) {
return KEEP_CODEC_RESULT_NO;
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 55415b5d33..eb0cd994eb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -15,6 +15,7 @@
*/
package com.google.android.exoplayer2.video;
+import static com.google.android.exoplayer2.mediacodec.MediaCodecInfo.KEEP_CODEC_RESULT_NO;
import static java.lang.Math.max;
import static java.lang.Math.min;
@@ -49,6 +50,7 @@ import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.mediacodec.MediaCodecAdapter;
import com.google.android.exoplayer2.mediacodec.MediaCodecDecoderException;
import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
+import com.google.android.exoplayer2.mediacodec.MediaCodecInfo.KeepCodecResult;
import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer;
import com.google.android.exoplayer2.mediacodec.MediaCodecSelector;
import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
@@ -565,18 +567,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
}
@Override
- protected @KeepCodecResult int canKeepCodec(
+ @KeepCodecResult
+ protected int canKeepCodec(
MediaCodec codec, MediaCodecInfo codecInfo, Format oldFormat, Format newFormat) {
- if (codecInfo.isSeamlessAdaptationSupported(
- oldFormat, newFormat, /* isNewFormatComplete= */ true)
- && newFormat.width <= codecMaxValues.width
- && newFormat.height <= codecMaxValues.height
- && getMaxInputSize(codecInfo, newFormat) <= codecMaxValues.inputSize) {
- return oldFormat.initializationDataEquals(newFormat)
- ? KEEP_CODEC_RESULT_YES_WITHOUT_RECONFIGURATION
- : KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION;
+ if (newFormat.width > codecMaxValues.width
+ || newFormat.height > codecMaxValues.height
+ || getMaxInputSize(codecInfo, newFormat) > codecMaxValues.inputSize) {
+ return KEEP_CODEC_RESULT_NO;
}
- return KEEP_CODEC_RESULT_NO;
+ return codecInfo.canKeepCodec(oldFormat, newFormat);
}
@CallSuper
@@ -1325,8 +1324,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
}
boolean haveUnknownDimensions = false;
for (Format streamFormat : streamFormats) {
- if (codecInfo.isSeamlessAdaptationSupported(
- format, streamFormat, /* isNewFormatComplete= */ false)) {
+ if (format.colorInfo != null && streamFormat.colorInfo == null) {
+ // streamFormat likely has incomplete color information. Copy the complete color information
+ // from format to avoid codec re-use being ruled out for only this reason.
+ streamFormat = streamFormat.buildUpon().setColorInfo(format.colorInfo).build();
+ }
+ if (codecInfo.canKeepCodec(format, streamFormat) != KEEP_CODEC_RESULT_NO) {
haveUnknownDimensions |=
(streamFormat.width == Format.NO_VALUE || streamFormat.height == Format.NO_VALUE);
maxWidth = max(maxWidth, streamFormat.width);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfoTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfoTest.java
index 488f58b573..efef2b47b3 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfoTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfoTest.java
@@ -15,6 +15,9 @@
*/
package com.google.android.exoplayer2.mediacodec;
+import static com.google.android.exoplayer2.mediacodec.MediaCodecInfo.KEEP_CODEC_RESULT_NO;
+import static com.google.android.exoplayer2.mediacodec.MediaCodecInfo.KEEP_CODEC_RESULT_YES_WITH_FLUSH;
+import static com.google.android.exoplayer2.mediacodec.MediaCodecInfo.KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION;
import static com.google.android.exoplayer2.util.MimeTypes.AUDIO_AAC;
import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_AV1;
import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H264;
@@ -64,6 +67,114 @@ public final class MediaCodecInfoTest {
.build();
@Test
+ public void canKeepCodec_withDifferentMimeType_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
+
+ Format hdAv1Format = FORMAT_H264_HD.buildUpon().setSampleMimeType(VIDEO_AV1).build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_HD, hdAv1Format)).isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_withRotation_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
+
+ Format hdRotatedFormat = FORMAT_H264_HD.buildUpon().setRotationDegrees(90).build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_HD, hdRotatedFormat))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_withResolutionChange_adaptiveCodec_returnsYesWithReconfiguration() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
+
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_HD, FORMAT_H264_4K))
+ .isEqualTo(KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION);
+ }
+
+ @Test
+ public void canKeepCodec_withResolutionChange_nonAdaptiveCodec_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
+
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_HD, FORMAT_H264_4K))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_noResolutionChange_nonAdaptiveCodec_returnsYesWithReconfiguration() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
+
+ Format hdVariantFormat =
+ FORMAT_H264_HD.buildUpon().setInitializationData(ImmutableList.of(new byte[] {0})).build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_HD, hdVariantFormat))
+ .isEqualTo(KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION);
+ }
+
+ @Test
+ public void canKeepCodec_colorInfoOmittedFromNewFormat_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
+
+ Format hdrVariantFormat =
+ FORMAT_H264_4K.buildUpon().setColorInfo(buildColorInfo(C.COLOR_SPACE_BT601)).build();
+ assertThat(codecInfo.canKeepCodec(hdrVariantFormat, FORMAT_H264_4K))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_colorInfoOmittedFromOldFormat_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
+
+ Format hdrVariantFormat =
+ FORMAT_H264_4K.buildUpon().setColorInfo(buildColorInfo(C.COLOR_SPACE_BT601)).build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_H264_4K, hdrVariantFormat))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_colorInfoChange_returnsNo() {
+ MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
+
+ Format hdrVariantFormat1 =
+ FORMAT_H264_4K.buildUpon().setColorInfo(buildColorInfo(C.COLOR_SPACE_BT601)).build();
+ Format hdrVariantFormat2 =
+ FORMAT_H264_4K.buildUpon().setColorInfo(buildColorInfo(C.COLOR_SPACE_BT709)).build();
+ assertThat(codecInfo.canKeepCodec(hdrVariantFormat1, hdrVariantFormat2))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ assertThat(codecInfo.canKeepCodec(hdrVariantFormat1, hdrVariantFormat2))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_audioWithDifferentChannelCounts_returnsNo() {
+ MediaCodecInfo codecInfo = buildAacCodecInfo();
+
+ assertThat(codecInfo.canKeepCodec(FORMAT_AAC_STEREO, FORMAT_AAC_SURROUND))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ public void canKeepCodec_audioWithSameChannelCounts_returnsYesWithFlush() {
+ MediaCodecInfo codecInfo = buildAacCodecInfo();
+
+ Format stereoVariantFormat = FORMAT_AAC_STEREO.buildUpon().setAverageBitrate(100).build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_AAC_STEREO, stereoVariantFormat))
+ .isEqualTo(KEEP_CODEC_RESULT_YES_WITH_FLUSH);
+ }
+
+ @Test
+ public void canKeepCodec_audioWithDifferentInitializationData_returnsNo() {
+ MediaCodecInfo codecInfo = buildAacCodecInfo();
+
+ Format stereoVariantFormat =
+ FORMAT_AAC_STEREO
+ .buildUpon()
+ .setInitializationData(ImmutableList.of(new byte[] {0}))
+ .build();
+ assertThat(codecInfo.canKeepCodec(FORMAT_AAC_STEREO, stereoVariantFormat))
+ .isEqualTo(KEEP_CODEC_RESULT_NO);
+ }
+
+ @Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_withDifferentMimeType_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
@@ -75,6 +186,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_withRotation_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
@@ -86,6 +198,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_withResolutionChange_adaptiveCodec_returnsTrue() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ true);
@@ -96,6 +209,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_withResolutionChange_nonAdaptiveCodec_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -106,6 +220,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_noResolutionChange_nonAdaptiveCodec_returnsTrue() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -118,6 +233,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_colorInfoOmittedFromCompleteNewFormat_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -130,6 +246,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_colorInfoOmittedFromIncompleteNewFormat_returnsTrue() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -142,6 +259,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_colorInfoOmittedFromOldFormat_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -154,6 +272,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_colorInfoChange_returnsFalse() {
MediaCodecInfo codecInfo = buildH264CodecInfo(/* adaptive= */ false);
@@ -172,6 +291,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_audioWithDifferentChannelCounts_returnsFalse() {
MediaCodecInfo codecInfo = buildAacCodecInfo();
@@ -182,6 +302,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_audioWithSameChannelCounts_returnsFalse() {
MediaCodecInfo codecInfo = buildAacCodecInfo();
@@ -193,6 +314,7 @@ public final class MediaCodecInfoTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void isSeamlessAdaptationSupported_audioWithDifferentInitializationData_returnsFalse() {
MediaCodecInfo codecInfo = buildAacCodecInfo();