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

Commit 48d80203 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

stagefright: do not set buffer when returning buffers 

Bug: 32976893
Bug: 32542437
Test: (manual) play secure content on Play Movies app (fugu) and see that it doesn't crash
Change-Id: Ib45fd552634c9addc8ce25a1d255113c80cc8ce7
parent 9ea205b1

media/libstagefright/MediaCodec.cpp

+0 −2
Original line number Diff line number Diff line
@@ -2377,8 +2377,6 @@ void MediaCodec::returnBuffersToCodecOnPort(int32_t portIndex, bool isReclaim) { 
        if (info->mNotify != NULL) {

            sp<AMessage> msg = info->mNotify;

            info->mNotify = NULL;

            msg->setObject("buffer", (portIndex == kPortIndexInput && mCrypto != NULL)

                    ? info->mSecureData : info->mData);

            if (isReclaim && info->mOwnedByClient) {

                ALOGD("port %d buffer %zu still owned by client when codec is reclaimed",

                        portIndex, i);