diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-08 08:34:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 08:34:33 -0800 |
| commit | 4f9b0c54011eb8fd2ccfb393c2dcd51cd07800e0 (patch) | |
| tree | 318b28bb04ce0b4ce39f75f6a8dbac27cee1455c | |
| parent | 86feafe15b3f9609e1e9f64184688c2b6f2e4834 (diff) | |
| parent | 0e265cf36d201a7ccc0238b5c60b50f43d1dc450 (diff) | |
| download | frameworks_av-4f9b0c54011eb8fd2ccfb393c2dcd51cd07800e0.zip frameworks_av-4f9b0c54011eb8fd2ccfb393c2dcd51cd07800e0.tar.gz frameworks_av-4f9b0c54011eb8fd2ccfb393c2dcd51cd07800e0.tar.bz2 | |
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
| -rw-r--r-- | include/media/AudioRecord.h | 1 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 1 | ||||
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 13 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 10 |
4 files changed, 0 insertions, 25 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index c8c5dba..ca57f9e 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -344,7 +344,6 @@ private: virtual status_t readyToRun() { return NO_ERROR; } virtual void onFirstRef() {} AudioRecord& mReceiver; - Mutex mLock; }; bool processAudioBuffer(const sp<ClientRecordThread>& thread); diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 9a42bc1..11db81b 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -446,7 +446,6 @@ private: virtual status_t readyToRun(); virtual void onFirstRef(); AudioTrack& mReceiver; - Mutex mLock; }; bool processAudioBuffer(const sp<AudioTrackThread>& thread); diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index c96bc76..b74b3e3 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -293,7 +293,6 @@ status_t AudioRecord::start() return WOULD_BLOCK; } } - t->mLock.lock(); } AutoMutex lock(mLock); @@ -334,10 +333,6 @@ status_t AudioRecord::start() } } - if (t != 0) { - t->mLock.unlock(); - } - return ret; } @@ -347,10 +342,6 @@ status_t AudioRecord::stop() ALOGV("stop"); - if (t != 0) { - t->mLock.lock(); - } - AutoMutex lock(mLock); if (mActive == 1) { mActive = 0; @@ -367,10 +358,6 @@ status_t AudioRecord::stop() } } - if (t != 0) { - t->mLock.unlock(); - } - return NO_ERROR; } diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 233cf75..087d7b2 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -345,7 +345,6 @@ void AudioTrack::start() return; } } - t->mLock.lock(); } AutoMutex lock(mLock); @@ -396,9 +395,6 @@ void AudioTrack::start() } } - if (t != 0) { - t->mLock.unlock(); - } } void AudioTrack::stop() @@ -406,9 +402,6 @@ void AudioTrack::stop() sp<AudioTrackThread> t = mAudioTrackThread; ALOGV("stop %p", this); - if (t != 0) { - t->mLock.lock(); - } AutoMutex lock(mLock); if (mActive) { @@ -434,9 +427,6 @@ void AudioTrack::stop() } } - if (t != 0) { - t->mLock.unlock(); - } } bool AudioTrack::stopped() const |