diff options
| author | Wei Jia <wjia@google.com> | 2014-09-10 00:49:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 00:49:06 +0000 |
| commit | 59424ee18cc68d5802bae05e15fd6f41f3f1113f (patch) | |
| tree | a32b326eec9b69725cc49146ad4a17c31bff1a8e /media | |
| parent | ba8711db379fe243667a0387e2e86a49e17bee68 (diff) | |
| parent | 8716e3f386f37abd3d759404ca8b3deaf46afde8 (diff) | |
| download | frameworks_av-59424ee18cc68d5802bae05e15fd6f41f3f1113f.zip frameworks_av-59424ee18cc68d5802bae05e15fd6f41f3f1113f.tar.gz frameworks_av-59424ee18cc68d5802bae05e15fd6f41f3f1113f.tar.bz2 | |
am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
* commit '8716e3f386f37abd3d759404ca8b3deaf46afde8':
NuPlayer: make previous decoders obsolete when reset is done.
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()); |