commit 5132fc5e85dd9d218b26c20c07a5cf7631ccc8d0
author Ray Essick <essick@google.com> Tue Oct 22 20:30:37 2019 +0000
committer Ray Essick <essick@google.com> Tue Oct 22 22:16:41 2019 +0000
tree fde8c5f0709ebe53811667cb4f5e84ce3dcb0c90
parent 72b55c5e31a3835a15349dffe24d8acd49adadc3

Revert "force g711 test to match 1-channel sample data"

This reverts commit 72b55c5e31a3835a15349dffe24d8acd49adadc3.

Reason for revert: test was already correct
Bug: 143163373
Test: vts-tradefed run vts --module VtsHalMediaC2V1_0Host
Change-Id: Id3b3fab14386a9660bb75af99a667c3c5a943de4

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 a8a552c..6469735 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,10 +547,6 @@
     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));