diff options
| author | Wonsik Kim <wonsik@google.com> | 2020-12-04 16:42:13 -0800 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-02-01 21:40:44 +0000 |
| commit | e12771d6375ef34e3c75944c7b914c795858b7c8 (patch) | |
| tree | 8e1f78ff4b2b5b56541fbc6681af3a6c1209ddfd | |
| parent | bc5fc3a6ba56d29d3c996aa7ad5bf92baf13b825 (diff) | |
| download | cts-e12771d6375ef34e3c75944c7b914c795858b7c8.tar.gz | |
media: fix MediaCodecTest#testException for video encoders
Specify the right color format for different scenarios.
Bug: 174780062
Bug: 172623083
Test: atest CtsMediaTestCases:MediaCodecTest#testException
Change-Id: I69903213c5ed4505bed58d14f7dd171932079e2c
(cherry picked from commit 0140eba0615b6ecf0df55093900b8c8fe78c340f)
(cherry picked from commit 69d5671df46090565cd03a72e9c541e3408cf579)
| -rw-r--r-- | tests/tests/media/src/android/media/cts/MediaCodecTest.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java index 201f6e4744c..f90ee5e8e4c 100644 --- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java +++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java @@ -147,8 +147,6 @@ public class MediaCodecTest extends AndroidTestCase { tested = verifyException(format, false /* isEncoder */) || tested; // video encoder (H.264/AVC may not be present on some Android devices) - format.setInteger(MediaFormat.KEY_COLOR_FORMAT, - MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible); tested = verifyException(format, true /* isEncoder */) || tested; // signal test is skipped due to no device media codecs. @@ -187,6 +185,12 @@ public class MediaCodecTest extends AndroidTestCase { final boolean isVideoEncoder = isEncoder && mimeType.startsWith("video/"); + if (isVideoEncoder) { + format = new MediaFormat(format); + format.setInteger(MediaFormat.KEY_COLOR_FORMAT, + MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface); + } + // create codec (enter Initialized State) MediaCodec codec; @@ -379,6 +383,11 @@ public class MediaCodecTest extends AndroidTestCase { // recreate codec = createCodecByType(format.getString(MediaFormat.KEY_MIME), isEncoder); + if (isVideoEncoder) { + format.setInteger(MediaFormat.KEY_COLOR_FORMAT, + MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible); + } + // configure improperly try { codec.configure(format, null /* surface */, null /* crypto */, |