Fix thread safety in VcmCapturer.

webrtc/test/vcm_capturer.cc

 /*
  *  Copyright (c) 2013 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 40 matching lines @@
 
   assert(vcm_->CaptureStarted());
 
   return true;
 }
 
 VcmCapturer* VcmCapturer::Create(VideoCaptureInput* input,
                                  size_t width,
                                  size_t height,
                                  size_t target_fps) {
-  VcmCapturer* vcm__capturer = new VcmCapturer(input);
-  if (!vcm__capturer->Init(width, height, target_fps)) {
+  VcmCapturer* vcm_capturer = new VcmCapturer(input);
+  if (!vcm_capturer->Init(width, height, target_fps)) {
     // TODO(pbos): Log a warning that this failed.
-    delete vcm__capturer;
+    delete vcm_capturer;
     return NULL;
   }
-  return vcm__capturer;
+  return vcm_capturer;
 }
 
 
-void VcmCapturer::Start() { started_ = true; }
+void VcmCapturer::Start() {
+  rtc::CritScope lock(&crit_);
+  started_ = true;
+}
 
-void VcmCapturer::Stop() { started_ = false; }
+void VcmCapturer::Stop() {
+  rtc::CritScope lock(&crit_);
+  started_ = false;
+}
 
 void VcmCapturer::Destroy() {
   if (vcm_ == NULL) {
     return;
   }
 
   vcm_->StopCapture();
   vcm_->DeRegisterCaptureDataCallback();
   vcm_->Release();
 
   // TODO(pbos): How do I destroy the VideoCaptureModule? This still leaves
   //             non-freed memory.
   vcm_ = NULL;
 }
 
 VcmCapturer::~VcmCapturer() { Destroy(); }
 
 void VcmCapturer::OnIncomingCapturedFrame(const int32_t id,
                                           const VideoFrame& frame) {
+  rtc::CritScope lock(&crit_);
   if (started_)
     input_->IncomingCapturedFrame(frame);
 }
 
 void VcmCapturer::OnCaptureDelayChanged(const int32_t id, const int32_t delay) {
 }
 }  // test
 }  // webrtc