Lock scheme #8: Introduced the new locking scheme

webrtc/modules/audio_processing/echo_cancellation_impl.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
 
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/common_audio/swap_queue.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_processing/processing_component.h"
 
 namespace webrtc {
 
 namespace {
 // Functor to use when supplying a verifier function for the queue item
 // verifcation.
 class AecRenderQueueItemVerifier {
  public:
   explicit AecRenderQueueItemVerifier(size_t allowed_size_1,
                                       size_t allowed_size_2)
       : allowed_size_1_(allowed_size_1), allowed_size_2_(allowed_size_2) {}
 
   bool operator()(const std::vector<float>& v) const {
     return (((v.size() == allowed_size_1_) || (v.size() == allowed_size_2_)) &&
             (v.capacity() >= std::max(allowed_size_1_, allowed_size_2_)));
   }
 
  private:
   size_t allowed_size_1_;
   size_t allowed_size_2_;
 };
 
 }  // namespace anonymous
 
 class AudioBuffer;
-class CriticalSectionWrapper;
 
 class EchoCancellationImpl : public EchoCancellation,
                              public ProcessingComponent {
  public:
   EchoCancellationImpl(const AudioProcessing* apm,
-                       CriticalSectionWrapper* crit,
+                       rtc::CriticalSection* crit_render,
+                       rtc::CriticalSection* crit_capture,
                        rtc::ThreadChecker* render_thread,
                        rtc::ThreadChecker* capture_thread);
   virtual ~EchoCancellationImpl();
 
   int ProcessRenderAudio(const AudioBuffer* audio);
   int ProcessCaptureAudio(AudioBuffer* audio);
 
   // EchoCancellation implementation.
   bool is_enabled() const override;
   int stream_drift_samples() const override;
@@ skipping 38 matching lines @@
   void* CreateHandle() const override;
   int InitializeHandle(void* handle) const override;
   int ConfigureHandle(void* handle) const override;
   void DestroyHandle(void* handle) const override;
   int num_handles_required() const override;
   int GetHandleError(void* handle) const override;
 
   void AllocateRenderQueue();
 
   const AudioProcessing* apm_;
-  CriticalSectionWrapper* crit_;
+  rtc::CriticalSection* const crit_render_;
+  rtc::CriticalSection* const crit_capture_;
   const rtc::ThreadChecker* const render_thread_;
   const rtc::ThreadChecker* const capture_thread_;
 
   bool drift_compensation_enabled_;
   bool metrics_enabled_;
   SuppressionLevel suppression_level_;
   int stream_drift_samples_;
   bool was_stream_drift_set_;
   bool stream_has_echo_;
   bool delay_logging_enabled_;
   bool extended_filter_enabled_;
   bool delay_agnostic_enabled_;
 
   size_t render_queue_element_max_size_;
   std::vector<float> render_queue_buffer_;
   std::vector<float> capture_queue_buffer_;
   rtc::scoped_ptr<SwapQueue<std::vector<float>, AecRenderQueueItemVerifier> >
       render_signal_queue_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_