| 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(
|
|
|