summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.h
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-08-06 11:24:07 -0700
committerWei Jia <wjia@google.com>2014-08-19 11:32:24 -0700
commit88703c34fb4a9db1ff51495879f9775474c8ce89 (patch)
tree8bf246b25fc40824005a4ee87d3e78fb3bda487b /media/libmediaplayerservice/nuplayer/NuPlayer.h
parent426c719a5f3b4d88480eb35a7b0b373f672ea3cb (diff)
downloadframeworks_av-88703c34fb4a9db1ff51495879f9775474c8ce89.zip
frameworks_av-88703c34fb4a9db1ff51495879f9775474c8ce89.tar.gz
frameworks_av-88703c34fb4a9db1ff51495879f9775474c8ce89.tar.bz2
NuPlayer: use generation to detect stale requests from old decoders.
Bug: 14955925 Bug: 16303659 Bug: 16467066 Bug: 13133027 Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index 48882c5..bb76636 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -129,6 +129,8 @@ private:
sp<CCDecoder> mCCDecoder;
sp<Renderer> mRenderer;
sp<ALooper> mRendererLooper;
+ int32_t mAudioDecoderGeneration;
+ int32_t mVideoDecoderGeneration;
List<sp<Action> > mDeferredActions;