Chromium Code Reviews| 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_impl.h" | 5 #include "content/renderer/pepper/pepper_platform_video_capture_impl.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_proxy.h" | 9 #include "base/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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 | 89 |
| 90 int PepperPlatformVideoCaptureImpl::CaptureFrameRate() { | 90 int PepperPlatformVideoCaptureImpl::CaptureFrameRate() { |
| 91 return handler_proxy_->state().frame_rate; | 91 return handler_proxy_->state().frame_rate; |
| 92 } | 92 } |
| 93 | 93 |
| 94 void PepperPlatformVideoCaptureImpl::DetachEventHandler() { | 94 void PepperPlatformVideoCaptureImpl::DetachEventHandler() { |
| 95 handler_ = NULL; | 95 handler_ = NULL; |
| 96 StopCapture(NULL); | 96 StopCapture(NULL); |
| 97 } | 97 } |
| 98 | 98 |
| 99 media::EncodedVideoSource* | |
|
Ami GONE FROM CHROMIUM
2013/06/08 00:18:01
Hopefully you can revert this file.
hshi1
2013/06/11 17:49:42
Done.
| |
| 100 PepperPlatformVideoCaptureImpl::GetEncodedVideoSource() { | |
| 101 return NULL; | |
| 102 } | |
| 103 | |
| 99 void PepperPlatformVideoCaptureImpl::OnStarted(VideoCapture* capture) { | 104 void PepperPlatformVideoCaptureImpl::OnStarted(VideoCapture* capture) { |
| 100 if (handler_) | 105 if (handler_) |
| 101 handler_->OnStarted(capture); | 106 handler_->OnStarted(capture); |
| 102 } | 107 } |
| 103 | 108 |
| 104 void PepperPlatformVideoCaptureImpl::OnStopped(VideoCapture* capture) { | 109 void PepperPlatformVideoCaptureImpl::OnStopped(VideoCapture* capture) { |
| 105 if (handler_) | 110 if (handler_) |
| 106 handler_->OnStopped(capture); | 111 handler_->OnStopped(capture); |
| 107 } | 112 } |
| 108 | 113 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 170 session_id_ = plugin_delegate_->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, | 175 session_id_ = plugin_delegate_->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, |
| 171 label); | 176 label); |
| 172 Initialize(); | 177 Initialize(); |
| 173 } | 178 } |
| 174 | 179 |
| 175 if (handler_) | 180 if (handler_) |
| 176 handler_->OnInitialized(this, succeeded); | 181 handler_->OnInitialized(this, succeeded); |
| 177 } | 182 } |
| 178 | 183 |
| 179 } // namespace content | 184 } // namespace content |
| OLD | NEW |