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

Commit 633154ba authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

media.c2 aidl: PersistentSurface: add an option to use AIDL interface am: 74efb3eb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3009982



Change-Id: Ie63cb5b4f6d0c476138c2478e9fed50b915ff53c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8e06f04 74efb3eb

media/libstagefright/include/media/stagefright/PersistentSurface.h

+63 −4
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#define PERSISTENT_SURFACE_H_



#include <android/binder_auto_utils.h>

#include <android/binder_libbinder.h>

#include <binder/Parcel.h>

#include <hidl/HidlSupport.h>

#include <hidl/HybridInterface.h>
@@ -29,24 +31,43 @@ namespace android { 
struct PersistentSurface : public RefBase {

    PersistentSurface() {}



    // create a persistent surface

    // create a persistent surface in HIDL

    PersistentSurface(

            const sp<IGraphicBufferProducer>& bufferProducer,

            const sp<hidl::base::V1_0::IBase>& hidlTarget) :

        mBufferProducer(bufferProducer),

        mHidlTarget(hidlTarget) { }

        mHidlTarget(hidlTarget),

        mAidlTarget(nullptr),

        mAidl(false) { }



    // create a persistent surface in AIDL

    PersistentSurface(

            const sp<IGraphicBufferProducer>& bufferProducer,

            const ::ndk::SpAIBinder& aidlTarget) :

        mBufferProducer(bufferProducer),

        mHidlTarget(nullptr),

        mAidlTarget(aidlTarget),

        mAidl(true) { }



    sp<IGraphicBufferProducer> getBufferProducer() const {

        return mBufferProducer;

    }



    bool isTargetAidl() const {

        return mAidl;

    }



    sp<hidl::base::V1_0::IBase> getHidlTarget() const {

        return mHidlTarget;

        return mAidl ? nullptr : mHidlTarget;

    }



    ::ndk::SpAIBinder getAidlTarget() const {

        return mAidl ? mAidlTarget : nullptr;

    }



    status_t writeToParcel(Parcel *parcel) const {

        parcel->writeStrongBinder(IInterface::asBinder(mBufferProducer));

        // write hidl target

        // write hidl target if available

        if (mHidlTarget != nullptr) {

            HalToken token;

            bool result = createHalToken(mHidlTarget, &token);
@@ -57,6 +78,22 @@ struct PersistentSurface : public RefBase { 
        } else {

            parcel->writeBool(false);

        }

        // write aidl target if available

        if (mAidl) {

            AIBinder *binder = mAidlTarget.get();

            if (binder != nullptr) {

                ::android::sp<::android::IBinder> intf =

                        AIBinder_toPlatformBinder(binder);

                if (intf) {

                    parcel->writeBool(true);

                    parcel->writeStrongBinder(intf);

                } else {

                    parcel->writeBool(false);

                }

            } else {

                parcel->writeBool(false);

            }

        }

        return NO_ERROR;

    }
@@ -65,21 +102,43 @@ struct PersistentSurface : public RefBase { 
                parcel->readStrongBinder());

        // read hidl target

        bool haveHidlTarget = parcel->readBool();

        mAidl = false;

        if (haveHidlTarget) {

            std::vector<uint8_t> tokenVector;

            parcel->readByteVector(&tokenVector);

            HalToken token = HalToken(tokenVector);

            mHidlTarget = retrieveHalInterface(token);

            deleteHalToken(token);

            return NO_ERROR;

        } else {

            mHidlTarget.clear();

        }



        // read aidl target

        bool haveAidlTarget = false;

        if (parcel->readBool(&haveAidlTarget) != NO_ERROR) {

            return NO_ERROR;

        }

        mAidl = true;

        if (haveAidlTarget) {

            ::android::sp<::android::IBinder> intf = parcel->readStrongBinder();

            AIBinder *ndkBinder = AIBinder_fromPlatformBinder(intf);

            if (ndkBinder) {

                mAidlTarget.set(ndkBinder);

            } else {

                mAidlTarget.set(nullptr);

            }

        } else {

            mAidlTarget.set(nullptr);

        }

        return NO_ERROR;

    }



private:

    sp<IGraphicBufferProducer> mBufferProducer;

    sp<hidl::base::V1_0::IBase> mHidlTarget;

    ::ndk::SpAIBinder mAidlTarget;

    bool mAidl;



    DISALLOW_EVIL_CONSTRUCTORS(PersistentSurface);

};