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

Side by Side Diff: content/renderer/pepper/pepper_platform_video_capture.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_platform_video_capture.h" 5 #include "content/renderer/pepper/pepper_platform_video_capture.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_to_current_loop.h"
8 #include "base/logging.h" 9 #include "base/logging.h"
9 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
10 #include "content/renderer/media/video_capture_impl_manager.h" 11 #include "content/renderer/media/video_capture_impl_manager.h"
11 #include "content/renderer/pepper/pepper_media_device_manager.h" 12 #include "content/renderer/pepper/pepper_media_device_manager.h"
12 #include "content/renderer/pepper/pepper_video_capture_host.h" 13 #include "content/renderer/pepper/pepper_video_capture_host.h"
13 #include "content/renderer/render_frame_impl.h" 14 #include "content/renderer/render_frame_impl.h"
14 #include "content/renderer/render_thread_impl.h" 15 #include "content/renderer/render_thread_impl.h"
15 #include "media/base/bind_to_current_loop.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 PepperPlatformVideoCapture::PepperPlatformVideoCapture( 20 PepperPlatformVideoCapture::PepperPlatformVideoCapture(
21 int render_frame_id, 21 int render_frame_id,
22 const std::string& device_id, 22 const std::string& device_id,
23 const GURL& document_url, 23 const GURL& document_url,
24 PepperVideoCaptureHost* handler) 24 PepperVideoCaptureHost* handler)
25 : render_frame_id_(render_frame_id), 25 : render_frame_id_(render_frame_id),
(...skipping 20 matching lines...) Expand all
46 void PepperPlatformVideoCapture::StartCapture( 46 void PepperPlatformVideoCapture::StartCapture(
47 const media::VideoCaptureParams& params) { 47 const media::VideoCaptureParams& params) {
48 DCHECK(thread_checker_.CalledOnValidThread()); 48 DCHECK(thread_checker_.CalledOnValidThread());
49 if (!stop_capture_cb_.is_null()) 49 if (!stop_capture_cb_.is_null())
50 return; 50 return;
51 VideoCaptureImplManager* manager = 51 VideoCaptureImplManager* manager =
52 RenderThreadImpl::current()->video_capture_impl_manager(); 52 RenderThreadImpl::current()->video_capture_impl_manager();
53 stop_capture_cb_ = 53 stop_capture_cb_ =
54 manager->StartCapture(session_id_, 54 manager->StartCapture(session_id_,
55 params, 55 params,
56 media::BindToCurrentLoop(base::Bind( 56 base::BindToCurrentLoop(base::Bind(
57 &PepperPlatformVideoCapture::OnStateUpdate, 57 &PepperPlatformVideoCapture::OnStateUpdate,
58 weak_factory_.GetWeakPtr())), 58 weak_factory_.GetWeakPtr())),
59 media::BindToCurrentLoop(base::Bind( 59 base::BindToCurrentLoop(base::Bind(
60 &PepperPlatformVideoCapture::OnFrameReady, 60 &PepperPlatformVideoCapture::OnFrameReady,
61 weak_factory_.GetWeakPtr()))); 61 weak_factory_.GetWeakPtr())));
62 } 62 }
63 63
64 void PepperPlatformVideoCapture::StopCapture() { 64 void PepperPlatformVideoCapture::StopCapture() {
65 DCHECK(thread_checker_.CalledOnValidThread()); 65 DCHECK(thread_checker_.CalledOnValidThread());
66 if (stop_capture_cb_.is_null()) 66 if (stop_capture_cb_.is_null())
67 return; 67 return;
68 stop_capture_cb_.Run(); 68 stop_capture_cb_.Run();
69 stop_capture_cb_.Reset(); 69 stop_capture_cb_.Reset();
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 148 }
149 149
150 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() { 150 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() {
151 RenderFrameImpl* const render_frame = 151 RenderFrameImpl* const render_frame =
152 RenderFrameImpl::FromRoutingID(render_frame_id_); 152 RenderFrameImpl::FromRoutingID(render_frame_id_);
153 return render_frame ? 153 return render_frame ?
154 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL; 154 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
155 } 155 }
156 156
157 } // namespace content 157 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_camera_device.cc ('k') | content/renderer/pepper/pepper_video_encoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698