diff options
author | Wei Jia <wjia@google.com> | 2014-12-18 10:44:17 -0800 |
---|---|---|
committer | Wei Jia <wjia@google.com> | 2014-12-19 11:29:30 -0800 |
commit | d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca (patch) | |
tree | 6a8a44525450cb0a0d13ab0c60ad31c47bed9f1b /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | |
parent | e48cf5b8f823c30af93577c1e380d752ac69b871 (diff) | |
download | frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.zip frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.tar.gz frameworks_av-d4cdba18ba7d0057ae54ec7efa5871b1a9d8beca.tar.bz2 |
NuPlayer: reports paused position in paused state.
Bug: 18733773
Change-Id: I993a4bf108913ab98a0294d7dcf7605349f7029b
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h index 406c64c..c6e3457 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h @@ -62,8 +62,6 @@ struct NuPlayer::Renderer : public AHandler { // Following setters and getters are protected by mTimeLock. status_t getCurrentPosition(int64_t *mediaUs); - status_t getCurrentPosition( - int64_t *mediaUs, int64_t nowUs, bool allowPastQueuedVideo = false); void setHasMedia(bool audio); void setAudioFirstAnchorTime(int64_t mediaUs); void setAudioFirstAnchorTimeIfNeeded(int64_t mediaUs); @@ -168,7 +166,10 @@ private: bool mSyncQueues; + // modified on only renderer's thread. bool mPaused; + int64_t mPausePositionMediaTimeUs; + bool mVideoSampleReceived; bool mVideoRenderingStarted; int32_t mVideoRenderingStartGeneration; @@ -183,6 +184,12 @@ private: int32_t mTotalBuffersQueued; int32_t mLastAudioBufferDrained; + status_t getCurrentPositionOnLooper(int64_t *mediaUs); + status_t getCurrentPositionOnLooper( + int64_t *mediaUs, int64_t nowUs, bool allowPastQueuedVideo = false); + bool getCurrentPositionIfPaused_l(int64_t *mediaUs); + status_t getCurrentPositionFromAnchor( + int64_t *mediaUs, int64_t nowUs, bool allowPastQueuedVideo = false); size_t fillAudioBuffer(void *buffer, size_t size); |