Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Side by Side Diff: content/renderer/media/mock_media_stream_registry.cc

Issue 2964003002: Remove support for old getUserMedia video constraints algorithm. (Closed)
Patch Set: rebase and address hbos@ comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/mock_media_stream_registry.h" 5 #include "content/renderer/media/mock_media_stream_registry.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/renderer/media/media_stream.h" 10 #include "content/renderer/media/media_stream.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 stream_url_ = stream_url; 51 stream_url_ = stream_url;
52 const blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks; 52 const blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks;
53 const blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks; 53 const blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks;
54 const blink::WebString label(kTestStreamLabel); 54 const blink::WebString label(kTestStreamLabel);
55 test_stream_.Initialize(label, webkit_audio_tracks, webkit_video_tracks); 55 test_stream_.Initialize(label, webkit_audio_tracks, webkit_video_tracks);
56 test_stream_.SetExtraData(new MediaStream()); 56 test_stream_.SetExtraData(new MediaStream());
57 } 57 }
58 58
59 void MockMediaStreamRegistry::AddVideoTrack( 59 void MockMediaStreamRegistry::AddVideoTrack(
60 const std::string& track_id, 60 const std::string& track_id,
61 const blink::WebMediaConstraints& constraints) {
62 DCHECK(IsOldVideoConstraints());
63 blink::WebMediaStreamSource blink_source;
64 blink_source.Initialize("mock video source id",
65 blink::WebMediaStreamSource::kTypeVideo,
66 "mock video source name", false /* remote */);
67 MockMediaStreamVideoSource* native_source =
68 new MockMediaStreamVideoSource(false /* manual get supported formats */);
69 blink_source.SetExtraData(native_source);
70 blink::WebMediaStreamTrack blink_track;
71 blink_track.Initialize(blink::WebString::FromUTF8(track_id), blink_source);
72
73 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
74 native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(),
75 true /* enabled */);
76 blink_track.SetTrackData(native_track);
77 test_stream_.AddTrack(blink_track);
78 }
79
80 void MockMediaStreamRegistry::AddVideoTrack(
81 const std::string& track_id,
82 const VideoTrackAdapterSettings& adapter_settings, 61 const VideoTrackAdapterSettings& adapter_settings,
83 const base::Optional<bool>& noise_reduction, 62 const base::Optional<bool>& noise_reduction,
84 bool is_screencast, 63 bool is_screencast,
85 double min_frame_rate) { 64 double min_frame_rate) {
86 DCHECK(!IsOldVideoConstraints());
87 blink::WebMediaStreamSource blink_source; 65 blink::WebMediaStreamSource blink_source;
88 blink_source.Initialize("mock video source id", 66 blink_source.Initialize("mock video source id",
89 blink::WebMediaStreamSource::kTypeVideo, 67 blink::WebMediaStreamSource::kTypeVideo,
90 "mock video source name", false /* remote */); 68 "mock video source name", false /* remote */);
91 MockMediaStreamVideoSource* native_source = 69 MockMediaStreamVideoSource* native_source =
92 new MockMediaStreamVideoSource(false /* manual get supported formats */); 70 new MockMediaStreamVideoSource(false /* manual get supported formats */);
93 blink_source.SetExtraData(native_source); 71 blink_source.SetExtraData(native_source);
94 blink::WebMediaStreamTrack blink_track; 72 blink::WebMediaStreamTrack blink_track;
95 blink_track.Initialize(blink::WebString::FromUTF8(track_id), blink_source); 73 blink_track.Initialize(blink::WebString::FromUTF8(track_id), blink_source);
96 74
97 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack( 75 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
98 native_source, adapter_settings, noise_reduction, is_screencast, 76 native_source, adapter_settings, noise_reduction, is_screencast,
99 min_frame_rate, MediaStreamVideoSource::ConstraintsCallback(), 77 min_frame_rate, MediaStreamVideoSource::ConstraintsCallback(),
100 true /* enabled */); 78 true /* enabled */);
101 blink_track.SetTrackData(native_track); 79 blink_track.SetTrackData(native_track);
102 test_stream_.AddTrack(blink_track); 80 test_stream_.AddTrack(blink_track);
103 } 81 }
104 82
105 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) { 83 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
106 if (IsOldVideoConstraints()) { 84 AddVideoTrack(track_id, VideoTrackAdapterSettings(), base::Optional<bool>(),
107 blink::WebMediaConstraints constraints; 85 false /* is_screncast */, 0.0 /* min_frame_rate */);
108 constraints.Initialize();
109 AddVideoTrack(track_id, constraints);
110 } else {
111 AddVideoTrack(track_id, VideoTrackAdapterSettings(), base::Optional<bool>(),
112 false /* is_screncast */, 0.0 /* min_frame_rate */);
113 }
114 } 86 }
115 87
116 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) { 88 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
117 blink::WebMediaStreamSource blink_source; 89 blink::WebMediaStreamSource blink_source;
118 blink_source.Initialize("mock audio source id", 90 blink_source.Initialize("mock audio source id",
119 blink::WebMediaStreamSource::kTypeAudio, 91 blink::WebMediaStreamSource::kTypeAudio,
120 "mock audio source name", false /* remote */); 92 "mock audio source name", false /* remote */);
121 MediaStreamAudioSource* const source = new MockCDQualityAudioSource(); 93 MediaStreamAudioSource* const source = new MockCDQualityAudioSource();
122 blink_source.SetExtraData(source); // Takes ownership. 94 blink_source.SetExtraData(source); // Takes ownership.
123 95
124 blink::WebMediaStreamTrack blink_track; 96 blink::WebMediaStreamTrack blink_track;
125 blink_track.Initialize(blink_source); 97 blink_track.Initialize(blink_source);
126 CHECK(source->ConnectToTrack(blink_track)); 98 CHECK(source->ConnectToTrack(blink_track));
127 99
128 test_stream_.AddTrack(blink_track); 100 test_stream_.AddTrack(blink_track);
129 } 101 }
130 102
131 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream( 103 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
132 const std::string& url) { 104 const std::string& url) {
133 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_; 105 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_;
134 } 106 }
135 107
136 } // namespace content 108 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/mock_media_stream_registry.h ('k') | content/renderer/media/mock_media_stream_video_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698