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

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

Merge "Revert "CCodecConfig: don't dup input format"" into rvc-qpr-dev am:... 

Merge "Revert "CCodecConfig: don't dup input format"" into rvc-qpr-dev am: d3b1df43 am: 339769f3

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

Change-Id: I1105d8365a0c8da4a3517d901247b4fa003a6aa5
parents 136a27af 339769f3

media/codec2/sfplugin/CCodecConfig.cpp

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


    bool changed = false;

    if (domain & mInputDomain) {

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

        sp<AMessage> oldFormat = mInputFormat;

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

        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) {