commit ae55cbf717757115f53b8a9cf71ba76e763599ce
author Ray Essick <essick@google.com> Fri Sep 13 09:20:20 2019 -0700
committer Ray Essick <essick@google.com> Sun Sep 15 14:48:25 2019 +0000
tree 9fce8b84216e4fe4fdb837fe1e87811f979cf5d1
parent 15437f1e0033c3af216eb9a42fbcb4eb1a779210

force g711 test to match 1-channel sample data

special case the g711 test to know that it is a 1-channel input.
Test case itself can't infer the channel count from the g711 stream
since there is no header/control info within the g711 stream.

Bug: 140773833
Test: vts-tradefed run vts --module VtsHalMediaC2V1_0Host
Change-Id: I9ac1f4d3ee0ccc42ffc8c199fcb88dc5c7122c0e
(cherry picked from commit 72b55c5e31a3835a15349dffe24d8acd49adadc3)

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));