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

Commit aa50cc78 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 56ce7260: IOMX: Add prepareForAdaptivePlayback method 

* commit '56ce7260':
  IOMX: Add prepareForAdaptivePlayback method
parents 31ed2c54 56ce7260

include/media/IOMX.h

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ public: 
    virtual status_t storeMetaDataInBuffers(

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



    virtual status_t prepareForAdaptivePlayback(

            node_id node, OMX_U32 portIndex, OMX_BOOL enable,

            OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight) = 0;



    virtual status_t enableGraphicBuffers(

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

media/libmedia/IOMX.cpp

+34 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ enum { 
    CREATE_INPUT_SURFACE,

    SIGNAL_END_OF_INPUT_STREAM,

    STORE_META_DATA_IN_BUFFERS,

    PREPARE_FOR_ADAPTIVE_PLAYBACK,

    ALLOC_BUFFER,

    ALLOC_BUFFER_WITH_BACKUP,

    FREE_BUFFER,
@@ -351,6 +352,22 @@ public: 
        return err;

    }



    virtual status_t prepareForAdaptivePlayback(

            node_id node, OMX_U32 port_index, OMX_BOOL enable,

            OMX_U32 max_width, OMX_U32 max_height) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32(port_index);

        data.writeInt32((int32_t)enable);

        data.writeInt32(max_width);

        data.writeInt32(max_height);

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



        status_t err = reply.readInt32();

        return err;

    }



    virtual status_t allocateBuffer(

            node_id node, OMX_U32 port_index, size_t size,

            buffer_id *buffer, void **buffer_data) {
@@ -770,6 +787,23 @@ status_t BnOMX::onTransact( 
            return NO_ERROR;

        }



        case PREPARE_FOR_ADAPTIVE_PLAYBACK:

        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            OMX_U32 port_index = data.readInt32();

            OMX_BOOL enable = (OMX_BOOL)data.readInt32();

            OMX_U32 max_width = data.readInt32();

            OMX_U32 max_height = data.readInt32();



            status_t err = prepareForAdaptivePlayback(

                    node, port_index, enable, max_width, max_height);

            reply->writeInt32(err);



            return NO_ERROR;

        }



        case ALLOC_BUFFER:

        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);

media/libstagefright/OMXClient.cpp

+11 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ struct MuxOMX : public IOMX { 
    virtual status_t storeMetaDataInBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable);



    virtual status_t prepareForAdaptivePlayback(

            node_id node, OMX_U32 port_index, OMX_BOOL enable,

            OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight);



    virtual status_t enableGraphicBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable);
@@ -268,6 +272,13 @@ status_t MuxOMX::storeMetaDataInBuffers( 
    return getOMX(node)->storeMetaDataInBuffers(node, port_index, enable);

}



status_t MuxOMX::prepareForAdaptivePlayback(

        node_id node, OMX_U32 port_index, OMX_BOOL enable,

        OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight) {

    return getOMX(node)->prepareForAdaptivePlayback(

            node, port_index, enable, maxFrameWidth, maxFrameHeight);

}



status_t MuxOMX::enableGraphicBuffers(

        node_id node, OMX_U32 port_index, OMX_BOOL enable) {

    return getOMX(node)->enableGraphicBuffers(node, port_index, enable);

media/libstagefright/include/OMX.h

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ public: 
    virtual status_t storeMetaDataInBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable);



    virtual status_t prepareForAdaptivePlayback(

            node_id node, OMX_U32 portIndex, OMX_BOOL enable,

            OMX_U32 max_frame_width, OMX_U32 max_frame_height);



    virtual status_t useBuffer(

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

            buffer_id *buffer);

media/libstagefright/include/OMXNodeInstance.h

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ struct OMXNodeInstance { 


    status_t storeMetaDataInBuffers(OMX_U32 portIndex, OMX_BOOL enable);



    status_t prepareForAdaptivePlayback(

            OMX_U32 portIndex, OMX_BOOL enable,

            OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight);



    status_t useBuffer(

            OMX_U32 portIndex, const sp<IMemory> &params,

            OMX::buffer_id *buffer);