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

Commit 8b8e5d45 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp 

Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
parents 2a8270e6 cbd74fcb

include/media/IOMX.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ class IOMX : public IInterface { 
public:

    DECLARE_META_INTERFACE(OMX);



    typedef void *buffer_id;

    typedef void *node_id;

    typedef uint32_t buffer_id;

    typedef uint32_t node_id;



    // Given a node_id and the calling process' pid, returns true iff

    // the implementation of the OMX interface lives in the same

include/media/stagefright/MediaCodec.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ private: 
    };



    struct BufferInfo {

        void *mBufferID;

        uint32_t mBufferID;

        sp<ABuffer> mData;

        sp<ABuffer> mEncryptedData;

        sp<AMessage> mNotify;

media/libmedia/IOMX.cpp

+68 −64
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
    virtual bool livesLocally(node_id node, pid_t pid) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(pid);

        remote()->transact(LIVES_LOCALLY, data, &reply);
@@ -104,7 +104,7 @@ public: 


        status_t err = reply.readInt32();

        if (err == OK) {

            *node = (void*)reply.readIntPtr();

            *node = (node_id)reply.readInt32();

        } else {

            *node = 0;

        }
@@ -115,7 +115,7 @@ public: 
    virtual status_t freeNode(node_id node) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

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



        return reply.readInt32();
@@ -125,7 +125,7 @@ public: 
            node_id node, OMX_COMMANDTYPE cmd, OMX_S32 param) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(cmd);

        data.writeInt32(param);

        remote()->transact(SEND_COMMAND, data, &reply);
@@ -138,7 +138,7 @@ public: 
            void *params, size_t size) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(index);

        data.writeInt64(size);

        data.write(params, size);
@@ -159,7 +159,7 @@ public: 
            const void *params, size_t size) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(index);

        data.writeInt64(size);

        data.write(params, size);
@@ -173,7 +173,7 @@ public: 
            void *params, size_t size) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(index);

        data.writeInt64(size);

        data.write(params, size);
@@ -194,7 +194,7 @@ public: 
            const void *params, size_t size) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(index);

        data.writeInt64(size);

        data.write(params, size);
@@ -207,7 +207,7 @@ public: 
            node_id node, OMX_STATETYPE* state) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

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



        *state = static_cast<OMX_STATETYPE>(reply.readInt32());
@@ -218,7 +218,7 @@ public: 
            node_id node, OMX_U32 port_index, OMX_BOOL enable) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeInt32((uint32_t)enable);

        remote()->transact(ENABLE_GRAPHIC_BUFFERS, data, &reply);
@@ -231,7 +231,7 @@ public: 
            node_id node, OMX_U32 port_index, OMX_U32* usage) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        remote()->transact(GET_GRAPHIC_BUFFER_USAGE, data, &reply);
@@ -245,7 +245,7 @@ public: 
            buffer_id *buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeStrongBinder(params->asBinder());

        remote()->transact(USE_BUFFER, data, &reply);
@@ -257,7 +257,7 @@ public: 
            return err;

        }



        *buffer = (void*)reply.readIntPtr();

        *buffer = (buffer_id)reply.readInt32();



        return err;

    }
@@ -268,7 +268,7 @@ public: 
            const sp<GraphicBuffer> &graphicBuffer, buffer_id *buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.write(*graphicBuffer);

        remote()->transact(USE_GRAPHIC_BUFFER, data, &reply);
@@ -280,7 +280,7 @@ public: 
            return err;

        }



        *buffer = (void*)reply.readIntPtr();

        *buffer = (buffer_id)reply.readInt32();



        return err;

    }
@@ -290,10 +290,10 @@ public: 
            const sp<GraphicBuffer> &graphicBuffer, buffer_id buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.write(*graphicBuffer);

        data.writeIntPtr((intptr_t)buffer);

        data.writeInt32((int32_t)buffer);

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



        status_t err = reply.readInt32();
@@ -306,7 +306,7 @@ public: 
        Parcel data, reply;

        status_t err;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        err = remote()->transact(CREATE_INPUT_SURFACE, data, &reply);

        if (err != OK) {
@@ -329,7 +329,7 @@ public: 
        Parcel data, reply;

        status_t err;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        err = remote()->transact(SIGNAL_END_OF_INPUT_STREAM, data, &reply);

        if (err != OK) {

            ALOGW("binder transaction failed: %d", err);
@@ -343,7 +343,7 @@ public: 
            node_id node, OMX_U32 port_index, OMX_BOOL enable) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeInt32((uint32_t)enable);

        remote()->transact(STORE_META_DATA_IN_BUFFERS, data, &reply);
@@ -357,7 +357,7 @@ public: 
            OMX_U32 max_width, OMX_U32 max_height) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeInt32((int32_t)enable);

        data.writeInt32(max_width);
@@ -373,7 +373,7 @@ public: 
            buffer_id *buffer, void **buffer_data) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeInt64(size);

        remote()->transact(ALLOC_BUFFER, data, &reply);
@@ -385,8 +385,8 @@ public: 
            return err;

        }



        *buffer = (void *)reply.readIntPtr();

        *buffer_data = (void *)reply.readIntPtr();

        *buffer = (buffer_id)reply.readInt32();

        *buffer_data = (void *)reply.readInt64();



        return err;

    }
@@ -396,7 +396,7 @@ public: 
            buffer_id *buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeStrongBinder(params->asBinder());

        remote()->transact(ALLOC_BUFFER_WITH_BACKUP, data, &reply);
@@ -408,7 +408,7 @@ public: 
            return err;

        }



        *buffer = (void*)reply.readIntPtr();

        *buffer = (buffer_id)reply.readInt32();



        return err;

    }
@@ -417,9 +417,9 @@ public: 
            node_id node, OMX_U32 port_index, buffer_id buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeIntPtr((intptr_t)buffer);

        data.writeInt32((int32_t)buffer);

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



        return reply.readInt32();
@@ -428,8 +428,8 @@ public: 
    virtual status_t fillBuffer(node_id node, buffer_id buffer) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeIntPtr((intptr_t)buffer);

        data.writeInt32((int32_t)node);

        data.writeInt32((int32_t)buffer);

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



        return reply.readInt32();
@@ -442,8 +442,8 @@ public: 
            OMX_U32 flags, OMX_TICKS timestamp) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeIntPtr((intptr_t)buffer);

        data.writeInt32((int32_t)node);

        data.writeInt32((int32_t)buffer);

        data.writeInt32(range_offset);

        data.writeInt32(range_length);

        data.writeInt32(flags);
@@ -459,7 +459,7 @@ public: 
            OMX_INDEXTYPE *index) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeCString(parameter_name);



        remote()->transact(GET_EXTENSION_INDEX, data, &reply);
@@ -482,7 +482,7 @@ public: 
            size_t size) {

        Parcel data, reply;

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

        data.writeIntPtr((intptr_t)node);

        data.writeInt32((int32_t)node);

        data.writeInt32(port_index);

        data.writeInt64(size);

        data.write(optionData, size);
@@ -509,7 +509,7 @@ status_t BnOMX::onTransact( 
        case LIVES_LOCALLY:

        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);

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

            node_id node = (node_id)data.readInt32();

            pid_t pid = (pid_t)data.readInt32();

            reply->writeInt32(livesLocally(node, pid));
@@ -553,7 +553,7 @@ status_t BnOMX::onTransact( 
            status_t err = allocateNode(name, observer, &node);

            reply->writeInt32(err);

            if (err == OK) {

                reply->writeIntPtr((intptr_t)node);

                reply->writeInt32((int32_t)node);

            }



            return NO_ERROR;
@@ -563,7 +563,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();



            reply->writeInt32(freeNode(node));
@@ -574,7 +574,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();



            OMX_COMMANDTYPE cmd =

                static_cast<OMX_COMMANDTYPE>(data.readInt32());
@@ -593,7 +593,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_INDEXTYPE index = static_cast<OMX_INDEXTYPE>(data.readInt32());



            size_t size = data.readInt64();
@@ -644,7 +644,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_STATETYPE state = OMX_StateInvalid;



            status_t err = getState(node, &state);
@@ -658,7 +658,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            OMX_BOOL enable = (OMX_BOOL)data.readInt32();
@@ -672,7 +672,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();



            OMX_U32 usage = 0;
@@ -687,7 +687,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            sp<IMemory> params =

                interface_cast<IMemory>(data.readStrongBinder());
@@ -697,7 +697,7 @@ status_t BnOMX::onTransact( 
            reply->writeInt32(err);



            if (err == OK) {

                reply->writeIntPtr((intptr_t)buffer);

                reply->writeInt32((int32_t)buffer);

            }



            return NO_ERROR;
@@ -707,7 +707,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            sp<GraphicBuffer> graphicBuffer = new GraphicBuffer();

            data.read(*graphicBuffer);
@@ -718,7 +718,7 @@ status_t BnOMX::onTransact( 
            reply->writeInt32(err);



            if (err == OK) {

                reply->writeIntPtr((intptr_t)buffer);

                reply->writeInt32((int32_t)buffer);

            }



            return NO_ERROR;
@@ -728,11 +728,11 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            sp<GraphicBuffer> graphicBuffer = new GraphicBuffer();

            data.read(*graphicBuffer);

            buffer_id buffer = (void*)data.readIntPtr();

            buffer_id buffer = (buffer_id)data.readInt32();



            status_t err = updateGraphicBufferInMeta(

                    node, port_index, graphicBuffer, buffer);
@@ -745,7 +745,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();



            sp<IGraphicBufferProducer> bufferProducer;
@@ -765,7 +765,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();



            status_t err = signalEndOfInputStream(node);

            reply->writeInt32(err);
@@ -777,7 +777,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            OMX_BOOL enable = (OMX_BOOL)data.readInt32();
@@ -791,7 +791,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

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

            OMX_U32 max_width = data.readInt32();
@@ -808,7 +808,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            size_t size = data.readInt64();
@@ -819,8 +819,8 @@ status_t BnOMX::onTransact( 
            reply->writeInt32(err);



            if (err == OK) {

                reply->writeIntPtr((intptr_t)buffer);

                reply->writeIntPtr((intptr_t)buffer_data);

                reply->writeInt32((int32_t)buffer);

                reply->writeInt64((uintptr_t)buffer_data);

            }



            return NO_ERROR;
@@ -830,7 +830,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            sp<IMemory> params =

                interface_cast<IMemory>(data.readStrongBinder());
@@ -842,7 +842,7 @@ status_t BnOMX::onTransact( 
            reply->writeInt32(err);



            if (err == OK) {

                reply->writeIntPtr((intptr_t)buffer);

                reply->writeInt32((int32_t)buffer);

            }



            return NO_ERROR;
@@ -852,9 +852,9 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            OMX_U32 port_index = data.readInt32();

            buffer_id buffer = (void*)data.readIntPtr();

            buffer_id buffer = (buffer_id)data.readInt32();

            reply->writeInt32(freeBuffer(node, port_index, buffer));



            return NO_ERROR;
@@ -864,8 +864,8 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            buffer_id buffer = (void*)data.readIntPtr();

            node_id node = (node_id)data.readInt32();

            buffer_id buffer = (buffer_id)data.readInt32();

            reply->writeInt32(fillBuffer(node, buffer));



            return NO_ERROR;
@@ -875,8 +875,8 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            buffer_id buffer = (void*)data.readIntPtr();

            node_id node = (node_id)data.readInt32();

            buffer_id buffer = (buffer_id)data.readInt32();

            OMX_U32 range_offset = data.readInt32();

            OMX_U32 range_length = data.readInt32();

            OMX_U32 flags = data.readInt32();
@@ -894,7 +894,7 @@ status_t BnOMX::onTransact( 
        {

            CHECK_OMX_INTERFACE(IOMX, data, reply);



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

            node_id node = (node_id)data.readInt32();

            const char *parameter_name = data.readCString();



            OMX_INDEXTYPE index;
@@ -927,6 +927,8 @@ public: 
        data.writeInterfaceToken(IOMXObserver::getInterfaceDescriptor());

        data.write(&msg, sizeof(msg));



        ALOGV("onMessage writing message %d, size %zu", msg.type, sizeof(msg));



        remote()->transact(OBSERVER_ON_MSG, data, &reply, IBinder::FLAG_ONEWAY);

    }

};
@@ -943,6 +945,8 @@ status_t BnOMXObserver::onTransact( 
            omx_message msg;

            data.read(&msg, sizeof(msg));



            ALOGV("onTransact reading message %d, size %zu", msg.type, sizeof(msg));



            // XXX Could use readInplace maybe?

            onMessage(msg);

media/libstagefright/ACodec.cpp

+36 −31

File changed.

Preview size limit exceeded, changes collapsed.

media/libstagefright/MediaCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1520,8 +1520,8 @@ size_t MediaCodec::updateBuffers( 
        int32_t portIndex, const sp<AMessage> &msg) {

    CHECK(portIndex == kPortIndexInput || portIndex == kPortIndexOutput);



    void *bufferID;

    CHECK(msg->findPointer("buffer-id", &bufferID));

    uint32_t bufferID;

    CHECK(msg->findInt32("buffer-id", (int32_t*)&bufferID));



    Vector<BufferInfo> *buffers = &mPortBuffers[portIndex];