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

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

Merge "CCodec: Updates to RevertOutputFormatIfNeeded" am: 6169766b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dc4d0ffa1405a3425e46bdd0c9f1ac98699ef23
parents c290630e 6169766b

media/codec2/sfplugin/CCodec.cpp

+5 −0
Original line number Diff line number Diff line
@@ -492,7 +492,10 @@ void RevertOutputFormatIfNeeded( 
    // We used to not report changes to these keys to the client.

    const static std::set<std::string> sIgnoredKeys({

            KEY_BIT_RATE,

            KEY_FRAME_RATE,

            KEY_MAX_BIT_RATE,

            KEY_MAX_WIDTH,

            KEY_MAX_HEIGHT,

            "csd-0",

            "csd-1",

            "csd-2",
@@ -1706,7 +1709,9 @@ void CCodec::signalResume() { 
    {

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;

        sp<AMessage> outputFormat = config->mOutputFormat;

        config->queryConfiguration(comp);

        RevertOutputFormatIfNeeded(outputFormat, config->mOutputFormat);

    }



    (void)mChannel->start(nullptr, nullptr, [&]{