diff options
| author | Robert Shih <robertshih@google.com> | 2015-08-05 21:39:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 21:39:05 +0000 |
| commit | 27b71aa74b6ddfb45a5508dcaa90c5065a12500b (patch) | |
| tree | 54d29a4176dbe6c6b615956dafd5ecc455c8f106 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | d24b430c3fc82e9288e9072971c9a185a18abd89 (diff) | |
| parent | 1a5c859016e743779e4db25855390b3ce523cd48 (diff) | |
| download | frameworks_av-27b71aa74b6ddfb45a5508dcaa90c5065a12500b.zip frameworks_av-27b71aa74b6ddfb45a5508dcaa90c5065a12500b.tar.gz frameworks_av-27b71aa74b6ddfb45a5508dcaa90c5065a12500b.tar.bz2 | |
Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 9456d5d..c9f0bbd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -154,6 +154,8 @@ private: int32_t mVideoDecoderGeneration; int32_t mRendererGeneration; + int64_t mPreviousSeekTimeUs; + List<sp<Action> > mDeferredActions; bool mAudioEOS; |