diff options
| author | Wei Jia <wjia@google.com> | 2014-09-09 22:08:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 22:08:45 +0000 |
| commit | 8716e3f386f37abd3d759404ca8b3deaf46afde8 (patch) | |
| tree | 994b1c4461e0997b72e1fffecef4346877319bb7 /media | |
| parent | 47a13d45ae3f05ddb778124484a17d4754c82b7a (diff) | |
| parent | 1008e1c9eb9ec7aeefffa4d9907f890a8eab7668 (diff) | |
| download | frameworks_av-8716e3f386f37abd3d759404ca8b3deaf46afde8.zip frameworks_av-8716e3f386f37abd3d759404ca8b3deaf46afde8.tar.gz frameworks_av-8716e3f386f37abd3d759404ca8b3deaf46afde8.tar.bz2 | |
Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 4004ddf..df3e992 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1832,6 +1832,9 @@ void NuPlayer::performReset() { ++mScanSourcesGeneration; mScanSourcesPending = false; + ++mAudioDecoderGeneration; + ++mVideoDecoderGeneration; + if (mRendererLooper != NULL) { if (mRenderer != NULL) { mRendererLooper->unregisterHandler(mRenderer->id()); |