| commit | e3dd2447f996a32c345397203c423f34302914ab | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Mon Oct 11 07:47:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 07:47:10 2021 +0000 |
| tree | 70f599d4ca27c7b6b804ba4ae286dc588a8e4aa2 | |
| parent | f5a15874db2ac769f25254ef4aa8f90e9ffcfcdc [diff] | |
| parent | 97b1662198b1c65898ffbdd195b4c393551bfe70 [diff] |
Merge "force g711 test to match 1-channel sample data" am: eb98d9453c am: 0db0cf02bf am: 77f3b24a43 am: 384cb18cb2 am: 97b1662198 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1851105 Change-Id: I5881ac9d257181345481c0b04f25a00f95de2584
diff --git a/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp b/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp index 9e3a823..d47ef67 100644 --- a/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp +++ b/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp
@@ -465,6 +465,11 @@ if (mMime.find("raw") != std::string::npos) { bitStreamInfo[0] = 8000; bitStreamInfo[1] = 1; + } else if ((mMime.find("g711-alaw") != std::string::npos) || + (mMime.find("g711-mlaw") != std::string::npos)) { + // g711 test data is all 1-channel and has no embedded config info. + bitStreamInfo[0] = 8000; + bitStreamInfo[1] = 1; } else { ASSERT_NO_FATAL_FAILURE(getInputChannelInfo(mComponent, mMime, bitStreamInfo)); }