commit 93a1e245c94f14b6fb68361f76e46285431dab26
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 01 13:43:07 2011 -0700
committer Android Code Review <code-review@android.com> Mon Aug 01 13:43:07 2011 -0700
tree 65b004e4db4538035e91fde8a15f214200f7dd55
parent e82c319beb2275ad0832cf77252943e16df04b1a
parent 972c502722d52cced15a0e4b5cb303ccf3f890ed

Merge "Stagefright: Return error if codec takes too long to return a buffer."

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index b5d00bf..ccda13f 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -3015,6 +3015,8 @@
 
 status_t OMXCodec::read(
         MediaBuffer **buffer, const ReadOptions *options) {
+
+    status_t wait_status = 0;
     *buffer = NULL;
 
     Mutex::Autolock autoLock(mLock);
@@ -3084,12 +3086,20 @@
         }
 
         while (mSeekTimeUs >= 0) {
-            mBufferFilled.wait(mLock);
+            wait_status = mBufferFilled.waitRelative(mLock, 3000000000);
+            if (wait_status) {
+                LOGE("Timed out waiting for the buffer! Line %d", __LINE__);
+                return UNKNOWN_ERROR;
+            }
         }
     }
 
     while (mState != ERROR && !mNoMoreOutputData && mFilledBuffers.empty()) {
-        mBufferFilled.wait(mLock);
+        wait_status = mBufferFilled.waitRelative(mLock, 3000000000);
+        if (wait_status) {
+            LOGE("Timed out waiting for the buffer! Line %d", __LINE__);
+            return UNKNOWN_ERROR;
+        }
     }
 
     if (mState == ERROR) {