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

Commit c66319fa authored by Chong Zhang's avatar Chong Zhang
Browse files

Always notify resource error in async mode when reclaim happens 

Currently, the async callback for onError may or may not be
called depending on whether there are "pending buffers". This
is totally random with timing. Client may not get resource
lost event properly.

bug: 168307955
bug: 154733526
Change-Id: I141070c8491059e2fb94e91db5cf49bdb3b6f346
parent ffebb80b

media/libstagefright/MediaCodec.cpp

+7 −5
Original line number Diff line number Diff line
@@ -2926,7 +2926,13 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            int32_t reclaimed = 0;

            msg->findInt32("reclaimed", &reclaimed);

            if (reclaimed) {

                if (!mReleasedByResourceManager) {

                    // notify the async client

                    if (mFlags & kFlagIsAsync) {

                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);

                    }

                    mReleasedByResourceManager = true;

                }



                int32_t force = 0;

                msg->findInt32("force", &force);
@@ -2938,10 +2944,6 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                    response->setInt32("err", WOULD_BLOCK);

                    response->postReply(replyID);



                    // notify the async client

                    if (mFlags & kFlagIsAsync) {

                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);

                    }

                    break;

                }

            }