commit 642929a42b9945a7a54b49201779e9da8dace11e
author Atanas Kirilov <akirilov@google.com> Wed Jul 11 22:45:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 11 22:45:05 2018 +0000
tree 9030e53ec9601039b3dbdc34971b872d1767bc0a
parent 25e9dff25cb89ab290834320243d77643b052256
parent 9bc021a323873091ea98f77b3b3dc4732d1c92e6

Merge "MediaExtractor: stop rendering when an error occurs" into nyc-dev

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 85ff226..f42c77e 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1387,12 +1387,15 @@
     }
     BufferMeta *buffer_meta = static_cast<BufferMeta *>(header->pAppPrivate);
 
+    // Invalidate buffers in the client side first before calling OMX_FreeBuffer.
+    // If not, pending events in the client side might access the buffers after free.
+    invalidateBufferID(buffer);
+
     OMX_ERRORTYPE err = OMX_FreeBuffer(mHandle, portIndex, header);
     CLOG_IF_ERROR(freeBuffer, err, "%s:%u %#x", portString(portIndex), portIndex, buffer);
 
     delete buffer_meta;
     buffer_meta = NULL;
-    invalidateBufferID(buffer);
 
     return StatusFromOMXError(err);
 }