OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "content/common/media/media_stream_options.h" | 6 #include "content/common/media/media_stream_options.h" |
7 #include "content/renderer/media/media_stream.h" | 7 #include "content/renderer/media/media_stream.h" |
8 #include "content/renderer/media/media_stream_audio_source.h" | 8 #include "content/renderer/media/media_stream_audio_source.h" |
9 #include "content/renderer/media/media_stream_video_source.h" | 9 #include "content/renderer/media/media_stream_video_source.h" |
10 #include "content/renderer/media/media_stream_video_track.h" | 10 #include "content/renderer/media/media_stream_video_track.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 audio_sources[i]); | 93 audio_sources[i]); |
94 MediaStreamTrack* native_track = | 94 MediaStreamTrack* native_track = |
95 new MediaStreamTrack( | 95 new MediaStreamTrack( |
96 WebRtcLocalAudioTrackAdapter::Create( | 96 WebRtcLocalAudioTrackAdapter::Create( |
97 audio_track_vector[i].id().utf8(), NULL), | 97 audio_track_vector[i].id().utf8(), NULL), |
98 true); | 98 true); |
99 | 99 |
100 audio_track_vector[i].setExtraData(native_track); | 100 audio_track_vector[i].setExtraData(native_track); |
101 } | 101 } |
102 | 102 |
| 103 blink::WebMediaConstraints constraints; |
| 104 constraints.initialize(); |
103 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( | 105 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( |
104 video_sources.size()); | 106 video_sources.size()); |
105 for (size_t i = 0; i < video_track_vector.size(); ++i) { | 107 for (size_t i = 0; i < video_track_vector.size(); ++i) { |
106 video_track_vector[i].initialize(video_sources[i].id(), | 108 MediaStreamVideoSource* native_source = |
107 video_sources[i]); | 109 MediaStreamVideoSource::GetVideoSource(video_sources[i]); |
108 video_track_vector[i].setExtraData( | 110 video_track_vector[i] = MediaStreamVideoTrack::CreateVideoTrack( |
109 new MediaStreamVideoTrack(dependency_factory_.get())); | 111 native_source, constraints, |
| 112 MediaStreamVideoSource::ConstraintsCallback(), true, |
| 113 dependency_factory_.get()); |
110 } | 114 } |
111 | 115 |
112 stream_desc.initialize("media stream", audio_track_vector, | 116 stream_desc.initialize("media stream", audio_track_vector, |
113 video_track_vector); | 117 video_track_vector); |
114 stream_desc.setExtraData( | 118 stream_desc.setExtraData( |
115 new content::MediaStream(dependency_factory_.get(), | 119 new content::MediaStream(dependency_factory_.get(), |
116 content::MediaStream::StreamStopCallback(), | 120 content::MediaStream::StreamStopCallback(), |
117 stream_desc)); | 121 stream_desc)); |
118 return stream_desc; | 122 return stream_desc; |
119 } | 123 } |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( | 207 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( |
204 stream_desc, video_tracks[0])); | 208 stream_desc, video_tracks[0])); |
205 VerifyMediaStream(stream_desc, 1, 0); | 209 VerifyMediaStream(stream_desc, 1, 0); |
206 | 210 |
207 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( | 211 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( |
208 stream_desc, video_tracks[0])); | 212 stream_desc, video_tracks[0])); |
209 VerifyMediaStream(stream_desc, 1, 1); | 213 VerifyMediaStream(stream_desc, 1, 1); |
210 } | 214 } |
211 | 215 |
212 } // namespace content | 216 } // namespace content |
OLD | NEW |