diff options
| author | Wei Jia <wjia@google.com> | 2015-08-27 13:59:30 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-08-28 10:28:17 -0700 |
| commit | 4ff69ce68bb21b0737cdd93d30c8cf68d819d324 (patch) | |
| tree | f94fb86a338646b710b9a86f76acca0e7a270361 /media/libmediaplayerservice/nuplayer/NuPlayer.cpp | |
| parent | 3cedbc817d7003628ff42a4ee75147f7f2b7615c (diff) | |
| download | frameworks_av-4ff69ce68bb21b0737cdd93d30c8cf68d819d324.zip frameworks_av-4ff69ce68bb21b0737cdd93d30c8cf68d819d324.tar.gz frameworks_av-4ff69ce68bb21b0737cdd93d30c8cf68d819d324.tar.bz2 | |
NuPlayer: do not create audio decoder if the player is still in shutdown process.
Bug: 23350795
Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 77b9799..c0146d5 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1488,7 +1488,9 @@ void NuPlayer::determineAudioModeChange() { } status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { - if (*decoder != NULL) { + // The audio decoder could be cleared by tear down. If still in shut down + // process, no need to create a new audio decoder. + if (*decoder != NULL || (audio && mFlushingAudio == SHUT_DOWN)) { return OK; } |