commit c66319fa024f75b0f7b46d08acc7cb5a2fddd50f
author Chong Zhang <chz@google.com> Wed Sep 16 12:51:26 2020 -0700
committer Chong Zhang <chz@google.com> Wed Sep 16 13:38:21 2020 -0700
tree 61e57133087d84f0b494f227298e983642480e6a
parent ffebb80bd127ecebfc4af02fe481d048d0c9a29c

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

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5015787..b5b5774 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2926,7 +2926,13 @@
             int32_t reclaimed = 0;
             msg->findInt32("reclaimed", &reclaimed);
             if (reclaimed) {
-                mReleasedByResourceManager = true;
+                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 @@
                     response->setInt32("err", WOULD_BLOCK);
                     response->postReply(replyID);
 
-                    // notify the async client
-                    if (mFlags & kFlagIsAsync) {
-                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);
-                    }
                     break;
                 }
             }