Lock scheme #8: Introduced the new locking scheme

webrtc/modules/audio_processing/voice_detection_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_processing/voice_detection_impl.h"
 
 #include <assert.h>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
-#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 namespace webrtc {
 
 typedef VadInst Handle;
 
 namespace {
 int MapSetting(VoiceDetection::Likelihood likelihood) {
   switch (likelihood) {
     case VoiceDetection::kVeryLowLikelihood:
       return 3;
     case VoiceDetection::kLowLikelihood:
       return 2;
     case VoiceDetection::kModerateLikelihood:
       return 1;
     case VoiceDetection::kHighLikelihood:
       return 0;
   }
   assert(false);
   return -1;
 }
 }  // namespace
 
 VoiceDetectionImpl::VoiceDetectionImpl(const AudioProcessing* apm,
-                                       CriticalSectionWrapper* crit,
+                                       rtc::CriticalSection* crit,
                                        rtc::ThreadChecker* capture_thread)
     : ProcessingComponent(),
       apm_(apm),
       crit_(crit),
       capture_thread_(capture_thread),
       stream_has_voice_(false),
       using_external_vad_(false),
       likelihood_(kLowLikelihood),
       frame_size_ms_(10),
       frame_size_samples_(0) {}
@@ skipping 25 matching lines @@
     stream_has_voice_ = true;
     audio->set_activity(AudioFrame::kVadActive);
   } else {
     return apm_->kUnspecifiedError;
   }
 
   return apm_->kNoError;
 }
 
 int VoiceDetectionImpl::Enable(bool enable) {
-  CriticalSectionScoped crit_scoped(crit_);
+  rtc::CritScope cs(crit_);
   return EnableComponent(enable);
 }
 
 bool VoiceDetectionImpl::is_enabled() const {
+  rtc::CritScope cs(crit_);
   return is_component_enabled();
 }
 
 int VoiceDetectionImpl::set_stream_has_voice(bool has_voice) {
+  rtc::CritScope cs(crit_);
   using_external_vad_ = true;
   stream_has_voice_ = has_voice;
   return apm_->kNoError;
 }
 
 bool VoiceDetectionImpl::stream_has_voice() const {
+  rtc::CritScope cs(crit_);
   // TODO(ajm): enable this assertion?
   //assert(using_external_vad_ || is_component_enabled());
   return stream_has_voice_;
 }
 
 int VoiceDetectionImpl::set_likelihood(VoiceDetection::Likelihood likelihood) {
-  CriticalSectionScoped crit_scoped(crit_);
+  rtc::CritScope cs(crit_);
   if (MapSetting(likelihood) == -1) {
     return apm_->kBadParameterError;
   }
 
   likelihood_ = likelihood;
   return Configure();
 }
 
 VoiceDetection::Likelihood VoiceDetectionImpl::likelihood() const {
+  rtc::CritScope cs(crit_);
   return likelihood_;
 }
 
 int VoiceDetectionImpl::set_frame_size_ms(int size) {
-  CriticalSectionScoped crit_scoped(crit_);
+  rtc::CritScope cs(crit_);
   assert(size == 10); // TODO(ajm): remove when supported.
   if (size != 10 &&
       size != 20 &&
       size != 30) {
     return apm_->kBadParameterError;
   }
 
   frame_size_ms_ = size;
 
   return Initialize();
 }
 
 int VoiceDetectionImpl::frame_size_ms() const {
+  rtc::CritScope cs(crit_);
   return frame_size_ms_;
 }
 
 int VoiceDetectionImpl::Initialize() {
   int err = ProcessingComponent::Initialize();
   if (err != apm_->kNoError || !is_component_enabled()) {
     return err;
   }
 
   using_external_vad_ = false;
@@ skipping 24 matching lines @@
 int VoiceDetectionImpl::num_handles_required() const {
   return 1;
 }
 
 int VoiceDetectionImpl::GetHandleError(void* handle) const {
   // The VAD has no get_error() function.
   assert(handle != NULL);
   return apm_->kUnspecifiedError;
 }
 }  // namespace webrtc