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

Unified Diff: trunk/src/content/renderer/media/rtc_video_capture_delegate.cc

Issue 135683002: Revert 244074 "Eliminate video capture thread in renderer" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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: trunk/src/content/renderer/media/rtc_video_capture_delegate.cc
===================================================================
--- trunk/src/content/renderer/media/rtc_video_capture_delegate.cc (revision 244357)
+++ trunk/src/content/renderer/media/rtc_video_capture_delegate.cc (working copy)
@@ -5,27 +5,25 @@
#include "content/renderer/media/rtc_video_capture_delegate.h"
#include "base/bind.h"
-#include "base/location.h"
-#include "content/renderer/media/video_capture_impl_manager.h"
-#include "content/renderer/render_thread_impl.h"
#include "media/base/video_frame.h"
namespace content {
RtcVideoCaptureDelegate::RtcVideoCaptureDelegate(
- const media::VideoCaptureSessionId id)
+ const media::VideoCaptureSessionId id,
+ VideoCaptureImplManager* vc_manager)
: session_id_(id),
+ vc_manager_(vc_manager),
+ capture_engine_(NULL),
got_first_frame_(false),
error_occured_(false) {
DVLOG(3) << " RtcVideoCaptureDelegate::ctor";
- capture_engine_ =
- RenderThreadImpl::current()->video_capture_impl_manager()
- ->UseDevice(session_id_);
+ capture_engine_ = vc_manager_->AddDevice(session_id_, this);
}
RtcVideoCaptureDelegate::~RtcVideoCaptureDelegate() {
DVLOG(3) << " RtcVideoCaptureDelegate::dtor";
- StopCapture();
+ vc_manager_->RemoveDevice(session_id_, this);
}
void RtcVideoCaptureDelegate::StartCapture(
« no previous file with comments | « trunk/src/content/renderer/media/rtc_video_capture_delegate.h ('k') | trunk/src/content/renderer/media/rtc_video_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698