commit b3adfe68492251ab6345b4fda500737822fb9c81
author Jean-Michel Trivi <jmtrivi@google.com> Fri Nov 02 15:20:27 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 02 15:20:27 2012 -0700
tree 7d4fcbc13da9411b99b5048cca5fddfeba3c30a4
parent 85b1ba5dfb402b1acbfa516776d946769ccb8ffd
parent 4a4c728965b10df683d37b4b7ac27211e02006ad

am 4a4c7289: Fix race condition when streaming MP2TS to media server

* commit '4a4c728965b10df683d37b4b7ac27211e02006ad':
  Fix race condition when streaming MP2TS to media server

src/android/android_StreamPlayer.cpp

diff --git a/src/android/android_StreamPlayer.cpp b/src/android/android_StreamPlayer.cpp
index ade5280..86501ae 100644
--- a/src/android/android_StreamPlayer.cpp
+++ b/src/android/android_StreamPlayer.cpp
@@ -77,8 +77,10 @@
 
     {
         Mutex::Autolock _l(mLock);
-        // assert not needed because if not set, size() will be zero and the CHECK_LT will also fail
-        // assert(mBuffersHasBeenSet);
+        if (!mBuffersHasBeenSet) {
+            // no buffers available to push data to from the buffer queue, bail
+            return;
+        }
         CHECK_LT(index, mBuffers.size());
 #if 0   // enable if needed for debugging
         sp<IMemory> mem = mBuffers.itemAt(index);