| Index: content/renderer/media/media_stream_video_track.h
|
| diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h
|
| index 5bd53b5ab1d3ba4b32fafeacea14e663d137f0b9..581d78dd63d74c33596177dfadd128c314c0f879 100644
|
| --- a/content/renderer/media/media_stream_video_track.h
|
| +++ b/content/renderer/media/media_stream_video_track.h
|
| @@ -36,17 +36,10 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
|
| // 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 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,
|
| @@ -60,15 +53,8 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
|
| const blink::WebMediaStreamTrack& track);
|
|
|
| // Constructors for video tracks.
|
| - // TODO(guidou): Remove the variant that takes a |constraints| argument.
|
| - // 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(
|
| @@ -90,28 +76,19 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
|
|
|
| void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state);
|
|
|
| - 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_;
|
| }
|
| const base::Optional<double>& min_frame_rate() const {
|
| - DCHECK(!IsOldVideoConstraints());
|
| return min_frame_rate_;
|
| }
|
| const base::Optional<double>& max_frame_rate() const {
|
| - DCHECK(!IsOldVideoConstraints());
|
| return max_frame_rate_;
|
| }
|
| const VideoTrackAdapterSettings& adapter_settings() const {
|
| - DCHECK(!IsOldVideoConstraints());
|
| return *adapter_settings_;
|
| }
|
|
|
| @@ -149,9 +126,6 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
|
| 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_;
|
|
|