summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-15 01:06:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-15 01:06:13 -0700
commit1f872d4e8675b918dafdd730100df7e865d9ce0b (patch)
tree3cbb80fead4f79e2ba97ad173e6183ba396c5c98 /media/libmedia
parent03cc558144138365d69ac8c29d9b77c508136efd (diff)
parentfb4f266a1b9f6a20e256d192a940ae4ccc510fad (diff)
downloadframeworks_base-1f872d4e8675b918dafdd730100df7e865d9ce0b.zip
frameworks_base-1f872d4e8675b918dafdd730100df7e865d9ce0b.tar.gz
frameworks_base-1f872d4e8675b918dafdd730100df7e865d9ce0b.tar.bz2
Merge change 7067
* changes: add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioTrack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index af7dae5..7b9eda7 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -891,7 +891,7 @@ void AudioTrack::AudioTrackThread::onFirstRef()
// =========================================================================
audio_track_cblk_t::audio_track_cblk_t()
- : user(0), server(0), userBase(0), serverBase(0), buffers(0), frameCount(0),
+ : lock(Mutex::SHARED), user(0), server(0), userBase(0), serverBase(0), buffers(0), frameCount(0),
loopStart(UINT_MAX), loopEnd(UINT_MAX), loopCount(0), volumeLR(0), flowControlFlag(1), forceReady(0)
{
}