diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-01 22:42:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-01 22:42:45 +0000 |
| commit | ecb8ea4ac451e8cf4c632a9afc43885c4f3c881c (patch) | |
| tree | b756899c28f490e2dcc34dc16060d1a924aa75d0 | |
| parent | 9ebb249168f1a697c495bb87c2763bceb8a62938 (diff) | |
| parent | 75d47ea3905beea4d21163d5694e3fac824a8501 (diff) | |
| download | cts-ecb8ea4ac451e8cf4c632a9afc43885c4f3c881c.tar.gz | |
Merge "mediav2 CTS: Skip validating audio decoder output in special cases" into stage-aosp-udc-ts-dev am: 75d47ea390
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24199650
Change-Id: I4cb81c5763f168f1baee4c21b8f817ab7b1904aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/media/src/android/mediav2/cts/CodecDecoderValidationTest.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/media/src/android/mediav2/cts/CodecDecoderValidationTest.java b/tests/media/src/android/mediav2/cts/CodecDecoderValidationTest.java index 0baa3afdbf8..6834b0c75e8 100644 --- a/tests/media/src/android/mediav2/cts/CodecDecoderValidationTest.java +++ b/tests/media/src/android/mediav2/cts/CodecDecoderValidationTest.java @@ -819,6 +819,17 @@ public class CodecDecoderValidationTest extends CodecDecoderTestBase { } Assume.assumeFalse("skip checksum verification due to tone mapping", mSkipChecksumVerification); + if (mIsAudio) { + int inputPcmEncoding = formats.get(0) + .getInteger(MediaFormat.KEY_PCM_ENCODING, AudioFormat.ENCODING_PCM_16BIT); + if (mMediaType.equals(MEDIA_TYPE_RAW) + && inputPcmEncoding != AudioFormat.ENCODING_PCM_16BIT) { + int outputPcmEncoding = mOutFormat.getInteger(MediaFormat.KEY_PCM_ENCODING, + AudioFormat.ENCODING_PCM_16BIT); + Assume.assumeTrue("output pcm encoding is not 16 bit, skipping output" + + " validation", outputPcmEncoding == AudioFormat.ENCODING_PCM_16BIT); + } + } CodecDecoderTest.verify(ref, mRefFile, mRmsError, AudioFormat.ENCODING_PCM_16BIT, mRefCRC, mTestConfig.toString() + mTestEnv.toString()); } |