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

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

Issue 960103002: Rename VideoCaptureImplManager to VideoCaptureService Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix some nits Created 5 years, 9 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/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "content/renderer/media/video_capture_impl_manager.h" 10 #include "content/renderer/media/video_capture_service.h"
11 #include "content/renderer/pepper/pepper_media_device_manager.h" 11 #include "content/renderer/pepper/pepper_media_device_manager.h"
12 #include "content/renderer/pepper/pepper_video_capture_host.h" 12 #include "content/renderer/pepper/pepper_video_capture_host.h"
13 #include "content/renderer/render_frame_impl.h" 13 #include "content/renderer/render_frame_impl.h"
14 #include "content/renderer/render_thread_impl.h" 14 #include "content/renderer/render_thread_impl.h"
15 #include "media/base/bind_to_current_loop.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(
(...skipping 20 matching lines...) Expand all
41 weak_factory_.GetWeakPtr())); 41 weak_factory_.GetWeakPtr()));
42 pending_open_device_ = true; 42 pending_open_device_ = true;
43 } 43 }
44 } 44 }
45 45
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 VideoCaptureService* manager =
52 RenderThreadImpl::current()->video_capture_impl_manager(); 52 RenderThreadImpl::current()->video_capture_service();
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 media::BindToCurrentLoop(base::Bind(
57 &PepperPlatformVideoCapture::OnStateUpdate, 57 &PepperPlatformVideoCapture::OnStateUpdate,
58 weak_factory_.GetWeakPtr())), 58 weak_factory_.GetWeakPtr())),
59 media::BindToCurrentLoop(base::Bind( 59 media::BindToCurrentLoop(base::Bind(
60 &PepperPlatformVideoCapture::OnFrameReady, 60 &PepperPlatformVideoCapture::OnFrameReady,
61 weak_factory_.GetWeakPtr()))); 61 weak_factory_.GetWeakPtr())));
62 } 62 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 const std::string& label) { 103 const std::string& label) {
104 pending_open_device_ = false; 104 pending_open_device_ = false;
105 pending_open_device_id_ = -1; 105 pending_open_device_id_ = -1;
106 106
107 PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager(); 107 PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager();
108 succeeded = succeeded && device_manager; 108 succeeded = succeeded && device_manager;
109 if (succeeded) { 109 if (succeeded) {
110 label_ = label; 110 label_ = label;
111 session_id_ = device_manager->GetSessionID( 111 session_id_ = device_manager->GetSessionID(
112 PP_DEVICETYPE_DEV_VIDEOCAPTURE, label); 112 PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
113 VideoCaptureImplManager* manager = 113 VideoCaptureService* manager =
114 RenderThreadImpl::current()->video_capture_impl_manager(); 114 RenderThreadImpl::current()->video_capture_service();
115 release_device_cb_ = manager->UseDevice(session_id_); 115 release_device_cb_ = manager->UseDevice(session_id_);
116 } 116 }
117 117
118 if (handler_) 118 if (handler_)
119 handler_->OnInitialized(succeeded); 119 handler_->OnInitialized(succeeded);
120 } 120 }
121 121
122 void PepperPlatformVideoCapture::OnStateUpdate(VideoCaptureState state) { 122 void PepperPlatformVideoCapture::OnStateUpdate(VideoCaptureState state) {
123 if (!handler_) 123 if (!handler_)
124 return; 124 return;
(...skipping 24 matching lines...) Expand all
149 } 149 }
150 150
151 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() { 151 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() {
152 RenderFrameImpl* const render_frame = 152 RenderFrameImpl* const render_frame =
153 RenderFrameImpl::FromRoutingID(render_frame_id_); 153 RenderFrameImpl::FromRoutingID(render_frame_id_);
154 return render_frame ? 154 return render_frame ?
155 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL; 155 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
156 } 156 }
157 157
158 } // namespace content 158 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698