OLD | NEW |
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/bind_to_current_loop.h" |
8 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
9 #include "base/logging.h" | 10 #include "base/logging.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 11 #include "base/message_loop/message_loop_proxy.h" |
11 #include "content/renderer/media/video_capture_impl_manager.h" | 12 #include "content/renderer/media/video_capture_impl_manager.h" |
12 #include "content/renderer/pepper/gfx_conversion.h" | 13 #include "content/renderer/pepper/gfx_conversion.h" |
13 #include "content/renderer/pepper/pepper_camera_device_host.h" | 14 #include "content/renderer/pepper/pepper_camera_device_host.h" |
14 #include "content/renderer/pepper/pepper_media_device_manager.h" | 15 #include "content/renderer/pepper/pepper_media_device_manager.h" |
15 #include "content/renderer/render_frame_impl.h" | 16 #include "content/renderer/render_frame_impl.h" |
16 #include "content/renderer/render_thread_impl.h" | 17 #include "content/renderer/render_thread_impl.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 |
22 PepperPlatformCameraDevice::PepperPlatformCameraDevice( | 22 PepperPlatformCameraDevice::PepperPlatformCameraDevice( |
23 int render_frame_id, | 23 int render_frame_id, |
24 const std::string& device_id, | 24 const std::string& device_id, |
25 const GURL& document_url, | 25 const GURL& document_url, |
26 PepperCameraDeviceHost* handler) | 26 PepperCameraDeviceHost* handler) |
27 : render_frame_id_(render_frame_id), | 27 : render_frame_id_(render_frame_id), |
(...skipping 14 matching lines...) Expand all Loading... |
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 VideoCaptureImplManager* manager = |
49 RenderThreadImpl::current()->video_capture_impl_manager(); | 49 RenderThreadImpl::current()->video_capture_impl_manager(); |
50 manager->GetDeviceSupportedFormats( | 50 manager->GetDeviceSupportedFormats( |
51 session_id_, | 51 session_id_, |
52 media::BindToCurrentLoop(base::Bind( | 52 base::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; |
60 if (!release_device_cb_.is_null()) { | 60 if (!release_device_cb_.is_null()) { |
61 base::ResetAndReturn(&release_device_cb_).Run(); | 61 base::ResetAndReturn(&release_device_cb_).Run(); |
62 } | 62 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
OLD | NEW |