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

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

fix build 

Revert incorrectly merged f8a4cb41.
Merge 7c3c2fa3 instead.

Keep fixes to these that were merged in since then.
parent 705b64ab

include/media/IOMX.h

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public: 
    // 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, OMX_U32 allottedSize, OMX_BOOL crossProcess = OMX_FALSE) = 0;

            buffer_id *buffer, OMX_U32 allottedSize) = 0;



    virtual status_t useGraphicBuffer(

            node_id node, OMX_U32 port_index,
@@ -156,7 +156,7 @@ public: 
    // may be larger.

    virtual status_t allocateBufferWithBackup(

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

            buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess = OMX_FALSE) = 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

+1 −4
Original line number Diff line number Diff line
@@ -1044,10 +1044,7 @@ status_t BnOMX::onTransact( 
            OMX_BOOL enable = (OMX_BOOL)data.readInt32();



            MetadataBufferType type = (MetadataBufferType)data.readInt32();

            status_t err =

                // only control output metadata via Binder

                port_index != 1 /* kOutputPortIndex */ ? BAD_VALUE :

                storeMetaDataInBuffers(node, port_index, enable, &type);

            status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);



            reply->writeInt32(type);

            reply->writeInt32(err);

media/libstagefright/OMXClient.cpp

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


    virtual status_t useBuffer(

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

            buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t useGraphicBuffer(

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


    virtual status_t allocateBufferWithBackup(

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

            buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t freeBuffer(

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


status_t MuxOMX::useBuffer(

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

        buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL /* crossProcess */) {

    return getOMX(node)->useBuffer(

            node, port_index, params, buffer, allottedSize, OMX_FALSE /* crossProcess */);

        buffer_id *buffer, OMX_U32 allottedSize) {

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

}



status_t MuxOMX::useGraphicBuffer(
@@ -448,9 +447,9 @@ status_t MuxOMX::allocateSecureBuffer( 


status_t MuxOMX::allocateBufferWithBackup(

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

        buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL /* crossProcess */) {

        buffer_id *buffer, OMX_U32 allottedSize) {

    return getOMX(node)->allocateBufferWithBackup(

            node, port_index, params, buffer, allottedSize, OMX_FALSE /* crossProcess */);

            node, port_index, params, buffer, allottedSize);

}



status_t MuxOMX::freeBuffer(

media/libstagefright/include/OMX.h

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public: 


    virtual status_t useBuffer(

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

            buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t useGraphicBuffer(

            node_id node, OMX_U32 port_index,
@@ -119,7 +119,7 @@ public: 


    virtual status_t allocateBufferWithBackup(

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

            buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            buffer_id *buffer, OMX_U32 allottedSize);



    virtual status_t freeBuffer(

            node_id node, OMX_U32 port_index, buffer_id buffer);

media/libstagefright/include/OMXNodeInstance.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct OMXNodeInstance { 


    status_t useBuffer(

            OMX_U32 portIndex, const sp<IMemory> &params,

            OMX::buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            OMX::buffer_id *buffer, OMX_U32 allottedSize);



    status_t useGraphicBuffer(

            OMX_U32 portIndex, const sp<GraphicBuffer> &graphicBuffer,
@@ -107,7 +107,7 @@ struct OMXNodeInstance { 


    status_t allocateBufferWithBackup(

            OMX_U32 portIndex, const sp<IMemory> &params,

            OMX::buffer_id *buffer, OMX_U32 allottedSize, OMX_BOOL crossProcess);

            OMX::buffer_id *buffer, OMX_U32 allottedSize);



    status_t freeBuffer(OMX_U32 portIndex, OMX::buffer_id buffer);