From f888cedf170f6d3cc060cc14ad9c56918f3a03c3 Mon Sep 17 00:00:00 2001
From: xiaoqiny <quic_xiaoqiny@codeaurora.org>
Date: Tue, 13 Jan 2015 17:59:04 +0800
Subject: libstagefright: handle error when B-frame is sent to MPEG4Writer

Without this patch, writing B-frame to MediaMuxer will be blocked and
cannot return a result. This may cause an endless progress bar shown in
gallery when triming or muting some videos.

Change-Id: Ib9f902a57da470c0357ec68aab00a35fbb26fb77
CRs-Fixed: 521005
---
 media/libstagefright/MPEG4Writer.cpp  |  4 +++-
 media/libstagefright/MediaAdapter.cpp | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'media/libstagefright')

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 24da000..6a8664e 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2452,7 +2452,9 @@ status_t MPEG4Writer::Track::threadEntry() {
             ALOGE("timestampUs %" PRId64 " < lastTimestampUs %" PRId64 " for %s track",
                 timestampUs, lastTimestampUs, trackName);
             copy->release();
-            return UNKNOWN_ERROR;
+            err = UNKNOWN_ERROR;
+            mSource->notifyError(err);
+            return err;
         }
 
         // if the duration is different for this sample, see if it is close enough to the previous
diff --git a/media/libstagefright/MediaAdapter.cpp b/media/libstagefright/MediaAdapter.cpp
index d680e0c..ec4550f 100644
--- a/media/libstagefright/MediaAdapter.cpp
+++ b/media/libstagefright/MediaAdapter.cpp
@@ -27,7 +27,8 @@ namespace android {
 MediaAdapter::MediaAdapter(const sp<MetaData> &meta)
     : mCurrentMediaBuffer(NULL),
       mStarted(false),
-      mOutputFormat(meta) {
+      mOutputFormat(meta),
+      mStatus(OK) {
 }
 
 MediaAdapter::~MediaAdapter() {
@@ -51,6 +52,9 @@ status_t MediaAdapter::stop() {
         // If stop() happens immediately after a pushBuffer(), we should
         // clean up the mCurrentMediaBuffer
         if (mCurrentMediaBuffer != NULL) {
+            mCurrentMediaBuffer->setObserver(this);
+            mCurrentMediaBuffer->claim();
+            mCurrentMediaBuffer->setObserver(0);
             mCurrentMediaBuffer->release();
             mCurrentMediaBuffer = NULL;
         }
@@ -113,13 +117,23 @@ status_t MediaAdapter::pushBuffer(MediaBuffer *buffer) {
         ALOGE("pushBuffer called before start");
         return INVALID_OPERATION;
     }
+    if (mStatus != OK) {
+        ALOGE("pushBuffer called when MediaAdapter in error status");
+        return mStatus;
+    }
     mCurrentMediaBuffer = buffer;
     mBufferReadCond.signal();
 
     ALOGV("wait for the buffer returned @ pushBuffer! %p", buffer);
     mBufferReturnedCond.wait(mAdapterLock);
 
-    return OK;
+    return mStatus;
+}
+
+void MediaAdapter::notifyError(status_t err) {
+    Mutex::Autolock autoLock(mAdapterLock);
+    mStatus = err;
+    mBufferReturnedCond.signal();
 }
 
 }  // namespace android
-- 
cgit v1.1