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

Commit 72675e93 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "stagefright: pass HIDL backed persistent surface cross binder" into pi-dev 

am: 55c07b0d

Change-Id: I274bc3fe6905f82795166b32d6fefcc30b57a674
parents 7375a473 55c07b0d

media/libmedia/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ cc_library { 
    ],



    shared_libs: [

        "android.hidl.token@1.0-utils",

        "liblog",

        "libcutils",

        "libutils",

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

+24 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <android/IGraphicBufferSource.h>

#include <binder/Parcel.h>

#include <hidl/HidlSupport.h>

#include <hidl/HybridInterface.h>

#include <gui/IGraphicBufferProducer.h>

#include <media/stagefright/foundation/ABase.h>
@@ -59,7 +60,19 @@ struct PersistentSurface : public RefBase { 


    status_t writeToParcel(Parcel *parcel) const {

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

        // this can handle null

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

        // write hidl target

        if (mHidlTarget != nullptr) {

            HalToken token;

            bool result = createHalToken(mHidlTarget, &token);

            parcel->writeBool(result);

            if (result) {

                parcel->writeByteArray(token.size(), token.data());

            }

        } else {

            parcel->writeBool(false);

        }

        return NO_ERROR;

    }
@@ -68,6 +81,17 @@ struct PersistentSurface : public RefBase { 
                parcel->readStrongBinder());

        mBufferSource = interface_cast<IGraphicBufferSource>(

                parcel->readStrongBinder());

        // read hidl target

        bool haveHidlTarget = parcel->readBool();

        if (haveHidlTarget) {

            std::vector<uint8_t> tokenVector;

            parcel->readByteVector(&tokenVector);

            HalToken token = HalToken(tokenVector);

            mHidlTarget = retrieveHalInterface(token);

            deleteHalToken(token);

        } else {

            mHidlTarget.clear();

        }

        return NO_ERROR;

    }