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

Commit d64d6261 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 069ee21a: Merge "Make parameter blocks read/writable even for... 

am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb

* commit '069ee21a2012e0b6fd355253ea81a84ea11138d2':
  Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
parents a027eaf8 662cb248

media/libmedia/IOMX.cpp

+20 −58
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <binder/IMemory.h>

#include <binder/Parcel.h>

#include <media/IOMX.h>

#include <media/stagefright/foundation/ADebug.h>

#include <surfaceflinger/ISurface.h>

#include <surfaceflinger/Surface.h>
@@ -449,48 +450,9 @@ status_t BnOMX::onTransact( 
        }



        case GET_PARAMETER:

        {

            CHECK_INTERFACE(IOMX, data, reply);



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

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



            size_t size = data.readInt32();



            // XXX I am not happy with this but Parcel::readInplace didn't work.

            void *params = malloc(size);

            data.read(params, size);



            status_t err = getParameter(node, index, params, size);



            reply->writeInt32(err);



            if (err == OK) {

                reply->write(params, size);

            }



            free(params);

            params = NULL;



            return NO_ERROR;

        }



        case SET_PARAMETER:

        {

            CHECK_INTERFACE(IOMX, data, reply);



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

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



            size_t size = data.readInt32();

            void *params = const_cast<void *>(data.readInplace(size));



            reply->writeInt32(setParameter(node, index, params, size));



            return NO_ERROR;

        }



        case GET_CONFIG:

        case SET_CONFIG:

        {

            CHECK_INTERFACE(IOMX, data, reply);
@@ -499,15 +461,30 @@ status_t BnOMX::onTransact( 


            size_t size = data.readInt32();



            // XXX I am not happy with this but Parcel::readInplace didn't work.

            void *params = malloc(size);

            data.read(params, size);



            status_t err = getConfig(node, index, params, size);

            status_t err;

            switch (code) {

                case GET_PARAMETER:

                    err = getParameter(node, index, params, size);

                    break;

                case SET_PARAMETER:

                    err = setParameter(node, index, params, size);

                    break;

                case GET_CONFIG:

                    err = getConfig(node, index, params, size);

                    break;

                case SET_CONFIG:

                    err = setConfig(node, index, params, size);

                    break;

                default:

                    TRESPASS();

            }



            reply->writeInt32(err);



            if (err == OK) {

            if ((code == GET_PARAMETER || code == GET_CONFIG) && err == OK) {

                reply->write(params, size);

            }
@@ -517,21 +494,6 @@ status_t BnOMX::onTransact( 
            return NO_ERROR;

        }



        case SET_CONFIG:

        {

            CHECK_INTERFACE(IOMX, data, reply);



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

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



            size_t size = data.readInt32();

            void *params = const_cast<void *>(data.readInplace(size));



            reply->writeInt32(setConfig(node, index, params, size));



            return NO_ERROR;

        }



        case ENABLE_GRAPHIC_BUFFERS:

        {

            CHECK_INTERFACE(IOMX, data, reply);