diff options
author | Andreas Huber <andih@google.com> | 2010-11-11 15:37:17 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-11-11 15:37:17 -0800 |
commit | 34ef0f32c8fc0186236a27e07405328cc1f7c56d (patch) | |
tree | 0625b59a0b78550160ae46f047a8e7443664132e /media/libstagefright/include | |
parent | 7ce05cf6009a2fbbceb3d2c0ff639473d0b7d6a9 (diff) | |
download | frameworks_av-34ef0f32c8fc0186236a27e07405328cc1f7c56d.zip frameworks_av-34ef0f32c8fc0186236a27e07405328cc1f7c56d.tar.gz frameworks_av-34ef0f32c8fc0186236a27e07405328cc1f7c56d.tar.bz2 |
Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.
Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3
Conflicts:
media/libstagefright/AwesomePlayer.cpp
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 1 | ||||
-rw-r--r-- | media/libstagefright/include/NuCachedSource2.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index a0a7436..302a1ba 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -274,6 +274,7 @@ private: bool getBitrate(int64_t *bitrate); void finishSeekIfNecessary(int64_t videoTimeUs); + void ensureCacheIsFetching_l(); AwesomePlayer(const AwesomePlayer &); AwesomePlayer &operator=(const AwesomePlayer &); diff --git a/media/libstagefright/include/NuCachedSource2.h b/media/libstagefright/include/NuCachedSource2.h index 4067585..8cd7d4b 100644 --- a/media/libstagefright/include/NuCachedSource2.h +++ b/media/libstagefright/include/NuCachedSource2.h @@ -47,6 +47,8 @@ struct NuCachedSource2 : public DataSource { void suspend(); void clearCacheAndResume(); + void resumeFetchingIfNecessary(); + protected: virtual ~NuCachedSource2(); @@ -96,7 +98,7 @@ private: status_t seekInternal_l(off_t offset); size_t approxDataRemaining_l(bool *eos); - void restartPrefetcherIfNecessary_l(); + void restartPrefetcherIfNecessary_l(bool ignoreLowWaterThreshold = false); DISALLOW_EVIL_CONSTRUCTORS(NuCachedSource2); }; |