From 5b75fdc8fbc026453888cbb2d3fe31345394618b Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Wed, 31 Aug 2011 10:24:18 -0700 Subject: Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419. Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb --- media/libstagefright/AwesomePlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 142dda0..f98b0de 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -513,7 +513,8 @@ void AwesomePlayer::reset_l() { // If we did this later, audio would continue playing while we // shutdown the video-related resources and the player appear to // not be as responsive to a reset request. - if (mAudioPlayer == NULL && mAudioSource != NULL) { + if ((mAudioPlayer == NULL || !(mFlags & AUDIOPLAYER_STARTED)) + && mAudioSource != NULL) { // If we had an audio player, it would have effectively // taken possession of the audio source and stopped it when // _it_ is stopped. Otherwise this is still our responsibility. -- cgit v1.1