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

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

Merge "CCodecBufferChannel: make sure the output buffers are reported in... 

Merge "CCodecBufferChannel: make sure the output buffers are reported in order" into udc-dev am: 6037baff

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



Change-Id: Ib79d489dc5c4c61d6f46c0545b84847177624b15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed01b909 6037baff

media/codec2/sfplugin/CCodecBufferChannel.cpp

+8 −2
Original line number Diff line number Diff line
@@ -2111,7 +2111,10 @@ bool CCodecBufferChannel::handleWork( 
            outBuffer->meta()->setInt32("flags", BUFFER_FLAG_CODEC_CONFIG);

            ALOGV("[%s] onWorkDone: csd index = %zu [%p]", mName, index, outBuffer.get());



            output.unlock();

            // TRICKY: we want popped buffers reported in order, so sending

            // the callback while holding the lock here. This assumes that

            // onOutputBufferAvailable() does not block. onOutputBufferAvailable()

            // callbacks are always sent with the Output lock held.

            mCallback->onOutputBufferAvailable(index, outBuffer);

        } else {

            ALOGD("[%s] onWorkDone: unable to register csd", mName);
@@ -2201,7 +2204,10 @@ void CCodecBufferChannel::sendOutputBuffers() { 
        case OutputBuffers::DISCARD:

            break;

        case OutputBuffers::NOTIFY_CLIENT:

            output.unlock();

            // TRICKY: we want popped buffers reported in order, so sending

            // the callback while holding the lock here. This assumes that

            // onOutputBufferAvailable() does not block. onOutputBufferAvailable()

            // callbacks are always sent with the Output lock held.

            mCallback->onOutputBufferAvailable(index, outBuffer);

            break;

        case OutputBuffers::REALLOCATE: