Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad2ede5c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Merge "force g711 test to match 1-channel sample data" into android10-tests-dev am: 031f612a" into android11-tests-dev am: 8cce7009" into android12-tests-dev am: 7ebdc99f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1138077



Change-Id: Ib8499e11b31898e0c0595cc939fc2958ac4c8fca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd6d5f55 7ebdc99f

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

+4 −0
Original line number Diff line number Diff line
@@ -465,6 +465,10 @@ TEST_P(Codec2AudioDecDecodeTest, DecodeTest) { 
    if (mMime.find("raw") != std::string::npos) {

        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, mMime, bitStreamInfo));

    }