Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo

2010-06-16 16:10:52 -07:00
parent 3242cc2719 1c8bc7bb99
commit 39e876ad74
1 changed files with 3 additions and 1 deletions
--- a/media/libstagefright/Prefetcher.cpp
+++ b/media/libstagefright/Prefetcher.cpp
@@ -148,8 +148,10 @@ void Prefetcher::threadFunc() {
            if (mDone) {
                break;
            }
+
            mCondition.waitRelative(
-                    mLock, fillingCache ? 10000000ll : 1000000000ll);
+                    mLock, fillingCache ? 1ll : 1000000000ll);
+

            ssize_t minIndex = -1;
            for (size_t i = 0; i < mSources.size(); ++i) {