| OLD | NEW |
| 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_impl_manager.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 const media::VideoCaptureFormat& format, | 145 const media::VideoCaptureFormat& format, |
| 146 const base::TimeTicks& estimated_capture_time) { | 146 const base::TimeTicks& estimated_capture_time) { |
| 147 if (handler_ && !stop_capture_cb_.is_null()) | 147 if (handler_ && !stop_capture_cb_.is_null()) |
| 148 handler_->OnFrameReady(frame, format); | 148 handler_->OnFrameReady(frame, format); |
| 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) : NULL; | 155 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL; |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace content | 158 } // namespace content |
| OLD | NEW |