diff options
| author | Lajos Molnar <lajos@google.com> | 2014-05-02 18:06:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 18:06:42 +0000 |
| commit | 344a1b9bb5cba14a0771c8b416466678aff3215f (patch) | |
| tree | 9799ffde4926129da9717b6ba18d96ec571cf019 /media/libstagefright/include/AwesomePlayer.h | |
| parent | b0210338bba812d27e0e6b1bb4b6b89405209a19 (diff) | |
| parent | 113f2122662856f2482836f1b4c585a050888afa (diff) | |
| download | frameworks_av-344a1b9bb5cba14a0771c8b416466678aff3215f.zip frameworks_av-344a1b9bb5cba14a0771c8b416466678aff3215f.tar.gz frameworks_av-344a1b9bb5cba14a0771c8b416466678aff3215f.tar.bz2 | |
am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"
* commit '113f2122662856f2482836f1b4c585a050888afa':
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 a81bbba..77d65e0 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; @@ -236,6 +237,7 @@ private: MediaBuffer *mVideoBuffer; + sp<ClockEstimator> mClockEstimator; sp<HTTPBase> mConnectingDataSource; sp<NuCachedSource2> mCachedSource; @@ -296,6 +298,7 @@ private: bool getBitrate(int64_t *bitrate); + int64_t estimateRealTimeUs(TimeSource *ts, int64_t systemTimeUs); void finishSeekIfNecessary(int64_t videoTimeUs); void ensureCacheIsFetching_l(); |