Change MediaStreamVideoSource::StartSourceImpl to use VideoCaptureFormat...

Change MediaStreamVideoSource::StartSourceImpl to use VideoCaptureFormat instead of VideoCaptureParams.
MediaStreamVideoSource only need the VideoCaptureFormat and thus should not pass VideoCaptureParams to its implementations.
This just a small code cleanup and does not change any behaviour.

TBR=bbudge@chromium.org

Review URL: https://codereview.chromium.org/528783002

Cr-Commit-Position: refs/heads/master@{#293924}

content/renderer/media/media_stream_video_capturer_source.cc

@@ -231,9 +231,10 @@ void MediaStreamVideoCapturerSource::GetCurrentSupportedFormats(
 }
 
 void MediaStreamVideoCapturerSource::StartSourceImpl(
-    const media::VideoCaptureParams& params,
+    const media::VideoCaptureFormat& format,
     const VideoCaptureDeliverFrameCB& frame_callback) {
-  media::VideoCaptureParams new_params(params);
+  media::VideoCaptureParams new_params;
+  new_params.requested_format = format;
   if (device_info().device.type == MEDIA_TAB_VIDEO_CAPTURE ||
       device_info().device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) {
     new_params.allow_resolution_change = true;

content/renderer/media/media_stream_video_capturer_source.h

@@ -107,7 +107,7 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
       const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;
 
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;
 
   virtual void StopSourceImpl() OVERRIDE;

content/renderer/media/media_stream_video_source.cc

@@ -482,10 +482,8 @@ void MediaStreamVideoSource::OnSupportedFormats(
   state_ = STARTING;
   DVLOG(3) << "Starting the capturer with " << current_format_.ToString();
 
-  media::VideoCaptureParams params;
-  params.requested_format = current_format_;
   StartSourceImpl(
-      params,
+      current_format_,
       base::Bind(&VideoTrackAdapter::DeliverFrameOnIO, track_adapter_));
 }
 

content/renderer/media/media_stream_video_source.h

@@ -107,11 +107,9 @@ class CONTENT_EXPORT MediaStreamVideoSource
   // An implementation must start capture frames using the resolution in
   // |params|. When the source has started or the source failed to start
   // OnStartDone must be called. An implementation must call
-  // invoke |frame_callback| on the IO thread with the captured frames.
-  // TODO(perkj): pass a VideoCaptureFormats instead of VideoCaptureParams for
-  // subclasses to customize.
+  // |frame_callback| on the IO thread with the captured frames.
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) = 0;
   void OnStartDone(MediaStreamRequestResult result);
 

content/renderer/media/media_stream_video_source_unittest.cc

@@ -77,10 +77,10 @@ class MediaStreamVideoSourceTest
     blink::WebMediaStreamTrack track = CreateTrack("123", constraints);
 
     mock_source_->CompleteGetSupportedFormats();
-    const media::VideoCaptureParams& format = mock_source()->start_params();
-    EXPECT_EQ(expected_width, format.requested_format.frame_size.width());
-    EXPECT_EQ(expected_height, format.requested_format.frame_size.height());
-    EXPECT_EQ(expected_frame_rate, format.requested_format.frame_rate);
+    const media::VideoCaptureFormat& format = mock_source()->start_format();
+    EXPECT_EQ(expected_width, format.frame_size.width());
+    EXPECT_EQ(expected_height, format.frame_size.height());
+    EXPECT_EQ(expected_frame_rate, format.frame_rate);
 
     EXPECT_EQ(0, NumberOfSuccessConstraintsCallbacks());
     mock_source_->StartMockedSource();
@@ -424,10 +424,10 @@ TEST_F(MediaStreamVideoSourceTest, OptionalAspectRatioTooHigh) {
       "123", factory.CreateWebMediaConstraints());
   mock_source()->CompleteGetSupportedFormats();
 
-  const media::VideoCaptureParams& params = mock_source()->start_params();
+  const media::VideoCaptureFormat& format = mock_source()->start_format();
   double aspect_ratio =
-      static_cast<double>(params.requested_format.frame_size.width()) /
-      params.requested_format.frame_size.height();
+      static_cast<double>(format.frame_size.width()) /
+      format.frame_size.height();
   EXPECT_LT(aspect_ratio, 2);
 }
 

content/renderer/media/mock_media_stream_video_source.cc

@@ -62,10 +62,10 @@ void MockMediaStreamVideoSource::GetCurrentSupportedFormats(
 }
 
 void MockMediaStreamVideoSource::StartSourceImpl(
-    const media::VideoCaptureParams& params,
+    const media::VideoCaptureFormat& format,
     const VideoCaptureDeliverFrameCB& frame_callback) {
   DCHECK(frame_callback_.is_null());
-  params_ = params;
+  format_ = format;
   attempted_to_start_ = true;
   frame_callback_ = frame_callback;
 }
@@ -79,7 +79,7 @@ void MockMediaStreamVideoSource::DeliverVideoFrame(
   io_message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO,
-                 base::Unretained(this), frame, params_.requested_format,
+                 base::Unretained(this), frame, format_,
                  base::TimeTicks(), frame_callback_));
 }
 

content/renderer/media/mock_media_stream_video_source.h

@@ -39,7 +39,7 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {
 
   void CompleteGetSupportedFormats();
 
-  const media::VideoCaptureParams& start_params() const { return params_; }
+  const media::VideoCaptureFormat& start_format() const { return format_; }
   int max_requested_height() const { return max_requested_height_; }
   int max_requested_width() const { return max_requested_width_; }
   double max_requested_frame_rate() const { return max_requested_frame_rate_; }
@@ -62,12 +62,12 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {
       double max_requested_frame_rate,
       const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;
   virtual void StopSourceImpl() OVERRIDE;
 
  private:
-  media::VideoCaptureParams params_;
+  media::VideoCaptureFormat format_;
   media::VideoCaptureFormats supported_formats_;
   bool manual_get_supported_formats_;
   int max_requested_height_;

content/renderer/media/webrtc/media_stream_remote_video_source.cc

@@ -148,7 +148,7 @@ void MediaStreamRemoteVideoSource::GetCurrentSupportedFormats(
 }
 
 void MediaStreamRemoteVideoSource::StartSourceImpl(
-    const media::VideoCaptureParams& params,
+    const media::VideoCaptureFormat& format,
     const VideoCaptureDeliverFrameCB& frame_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!delegate_.get());

content/renderer/media/webrtc/media_stream_remote_video_source.h

@@ -34,7 +34,7 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource
       const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;
 
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;
 
   virtual void StopSourceImpl() OVERRIDE;

content/renderer/media/webrtc/video_destination_handler.cc

@@ -94,7 +94,7 @@ void PpFrameWriter::GetCurrentSupportedFormats(
 }
 
 void PpFrameWriter::StartSourceImpl(
-    const media::VideoCaptureParams& params,
+    const media::VideoCaptureFormat& format,
     const VideoCaptureDeliverFrameCB& frame_callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(!delegate_.get());

content/renderer/media/webrtc/video_destination_handler.h

@@ -55,7 +55,7 @@ class CONTENT_EXPORT PpFrameWriter
       double max_requested_frame_rate,
       const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;
   virtual void StopSourceImpl() OVERRIDE;
 

content/renderer/pepper/pepper_media_stream_video_track_host.cc

@@ -442,7 +442,7 @@ void PepperMediaStreamVideoTrackHost::GetCurrentSupportedFormats(
 }
 
 void PepperMediaStreamVideoTrackHost::StartSourceImpl(
-    const media::VideoCaptureParams& params,
+    const media::VideoCaptureFormat& format,
     const VideoCaptureDeliverFrameCB& frame_callback) {
   output_started_ = true;
   frame_deliverer_ = new FrameDeliverer(io_message_loop(), frame_callback);

content/renderer/pepper/pepper_media_stream_video_track_host.h

@@ -67,7 +67,7 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase,
       const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;
 
   virtual void StartSourceImpl(
-      const media::VideoCaptureParams& params,
+      const media::VideoCaptureFormat& format,
       const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;
 
   virtual void StopSourceImpl() OVERRIDE;