commit 5a670d3669061c3fe3305195f7c98d78fb44ea02
author Ray Essick <essick@google.com> Thu Nov 07 19:13:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 07 19:13:33 2019 +0000
tree b83b44f5864bc14dce92c698edee3b2d36e44a90
parent b4235aabf383c9ea3e5bcaddcab37d69b4cb6d44
parent 5132fc5e85dd9d218b26c20c07a5cf7631ccc8d0

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

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