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

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

Merge "CCodecBufferChannel: exit handleWork early if output buffers are cleared" am: 404f1e6e 

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



Change-Id: I8f3adb2dfeeee3b958808ad5ca2f441aff5aecf8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c721a5e4 404f1e6e

media/codec2/sfplugin/CCodecBufferChannel.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2066,7 +2066,10 @@ bool CCodecBufferChannel::handleWork( 
    // csd cannot be re-ordered and will always arrive first.

    if (initData != nullptr) {

        Mutexed<Output>::Locked output(mOutput);

        if (output->buffers && outputFormat) {

        if (!output->buffers) {

            return false;

        }

        if (outputFormat) {

            output->buffers->updateSkipCutBuffer(outputFormat);

            output->buffers->setFormat(outputFormat);

        }
@@ -2075,7 +2078,7 @@ bool CCodecBufferChannel::handleWork( 
        }

        size_t index;

        sp<MediaCodecBuffer> outBuffer;

        if (output->buffers && output->buffers->registerCsd(initData, &index, &outBuffer) == OK) {

        if (output->buffers->registerCsd(initData, &index, &outBuffer) == OK) {

            outBuffer->meta()->setInt64("timeUs", timestamp.peek());

            outBuffer->meta()->setInt32("flags", BUFFER_FLAG_CODEC_CONFIG);

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