diff options
| author | Wei Jia <wjia@google.com> | 2014-12-06 01:20:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-06 01:20:39 +0000 |
| commit | 80c57d570238f9f213ccfe818e285090daeafd63 (patch) | |
| tree | 95ff9139a96af8181ff7ef9f33245512d450d4b5 /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | 18265202049bfa53fe5b18a95d956325acca9c7b (diff) | |
| parent | 474d7c778b63aa33dcf25a92e23a52c1c47f0ac1 (diff) | |
| download | frameworks_av-80c57d570238f9f213ccfe818e285090daeafd63.zip frameworks_av-80c57d570238f9f213ccfe818e285090daeafd63.tar.gz frameworks_av-80c57d570238f9f213ccfe818e285090daeafd63.tar.bz2 | |
Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 9b73817..1b63a1f 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -183,6 +183,7 @@ private: sp<ABuffer> mediaBufferToABuffer( MediaBuffer *mbuf, media_track_type trackType, + int64_t seekTimeUs, int64_t *actualTimeUs = NULL); void postReadBuffer(media_track_type trackType); |