Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: webrtc/video/vie_sync_module.cc

Issue 1613053003: Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase? Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/vie_sync_module.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/vie_sync_module.cc
diff --git a/webrtc/video/vie_sync_module.cc b/webrtc/video/vie_sync_module.cc
index 9ca9a9480e81a8b59b8a61edacb0d2e35879346b..0a6bc8e9c729173a5e1a10170efadb39c72c8dbc 100644
--- a/webrtc/video/vie_sync_module.cc
+++ b/webrtc/video/vie_sync_module.cc
@@ -15,7 +15,6 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/video/stream_synchronization.h"
#include "webrtc/voice_engine/include/voe_video_sync.h"
@@ -49,8 +48,7 @@ int UpdateMeasurements(StreamSynchronization::Measurements* stream,
}
ViESyncModule::ViESyncModule(VideoCodingModule* vcm)
- : data_cs_(CriticalSectionWrapper::CreateCriticalSection()),
- vcm_(vcm),
+ : vcm_(vcm),
video_receiver_(NULL),
video_rtp_rtcp_(NULL),
voe_channel_id_(-1),
@@ -66,7 +64,7 @@ int ViESyncModule::ConfigureSync(int voe_channel_id,
VoEVideoSync* voe_sync_interface,
RtpRtcp* video_rtcp_module,
RtpReceiver* video_receiver) {
- CriticalSectionScoped cs(data_cs_.get());
+ rtc::CritScope lock(&data_cs_);
// Prevent expensive no-ops.
if (voe_channel_id_ == voe_channel_id &&
voe_sync_interface_ == voe_sync_interface &&
@@ -102,7 +100,7 @@ int64_t ViESyncModule::TimeUntilNextProcess() {
}
int32_t ViESyncModule::Process() {
- CriticalSectionScoped cs(data_cs_.get());
+ rtc::CritScope lock(&data_cs_);
last_sync_time_ = TickTime::Now();
const int current_video_delay_ms = vcm_->Delay();
« no previous file with comments | « webrtc/video/vie_sync_module.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698