commit 9956aa28741e1a01299d3c0eda16c96abe6288d1
author Ray Essick <essick@google.com> Fri Sep 20 13:23:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 13:23:06 2019 -0700
tree cdf211c6f1522b55ff51ec3e006902390af376fd
parent ef6506d2c5eb9fc71e41e804ebf0e3fb602240eb
parent ae55cbf717757115f53b8a9cf71ba76e763599ce

force g711 test to match 1-channel sample data
am: ae55cbf717

Change-Id: I27cd320ad4a6ec7eb67842eebce37cfba4cb0274

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp

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 6469735..a8a552c 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 @@
     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));