diff options
| author | James Dong <jdong@google.com> | 2010-06-16 16:10:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-16 16:10:52 -0700 |
| commit | 39e876ad743f203fe005333947c61383772b0d14 (patch) | |
| tree | 332eaba8438e95376168bab702e9ec4082f8fdc4 /media | |
| parent | 3242cc2719a4aeb64ac5ed273cf222d8d326d44b (diff) | |
| parent | 1c8bc7bb999a7b7b02d1e99f21610cfca67433bb (diff) | |
| download | frameworks_base-39e876ad743f203fe005333947c61383772b0d14.zip frameworks_base-39e876ad743f203fe005333947c61383772b0d14.tar.gz frameworks_base-39e876ad743f203fe005333947c61383772b0d14.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/Prefetcher.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/Prefetcher.cpp b/media/libstagefright/Prefetcher.cpp index b6ed56b..650a9f9 100644 --- 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) { |