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

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:57:23 -07:00
committed by Android (Google) Code Review
parent 407f98bfcd 5fb03b876b
commit 2cb138dbe8
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,
&AudioPlayer::AudioSinkCallback, this);
if (err != OK) {
mSource->stop();
if (!sourceAlreadyStarted) {
mSource->stop();
}
return err;
}
@ -108,7 +110,9 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
delete mAudioTrack;
mAudioTrack = NULL;
mSource->stop();
if (!sourceAlreadyStarted) {
mSource->stop();
}
return err;
}