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

Commit 110a6641 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodecConfig: don't dup input format" am: a8460237 

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

Change-Id: I515de0360a4774a397e0dd69561718f8823a229c
parents 90871601 a8460237

media/codec2/sfplugin/CCodecConfig.cpp

+1 −4
Original line number Diff line number Diff line
@@ -1151,14 +1151,11 @@ bool CCodecConfig::updateFormats(Domain domain) { 


    bool changed = false;

    if (domain & mInputDomain) {

        sp<AMessage> oldFormat = mInputFormat;

        mInputFormat = mInputFormat->dup(); // trigger format changed

        sp<AMessage> oldFormat = mInputFormat->dup();

        mInputFormat->extend(getFormatForDomain(reflected, mInputDomain));

        if (mInputFormat->countEntries() != oldFormat->countEntries()

                || mInputFormat->changesFrom(oldFormat)->countEntries() > 0) {

            changed = true;

        } else {

            mInputFormat = oldFormat; // no change

        }

    }

    if (domain & mOutputDomain) {