diff options
| author | Wei Jia <wjia@google.com> | 2015-08-28 15:56:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-28 15:56:54 +0000 |
| commit | 08723d86e9921a3eacca77c79c50839d40ee4f33 (patch) | |
| tree | 1627cdd3e7c8ca2bdab3917d8a7301bf766f017f /media/libmediaplayerservice | |
| parent | ec58b2fdbbcaaf2494bcde990cee81f9de8e24bb (diff) | |
| parent | 5d76e54d2f3b02b52be035e37681fde0caf15eaa (diff) | |
| download | frameworks_av-08723d86e9921a3eacca77c79c50839d40ee4f33.zip frameworks_av-08723d86e9921a3eacca77c79c50839d40ee4f33.tar.gz frameworks_av-08723d86e9921a3eacca77c79c50839d40ee4f33.tar.bz2 | |
am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev
* commit '5d76e54d2f3b02b52be035e37681fde0caf15eaa':
NuPlayer: do not create audio decoder if the player is still in shutdown process.
Diffstat (limited to 'media/libmediaplayerservice')
| -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; } |