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

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

Merge "CCodecConfig: Remove SBR mode from SDK message when it is set to auto"... 

Merge "CCodecConfig: Remove SBR mode from SDK message when it is set to auto" am: f81e44f2 am: a1a3d48f am: d5b019d5

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

Change-Id: Ide77b3630f9c7db2548bb1d98997d8f3030573df
parents a2fe8556 d5b019d5

media/codec2/sfplugin/CCodecConfig.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,14 @@ sp<AMessage> CCodecConfig::getFormatForDomain( 
        }

    }



    // Remove KEY_AAC_SBR_MODE from SDK message if it is outside supported range

    // as SDK doesn't have a way to signal default sbr mode based on profile and

    // requires that the key isn't present in format to signal that

    int sbrMode;

    if (msg->findInt32(KEY_AAC_SBR_MODE, &sbrMode) && (sbrMode < 0 || sbrMode > 2)) {

        msg->removeEntryAt(msg->findEntryByName(KEY_AAC_SBR_MODE));

    }



    { // convert color info

        // move default color to color aspect if not read from the component

        int32_t tmp;