Chromium Code Reviews| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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::WebVector<blink::WebMediaStreamTrack> video_track_vector( | 103 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( |
| 104 video_sources.size()); | 104 video_sources.size()); |
| 105 for (size_t i = 0; i < video_track_vector.size(); ++i) { | 105 for (size_t i = 0; i < video_track_vector.size(); ++i) { |
| 106 video_track_vector[i].initialize(video_sources[i].id(), | 106 video_track_vector[i].initialize(video_sources[i].id(), |
| 107 video_sources[i]); | 107 video_sources[i]); |
| 108 video_track_vector[i].setExtraData( | 108 MediaStreamVideoSource* native_source = |
| 109 new MediaStreamVideoTrack(dependency_factory_.get())); | 109 MediaStreamVideoSource::GetVideoSource(video_sources[i]); |
| 110 MediaStreamVideoTrack* native_video_track = | |
| 111 new MediaStreamVideoTrack( | |
| 112 native_source, | |
|
Jói
2014/02/28 14:52:50
nit: this and next parameter would fit on previous
perkj_chrome
2014/03/02 09:20:44
Done.
| |
| 113 dependency_factory_.get()); | |
| 114 video_track_vector[i].setExtraData(native_video_track); | |
| 115 blink::WebMediaConstraints constraints; | |
| 116 constraints.initialize(); | |
| 117 native_source->AddTrack(video_track_vector[i], | |
| 118 constraints, | |
| 119 MediaStreamVideoSource::ConstraintsCallback()); | |
| 120 | |
|
Alpha Left Google
2014/02/28 02:49:22
nit: remove these empty lines.
perkj_chrome
2014/03/02 09:20:44
Done.
| |
| 121 | |
| 122 | |
| 110 } | 123 } |
| 111 | 124 |
| 112 stream_desc.initialize("media stream", audio_track_vector, | 125 stream_desc.initialize("media stream", audio_track_vector, |
| 113 video_track_vector); | 126 video_track_vector); |
| 114 stream_desc.setExtraData( | 127 stream_desc.setExtraData( |
| 115 new content::MediaStream(dependency_factory_.get(), | 128 new content::MediaStream(dependency_factory_.get(), |
| 116 content::MediaStream::StreamStopCallback(), | 129 content::MediaStream::StreamStopCallback(), |
| 117 stream_desc)); | 130 stream_desc)); |
| 118 return stream_desc; | 131 return stream_desc; |
| 119 } | 132 } |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( | 216 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( |
| 204 stream_desc, video_tracks[0])); | 217 stream_desc, video_tracks[0])); |
| 205 VerifyMediaStream(stream_desc, 1, 0); | 218 VerifyMediaStream(stream_desc, 1, 0); |
| 206 | 219 |
| 207 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( | 220 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( |
| 208 stream_desc, video_tracks[0])); | 221 stream_desc, video_tracks[0])); |
| 209 VerifyMediaStream(stream_desc, 1, 1); | 222 VerifyMediaStream(stream_desc, 1, 1); |
| 210 } | 223 } |
| 211 | 224 |
| 212 } // namespace content | 225 } // namespace content |
| OLD | NEW |