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

Commit e3dd2447 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "force g711 test to match 1-channel sample data" am: eb98d945 am:... 

Merge "force g711 test to match 1-channel sample data" am: eb98d945 am: 0db0cf02 am: 77f3b24a am: 384cb18c am: 97b16621

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

Change-Id: I5881ac9d257181345481c0b04f25a00f95de2584
parents f5a15874 97b16621

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

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

        bitStreamInfo[0] = 8000;

        bitStreamInfo[1] = 1;

    } else if ((mMime.find("g711-alaw") != std::string::npos) ||

               (mMime.find("g711-mlaw") != std::string::npos)) {

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

    }