commit 5bbca4625679e312ff540d9807ea1d1b2149c13a
author Andreas Huber <andih@google.com> Mon May 20 09:13:23 2013 -0700
committer The Android Automerger <android-build@android.com> Tue May 21 17:18:57 2013 -0700
tree c07b6273cba3b97b38fe8804384f3bf7f02c3557
parent a01f72dea582935bf4a4e83767d3c93f233323d8

Avoid a deadlock during EmptyBufferDone

The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.

Bug: 8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45

media/libstagefright/omx/OMXNodeInstance.cpp

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 @@
             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 @@
     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);
 }