generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes data race in WebRTCAudioDeviceTest.StartRecording reported by ThreadSanitizer

Browse Source 
BUG=225690

Review URL: https://webrtc-codereview.appspot.com/1269008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3755 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@webrtc.org 2013-04-03 11:25:31 +00:00
parent 82dcc9ff11
commit d108a46206
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/voice_engine/level_indicator.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "critical_section_wrapper.h"
#include "level_indicator.h"
#include "module_common_types.h"
#include "signal_processing_library.h"
@ -16,7 +17,6 @@ namespace webrtc {
namespace voe {
// Number of bars on the indicator.
// Note that the number of elements is specified because we are indexing it
// in the range of 0-32
@ -25,28 +25,26 @@ const WebRtc_Word8 permutation[33] =
AudioLevel::AudioLevel() :
_critSect(*CriticalSectionWrapper::CreateCriticalSection()),
_absMax(0),
_count(0),
_currentLevel(0),
_currentLevelFullRange(0)
{
_currentLevelFullRange(0) {
}
AudioLevel::~AudioLevel()
{
AudioLevel::~AudioLevel() {
}
void
AudioLevel::Clear()
void AudioLevel::Clear()
{
CriticalSectionScoped cs(&_critSect);
_absMax = 0;
_count = 0;
_currentLevel = 0;
_currentLevelFullRange = 0;
}
void
AudioLevel::ComputeLevel(const AudioFrame& audioFrame)
void AudioLevel::ComputeLevel(const AudioFrame& audioFrame)
{
WebRtc_Word16 absValue(0);
@ -54,6 +52,11 @@ AudioLevel::ComputeLevel(const AudioFrame& audioFrame)
absValue = WebRtcSpl_MaxAbsValueW16(
audioFrame.data_,
audioFrame.samples_per_channel_*audioFrame.num_channels_);
// Protect member access using a lock since this method is called on a
// dedicated audio thread in the RecordedDataIsAvailable() callback.
CriticalSectionScoped cs(&_critSect);
if (absValue > _absMax)
_absMax = absValue;
@ -82,15 +85,15 @@ AudioLevel::ComputeLevel(const AudioFrame& audioFrame)
}
}
WebRtc_Word8
AudioLevel::Level() const
WebRtc_Word8 AudioLevel::Level() const
{
CriticalSectionScoped cs(&_critSect);
return _currentLevel;
}
WebRtc_Word16
AudioLevel::LevelFullRange() const
WebRtc_Word16 AudioLevel::LevelFullRange() const
{
CriticalSectionScoped cs(&_critSect);
return _currentLevelFullRange;
}

14
webrtc/voice_engine/level_indicator.h
View File

@ -17,6 +17,7 @@
namespace webrtc {
class AudioFrame;
class CriticalSectionWrapper;
namespace voe {
class AudioLevel
@ -25,17 +26,22 @@ public:
AudioLevel();
virtual ~AudioLevel();
void ComputeLevel(const AudioFrame& audioFrame);
// Called on "API thread(s)" from APIs like VoEBase::CreateChannel(),
// VoEBase::StopSend(), VoEVolumeControl::GetSpeechOutputLevel().
WebRtc_Word8 Level() const;
WebRtc_Word16 LevelFullRange() const;
void Clear();
// Called on a native capture audio thread (platform dependent) from the
// AudioTransport::RecordedDataIsAvailable() callback.
// In Chrome, this method is called on the AudioInputDevice thread.
void ComputeLevel(const AudioFrame& audioFrame);
private:
enum { kUpdateFrequency = 10};
CriticalSectionWrapper& _critSect;
WebRtc_Word16 _absMax;
WebRtc_Word16 _count;
WebRtc_Word8 _currentLevel;