commit 105925376f8d0f6b318c9938c7b83ef7fef094da
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
tree 3b19ee2bd8704cb9c6a0da7e42dec6759183de6d
parent ba87e3e6c985e7175152993b5efcc7dd2f0e1c93

auto import from //branches/cupcake_rel/...@140373

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index d26b0c5..7537ddf 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -387,12 +387,10 @@
     LOGV("flush");
 
     if (!mActive) {
-        mCblk->lock.lock();
         mAudioTrack->flush();
         // Release AudioTrack callback thread in case it was waiting for new buffers
         // in AudioTrack::obtainBuffer()
         mCblk->cv.signal();
-        mCblk->lock.unlock();
     }
 }
 
@@ -443,7 +441,7 @@
     if (rate > afSamplingRate*2) rate = afSamplingRate*2;
     if (rate > MAX_SAMPLE_RATE) rate = MAX_SAMPLE_RATE;
 
-    mCblk->sampleRate = rate;
+    mCblk->sampleRate = (uint16_t)rate;
 }
 
 uint32_t AudioTrack::getSampleRate()