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

Side by Side Diff: content/renderer/pepper/pepper_platform_camera_device.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, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_camera_device.h" 5 #include "content/renderer/pepper/pepper_platform_camera_device.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 #include "content/renderer/media/video_capture_impl_manager.h" 11 #include "content/renderer/media/video_capture_service.h"
12 #include "content/renderer/pepper/gfx_conversion.h" 12 #include "content/renderer/pepper/gfx_conversion.h"
13 #include "content/renderer/pepper/pepper_camera_device_host.h" 13 #include "content/renderer/pepper/pepper_camera_device_host.h"
14 #include "content/renderer/pepper/pepper_media_device_manager.h" 14 #include "content/renderer/pepper/pepper_media_device_manager.h"
15 #include "content/renderer/render_frame_impl.h" 15 #include "content/renderer/render_frame_impl.h"
16 #include "content/renderer/render_thread_impl.h" 16 #include "content/renderer/render_thread_impl.h"
17 #include "media/base/bind_to_current_loop.h" 17 #include "media/base/bind_to_current_loop.h"
18 #include "url/gurl.h" 18 #include "url/gurl.h"
19 19
20 namespace content { 20 namespace content {
21 21
(...skipping 16 matching lines...) Expand all
38 pending_open_device_id_ = device_manager->OpenDevice( 38 pending_open_device_id_ = device_manager->OpenDevice(
39 PP_DEVICETYPE_DEV_VIDEOCAPTURE, device_id, document_url, 39 PP_DEVICETYPE_DEV_VIDEOCAPTURE, device_id, document_url,
40 base::Bind(&PepperPlatformCameraDevice::OnDeviceOpened, 40 base::Bind(&PepperPlatformCameraDevice::OnDeviceOpened,
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 PepperPlatformCameraDevice::GetSupportedVideoCaptureFormats() { 46 void PepperPlatformCameraDevice::GetSupportedVideoCaptureFormats() {
47 DCHECK(thread_checker_.CalledOnValidThread()); 47 DCHECK(thread_checker_.CalledOnValidThread());
48 VideoCaptureImplManager* manager = 48 VideoCaptureService* manager =
49 RenderThreadImpl::current()->video_capture_impl_manager(); 49 RenderThreadImpl::current()->video_capture_service();
50 manager->GetDeviceSupportedFormats( 50 manager->GetDeviceSupportedFormats(
51 session_id_, 51 session_id_,
52 media::BindToCurrentLoop(base::Bind( 52 media::BindToCurrentLoop(base::Bind(
53 &PepperPlatformCameraDevice::OnDeviceSupportedFormatsEnumerated, 53 &PepperPlatformCameraDevice::OnDeviceSupportedFormatsEnumerated,
54 weak_factory_.GetWeakPtr()))); 54 weak_factory_.GetWeakPtr())));
55 } 55 }
56 56
57 void PepperPlatformCameraDevice::DetachEventHandler() { 57 void PepperPlatformCameraDevice::DetachEventHandler() {
58 DCHECK(thread_checker_.CalledOnValidThread()); 58 DCHECK(thread_checker_.CalledOnValidThread());
59 handler_ = NULL; 59 handler_ = NULL;
(...skipping 30 matching lines...) Expand all
90 90
91 pending_open_device_ = false; 91 pending_open_device_ = false;
92 pending_open_device_id_ = -1; 92 pending_open_device_id_ = -1;
93 93
94 PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager(); 94 PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager();
95 succeeded = succeeded && device_manager; 95 succeeded = succeeded && device_manager;
96 if (succeeded) { 96 if (succeeded) {
97 label_ = label; 97 label_ = label;
98 session_id_ = 98 session_id_ =
99 device_manager->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, label); 99 device_manager->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
100 VideoCaptureImplManager* manager = 100 VideoCaptureService* manager =
101 RenderThreadImpl::current()->video_capture_impl_manager(); 101 RenderThreadImpl::current()->video_capture_service();
102 release_device_cb_ = manager->UseDevice(session_id_); 102 release_device_cb_ = manager->UseDevice(session_id_);
103 } 103 }
104 104
105 handler_->OnInitialized(succeeded); 105 handler_->OnInitialized(succeeded);
106 } 106 }
107 107
108 void PepperPlatformCameraDevice::OnDeviceSupportedFormatsEnumerated( 108 void PepperPlatformCameraDevice::OnDeviceSupportedFormatsEnumerated(
109 const media::VideoCaptureFormats& formats) { 109 const media::VideoCaptureFormats& formats) {
110 DCHECK(thread_checker_.CalledOnValidThread()); 110 DCHECK(thread_checker_.CalledOnValidThread());
111 DCHECK(handler_); 111 DCHECK(handler_);
(...skipping 10 matching lines...) Expand all
122 122
123 PepperMediaDeviceManager* PepperPlatformCameraDevice::GetMediaDeviceManager() { 123 PepperMediaDeviceManager* PepperPlatformCameraDevice::GetMediaDeviceManager() {
124 RenderFrameImpl* const render_frame = 124 RenderFrameImpl* const render_frame =
125 RenderFrameImpl::FromRoutingID(render_frame_id_); 125 RenderFrameImpl::FromRoutingID(render_frame_id_);
126 return render_frame 126 return render_frame
127 ? PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() 127 ? PepperMediaDeviceManager::GetForRenderFrame(render_frame).get()
128 : NULL; 128 : NULL;
129 } 129 }
130 130
131 } // namespace content 131 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698