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

Commit ecc8bbbf authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: propagate nativeHandle properly for secure playback" into nyc-dev

parents b3be0064 c6e96a91

include/media/stagefright/CodecBase.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct CodecBase : public AHandler { 
        virtual size_t countBuffers() = 0;

        virtual IOMX::buffer_id bufferIDAt(size_t index) const = 0;

        virtual sp<ABuffer> bufferAt(size_t index) const = 0;

        virtual sp<NativeHandle> handleAt(size_t index) { return NULL; };

        virtual sp<NativeHandle> handleAt(size_t index) const { return NULL; };

        virtual sp<RefBase> memRefAt(size_t index) const { return NULL; }



    protected:

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2498,7 +2498,7 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 
        ICrypto::DestinationType dst_type = ICrypto::kDestinationTypeOpaqueHandle;



        if (info->mNativeHandle != NULL) {

            dst_pointer = (void *)info->mNativeHandle.get();

            dst_pointer = (void *)info->mNativeHandle->handle();

            dst_type = ICrypto::kDestinationTypeNativeHandle;

        } else if ((mFlags & kFlagIsSecure) == 0) {

            dst_type = ICrypto::kDestinationTypeVmPointer;