| Index: content/renderer/pepper/pepper_platform_video_capture.cc
|
| diff --git a/content/renderer/pepper/pepper_platform_video_capture.cc b/content/renderer/pepper/pepper_platform_video_capture.cc
|
| index 86ce45d845350c6df53532657cb9fd8425a6bbc4..dc58ad44e68570aecd07095c60b3f1043b90c601 100644
|
| --- a/content/renderer/pepper/pepper_platform_video_capture.cc
|
| +++ b/content/renderer/pepper/pepper_platform_video_capture.cc
|
| @@ -46,7 +46,7 @@ PepperPlatformVideoCapture::PepperPlatformVideoCapture(
|
|
|
| void PepperPlatformVideoCapture::StartCapture(
|
| media::VideoCapture::EventHandler* handler,
|
| - const media::VideoCaptureCapability& capability) {
|
| + const media::VideoCaptureParams& params) {
|
| DCHECK(handler == handler_);
|
|
|
| if (unbalanced_start_)
|
| @@ -55,7 +55,7 @@ void PepperPlatformVideoCapture::StartCapture(
|
| if (video_capture_) {
|
| unbalanced_start_ = true;
|
| AddRef(); // Will be balanced in OnRemoved().
|
| - video_capture_->StartCapture(handler_proxy_.get(), capability);
|
| + video_capture_->StartCapture(handler_proxy_.get(), params);
|
| }
|
| }
|
|
|
| @@ -75,14 +75,6 @@ bool PepperPlatformVideoCapture::CaptureStarted() {
|
| return handler_proxy_->state().started;
|
| }
|
|
|
| -int PepperPlatformVideoCapture::CaptureWidth() {
|
| - return handler_proxy_->state().width;
|
| -}
|
| -
|
| -int PepperPlatformVideoCapture::CaptureHeight() {
|
| - return handler_proxy_->state().height;
|
| -}
|
| -
|
| int PepperPlatformVideoCapture::CaptureFrameRate() {
|
| return handler_proxy_->state().frame_rate;
|
| }
|
| @@ -146,13 +138,6 @@ void PepperPlatformVideoCapture::OnFrameReady(
|
| handler_->OnFrameReady(capture, frame);
|
| }
|
|
|
| -void PepperPlatformVideoCapture::OnDeviceInfoReceived(
|
| - VideoCapture* capture,
|
| - const media::VideoCaptureParams& device_info) {
|
| - if (handler_)
|
| - handler_->OnDeviceInfoReceived(capture, device_info);
|
| -}
|
| -
|
| PepperPlatformVideoCapture::~PepperPlatformVideoCapture() {
|
| DCHECK(!video_capture_);
|
| DCHECK(label_.empty());
|
|
|