am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

* commit '9545b6707e8c2213806c71fa9b0cae608b8bc032':
  Avoid a deadlock during EmptyBufferDone

1 files changed, 17 insertions, 11 deletions

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index e7d5e74..a9eb94f 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -779,6 +779,23 @@ void OMXNodeInstance::onMessage(const omx_message &msg) {
             static_cast<BufferMeta *>(buffer->pAppPrivate);
 
         buffer_meta->CopyFromOMX(buffer);
+    } else if (msg.type == omx_message::EMPTY_BUFFER_DONE) {
+        const sp<GraphicBufferSource>& bufferSource(getGraphicBufferSource());
+
+        if (bufferSource != NULL) {
+            // This is one of the buffers used exclusively by
+            // GraphicBufferSource.
+            // Don't dispatch a message back to ACodec, since it doesn't
+            // know that anyone asked to have the buffer emptied and will
+            // be very confused.
+
+            OMX_BUFFERHEADERTYPE *buffer =
+                static_cast<OMX_BUFFERHEADERTYPE *>(
+                        msg.u.buffer_data.buffer);
+
+            bufferSource->codecBufferEmptied(buffer);
+            return;
+        }
     }
 
     mObserver->onMessage(msg);
@@ -839,17 +856,6 @@ OMX_ERRORTYPE OMXNodeInstance::OnEmptyBufferDone(
     if (instance->mDying) {
         return OMX_ErrorNone;
     }
-    const sp<GraphicBufferSource>& bufferSource(
-            instance->getGraphicBufferSource());
-    if (bufferSource != NULL) {
-        bufferSource->codecBufferEmptied(pBuffer);
-
-        // This is one of the buffers used exclusively by GraphicBufferSource.
-        // Don't dispatch a message back to ACodec, since it doesn't
-        // know that anyone asked to have the buffer emptied and will
-        // be very confused.
-        return OMX_ErrorNone;
-    }
     return instance->owner()->OnEmptyBufferDone(instance->nodeID(), pBuffer);
 }