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

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

Issue 2790823002: Spec compliant video constraints for getUserMedia behind flag. (Closed)
Patch Set: rebase Created 3 years, 8 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"
11 #include "content/renderer/media/media_stream_audio_source.h" 11 #include "content/renderer/media/media_stream_audio_source.h"
12 #include "content/renderer/media/media_stream_video_track.h" 12 #include "content/renderer/media/media_stream_video_track.h"
13 #include "content/renderer/media/mock_media_stream_video_source.h" 13 #include "content/renderer/media/mock_media_stream_video_source.h"
14 #include "content/renderer/media/video_track_adapter.h"
14 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 15 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 16 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
16 #include "third_party/WebKit/public/platform/WebString.h" 17 #include "third_party/WebKit/public/platform/WebString.h"
17 #include "third_party/WebKit/public/platform/WebVector.h" 18 #include "third_party/WebKit/public/platform/WebVector.h"
18 19
19 namespace content { 20 namespace content {
20 21
21 namespace { 22 namespace {
22 23
23 const char kTestStreamLabel[] = "stream_label"; 24 const char kTestStreamLabel[] = "stream_label";
(...skipping 27 matching lines...) Expand all
51 const blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks; 52 const blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks;
52 const blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks; 53 const blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks;
53 const blink::WebString label(kTestStreamLabel); 54 const blink::WebString label(kTestStreamLabel);
54 test_stream_.initialize(label, webkit_audio_tracks, webkit_video_tracks); 55 test_stream_.initialize(label, webkit_audio_tracks, webkit_video_tracks);
55 test_stream_.setExtraData(new MediaStream()); 56 test_stream_.setExtraData(new MediaStream());
56 } 57 }
57 58
58 void MockMediaStreamRegistry::AddVideoTrack( 59 void MockMediaStreamRegistry::AddVideoTrack(
59 const std::string& track_id, 60 const std::string& track_id,
60 const blink::WebMediaConstraints& constraints) { 61 const blink::WebMediaConstraints& constraints) {
62 DCHECK(IsOldVideoConstraints());
61 blink::WebMediaStreamSource blink_source; 63 blink::WebMediaStreamSource blink_source;
62 blink_source.initialize("mock video source id", 64 blink_source.initialize("mock video source id",
63 blink::WebMediaStreamSource::TypeVideo, 65 blink::WebMediaStreamSource::TypeVideo,
64 "mock video source name", false /* remote */); 66 "mock video source name", false /* remote */);
65 MockMediaStreamVideoSource* native_source = 67 MockMediaStreamVideoSource* native_source =
66 new MockMediaStreamVideoSource(false /* manual get supported formats */); 68 new MockMediaStreamVideoSource(false /* manual get supported formats */);
67 blink_source.setExtraData(native_source); 69 blink_source.setExtraData(native_source);
68 blink::WebMediaStreamTrack blink_track; 70 blink::WebMediaStreamTrack blink_track;
69 blink_track.initialize(blink::WebString::fromUTF8(track_id), blink_source); 71 blink_track.initialize(blink::WebString::fromUTF8(track_id), blink_source);
70 72
71 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack( 73 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
72 native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(), 74 native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(),
73 true /* enabled */); 75 true /* enabled */);
74 blink_track.setTrackData(native_track); 76 blink_track.setTrackData(native_track);
75 test_stream_.addTrack(blink_track); 77 test_stream_.addTrack(blink_track);
76 } 78 }
77 79
80 void MockMediaStreamRegistry::AddVideoTrack(
81 const std::string& track_id,
82 const VideoTrackAdapterSettings& adapter_settings,
83 const base::Optional<bool>& noise_reduction,
84 bool is_screencast,
85 double min_frame_rate) {
86 DCHECK(!IsOldVideoConstraints());
87 blink::WebMediaStreamSource blink_source;
88 blink_source.initialize("mock video source id",
89 blink::WebMediaStreamSource::TypeVideo,
90 "mock video source name", false /* remote */);
91 MockMediaStreamVideoSource* native_source =
92 new MockMediaStreamVideoSource(false /* manual get supported formats */);
93 blink_source.setExtraData(native_source);
94 blink::WebMediaStreamTrack blink_track;
95 blink_track.initialize(blink::WebString::fromUTF8(track_id), blink_source);
96
97 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
98 native_source, adapter_settings, noise_reduction, is_screencast,
99 min_frame_rate, MediaStreamVideoSource::ConstraintsCallback(),
100 true /* enabled */);
101 blink_track.setTrackData(native_track);
102 test_stream_.addTrack(blink_track);
103 }
104
78 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) { 105 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
79 blink::WebMediaConstraints constraints; 106 if (IsOldVideoConstraints()) {
80 constraints.initialize(); 107 blink::WebMediaConstraints constraints;
81 AddVideoTrack(track_id, constraints); 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 }
82 } 114 }
83 115
84 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) { 116 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
85 blink::WebMediaStreamSource blink_source; 117 blink::WebMediaStreamSource blink_source;
86 blink_source.initialize("mock audio source id", 118 blink_source.initialize("mock audio source id",
87 blink::WebMediaStreamSource::TypeAudio, 119 blink::WebMediaStreamSource::TypeAudio,
88 "mock audio source name", false /* remote */); 120 "mock audio source name", false /* remote */);
89 MediaStreamAudioSource* const source = new MockCDQualityAudioSource(); 121 MediaStreamAudioSource* const source = new MockCDQualityAudioSource();
90 blink_source.setExtraData(source); // Takes ownership. 122 blink_source.setExtraData(source); // Takes ownership.
91 123
92 blink::WebMediaStreamTrack blink_track; 124 blink::WebMediaStreamTrack blink_track;
93 blink_track.initialize(blink_source); 125 blink_track.initialize(blink_source);
94 CHECK(source->ConnectToTrack(blink_track)); 126 CHECK(source->ConnectToTrack(blink_track));
95 127
96 test_stream_.addTrack(blink_track); 128 test_stream_.addTrack(blink_track);
97 } 129 }
98 130
99 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream( 131 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
100 const std::string& url) { 132 const std::string& url) {
101 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_; 133 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_;
102 } 134 }
103 135
104 } // namespace content 136 } // 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.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698