Merge pull request #21 from jhlin/bug1114477

Bug 1114477 - Stop source after thread stopped. r=mikeh
mozilla-b2g · Jan 7, 2015 · 8642b85 · 8642b85
2 parents c976871 + 8d89e2f
commit 8642b85
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
@@ -1783,13 +1783,16 @@ status_t MPEG4Writer::Track::stop() {
     }
     mDone = true;
 
-    ALOGD("%s track source stopping", mIsAudio? "Audio": "Video");
-    mSource->stop();
-    ALOGD("%s track source stopped", mIsAudio? "Audio": "Video");
-
     void *dummy;
     pthread_join(mThread, &dummy);
     status_t err = static_cast<status_t>(reinterpret_cast<uintptr_t>(dummy));
+    ALOGD("Stopping %s track source", mIsAudio? "Audio": "Video");
+    {
+        status_t status = mSource->stop();
+        if (err == OK && status != OK && status != ERROR_END_OF_STREAM) {
+            err = status;
+        }
+    }
 
     ALOGD("%s track stopped", mIsAudio? "Audio": "Video");
     return err;