commit 2cb138dbe89c493547066679e1a8ef1ae0a848de
author Andreas Huber <andih@google.com> Thu May 27 08:57:23 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 27 08:57:23 2010 -0700
tree 92bf6cf3ac7708b6b0842b1903d52fa979e5d1c4
parent 407f98bfcd4c7ba71acf9ec7b7c170ebec8c490b
parent 5fb03b876b6749c17d7ee6f41f62c4e5e7d6367e

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

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index bcf2463..b79ba13 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -87,7 +87,9 @@
                 DEFAULT_AUDIOSINK_BUFFERCOUNT,
                 &AudioPlayer::AudioSinkCallback, this);
         if (err != OK) {
-            mSource->stop();
+            if (!sourceAlreadyStarted) {
+                mSource->stop();
+            }
 
             return err;
         }
@@ -108,7 +110,9 @@
             delete mAudioTrack;
             mAudioTrack = NULL;
 
-            mSource->stop();
+            if (!sourceAlreadyStarted) {
+                mSource->stop();
+            }
 
             return err;
         }