diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-02 20:39:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-02 20:39:41 +0000 |
| commit | 66f0bcdcee8592e6dc1f23ddfe650efdc19b25cd (patch) | |
| tree | 029ce82bfa2b7307c6a823c19d9155291d77e0fc | |
| parent | 650f29f1f22b7fe039a4b0871e1b37e6c68526f2 (diff) | |
| parent | 1b56ade7a75a146eb6f38404dba73d968df5aece (diff) | |
| download | cts-66f0bcdcee8592e6dc1f23ddfe650efdc19b25cd.tar.gz | |
Merge "Revert "media/codec: avoid COLOR_FormatSurface for codecs used w/o a surface"" into snap-temp-L46600000958426283
| -rw-r--r-- | tests/tests/media/codec/src/android/media/codec/cts/MediaCodecCapabilitiesTest.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecCapabilitiesTest.java b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecCapabilitiesTest.java index 644ecc6aa9f..0c33f93a70d 100644 --- a/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecCapabilitiesTest.java +++ b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecCapabilitiesTest.java @@ -750,15 +750,7 @@ public class MediaCodecCapabilitiesTest extends MediaPlayerTestBase { int minFrameRate = Math.max(vcaps.getSupportedFrameRatesFor(minWidth, minHeight) .getLower().intValue(), 1); format = MediaFormat.createVideoFormat(mime, minWidth, minHeight); - int colorFormat = caps.colorFormats[0]; - for (int i = 0; i < caps.colorFormats.length; ++i) { - colorFormat = caps.colorFormats[i]; - // Avoid COLOR_FormatSurface as we will be configuring the codec without a surface. - if (colorFormat != CodecCapabilities.COLOR_FormatSurface) { - break; - } - } - format.setInteger(MediaFormat.KEY_COLOR_FORMAT, colorFormat); + format.setInteger(MediaFormat.KEY_COLOR_FORMAT, caps.colorFormats[0]); format.setInteger(MediaFormat.KEY_BIT_RATE, minBitrate); format.setInteger(MediaFormat.KEY_FRAME_RATE, minFrameRate); format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, IFRAME_INTERVAL); |