diff options
| author | Lajos Molnar <lajos@google.com> | 2014-05-02 18:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 18:00:44 +0000 |
| commit | 113f2122662856f2482836f1b4c585a050888afa (patch) | |
| tree | e0e15724deeadb53d5bec3968ed631880658f5a9 /media/libstagefright/include/AwesomePlayer.h | |
| parent | 9e0922ba7dda72fc94d2af2872cfc630ad599c91 (diff) | |
| parent | 5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5 (diff) | |
| download | frameworks_av-113f2122662856f2482836f1b4c585a050888afa.zip frameworks_av-113f2122662856f2482836f1b4c585a050888afa.tar.gz frameworks_av-113f2122662856f2482836f1b4c585a050888afa.tar.bz2 | |
am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"
* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 271df8e..6ee95a9 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -32,6 +32,7 @@ namespace android { struct AudioPlayer; +struct ClockEstimator; struct DataSource; struct MediaBuffer; struct MediaExtractor; @@ -234,6 +235,7 @@ private: MediaBuffer *mVideoBuffer; + sp<ClockEstimator> mClockEstimator; sp<HTTPBase> mConnectingDataSource; sp<NuCachedSource2> mCachedSource; @@ -293,6 +295,7 @@ private: bool getBitrate(int64_t *bitrate); + int64_t estimateRealTimeUs(TimeSource *ts, int64_t systemTimeUs); void finishSeekIfNecessary(int64_t videoTimeUs); void ensureCacheIsFetching_l(); |