| commit | 0db0cf02bfc4e66e26f5ea7faae9670ce9954c79 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Mon Oct 11 06:58:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 06:58:31 2021 +0000 |
| tree | 26d2693cda05db7ff4f39894d1d54324149fe1dc | |
| parent | b566987209a453caa090cd8b84a7faffcd08c8eb [diff] | |
| parent | eb98d9453c1107e0c7e652ec79785822a5c030fd [diff] |
Merge "force g711 test to match 1-channel sample data" am: eb98d9453c Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1851105 Change-Id: I1822296cdd9622d747053dfe94d13b72eff50b02
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)); }