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

Commit cc7cc673 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: allow to overallocate OMX codec buffers 

Specify allottedSize for useBuffer and allocateBufferWithBackup,
where OMX will see only the allottedSize, even though framework may
allocate and use a bigger buffer.

Bug: 13222807
Change-Id: Ibfa93f6c7b7c8ca0853ef17d4a0758e496eaf921
parent f9a3dce5

include/media/IOMX.h

+5 −2
Original line number Diff line number Diff line
@@ -98,9 +98,10 @@ public: 
    virtual status_t getGraphicBufferUsage(

            node_id node, OMX_U32 port_index, OMX_U32* usage) = 0;



    // Use |params| as an OMX buffer, but limit the size of the OMX buffer to |allottedSize|.

    virtual status_t useBuffer(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) = 0;

            buffer_id *buffer, OMX_U32 allottedSize) = 0;



    virtual status_t useGraphicBuffer(

            node_id node, OMX_U32 port_index,
@@ -132,9 +133,11 @@ public: 
            node_id node, OMX_U32 port_index, size_t size,

            buffer_id *buffer, void **buffer_data) = 0;



    // Allocate an OMX buffer of size |allotedSize|. Use |params| as the backup buffer, which

    // may be larger.

    virtual status_t allocateBufferWithBackup(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) = 0;

            buffer_id *buffer, OMX_U32 allottedSize) = 0;



    virtual status_t freeBuffer(

            node_id node, OMX_U32 port_index, buffer_id buffer) = 0;

media/libmedia/IOMX.cpp

+8 −4
Original line number Diff line number Diff line
@@ -245,12 +245,13 @@ public: 


    virtual status_t useBuffer(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) {

            buffer_id *buffer, OMX_U32 allottedSize) {

        Parcel data, reply;

        data.writeInterfaceToken(IOMX::getInterfaceDescriptor());

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeStrongBinder(IInterface::asBinder(params));

        data.writeInt32(allottedSize);

        remote()->transact(USE_BUFFER, data, &reply);



        status_t err = reply.readInt32();
@@ -459,12 +460,13 @@ public: 


    virtual status_t allocateBufferWithBackup(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer) {

            buffer_id *buffer, OMX_U32 allottedSize) {

        Parcel data, reply;

        data.writeInterfaceToken(IOMX::getInterfaceDescriptor());

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeStrongBinder(IInterface::asBinder(params));

        data.writeInt32(allottedSize);

        remote()->transact(ALLOC_BUFFER_WITH_BACKUP, data, &reply);



        status_t err = reply.readInt32();
@@ -757,9 +759,10 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();

            sp<IMemory> params =

                interface_cast<IMemory>(data.readStrongBinder());

            OMX_U32 allottedSize = data.readInt32();



            buffer_id buffer;

            status_t err = useBuffer(node, port_index, params, &buffer);

            status_t err = useBuffer(node, port_index, params, &buffer, allottedSize);

            reply->writeInt32(err);



            if (err == OK) {
@@ -953,10 +956,11 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();

            sp<IMemory> params =

                interface_cast<IMemory>(data.readStrongBinder());

            OMX_U32 allottedSize = data.readInt32();



            buffer_id buffer;

            status_t err = allocateBufferWithBackup(

                    node, port_index, params, &buffer);

                    node, port_index, params, &buffer, allottedSize);



            reply->writeInt32(err);

media/libstagefright/ACodec.cpp

+3 −3
Original line number Diff line number Diff line
@@ -725,9 +725,9 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
                    info.mData = new ABuffer(ptr, bufSize);

                } else if (mQuirks & requiresAllocateBufferBit) {

                    err = mOMX->allocateBufferWithBackup(

                            mNode, portIndex, mem, &info.mBufferID);

                            mNode, portIndex, mem, &info.mBufferID, def.nBufferSize);

                } else {

                    err = mOMX->useBuffer(mNode, portIndex, mem, &info.mBufferID);

                    err = mOMX->useBuffer(mNode, portIndex, mem, &info.mBufferID, def.nBufferSize);

                }



                if (mem != NULL) {
@@ -997,7 +997,7 @@ status_t ACodec::allocateOutputMetaDataBuffers() { 


        // we use useBuffer for metadata regardless of quirks

        err = mOMX->useBuffer(

                mNode, kPortIndexOutput, mem, &info.mBufferID);

                mNode, kPortIndexOutput, mem, &info.mBufferID, mem->size());



        mBuffers[kPortIndexOutput].push(info);

media/libstagefright/OMXClient.cpp

+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct MuxOMX : public IOMX { 


    virtual status_t useBuffer(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t useGraphicBuffer(

            node_id node, OMX_U32 port_index,
@@ -120,7 +120,7 @@ struct MuxOMX : public IOMX { 


    virtual status_t allocateBufferWithBackup(

            node_id node, OMX_U32 port_index, const sp<IMemory> &params,

            buffer_id *buffer);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t freeBuffer(

            node_id node, OMX_U32 port_index, buffer_id buffer);
@@ -322,8 +322,8 @@ status_t MuxOMX::getGraphicBufferUsage( 


status_t MuxOMX::useBuffer(

        node_id node, OMX_U32 port_index, const sp<IMemory> &params,

        buffer_id *buffer) {

    return getOMX(node)->useBuffer(node, port_index, params, buffer);

        buffer_id *buffer, OMX_U32 allottedSize) {

    return getOMX(node)->useBuffer(node, port_index, params, buffer, allottedSize);

}



status_t MuxOMX::useGraphicBuffer(
@@ -375,9 +375,9 @@ status_t MuxOMX::allocateBuffer( 


status_t MuxOMX::allocateBufferWithBackup(

        node_id node, OMX_U32 port_index, const sp<IMemory> &params,

        buffer_id *buffer) {

        buffer_id *buffer, OMX_U32 allottedSize) {

    return getOMX(node)->allocateBufferWithBackup(

            node, port_index, params, buffer);

            node, port_index, params, buffer, allottedSize);

}



status_t MuxOMX::freeBuffer(

media/libstagefright/OMXCodec.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
                        &info.mData);

            } else {

                err = mOMX->allocateBufferWithBackup(

                        mNode, portIndex, mem, &buffer);

                        mNode, portIndex, mem, &buffer, mem->size());

            }

        } else if (portIndex == kPortIndexOutput

                && (mQuirks & kRequiresAllocateBufferOnOutputPorts)) {
@@ -1690,10 +1690,10 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
                        &info.mData);

            } else {

                err = mOMX->allocateBufferWithBackup(

                        mNode, portIndex, mem, &buffer);

                        mNode, portIndex, mem, &buffer, mem->size());

            }

        } else {

            err = mOMX->useBuffer(mNode, portIndex, mem, &buffer);

            err = mOMX->useBuffer(mNode, portIndex, mem, &buffer, mem->size());

        }



        if (err != OK) {