Use rtc::scoped_refptr for WebRtcVideoCapturer.

webrtc/media/engine/webrtcvideocapturer.cc

 /*
  *  Copyright (c) 2011 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 34 matching lines @@
   { FOURCC_UYVY, webrtc::kVideoUYVY },   // 16 bpp, fast conversion.
   { FOURCC_NV12, webrtc::kVideoNV12 },   // 12 bpp, fast conversion.
   { FOURCC_NV21, webrtc::kVideoNV21 },   // 12 bpp, fast conversion.
   { FOURCC_MJPG, webrtc::kVideoMJPEG },  // compressed, slow conversion.
   { FOURCC_ARGB, webrtc::kVideoARGB },   // 32 bpp, slow conversion.
   { FOURCC_24BG, webrtc::kVideoRGB24 },  // 24 bpp, slow conversion.
 };
 
 class WebRtcVcmFactory : public WebRtcVcmFactoryInterface {
  public:
-  virtual webrtc::VideoCaptureModule* Create(int id, const char* device) {
+  virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
+      int id,
+      const char* device) {
     return webrtc::VideoCaptureFactory::Create(id, device);
   }
   virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
     return webrtc::VideoCaptureFactory::CreateDeviceInfo(id);
   }
   virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {
     delete info;
   }
 };
 
@@ skipping 55 matching lines @@
 
 WebRtcVideoCapturer::WebRtcVideoCapturer(WebRtcVcmFactoryInterface* factory)
     : factory_(factory),
       module_(nullptr),
       captured_frames_(0),
       start_thread_(nullptr),
       async_invoker_(nullptr) {
   set_frame_factory(new WebRtcVideoFrameFactory());
 }
 
-WebRtcVideoCapturer::~WebRtcVideoCapturer() {
-  if (module_) {
-    module_->Release();
-  }
-}
+WebRtcVideoCapturer::~WebRtcVideoCapturer() {}
 
 bool WebRtcVideoCapturer::Init(const Device& device) {
   RTC_DCHECK(!start_thread_);
   if (module_) {
     LOG(LS_ERROR) << "The capturer is already initialized";
     return false;
   }
 
   webrtc::VideoCaptureModule::DeviceInfo* info = factory_->CreateDeviceInfo(0);
   if (!info) {
@@ skipping 45 matching lines @@
     return false;
   }
 
   module_ = factory_->Create(0, vcm_id);
   if (!module_) {
     LOG(LS_ERROR) << "Failed to create capturer for id: " << device.id;
     return false;
   }
 
   // It is safe to change member attributes now.
-  module_->AddRef();
   SetId(device.id);
   SetSupportedFormats(supported);
 
   return true;
 }
 
-bool WebRtcVideoCapturer::Init(webrtc::VideoCaptureModule* module) {
+bool WebRtcVideoCapturer::Init(
+    const rtc::scoped_refptr<webrtc::VideoCaptureModule>& module) {
   RTC_DCHECK(!start_thread_);
   if (module_) {
     LOG(LS_ERROR) << "The capturer is already initialized";
     return false;
   }
   if (!module) {
     LOG(LS_ERROR) << "Invalid VCM supplied";
     return false;
   }
   // TODO(juberti): Set id and formats.
-  (module_ = module)->AddRef();
+  module_ = module;
   return true;
 }
 
 bool WebRtcVideoCapturer::GetBestCaptureFormat(const VideoFormat& desired,
                                                VideoFormat* best_format) {
   if (!best_format) {
     return false;
   }
 
   if (!VideoCapturer::GetBestCaptureFormat(desired, best_format)) {
@@ skipping 187 matching lines @@
   pixel_width = 1;
   pixel_height = 1;
   // Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds).
   time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;
   data_size = rtc::checked_cast<uint32_t>(length);
   data = buffer;
   rotation = sample.rotation();
 }
 
 }  // namespace cricket