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

Commit e6befb88 authored by Jamie Gennis's avatar Jamie Gennis
Browse files

Add an OMX IL API for querying buffer usage flags. 

This change defines an OpenMAX IL API for querying from the IL component
the gralloc buffer usage flags that should be used to allocate the
buffers.  It also adds the Stagefright plumbing for using the new OMX IL
API.

Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6
Related-Bug: 3479027
parent 8e79442c

include/media/IOMX.h

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public: 
    virtual status_t enableGraphicBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable) = 0;



    virtual status_t getGraphicBufferUsage(

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



    virtual status_t useBuffer(

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

            buffer_id *buffer) = 0;

include/media/stagefright/HardwareAPI.h

+12 −0
Original line number Diff line number Diff line
@@ -87,6 +87,18 @@ struct UseAndroidNativeBufferParams { 
    const sp<android_native_buffer_t>& nativeBuffer;

};



// A pointer to this struct is passed to OMX_GetParameter when the extension

// index for the 'OMX.google.android.index.getAndroidNativeBufferUsage'

// extension is given.  The usage bits returned from this query will be used to

// allocate the Gralloc buffers that get passed to the useAndroidNativeBuffer

// command.

struct GetAndroidNativeBufferUsageParams {

    OMX_U32 nSize;              // IN

    OMX_VERSIONTYPE nVersion;   // IN

    OMX_U32 nPortIndex;         // IN

    OMX_U32 nUsage;             // OUT

};



}  // namespace android



extern android::OMXPluginBase *createOMXPlugin();

media/libmedia/IOMX.cpp

+29 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ enum { 
    EMPTY_BUFFER,

    GET_EXTENSION_INDEX,

    OBSERVER_ON_MSG,

    GET_GRAPHIC_BUFFER_USAGE,

};



class BpOMX : public BpInterface<IOMX> {
@@ -194,6 +195,19 @@ public: 
        return err;

    }



    virtual status_t getGraphicBufferUsage(

            node_id node, OMX_U32 port_index, OMX_U32* usage) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32(port_index);

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



        status_t err = reply.readInt32();

        *usage = reply.readInt32();

        return err;

    }



    virtual status_t useBuffer(

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

            buffer_id *buffer) {
@@ -508,6 +522,21 @@ status_t BnOMX::onTransact( 
            return NO_ERROR;

        }



        case GET_GRAPHIC_BUFFER_USAGE:

        {

            CHECK_INTERFACE(IOMX, data, reply);



            node_id node = (void*)data.readIntPtr();

            OMX_U32 port_index = data.readInt32();



            OMX_U32 usage = 0;

            status_t err = getGraphicBufferUsage(node, port_index, &usage);

            reply->writeInt32(err);

            reply->writeInt32(usage);



            return NO_ERROR;

        }



        case USE_BUFFER:

        {

            CHECK_INTERFACE(IOMX, data, reply);

media/libstagefright/include/OMX.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ public: 
    virtual status_t enableGraphicBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable);



    virtual status_t getGraphicBufferUsage(

            node_id node, OMX_U32 port_index, OMX_U32* usage);



    virtual status_t storeMetaDataInBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable);

media/libstagefright/include/OMXNodeInstance.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ struct OMXNodeInstance { 
    status_t setConfig(OMX_INDEXTYPE index, const void *params, size_t size);



    status_t enableGraphicBuffers(OMX_U32 portIndex, OMX_BOOL enable);



    status_t getGraphicBufferUsage(OMX_U32 portIndex, OMX_U32* usage);



    status_t storeMetaDataInBuffers(OMX_U32 portIndex, OMX_BOOL enable);



    status_t useBuffer(