From Video Capture, abolish OnFrameInfo and enable resolution changes

content/renderer/media/rtc_video_capture_delegate.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/media/rtc_video_capture_delegate.h"
 
 #include "base/bind.h"
 
 namespace content {
 
 RtcVideoCaptureDelegate::RtcVideoCaptureDelegate(
     const media::VideoCaptureSessionId id,
     VideoCaptureImplManager* vc_manager)
     : session_id_(id),
       vc_manager_(vc_manager),
       capture_engine_(NULL),
       got_first_frame_(false),
       error_occured_(false) {
   DVLOG(3) << " RtcVideoCaptureDelegate::ctor";
   capture_engine_ = vc_manager_->AddDevice(session_id_, this);
 }
 
 RtcVideoCaptureDelegate::~RtcVideoCaptureDelegate() {
   DVLOG(3) << " RtcVideoCaptureDelegate::dtor";
   vc_manager_->RemoveDevice(session_id_, this);
 }
 
 void RtcVideoCaptureDelegate::StartCapture(
-    const media::VideoCaptureCapability& capability,
+    const media::VideoCaptureParams& params,
     const FrameCapturedCallback& captured_callback,
     const StateChangeCallback& state_callback) {
   DVLOG(3) << " RtcVideoCaptureDelegate::StartCapture ";
   message_loop_proxy_ = base::MessageLoopProxy::current();
   captured_callback_ = captured_callback;
   state_callback_ = state_callback;
   got_first_frame_ = false;
   error_occured_ = false;
 
   // Increase the reference count to ensure we are not deleted until
   // The we are unregistered in RtcVideoCaptureDelegate::OnRemoved.
   AddRef();
-  capture_engine_->StartCapture(this, capability);
+  capture_engine_->StartCapture(this, params);
 }
 
 void RtcVideoCaptureDelegate::StopCapture() {
   // Immediately make sure we don't provide more frames.
   captured_callback_.Reset();
   state_callback_.Reset();
   capture_engine_->StopCapture(this);
 }
 
 void RtcVideoCaptureDelegate::OnStarted(media::VideoCapture* capture) {
@@ skipping 34 matching lines @@
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&RtcVideoCaptureDelegate::OnFrameReadyOnCaptureThread,
                  this,
                  capture,
                  frame));
 }
 
 void RtcVideoCaptureDelegate::OnDeviceInfoReceived(
     media::VideoCapture* capture,
-    const media::VideoCaptureParams& device_info) {
-}
-
-void RtcVideoCaptureDelegate::OnDeviceInfoChanged(
-    media::VideoCapture* capture,
-    const media::VideoCaptureParams& device_info) {
+    const media::VideoCaptureFormat& device_info) {
 }
 
 void RtcVideoCaptureDelegate::OnFrameReadyOnCaptureThread(
     media::VideoCapture* capture,
     const scoped_refptr<media::VideoFrame>& frame) {
   if (!captured_callback_.is_null()) {
     if (!got_first_frame_) {
       got_first_frame_ = true;
       if (!state_callback_.is_null())
         state_callback_.Run(CAPTURE_RUNNING);
@@ skipping 11 matching lines @@
 }
 
 
 void RtcVideoCaptureDelegate::OnRemovedOnCaptureThread(
     media::VideoCapture* capture) {
   if (!error_occured_ && !state_callback_.is_null())
     state_callback_.Run(CAPTURE_STOPPED);
 }
 
 }  // namespace content