loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the supported codec name in DecodeOneFrameUtil.

Browse Source 
Tested:
  Before: fusion2/7d7db2d1-1c3e-3df3-8507-73b929c6eac8 (Weekly triage)
  After: sponge2/4c078211-e08c-43fa-91d5-346fccc04bcd (custom run)
PiperOrigin-RevId: 511157461
This commit is contained in:
samrobinson 2023-02-21 11:54:31 +00:00 committed by tonihei
parent 37bb432869
commit 3511e08340
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameUtil.java
View File

@ -171,14 +171,13 @@ public final class DecodeOneFrameUtil {
} }
} }
checkStateNotNull(mediaFormat); @Nullable String decoderName = getSupportedDecoderName(checkStateNotNull(mediaFormat));
if (!isSupportedByDecoder(mediaFormat)) { if (decoderName == null) {
throw new UnsupportedOperationException(NO_DECODER_SUPPORT_ERROR_STRING); throw new UnsupportedOperationException(NO_DECODER_SUPPORT_ERROR_STRING);
} }
// Queue the first video frame from the extractor. mediaCodec = MediaCodec.createByCodecName(decoderName);
String mimeType = checkNotNull(mediaFormat.getString(MediaFormat.KEY_MIME));
mediaCodec = MediaCodec.createDecoderByType(mimeType);
// Queue the first video frame from the extractor.
mediaCodec.configure(mediaFormat, surface, /* crypto= */ null, /* flags= */ 0); mediaCodec.configure(mediaFormat, surface, /* crypto= */ null, /* flags= */ 0);
mediaCodec.start(); mediaCodec.start();
int inputBufferIndex = mediaCodec.dequeueInputBuffer(DEQUEUE_TIMEOUT_US); int inputBufferIndex = mediaCodec.dequeueInputBuffer(DEQUEUE_TIMEOUT_US);
@ -224,12 +223,13 @@ public final class DecodeOneFrameUtil {
} }
/** /**
* Returns whether a decoder supports this {@link MediaFormat}. * Returns the name of a decoder that supports this {@link MediaFormat}.
* *
* <p>Capability check is similar to * <p>Capability check is similar to
* androidx.media3.transformer.EncoderUtil.java#findCodecForFormat(). * androidx.media3.transformer.EncoderUtil.java#findCodecForFormat().
*/ */
private static boolean isSupportedByDecoder(MediaFormat format) { @Nullable
private static String getSupportedDecoderName(MediaFormat format) {
if (Util.SDK_INT < 21) { if (Util.SDK_INT < 21) {
throw new UnsupportedOperationException("Unable to detect decoder support under API 21."); throw new UnsupportedOperationException("Unable to detect decoder support under API 21.");
} }
@ -253,7 +253,7 @@ public final class DecodeOneFrameUtil {
if (Util.SDK_INT == 21) { if (Util.SDK_INT == 21) {
MediaFormatUtil.maybeSetInteger(format, MediaFormat.KEY_FRAME_RATE, round(frameRate)); MediaFormatUtil.maybeSetInteger(format, MediaFormat.KEY_FRAME_RATE, round(frameRate));
} }
return mediaCodecName != null; return mediaCodecName;
} }
private DecodeOneFrameUtil() {} private DecodeOneFrameUtil() {}