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

Unified Diff: content/renderer/media/video_capture_module_impl.cc

Issue 7887002: Update the Chromium version of webrtc::VideoCaptureModule to be reference counted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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: content/renderer/media/video_capture_module_impl.cc
===================================================================
--- content/renderer/media/video_capture_module_impl.cc (revision 100680)
+++ content/renderer/media/video_capture_module_impl.cc (working copy)
@@ -4,6 +4,7 @@
#include "content/renderer/media/video_capture_module_impl.h"
+#include "base/atomicops.h"
#include "content/renderer/media/video_capture_impl_manager.h"
// static
@@ -27,7 +28,8 @@
frame_rate_(-1),
video_type_(webrtc::kVideoI420),
capture_engine_(NULL),
- pending_start_(false) {
+ pending_start_(false),
+ ref_count_(0) {
DCHECK(vc_manager_);
Init();
}
@@ -43,6 +45,21 @@
capture_engine_ = vc_manager_->AddDevice(session_id_, this);
}
+int32_t VideoCaptureModuleImpl::AddRef() {
+ VLOG(1) << "VideoCaptureModuleImpl::AddRef()";
+ return base::subtle::Barrier_AtomicIncrement(&ref_count_, 1);
+}
+
+int32_t VideoCaptureModuleImpl::Release() {
+ VLOG(1) << "VideoCaptureModuleImpl::Release()";
+ int ret = base::subtle::Barrier_AtomicIncrement(&ref_count_, -1);
+ if (ret == 0) {
+ VLOG(1) << "Reference count is zero, hence this object is now deleted.";
+ delete this;
+ }
+ return ret;
+}
+
WebRtc_Word32 VideoCaptureModuleImpl::StartCapture(
const webrtc::VideoCaptureCapability& capability) {
message_loop_proxy_->PostTask(

Powered by Google App Engine
This is Rietveld 408576698