Add GetPreferredFormats method to media::VideoCapturerSource.

content/renderer/media_capture_from_element/html_video_element_capturer_source.cc

 // Copyright 2015 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_capture_from_element/html_video_element_capturer_source.h"
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 37 matching lines @@
       io_task_runner_(io_task_runner),
       capture_frame_rate_(0.0),
       weak_factory_(this) {
   DCHECK(web_media_player_);
 }
 
 HtmlVideoElementCapturerSource::~HtmlVideoElementCapturerSource() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void HtmlVideoElementCapturerSource::GetCurrentSupportedFormats(
-    int max_requested_width,
-    int max_requested_height,
-    double max_requested_frame_rate,
-    const VideoCaptureDeviceFormatsCB& callback) {
-  DVLOG(2) << __func__ << "{ max_requested_height = " << max_requested_height
-           << "}) { max_requested_width = " << max_requested_width
-           << "}) { max_requested_frame_rate = " << max_requested_frame_rate
-           << "})";
+media::VideoCaptureFormats
+HtmlVideoElementCapturerSource::GetPreferredFormats() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // WebMediaPlayer has a setRate() but can't be read back.
   // TODO(mcasas): Add getRate() to WMPlayer and/or fix the spec to allow users
   // to specify it.
   const media::VideoCaptureFormat format(
       web_media_player_->naturalSize(),
       MediaStreamVideoSource::kDefaultFrameRate,
       media::PIXEL_FORMAT_I420);
   media::VideoCaptureFormats formats;
   formats.push_back(format);
-  callback.Run(formats);
+  return formats;
 }
 
 void HtmlVideoElementCapturerSource::StartCapture(
     const media::VideoCaptureParams& params,
     const VideoCaptureDeliverFrameCB& new_frame_callback,
     const RunningCallback& running_callback) {
   DVLOG(2) << __func__ << " requested "
            << media::VideoCaptureFormat::ToString(params.requested_format);
   DCHECK(params.requested_format.IsValid());
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 99 matching lines @@
       next_capture_time_ = current_time;
   }
   // Schedule next capture.
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&HtmlVideoElementCapturerSource::sendNewFrame,
                             weak_factory_.GetWeakPtr()),
       next_capture_time_ - current_time);
 }
 
 }  // namespace content