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

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

Merge changes If34bd5eb,Ib373b71b am: 9ef57e41 

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

Change-Id: I6f2863652811a4e632b35b59da50552a66d29536
parents c3c3efa3 9ef57e41

media/codec2/sfplugin/CCodec.cpp

+1 −4
Original line number Diff line number Diff line
@@ -1331,8 +1331,6 @@ void CCodec::start() { 
        mCallback->onError(err2, ACTION_CODE_FATAL);

        return;

    }

    // We're not starting after flush.

    (void)mSentConfigAfterResume.test_and_set();

    err2 = mChannel->start(inputFormat, outputFormat, buffersBoundToCodec);

    if (err2 != OK) {

        mCallback->onError(err2, ACTION_CODE_FATAL);
@@ -1580,7 +1578,6 @@ void CCodec::signalResume() { 
        return;

    }



    mSentConfigAfterResume.clear();

    {

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

        const std::unique_ptr<Config> &config = *configLocked;
@@ -1797,7 +1794,7 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
            // handle configuration changes in work done

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

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

            bool changed = !mSentConfigAfterResume.test_and_set();

            bool changed = false;

            Config::Watcher<C2StreamInitDataInfo::output> initData =

                config->watch<C2StreamInitDataInfo::output>();

            if (!work->worklets.empty()

media/codec2/sfplugin/include/media/stagefright/CCodec.h

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ private: 


    Mutexed<std::unique_ptr<CCodecConfig>> mConfig;

    Mutexed<std::list<std::unique_ptr<C2Work>>> mWorkDoneQueue;

    std::atomic_flag mSentConfigAfterResume;



    friend class CCodecCallbackImpl;