From ae55cbf717757115f53b8a9cf71ba76e763599ce Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Fri, 13 Sep 2019 09:20:20 -0700 Subject: [PATCH] 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) --- .../functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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));