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

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/webrtc/webrtc_media_stream_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( 74 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(
75 video ? static_cast<size_t>(1) : 0); 75 video ? static_cast<size_t>(1) : 0);
76 MediaStreamSource::SourceStoppedCallback dummy_callback; 76 MediaStreamSource::SourceStoppedCallback dummy_callback;
77 if (video) { 77 if (video) {
78 blink::WebMediaStreamSource video_source; 78 blink::WebMediaStreamSource video_source;
79 video_source.initialize("video", blink::WebMediaStreamSource::TypeVideo, 79 video_source.initialize("video", blink::WebMediaStreamSource::TypeVideo,
80 "video", false /* remote */); 80 "video", false /* remote */);
81 MediaStreamVideoSource* native_source = 81 MediaStreamVideoSource* native_source =
82 new MockMediaStreamVideoSource(false); 82 new MockMediaStreamVideoSource(false);
83 video_source.setExtraData(native_source); 83 video_source.setExtraData(native_source);
84 blink::WebMediaConstraints constraints;
85 constraints.initialize();
86 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack( 84 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack(
87 native_source, constraints, 85 native_source, MediaStreamVideoSource::ConstraintsCallback(), true);
88 MediaStreamVideoSource::ConstraintsCallback(), true);
89 } 86 }
90 87
91 blink::WebMediaStream stream_desc; 88 blink::WebMediaStream stream_desc;
92 stream_desc.initialize("media stream", 89 stream_desc.initialize("media stream",
93 audio_track_vector, 90 audio_track_vector,
94 video_track_vector); 91 video_track_vector);
95 stream_desc.setExtraData(new MediaStream()); 92 stream_desc.setExtraData(new MediaStream());
96 return stream_desc; 93 return stream_desc;
97 } 94 }
98 95
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); 170 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());
174 171
175 native_stream->AddTrack(audio_tracks[0]); 172 native_stream->AddTrack(audio_tracks[0]);
176 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); 173 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());
177 174
178 native_stream->AddTrack(video_tracks[0]); 175 native_stream->AddTrack(video_tracks[0]);
179 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); 176 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());
180 } 177 }
181 178
182 } // namespace content 179 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698