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

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

Merge "C2BqBuffer: Remove detach during migration" am: 0ef532f9 am:... 

Merge "C2BqBuffer: Remove detach during migration" am: 0ef532f9 am: 216c3832 am: 76e6d9c7 am: 3c3e64ab

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



Change-Id: Id0ece7e84dce9c5933dce169fee7f1d3c5230e65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62543f7c 3c3e64ab

media/codec2/vndk/platform/C2BqBuffer.cpp

+0 −16
Original line number Diff line number Diff line
@@ -576,14 +576,7 @@ public: 
    }



    ~Impl() {

        bool noInit = false;

        for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {

            if (!noInit && mProducer) {

                Return<HStatus> transResult =

                        mProducer->detachBuffer(static_cast<int32_t>(i));

                noInit = !transResult.isOk() ||

                         static_cast<HStatus>(transResult) == HStatus::NO_INIT;

            }

            mBuffers[i].clear();

        }

    }
@@ -692,15 +685,6 @@ public: 
        {

            sp<GraphicBuffer> buffers[NUM_BUFFER_SLOTS];

            std::scoped_lock<std::mutex> lock(mMutex);

            bool noInit = false;

            for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {

                if (!noInit && mProducer) {

                    Return<HStatus> transResult =

                            mProducer->detachBuffer(static_cast<int32_t>(i));

                    noInit = !transResult.isOk() ||

                             static_cast<HStatus>(transResult) == HStatus::NO_INIT;

                }

            }

            int32_t oldGeneration = mGeneration;

            if (producer) {

                mProducer = producer;