commit fc22d932353504e24e5ed32809420f6db8355795
author Andreas Huber <andih@google.com> Wed Jan 27 12:08:25 2010 -0800
committer Andreas Huber <andih@google.com> Wed Jan 27 12:08:25 2010 -0800
tree 3ac6a66817a30adc5da10413b26027d6ff7217dd
parent 1b624fa1641a6e7a0072f81b74cd1bff4b08d373

Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available.

related-to-bug: 2295438

media/libstagefright/Prefetcher.cpp

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