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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_media_stream_registry.cc
diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc
index c775e7cfd5641d2a4ace95dd0c89dc6a9e3f6476..7f10526e3582271346a67372b3e6e2e9841e526f 100644
--- a/content/renderer/media/mock_media_stream_registry.cc
+++ b/content/renderer/media/mock_media_stream_registry.cc
@@ -56,34 +56,12 @@ void MockMediaStreamRegistry::Init(const std::string& stream_url) {
test_stream_.SetExtraData(new MediaStream());
}
-void MockMediaStreamRegistry::AddVideoTrack(
- const std::string& track_id,
- const blink::WebMediaConstraints& constraints) {
- DCHECK(IsOldVideoConstraints());
- blink::WebMediaStreamSource blink_source;
- blink_source.Initialize("mock video source id",
- blink::WebMediaStreamSource::kTypeVideo,
- "mock video source name", false /* remote */);
- MockMediaStreamVideoSource* native_source =
- new MockMediaStreamVideoSource(false /* manual get supported formats */);
- blink_source.SetExtraData(native_source);
- blink::WebMediaStreamTrack blink_track;
- blink_track.Initialize(blink::WebString::FromUTF8(track_id), blink_source);
-
- MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
- native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(),
- true /* enabled */);
- blink_track.SetTrackData(native_track);
- test_stream_.AddTrack(blink_track);
-}
-
void MockMediaStreamRegistry::AddVideoTrack(
const std::string& track_id,
const VideoTrackAdapterSettings& adapter_settings,
const base::Optional<bool>& noise_reduction,
bool is_screencast,
double min_frame_rate) {
- DCHECK(!IsOldVideoConstraints());
blink::WebMediaStreamSource blink_source;
blink_source.Initialize("mock video source id",
blink::WebMediaStreamSource::kTypeVideo,
@@ -103,14 +81,8 @@ void MockMediaStreamRegistry::AddVideoTrack(
}
void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
- if (IsOldVideoConstraints()) {
- blink::WebMediaConstraints constraints;
- constraints.Initialize();
- AddVideoTrack(track_id, constraints);
- } else {
- AddVideoTrack(track_id, VideoTrackAdapterSettings(), base::Optional<bool>(),
- false /* is_screncast */, 0.0 /* min_frame_rate */);
- }
+ AddVideoTrack(track_id, VideoTrackAdapterSettings(), base::Optional<bool>(),
+ false /* is_screncast */, 0.0 /* min_frame_rate */);
}
void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
« 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