remove more CriticalSectionWrappers.
BUG=webrtc:7035
Review-Url: https://codereview.webrtc.org/2779623002
Cr-Commit-Position: refs/heads/master@{#17392}
diff --git a/webrtc/modules/video_coding/media_optimization.cc b/webrtc/modules/video_coding/media_optimization.cc
index fec5c4c..ccd23f6 100644
--- a/webrtc/modules/video_coding/media_optimization.cc
+++ b/webrtc/modules/video_coding/media_optimization.cc
@@ -33,8 +33,7 @@
};
MediaOptimization::MediaOptimization(Clock* clock)
- : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
- clock_(clock),
+ : clock_(clock),
max_bit_rate_(0),
codec_width_(0),
codec_height_(0),
@@ -56,7 +55,7 @@
}
void MediaOptimization::Reset() {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
SetEncodingDataInternal(0, 0, 0, 0, 0, 0, max_payload_size_);
memset(incoming_frame_times_, -1, sizeof(incoming_frame_times_));
incoming_frame_rate_ = 0.0;
@@ -79,7 +78,7 @@
uint32_t frame_rate,
int num_layers,
int32_t mtu) {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
SetEncodingDataInternal(max_bit_rate, frame_rate, target_bitrate, width,
height, num_layers, mtu);
}
@@ -107,7 +106,7 @@
}
uint32_t MediaOptimization::SetTargetRates(uint32_t target_bitrate) {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
video_target_bitrate_ = target_bitrate;
@@ -125,7 +124,7 @@
}
uint32_t MediaOptimization::InputFrameRate() {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
return InputFrameRateInternal();
}
@@ -137,7 +136,7 @@
}
uint32_t MediaOptimization::SentFrameRate() {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
return SentFrameRateInternal();
}
@@ -148,7 +147,7 @@
}
uint32_t MediaOptimization::SentBitRate() {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
const int64_t now_ms = clock_->TimeInMilliseconds();
PurgeOldFrameSamples(now_ms);
UpdateSentBitrate(now_ms);
@@ -159,7 +158,7 @@
const EncodedImage& encoded_image) {
size_t encoded_length = encoded_image._length;
uint32_t timestamp = encoded_image._timeStamp;
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
const int64_t now_ms = clock_->TimeInMilliseconds();
PurgeOldFrameSamples(now_ms);
if (encoded_frame_samples_.size() > 0 &&
@@ -184,12 +183,12 @@
}
void MediaOptimization::EnableFrameDropper(bool enable) {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
frame_dropper_->Enable(enable);
}
bool MediaOptimization::DropFrame() {
- CriticalSectionScoped lock(crit_sect_.get());
+ rtc::CritScope lock(&crit_sect_);
UpdateIncomingFrameRate();
// Leak appropriate number of bytes.
frame_dropper_->Leak((uint32_t)(InputFrameRateInternal() + 0.5f));
diff --git a/webrtc/modules/video_coding/media_optimization.h b/webrtc/modules/video_coding/media_optimization.h
index 290636f..bc48300 100644
--- a/webrtc/modules/video_coding/media_optimization.h
+++ b/webrtc/modules/video_coding/media_optimization.h
@@ -101,7 +101,7 @@
uint32_t SentFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
// Protect all members.
- std::unique_ptr<CriticalSectionWrapper> crit_sect_;
+ rtc::CriticalSection crit_sect_;
Clock* clock_ GUARDED_BY(crit_sect_);
int32_t max_bit_rate_ GUARDED_BY(crit_sect_);
diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc
index 826647c..af9ddb8 100644
--- a/webrtc/modules/video_coding/receiver.cc
+++ b/webrtc/modules/video_coding/receiver.cc
@@ -72,8 +72,7 @@
std::unique_ptr<EventWrapper> jitter_buffer_event,
NackSender* nack_sender,
KeyFrameRequestSender* keyframe_request_sender)
- : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
- clock_(clock),
+ : clock_(clock),
jitter_buffer_(clock_,
std::move(jitter_buffer_event),
nack_sender,
@@ -86,11 +85,10 @@
VCMReceiver::~VCMReceiver() {
render_wait_event_->Set();
- delete crit_sect_;
}
void VCMReceiver::Reset() {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
if (!jitter_buffer_.Running()) {
jitter_buffer_.Start();
} else {
@@ -242,7 +240,7 @@
void VCMReceiver::SetNackMode(VCMNackMode nackMode,
int64_t low_rtt_nack_threshold_ms,
int64_t high_rtt_nack_threshold_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
// Default to always having NACK enabled in hybrid mode.
jitter_buffer_.SetNackMode(nackMode, low_rtt_nack_threshold_ms,
high_rtt_nack_threshold_ms);
@@ -256,7 +254,7 @@
}
VCMNackMode VCMReceiver::NackMode() const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
return jitter_buffer_.nack_mode();
}
@@ -273,7 +271,7 @@
}
int VCMReceiver::SetMinReceiverDelay(int desired_delay_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
if (desired_delay_ms < 0 || desired_delay_ms > kMaxReceiverDelayMs) {
return -1;
}
diff --git a/webrtc/modules/video_coding/receiver.h b/webrtc/modules/video_coding/receiver.h
index a8d3ef3..0664d62 100644
--- a/webrtc/modules/video_coding/receiver.h
+++ b/webrtc/modules/video_coding/receiver.h
@@ -14,10 +14,10 @@
#include <memory>
#include <vector>
+#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/video_coding/jitter_buffer.h"
#include "webrtc/modules/video_coding/packet.h"
#include "webrtc/modules/video_coding/timing.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
@@ -91,7 +91,7 @@
void TriggerDecoderShutdown();
private:
- CriticalSectionWrapper* crit_sect_;
+ rtc::CriticalSection crit_sect_;
Clock* const clock_;
VCMJitterBuffer jitter_buffer_;
VCMTiming* timing_;
diff --git a/webrtc/modules/video_coding/timing.cc b/webrtc/modules/video_coding/timing.cc
index f30976f..21f4a3d 100644
--- a/webrtc/modules/video_coding/timing.cc
+++ b/webrtc/modules/video_coding/timing.cc
@@ -21,22 +21,21 @@
namespace webrtc {
VCMTiming::VCMTiming(Clock* clock, VCMTiming* master_timing)
- : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
- clock_(clock),
- master_(false),
- ts_extrapolator_(),
- codec_timer_(new VCMCodecTimer()),
- render_delay_ms_(kDefaultRenderDelayMs),
- min_playout_delay_ms_(0),
- max_playout_delay_ms_(10000),
- jitter_delay_ms_(0),
- current_delay_ms_(0),
- last_decode_ms_(0),
- prev_frame_timestamp_(0),
- num_decoded_frames_(0),
- num_delayed_decoded_frames_(0),
- first_decoded_frame_ms_(-1),
- sum_missed_render_deadline_ms_(0) {
+ : clock_(clock),
+ master_(false),
+ ts_extrapolator_(),
+ codec_timer_(new VCMCodecTimer()),
+ render_delay_ms_(kDefaultRenderDelayMs),
+ min_playout_delay_ms_(0),
+ max_playout_delay_ms_(10000),
+ jitter_delay_ms_(0),
+ current_delay_ms_(0),
+ last_decode_ms_(0),
+ prev_frame_timestamp_(0),
+ num_decoded_frames_(0),
+ num_delayed_decoded_frames_(0),
+ first_decoded_frame_ms_(-1),
+ sum_missed_render_deadline_ms_(0) {
if (master_timing == NULL) {
master_ = true;
ts_extrapolator_ = new TimestampExtrapolator(clock_->TimeInMilliseconds());
@@ -50,11 +49,10 @@
if (master_) {
delete ts_extrapolator_;
}
- delete crit_sect_;
}
void VCMTiming::UpdateHistograms() const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
if (num_decoded_frames_ == 0) {
return;
}
@@ -77,7 +75,7 @@
}
void VCMTiming::Reset() {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
ts_extrapolator_->Reset(clock_->TimeInMilliseconds());
codec_timer_.reset(new VCMCodecTimer());
render_delay_ms_ = kDefaultRenderDelayMs;
@@ -88,37 +86,37 @@
}
void VCMTiming::ResetDecodeTime() {
- CriticalSectionScoped lock(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
codec_timer_.reset(new VCMCodecTimer());
}
void VCMTiming::set_render_delay(int render_delay_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
render_delay_ms_ = render_delay_ms;
}
void VCMTiming::set_min_playout_delay(int min_playout_delay_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
min_playout_delay_ms_ = min_playout_delay_ms;
}
int VCMTiming::min_playout_delay() {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
return min_playout_delay_ms_;
}
void VCMTiming::set_max_playout_delay(int max_playout_delay_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
max_playout_delay_ms_ = max_playout_delay_ms;
}
int VCMTiming::max_playout_delay() {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
return max_playout_delay_ms_;
}
void VCMTiming::SetJitterDelay(int jitter_delay_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
if (jitter_delay_ms != jitter_delay_ms_) {
jitter_delay_ms_ = jitter_delay_ms;
// When in initial state, set current delay to minimum delay.
@@ -129,7 +127,7 @@
}
void VCMTiming::UpdateCurrentDelay(uint32_t frame_timestamp) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
int target_delay_ms = TargetDelayInternal();
if (current_delay_ms_ == 0) {
@@ -171,7 +169,7 @@
void VCMTiming::UpdateCurrentDelay(int64_t render_time_ms,
int64_t actual_decode_time_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
uint32_t target_delay_ms = TargetDelayInternal();
int64_t delayed_ms =
actual_decode_time_ms -
@@ -190,7 +188,7 @@
int32_t decode_time_ms,
int64_t now_ms,
int64_t render_time_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
codec_timer_->AddTiming(decode_time_ms, now_ms);
assert(decode_time_ms >= 0);
last_decode_ms_ = decode_time_ms;
@@ -209,13 +207,13 @@
}
void VCMTiming::IncomingTimestamp(uint32_t time_stamp, int64_t now_ms) {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
ts_extrapolator_->Update(now_ms, time_stamp);
}
int64_t VCMTiming::RenderTimeMs(uint32_t frame_timestamp,
int64_t now_ms) const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
const int64_t render_time_ms = RenderTimeMsInternal(frame_timestamp, now_ms);
return render_time_ms;
}
@@ -249,7 +247,7 @@
uint32_t VCMTiming::MaxWaitingTime(int64_t render_time_ms,
int64_t now_ms) const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
const int64_t max_wait_time_ms =
render_time_ms - now_ms - RequiredDecodeTimeMs() - render_delay_ms_;
@@ -262,7 +260,7 @@
bool VCMTiming::EnoughTimeToDecode(
uint32_t available_processing_time_ms) const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
int64_t required_decode_time_ms = RequiredDecodeTimeMs();
if (required_decode_time_ms < 0) {
// Haven't decoded any frames yet, try decoding one to get an estimate
@@ -279,7 +277,7 @@
}
int VCMTiming::TargetVideoDelay() const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
return TargetDelayInternal();
}
@@ -295,7 +293,7 @@
int* jitter_buffer_ms,
int* min_playout_delay_ms,
int* render_delay_ms) const {
- CriticalSectionScoped cs(crit_sect_);
+ rtc::CritScope cs(&crit_sect_);
*decode_ms = last_decode_ms_;
*max_decode_ms = RequiredDecodeTimeMs();
*current_delay_ms = current_delay_ms_;
diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h
index 429c282..bfd6778 100644
--- a/webrtc/modules/video_coding/timing.h
+++ b/webrtc/modules/video_coding/timing.h
@@ -13,9 +13,9 @@
#include <memory>
+#include "webrtc/base/criticalsection.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/video_coding/codec_timer.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@@ -114,7 +114,7 @@
private:
void UpdateHistograms() const;
- CriticalSectionWrapper* crit_sect_;
+ rtc::CriticalSection crit_sect_;
Clock* const clock_;
bool master_ GUARDED_BY(crit_sect_);
TimestampExtrapolator* ts_extrapolator_ GUARDED_BY(crit_sect_);
diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
index a1cfc07..8ff5482 100644
--- a/webrtc/modules/video_coding/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/video_coding_impl.cc
@@ -50,21 +50,19 @@
// a register method all the way down to the function calling it.
class EncodedImageCallbackWrapper : public EncodedImageCallback {
public:
- EncodedImageCallbackWrapper()
- : cs_(CriticalSectionWrapper::CreateCriticalSection()),
- callback_(nullptr) {}
+ EncodedImageCallbackWrapper() : callback_(nullptr) {}
virtual ~EncodedImageCallbackWrapper() {}
void Register(EncodedImageCallback* callback) {
- CriticalSectionScoped cs(cs_.get());
+ rtc::CritScope lock(&cs_);
callback_ = callback;
}
virtual Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
- CriticalSectionScoped cs(cs_.get());
+ rtc::CritScope lock(&cs_);
if (callback_) {
return callback_->OnEncodedImage(encoded_image, codec_specific_info,
fragmentation);
@@ -73,7 +71,7 @@
}
private:
- std::unique_ptr<CriticalSectionWrapper> cs_;
+ rtc::CriticalSection cs_;
EncodedImageCallback* callback_ GUARDED_BY(cs_);
};