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

Commit f106f9e4 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev 

* commit '15e991bd':
  DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
parents d4df7559 15e991bd

include/media/IOMX.h

+6 −0
Original line number Diff line number Diff line
@@ -207,6 +207,12 @@ public: 
    virtual status_t onTransact(

            uint32_t code, const Parcel &data, Parcel *reply,

            uint32_t flags = 0);



protected:

    // check if the codec is secure.

    virtual bool isSecure(IOMX::node_id node) {

        return false;

    }

};



class BnOMXObserver : public BnInterface<IOMXObserver> {

media/libmedia/IOMX.cpp

+6 −0
Original line number Diff line number Diff line
@@ -848,6 +848,12 @@ status_t BnOMX::onTransact( 


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

            OMX_U32 port_index = data.readInt32();

            if (!isSecure(node) || port_index != 0 /* kPortIndexInput */) {

                ALOGE("b/24310423");

                reply->writeInt32(INVALID_OPERATION);

                return NO_ERROR;

            }



            size_t size = data.readInt64();



            buffer_id buffer;

media/libstagefright/include/OMX.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ public: 


    virtual void binderDied(const wp<IBinder> &the_late_who);



    virtual bool isSecure(IOMX::node_id node);



    OMX_ERRORTYPE OnEvent(

            node_id node,

            OMX_IN OMX_EVENTTYPE eEvent,

media/libstagefright/include/OMXNodeInstance.h

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ struct OMXNodeInstance { 
            const void *data,

            size_t size);



    bool isSecure() const {

        return mIsSecure;

    }



    void onMessage(const omx_message &msg);

    void onObserverDied(OMXMaster *master);

    void onGetHandleFailed();
@@ -129,6 +133,7 @@ private: 
    OMX_HANDLETYPE mHandle;

    sp<IOMXObserver> mObserver;

    bool mDying;

    bool mIsSecure;



    // Lock only covers mGraphicBufferSource.  We can't always use mLock

    // because of rare instances where we'd end up locking it recursively.

media/libstagefright/omx/OMX.cpp

+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) { 
    instance->onObserverDied(mMaster);

}



bool OMX::isSecure(node_id node) {

    OMXNodeInstance *instance = findInstance(node);

    return (instance == NULL ? false : instance->isSecure());

}



bool OMX::livesLocally(node_id /* node */, pid_t pid) {

    return pid == getpid();

}