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

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

Merge "MediaCodec: fix 0-sized buffer handling" into main am: 78f6d89f 

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



Change-Id: I544f194599a5b152fa49fc1b6628871b5209beac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8ffb705 78f6d89f

media/codec2/sfplugin/CCodecBuffers.cpp

+7 −3
Original line number Diff line number Diff line
@@ -1550,19 +1550,23 @@ void LinearOutputBuffers::flush( 


sp<Codec2Buffer> LinearOutputBuffers::wrap(const std::shared_ptr<C2Buffer> &buffer) {

    if (buffer == nullptr) {

        ALOGV("[%s] using a dummy buffer", mName);

        ALOGD("[%s] received null buffer", mName);

        return new LocalLinearBuffer(mFormat, new ABuffer(0));

    }

    if (buffer->data().type() != C2BufferData::LINEAR) {

        ALOGV("[%s] non-linear buffer %d", mName, buffer->data().type());

        ALOGW("[%s] non-linear buffer %d", mName, buffer->data().type());

        // We expect linear output buffers from the component.

        return nullptr;

    }

    if (buffer->data().linearBlocks().size() != 1u) {

        ALOGV("[%s] no linear buffers", mName);

        ALOGW("[%s] no linear buffers", mName);

        // We expect one and only one linear block from the component.

        return nullptr;

    }

    if (buffer->data().linearBlocks().front().size() == 0) {

        ALOGD("[%s] received 0-sized buffer", mName);

        return new LocalLinearBuffer(mFormat, new ABuffer(0));

    }

    sp<Codec2Buffer> clientBuffer = ConstLinearBlockBuffer::Allocate(mFormat, buffer);

    if (clientBuffer == nullptr) {

        ALOGD("[%s] ConstLinearBlockBuffer::Allocate failed", mName);

media/codec2/sfplugin/Codec2Buffer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -179,10 +179,17 @@ sp<ConstLinearBlockBuffer> ConstLinearBlockBuffer::Allocate( 
    if (!buffer

            || buffer->data().type() != C2BufferData::LINEAR

            || buffer->data().linearBlocks().size() != 1u) {

        if (!buffer) {

            ALOGD("ConstLinearBlockBuffer::Allocate: null buffer");

        } else {

            ALOGW("ConstLinearBlockBuffer::Allocate: type=%d # linear blocks=%zu",

                  buffer->data().type(), buffer->data().linearBlocks().size());

        }

        return nullptr;

    }

    C2ReadView readView(buffer->data().linearBlocks()[0].map().get());

    if (readView.error() != C2_OK) {

        ALOGW("ConstLinearBlockBuffer::Allocate: readView.error()=%d", readView.error());

        return nullptr;

    }

    return new ConstLinearBlockBuffer(format, std::move(readView), buffer);

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6646,9 +6646,9 @@ ssize_t MediaCodec::dequeuePortBuffer(int32_t portIndex) { 
    CHECK_EQ(info, &mPortBuffers[portIndex][index]);

    availBuffers->erase(availBuffers->begin());



    CHECK(!info->mOwnedByClient);

    {

        Mutex::Autolock al(mBufferLock);

        CHECK(!info->mOwnedByClient);

        info->mOwnedByClient = true;



        // set image-data