summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2019-09-20 13:28:08 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-20 13:28:08 -0700
commiteaf3f613a91f4b6383d4c2d81cbedefebef83ec7 (patch)
tree631a02127bfcda3d466a696ba5f13ba74e299f3a
parentcf935409652e633096729bdb64029cf2383534e3 (diff)
parent9956aa28741e1a01299d3c0eda16c96abe6288d1 (diff)
downloadav-eaf3f613a91f4b6383d4c2d81cbedefebef83ec7.tar.gz
force g711 test to match 1-channel sample data am: ae55cbf717
am: 9956aa2874 Change-Id: I32a041f3b2c6e9ea19bc21476fd17353ac235ab9
-rw-r--r--media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp4
1 files changed, 4 insertions, 0 deletions
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 6469735611..a8a552cfba 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
@@ -547,6 +547,10 @@ TEST_P(Codec2AudioDecDecodeTest, DecodeTest) {
if (mCompName == raw) {
bitStreamInfo[0] = 8000;
bitStreamInfo[1] = 1;
+ } else if (mCompName == g711alaw || mCompName == g711mlaw) {
+ // 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, mCompName, bitStreamInfo));