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

Unified Diff: webrtc/modules/video_capture/windows/video_capture_ds.cc

Issue 2790533002: Remove ALL usage of CriticalSectionWrapper. (Closed)
Patch Set: remove winXP rw_lock include Created 3 years, 9 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
Index: webrtc/modules/video_capture/windows/video_capture_ds.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.cc b/webrtc/modules/video_capture/windows/video_capture_ds.cc
index a98b1b85275519b980fe393fd01d29e1c10252d0..9bb928d54608256ea33cad76eb92dae80e80ae65 100644
--- a/webrtc/modules/video_capture/windows/video_capture_ds.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_ds.cc
@@ -13,7 +13,6 @@
#include "webrtc/modules/video_capture/video_capture_config.h"
#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
#include "webrtc/modules/video_capture/windows/sink_filter_ds.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
#include <Dvdmedia.h> // VIDEOINFOHEADER2
@@ -153,7 +152,7 @@ int32_t VideoCaptureDS::Init(const char* deviceUniqueIdUTF8)
int32_t VideoCaptureDS::StartCapture(
const VideoCaptureCapability& capability)
{
- CriticalSectionScoped cs(&_apiCs);
+ rtc::CritScope cs(&_apiCs);
if (capability != _requestedCapability)
{
@@ -176,7 +175,7 @@ int32_t VideoCaptureDS::StartCapture(
int32_t VideoCaptureDS::StopCapture()
{
- CriticalSectionScoped cs(&_apiCs);
+ rtc::CritScope cs(&_apiCs);
HRESULT hr = _mediaControl->Pause();
if (FAILED(hr))
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.cc ('k') | webrtc/modules/video_coding/codecs/test/packet_manipulator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698