summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2012-10-02 01:25:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-02 01:25:41 -0700
commitbd710197a47e3772763c48bfb5d6be21df173a7f (patch)
tree8f692b43ee85e2621ab980c7b563cd25e1af0f1c /media/libstagefright
parentee178668818eb4f43ff40735405f8fc42372620f (diff)
parenta3fafcb4ee6d6344f2b5b602d095a4ffebc8dbb7 (diff)
downloadframeworks_av-bd710197a47e3772763c48bfb5d6be21df173a7f.zip
frameworks_av-bd710197a47e3772763c48bfb5d6be21df173a7f.tar.gz
frameworks_av-bd710197a47e3772763c48bfb5d6be21df173a7f.tar.bz2
Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 9f069ae..0cb378d 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -755,22 +755,18 @@ void AwesomePlayer::onBufferingUpdate() {
if ((mFlags & PLAYING) && !eos
&& (cachedDurationUs < kLowWaterMarkUs)) {
modifyFlags(CACHE_UNDERRUN, SET);
- if (mWVMExtractor == NULL) {
- ALOGI("cache is running low (%.2f secs) , pausing.",
- cachedDurationUs / 1E6);
- pause_l();
- ensureCacheIsFetching_l();
- }
+ ALOGI("cache is running low (%.2f secs) , pausing.",
+ cachedDurationUs / 1E6);
+ pause_l();
+ ensureCacheIsFetching_l();
sendCacheStats();
notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START);
} else if (eos || cachedDurationUs > kHighWaterMarkUs) {
if (mFlags & CACHE_UNDERRUN) {
modifyFlags(CACHE_UNDERRUN, CLEAR);
- if (mWVMExtractor == NULL) {
- ALOGI("cache has filled up (%.2f secs), resuming.",
- cachedDurationUs / 1E6);
- play_l();
- }
+ ALOGI("cache has filled up (%.2f secs), resuming.",
+ cachedDurationUs / 1E6);
+ play_l();
} else if (mFlags & PREPARING) {
ALOGV("cache has filled up (%.2f secs), prepare is done",
cachedDurationUs / 1E6);