Remove ALL usage of CriticalSectionWrapper.

webrtc/modules/video_capture/linux/video_capture_linux.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.
  */
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <iostream>
 #include <new>
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 namespace videocapturemodule {
 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
     const char* deviceUniqueId) {
     rtc::scoped_refptr<VideoCaptureModuleV4L2> implementation(
         new rtc::RefCountedObject<VideoCaptureModuleV4L2>());
 
     if (implementation->Init(deviceUniqueId) != 0)
         return nullptr;
 
     return implementation;
 }
 
 VideoCaptureModuleV4L2::VideoCaptureModuleV4L2()
     : VideoCaptureImpl(),
-      _captureCritSect(CriticalSectionWrapper::CreateCriticalSection()),
       _deviceId(-1),
       _deviceFd(-1),
       _buffersAllocatedByDevice(-1),
       _currentWidth(-1),
       _currentHeight(-1),
       _currentFrameRate(-1),
       _captureStarted(false),
       _captureVideoType(kVideoI420),
       _pool(NULL)
 {
@@ skipping 44 matching lines @@
                      0, "no matching device found");
         return -1;
     }
     _deviceId = n; //store the device id
     return 0;
 }
 
 VideoCaptureModuleV4L2::~VideoCaptureModuleV4L2()
 {
     StopCapture();
-    if (_captureCritSect)
-    {
-        delete _captureCritSect;
-    }
     if (_deviceFd != -1)
       close(_deviceFd);
 }
 
 int32_t VideoCaptureModuleV4L2::StartCapture(
     const VideoCaptureCapability& capability)
 {
     if (_captureStarted)
     {
         if (capability.width == _currentWidth &&
             capability.height == _currentHeight &&
             _captureVideoType == capability.rawType)
         {
             return 0;
         }
         else
         {
             StopCapture();
         }
     }
 
-    CriticalSectionScoped cs(_captureCritSect);
+    rtc::CritScope cs(&_captureCritSect);
     //first open /dev/video device
     char device[20];
     sprintf(device, "/dev/video%d", (int) _deviceId);
 
     if ((_deviceFd = open(device, O_RDWR | O_NONBLOCK, 0)) < 0)
     {
         WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, 0,
                    "error in opening %s errono = %d", device, errno);
         return -1;
     }
@@ skipping 150 matching lines @@
 }
 
 int32_t VideoCaptureModuleV4L2::StopCapture()
 {
     if (_captureThread) {
         // Make sure the capture thread stop stop using the critsect.
         _captureThread->Stop();
         _captureThread.reset();
     }
 
-    CriticalSectionScoped cs(_captureCritSect);
+    rtc::CritScope cs(&_captureCritSect);
     if (_captureStarted)
     {
         _captureStarted = false;
 
         DeAllocateVideoBuffers();
         close(_deviceFd);
         _deviceFd = -1;
     }
 
     return 0;
@@ skipping 86 matching lines @@
 bool VideoCaptureModuleV4L2::CaptureThread(void* obj)
 {
     return static_cast<VideoCaptureModuleV4L2*> (obj)->CaptureProcess();
 }
 bool VideoCaptureModuleV4L2::CaptureProcess()
 {
     int retVal = 0;
     fd_set rSet;
     struct timeval timeout;
 
-    _captureCritSect->Enter();
+    rtc::CritScope cs(&_captureCritSect);
 
     FD_ZERO(&rSet);
     FD_SET(_deviceFd, &rSet);
     timeout.tv_sec = 1;
     timeout.tv_usec = 0;
 
     retVal = select(_deviceFd + 1, &rSet, NULL, NULL, &timeout);
     if (retVal < 0 && errno != EINTR) // continue if interrupted
     {
         // select failed
-        _captureCritSect->Leave();
         return false;
     }
     else if (retVal == 0)
     {
         // select timed out
-        _captureCritSect->Leave();
         return true;
     }
     else if (!FD_ISSET(_deviceFd, &rSet))
     {
         // not event on camera handle
-        _captureCritSect->Leave();
         return true;
     }
 
     if (_captureStarted)
     {
         struct v4l2_buffer buf;
         memset(&buf, 0, sizeof(struct v4l2_buffer));
         buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         buf.memory = V4L2_MEMORY_MMAP;
         // dequeue a buffer - repeat until dequeued properly!
         while (ioctl(_deviceFd, VIDIOC_DQBUF, &buf) < 0)
         {
             if (errno != EINTR)
             {
                 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, 0,
                            "could not sync on a buffer on device %s", strerror(errno));
-                _captureCritSect->Leave();
                 return true;
             }
         }
         VideoCaptureCapability frameInfo;
         frameInfo.width = _currentWidth;
         frameInfo.height = _currentHeight;
         frameInfo.rawType = _captureVideoType;
 
         // convert to to I420 if needed
         IncomingFrame((unsigned char*) _pool[buf.index].start,
                       buf.bytesused, frameInfo);
         // enqueue the buffer again
         if (ioctl(_deviceFd, VIDIOC_QBUF, &buf) == -1)
         {
             WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCapture, 0,
                        "Failed to enqueue capture buffer");
         }
     }
-    _captureCritSect->Leave();
     usleep(0);
     return true;
 }
 
 int32_t VideoCaptureModuleV4L2::CaptureSettings(VideoCaptureCapability& settings)
 {
     settings.width = _currentWidth;
     settings.height = _currentHeight;
     settings.maxFPS = _currentFrameRate;
     settings.rawType=_captureVideoType;
 
     return 0;
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc