Spec compliant video constraints for getUserMedia behind flag.

content/renderer/media/media_stream_video_track.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/media_stream_video_sink.h"
 #include "content/renderer/media/media_stream_track.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/secure_display_link_tracker.h"
 
 namespace content {
 
+struct VideoTrackAdapterSettings;
+
 // MediaStreamVideoTrack is a video specific representation of a
 // blink::WebMediaStreamTrack in content. It is owned by the blink object
 // and can be retrieved from a blink object using
 // WebMediaStreamTrack::getExtraData() or MediaStreamVideoTrack::GetVideoTrack.
 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
  public:
   // Help method to create a blink::WebMediaStreamTrack and a
   // MediaStreamVideoTrack instance. The MediaStreamVideoTrack object is owned
   // by the blink object in its WebMediaStreamTrack::ExtraData member.
   // |callback| is triggered if the track is added to the source
-  // successfully and will receive video frames that match |constraints|
-  // or if the source fail to provide video frames.
+  // successfully and will receive video frames that match the given settings
+  // or if the source fails to provide video frames.
   // If |enabled| is true, sinks added to the track will
-  // receive video frames when the source deliver frames to the track.
+  // receive video frames when the source delivers frames to the track.
+  // TODO(guidou): Remove the variant that takes a |constraints| argument.
+  // http://crbug.com/706408
+  static blink::WebMediaStreamTrack CreateVideoTrack(
+      MediaStreamVideoSource* source,
+      const MediaStreamVideoSource::ConstraintsCallback& callback,
+      bool enabled);
   static blink::WebMediaStreamTrack CreateVideoTrack(
       MediaStreamVideoSource* source,
       const blink::WebMediaConstraints& constraints,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
+  static blink::WebMediaStreamTrack CreateVideoTrack(
+      MediaStreamVideoSource* source,
+      const VideoTrackAdapterSettings& adapter_settings,
+      const base::Optional<bool>& noise_reduction,
+      bool is_screencast,
+      double min_frame_rate,
+      const MediaStreamVideoSource::ConstraintsCallback& callback,
+      bool enabled);
 
   static MediaStreamVideoTrack* GetVideoTrack(
       const blink::WebMediaStreamTrack& track);
 
-  // Constructor for video tracks.
+  // Constructors for video tracks.
+  // TODO(guidou): Remove this variant that takes a |constraints| argument.

[hbos_chromium, 2017/04/05 12:37:28]

nit: the variant

[Guido Urdaneta, 2017/04/05 16:17:17]

Done.

+  // http://crbug.com/706408
+  MediaStreamVideoTrack(
+      MediaStreamVideoSource* source,
+      const MediaStreamVideoSource::ConstraintsCallback& callback,
+      bool enabled);
   MediaStreamVideoTrack(
       MediaStreamVideoSource* source,
       const blink::WebMediaConstraints& constraints,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
+  MediaStreamVideoTrack(
+      MediaStreamVideoSource* source,
+      const VideoTrackAdapterSettings& adapter_settings,
+      const base::Optional<bool>& noise_reduction,
+      bool is_screen_cast,
+      double min_frame_rate,
+      const MediaStreamVideoSource::ConstraintsCallback& callback,
+      bool enabled);
   ~MediaStreamVideoTrack() override;
 
   // MediaStreamTrack overrides.
   void SetEnabled(bool enabled) override;
   void SetContentHint(
       blink::WebMediaStreamTrack::ContentHintType content_hint) override;
   void Stop() override;
   void getSettings(blink::WebMediaStreamTrack::Settings& settings) override;
 
   void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state);
 
-  const blink::WebMediaConstraints& constraints() const { return constraints_; }
+  const blink::WebMediaConstraints& constraints() const {
+    DCHECK(IsOldVideoConstraints());
+    return constraints_;
+  }
+  const base::Optional<bool>& noise_reduction() const {
+    DCHECK(!IsOldVideoConstraints());
+    return noise_reduction_;
+  }
+  bool is_screencast() const {
+    DCHECK(!IsOldVideoConstraints());
+    return is_screencast_;
+  }
+  double min_frame_rate() const {
+    DCHECK(!IsOldVideoConstraints());
+    return min_frame_rate_;
+  }
+  const VideoTrackAdapterSettings& adapter_settings() const {
+    DCHECK(!IsOldVideoConstraints());
+    return *adapter_settings_;
+  }
 
   // Setting information about the track size.
   // Called from MediaStreamVideoSource at track initialization.
   void SetTargetSize(int width, int height) {
     width_ = width;
     height_ = height;
   }
 
  private:
   // MediaStreamVideoSink is a friend to allow it to call AddSink() and
@@ skipping 14 matching lines @@
                bool is_sink_secure);
   void RemoveSink(MediaStreamVideoSink* sink);
 
   std::vector<MediaStreamVideoSink*> sinks_;
 
   // |FrameDeliverer| is an internal helper object used for delivering video
   // frames on the IO-thread using callbacks to all registered tracks.
   class FrameDeliverer;
   const scoped_refptr<FrameDeliverer> frame_deliverer_;
 
+  // TODO(guidou): remove this field. http://crbug.com/706408
   const blink::WebMediaConstraints constraints_;
 
+  // TODO(guidou): Make this field a regular field instead of a unique_ptr.
+  std::unique_ptr<VideoTrackAdapterSettings> adapter_settings_;
+  base::Optional<bool> noise_reduction_;
+  bool is_screencast_;
+  double min_frame_rate_;
+
   // Weak ref to the source this tracks is connected to.
   base::WeakPtr<MediaStreamVideoSource> source_;
 
   // This is used for tracking if all connected video sinks are secure.
   SecureDisplayLinkTracker<MediaStreamVideoSink> secure_tracker_;
 
   // Remembering our desired video size.
   int width_ = 0;
   int height_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_