Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video.

webrtc/video/vie_channel.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.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/frame_callback.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/payload_router.h"
 #include "webrtc/video/receive_statistics_proxy.h"
 #include "webrtc/video/report_block_stats.h"
 
 namespace webrtc {
 
 const int kMaxDecodeWaitTimeMs = 50;
 static const int kMaxTargetDelayMs = 10000;
@@ skipping 44 matching lines @@
                        TransportFeedbackObserver* transport_feedback_observer,
                        RemoteBitrateEstimator* remote_bitrate_estimator,
                        RtcpRttStats* rtt_stats,
                        PacedSender* paced_sender,
                        PacketRouter* packet_router,
                        size_t max_rtp_streams,
                        bool sender)
     : number_of_cores_(number_of_cores),
       sender_(sender),
       module_process_thread_(module_process_thread),
-      crit_(CriticalSectionWrapper::CreateCriticalSection()),
       send_payload_router_(new PayloadRouter()),
       vcm_protection_callback_(new ViEChannelProtectionCallback(this)),
       vcm_(VideoCodingModule::Create(Clock::GetRealTimeClock(),
                                      nullptr,
                                      nullptr)),
       vie_receiver_(vcm_, remote_bitrate_estimator, this),
       vie_sync_(vcm_),
       stats_observer_(new ChannelStatsObserver(this)),
       receive_stats_callback_(nullptr),
       incoming_video_stream_(nullptr),
@@ skipping 82 matching lines @@
   if (!sender_)
     StopDecodeThread();
   // Release modules.
   VideoCodingModule::Destroy(vcm_);
 }
 
 void ViEChannel::UpdateHistograms() {
   int64_t now = Clock::GetRealTimeClock()->TimeInMilliseconds();
 
   {
-    CriticalSectionScoped cs(crit_.get());
+    rtc::CritScope lock(&crit_);
     int64_t elapsed_sec = (now - time_of_first_rtt_ms_) / 1000;
     if (time_of_first_rtt_ms_ != -1 && num_rtts_ > 0 &&
         elapsed_sec > metrics::kMinRunTimeInSeconds) {
       int64_t avg_rtt_ms = (rtt_sum_ms_ + num_rtts_ / 2) / num_rtts_;
       RTC_HISTOGRAM_COUNTS_SPARSE_10000(
           "WebRTC.Video.AverageRoundTripTimeInMilliseconds", avg_rtt_ms);
     }
   }
 
   if (sender_) {
@@ skipping 150 matching lines @@
   send_payload_router_->SetSendingRtpModules(std::list<RtpRtcp*>());
 
   std::vector<RtpRtcp*> registered_modules;
   std::vector<RtpRtcp*> deregistered_modules;
   size_t num_active_modules = video_codec.numberOfSimulcastStreams > 0
                                    ? video_codec.numberOfSimulcastStreams
                                    : 1;
   size_t num_prev_active_modules;
   {
     // Cache which modules are active so StartSend can know which ones to start.
-    CriticalSectionScoped cs(crit_.get());
+    rtc::CritScope lock(&crit_);
     num_prev_active_modules = num_active_rtp_rtcp_modules_;
     num_active_rtp_rtcp_modules_ = num_active_modules;
   }
   for (size_t i = 0; i < num_active_modules; ++i)
     registered_modules.push_back(rtp_rtcp_modules_[i]);
 
   for (size_t i = num_active_modules; i < rtp_rtcp_modules_.size(); ++i)
     deregistered_modules.push_back(rtp_rtcp_modules_[i]);
 
   // Disable inactive modules.
@@ skipping 58 matching lines @@
 }
 
 void ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,
                                          VideoDecoder* decoder) {
   RTC_DCHECK(!sender_);
   vcm_->RegisterExternalDecoder(decoder, pl_type);
 }
 
 int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
                                            uint32_t* num_delta_frames) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   *num_key_frames = receive_frame_counts_.key_frames;
   *num_delta_frames = receive_frame_counts_.delta_frames;
   return 0;
 }
 
 uint32_t ViEChannel::DiscardedPackets() const {
   return vcm_->DiscardedPackets();
 }
 
 int ViEChannel::ReceiveDelay() const {
@@ skipping 417 matching lines @@
     SendSideDelayObserver* observer) {
   send_side_delay_observer_.Set(observer);
 }
 
 void ViEChannel::RegisterSendBitrateObserver(
     BitrateStatisticsObserver* observer) {
   send_bitrate_observer_.Set(observer);
 }
 
 int32_t ViEChannel::StartSend() {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
 
   if (rtp_rtcp_modules_[0]->Sending())
     return -1;
 
   for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i) {
     RtpRtcp* rtp_rtcp = rtp_rtcp_modules_[i];
     rtp_rtcp->SetSendingMediaStatus(true);
     rtp_rtcp->SetSendingStatus(true);
   }
   send_payload_router_->set_active(true);
@@ skipping 65 matching lines @@
 
 CallStatsObserver* ViEChannel::GetStatsObserver() {
   return stats_observer_.get();
 }
 
 // Do not acquire the lock of |vcm_| in this function. Decode callback won't
 // necessarily be called from the decoding thread. The decoding thread may have
 // held the lock when calling VideoDecoder::Decode, Reset, or Release. Acquiring
 // the same lock in the path of decode callback can deadlock.
 int32_t ViEChannel::FrameToRender(VideoFrame& video_frame) {  // NOLINT
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
 
   if (pre_render_callback_ != NULL)
     pre_render_callback_->FrameCallback(&video_frame);
 
   // TODO(pbos): Remove stream id argument.
   incoming_video_stream_->RenderFrame(0xFFFFFFFF, video_frame);
   return 0;
 }
 
 int32_t ViEChannel::ReceivedDecodedReferenceFrame(
   const uint64_t picture_id) {
   return rtp_rtcp_modules_[0]->SendRTCPReferencePictureSelection(picture_id);
 }
 
 void ViEChannel::OnIncomingPayloadType(int payload_type) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (receive_stats_callback_)
     receive_stats_callback_->OnIncomingPayloadType(payload_type);
 }
 
 void ViEChannel::OnDecoderImplementationName(const char* implementation_name) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (receive_stats_callback_)
     receive_stats_callback_->OnDecoderImplementationName(implementation_name);
 }
 
 void ViEChannel::OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (receive_stats_callback_)
     receive_stats_callback_->OnIncomingRate(frame_rate, bit_rate);
 }
 
 void ViEChannel::OnDiscardedPacketsUpdated(int discarded_packets) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (receive_stats_callback_)
     receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets);
 }
 
 void ViEChannel::OnFrameCountsUpdated(const FrameCounts& frame_counts) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   receive_frame_counts_ = frame_counts;
   if (receive_stats_callback_)
     receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
 }
 
 void ViEChannel::OnDecoderTiming(int decode_ms,
                                  int max_decode_ms,
                                  int current_delay_ms,
                                  int target_delay_ms,
                                  int jitter_buffer_ms,
                                  int min_playout_delay_ms,
                                  int render_delay_ms) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (!receive_stats_callback_)
     return;
   receive_stats_callback_->OnDecoderTiming(
       decode_ms, max_decode_ms, current_delay_ms, target_delay_ms,
       jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt_ms_);
 }
 
 int32_t ViEChannel::RequestKeyFrame() {
   return rtp_rtcp_modules_[0]->RequestKeyFrame();
 }
@@ skipping 14 matching lines @@
 }
 
 bool ViEChannel::ChannelDecodeProcess() {
   vcm_->Decode(kMaxDecodeWaitTimeMs);
   return true;
 }
 
 void ViEChannel::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
   vcm_->SetReceiveChannelParameters(max_rtt_ms);
 
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   if (time_of_first_rtt_ms_ == -1)
     time_of_first_rtt_ms_ = Clock::GetRealTimeClock()->TimeInMilliseconds();
   rtt_sum_ms_ += avg_rtt_ms;
   last_rtt_ms_ = avg_rtt_ms;
   ++num_rtts_;
 }
 
 int ViEChannel::ProtectionRequest(const FecProtectionParams* delta_fec_params,
                                   const FecProtectionParams* key_fec_params,
                                   uint32_t* video_rate_bps,
@@ skipping 89 matching lines @@
                                  rtp_rtcp_modules_[0],
                                  vie_receiver_.GetRtpReceiver());
 }
 
 int32_t ViEChannel::VoiceChannel() {
   return vie_sync_.VoiceChannel();
 }
 
 void ViEChannel::RegisterPreRenderCallback(
     I420FrameCallback* pre_render_callback) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   pre_render_callback_ = pre_render_callback;
 }
 
 void ViEChannel::RegisterPreDecodeImageCallback(
     EncodedImageCallback* pre_decode_callback) {
   vcm_->RegisterPreDecodeImageCallback(pre_decode_callback);
 }
 
 // TODO(pbos): Remove OnInitializeDecoder which is called from the RTP module,
 // any decoder resetting should be handled internally within the VCM.
@@ skipping 16 matching lines @@
 
 void ViEChannel::OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) {}
 
 void ViEChannel::RegisterSendFrameCountObserver(
     FrameCountObserver* observer) {
   send_frame_count_observer_.Set(observer);
 }
 
 void ViEChannel::RegisterReceiveStatisticsProxy(
     ReceiveStatisticsProxy* receive_statistics_proxy) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
-  CriticalSectionScoped cs(crit_.get());
+  rtc::CritScope lock(&crit_);
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc