drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2cb138db: Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken

Browse Source
This commit is contained in:
Andreas Huber
2010-05-27 08:59:07 -07:00
committed by Android Git Automerger
parent cd9cdf8d42 2cb138dbe8
commit 215aeda9f3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/AudioPlayer.cpp
View File

@ -87,7 +87,9 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
DEFAULT_AUDIOSINK_BUFFERCOUNT, DEFAULT_AUDIOSINK_BUFFERCOUNT,
&AudioPlayer::AudioSinkCallback, this); &AudioPlayer::AudioSinkCallback, this);
if (err != OK) { if (err != OK) {
mSource->stop(); if (!sourceAlreadyStarted) {
mSource->stop();
}
return err; return err;
} }
@ -108,7 +110,9 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
delete mAudioTrack; delete mAudioTrack;
mAudioTrack = NULL; mAudioTrack = NULL;
mSource->stop(); if (!sourceAlreadyStarted) {
mSource->stop();
}
return err; return err;
} }