From Video Capture, abolish OnFrameInfo and enable resolution changes

content/renderer/pepper/pepper_platform_video_capture.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_platform_video_capture.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
@@ skipping 28 matching lines @@
         PP_DEVICETYPE_DEV_VIDEOCAPTURE,
         device_id,
         document_url,
         base::Bind(&PepperPlatformVideoCapture::OnDeviceOpened, this));
     pending_open_device_ = true;
   }
 }
 
 void PepperPlatformVideoCapture::StartCapture(
     media::VideoCapture::EventHandler* handler,
-    const media::VideoCaptureCapability& capability) {
+    const media::VideoCaptureParams& params) {
   DCHECK(handler == handler_);
 
   if (unbalanced_start_)
     return;
 
   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);
   }
 }
 
 void PepperPlatformVideoCapture::StopCapture(
     media::VideoCapture::EventHandler* handler) {
   DCHECK(handler == handler_);
   if (!unbalanced_start_)
     return;
 
   if (video_capture_) {
     unbalanced_start_ = false;
     video_capture_->StopCapture(handler_proxy_.get());
   }
 }
 
 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;
 }
 
 void PepperPlatformVideoCapture::DetachEventHandler() {
   handler_ = NULL;
   StopCapture(NULL);
 
   if (video_capture_) {
     VideoCaptureImplManager* manager =
@@ skipping 43 matching lines @@
   Release();  // Balance the AddRef() in StartCapture().
 }
 
 void PepperPlatformVideoCapture::OnFrameReady(
     VideoCapture* capture,
     const scoped_refptr<media::VideoFrame>& frame) {
   if (handler_)
     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());
   DCHECK(!pending_open_device_);
 }
 
 void PepperPlatformVideoCapture::Initialize() {
   VideoCaptureImplManager* manager =
       RenderThreadImpl::current()->video_capture_impl_manager();
   video_capture_ = manager->AddDevice(session_id_, handler_proxy_.get());
@@ skipping 16 matching lines @@
   if (handler_)
     handler_->OnInitialized(this, succeeded);
 }
 
 PepperMediaDeviceManager*
     PepperPlatformVideoCapture::GetMediaDeviceManager() {
   return PepperMediaDeviceManager::GetForRenderView(render_view_.get());
 }
 
 }  // namespace content