diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-29 23:41:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 23:41:38 +0000 |
| commit | 70d39fbbd6b8763c2bda5b7d079485da90ccec41 (patch) | |
| tree | e3bd73300d852533668b9ad9c71afe3f616baf51 | |
| parent | 47378bf3ce3cc2a060ab92b015ba03913c872d1c (diff) | |
| parent | 5716df8fd2faa04c01eb70d4f83f3ba4eb7af7cb (diff) | |
| download | cts-70d39fbbd6b8763c2bda5b7d079485da90ccec41.tar.gz | |
Merge "mediav2: Remove vp9 profile workaround for high bit depth clips" into main
| -rw-r--r-- | tests/media/common/src/android/mediav2/common/cts/CodecDecoderTestBase.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/media/common/src/android/mediav2/common/cts/CodecDecoderTestBase.java b/tests/media/common/src/android/mediav2/common/cts/CodecDecoderTestBase.java index f4fd16c5c0c..d0521f883ad 100644 --- a/tests/media/common/src/android/mediav2/common/cts/CodecDecoderTestBase.java +++ b/tests/media/common/src/android/mediav2/common/cts/CodecDecoderTestBase.java @@ -131,14 +131,6 @@ public class CodecDecoderTestBase extends CodecTestBase { boolean selectHBD = doesAnyFormatHaveHDRProfile(mMediaType, formatList); if (!selectHBD && srcFile.contains("10bit")) { selectHBD = true; - if (mMediaType.equals(MediaFormat.MIMETYPE_VIDEO_VP9)) { - // In some cases, webm extractor may not signal profile for 10-bit VP9 - // clips. In such cases, set profile to a 10-bit compatible profile. - // TODO (b/295804596) Remove the following once webm extractor signals - // profile correctly for all 10-bit clips - int[] profileArray = CodecTestBase.PROFILE_HDR_MAP.get(mMediaType); - format.setInteger(MediaFormat.KEY_PROFILE, profileArray[0]); - } } format.setInteger(MediaFormat.KEY_COLOR_FORMAT, getColorFormat(mCodecName, mMediaType, mSurface != null, selectHBD)); |