Refactor VideoDestinationHandler to implement MediaStreamVideoSource.

content/renderer/media/media_stream_video_source.cc

Index: content/renderer/media/media_stream_video_source.cc
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index 57caf078a060a737f2b4250b622815d0cfcff7f4..2d913035815be179954863494aa6e1144de8e4d7 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -26,6 +26,18 @@ const char MediaStreamVideoSource::kMinHeight[] = "minHeight";
 const char MediaStreamVideoSource::kMaxFrameRate[] = "maxFrameRate";
 const char MediaStreamVideoSource::kMinFrameRate[] = "minFrameRate";
 
+const char* kSupportedConstraints[] = {
+    MediaStreamVideoSource::kMinAspectRatio,
+    MediaStreamVideoSource::kMinAspectRatio,

[Jói, 2014/03/26 21:36:13]

This is a duplicate.

[perkj_chrome, 2014/03/27 11:24:32]

Done.

+    MediaStreamVideoSource::kMaxAspectRatio,

[Jói, 2014/03/26 21:36:13]

For all the others, max comes before min. Can we do that here too?

[perkj_chrome, 2014/03/27 11:24:32]

Done.

+    MediaStreamVideoSource::kMaxWidth,
+    MediaStreamVideoSource::kMinWidth,
+    MediaStreamVideoSource::kMaxHeight,
+    MediaStreamVideoSource::kMinHeight,
+    MediaStreamVideoSource::kMaxFrameRate,
+    MediaStreamVideoSource::kMinFrameRate,
+};
+
 const int MediaStreamVideoSource::kDefaultWidth = 640;
 const int MediaStreamVideoSource::kDefaultHeight = 480;
 const int MediaStreamVideoSource::kDefaultFrameRate = 30;
@@ -283,6 +295,15 @@ MediaStreamVideoSource* MediaStreamVideoSource::GetVideoSource(
   return static_cast<MediaStreamVideoSource*>(source.extraData());
 }
 
+//static
+bool MediaStreamVideoSource::IsConstraintSupported(const std::string& name) {
+  for (size_t i = 0; i < arraysize(kSupportedConstraints); ++i) {
+    if (kSupportedConstraints[i] == name)
+      return true;
+  }
+  return false;
+}
+
 MediaStreamVideoSource::MediaStreamVideoSource(
     MediaStreamDependencyFactory* factory)
     : state_(NEW),
@@ -354,7 +375,6 @@ void MediaStreamVideoSource::InitAdapter() {
       device_info().device.type == MEDIA_TAB_VIDEO_CAPTURE ||
       device_info().device.type == MEDIA_DESKTOP_VIDEO_CAPTURE;
   capture_adapter_ = factory_->CreateVideoCapturer(is_screencast);
-  capture_adapter_->SetRequestedFormat(current_format_);
   adapter_ = factory_->CreateVideoSource(capture_adapter_,
                                          current_constraints_);
 }