commit 397afb54649d30b2710a6620b08c3565500f2ed7
author Andreas Huber <andih@google.com> Thu Feb 18 15:55:30 2010 -0800
committer Andreas Huber <andih@google.com> Thu Feb 18 15:55:30 2010 -0800
tree 2d3f9fa526ebc86232a4c4e4b96be7b32b4f1f09
parent 5706329cf42db714582fa698eb9f408350276f16

Fix a race condition in the prefetcher, the source may be shutdown while we're reading data from it.

related-to-bug: 2453414

media/libstagefright/Prefetcher.cpp

diff --git a/media/libstagefright/Prefetcher.cpp b/media/libstagefright/Prefetcher.cpp
index 76ca77b..363e121 100644
--- a/media/libstagefright/Prefetcher.cpp
+++ b/media/libstagefright/Prefetcher.cpp
@@ -337,24 +337,20 @@
 void PrefetchedSource::cacheMore() {
     MediaSource::ReadOptions options;
 
-    {
-        Mutex::Autolock autoLock(mLock);
+    Mutex::Autolock autoLock(mLock);
 
-        if (!mStarted) {
-            return;
-        }
+    if (!mStarted) {
+        return;
+    }
 
-        if (mSeekTimeUs >= 0) {
-            options.setSeekTo(mSeekTimeUs);
-            mSeekTimeUs = -1;
-        }
+    if (mSeekTimeUs >= 0) {
+        options.setSeekTo(mSeekTimeUs);
+        mSeekTimeUs = -1;
     }
 
     MediaBuffer *buffer;
     status_t err = mSource->read(&buffer, &options);
 
-    Mutex::Autolock autoLock(mLock);
-
     if (err != OK) {
         mReachedEOS = true;
         mCondition.signal();