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 "content/renderer/media/media_stream_center.h" | 5 #include "content/renderer/media/media_stream_center.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 | 158 |
| 159 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | 159 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
| 160 stream.videoTracks(video_tracks); | 160 stream.videoTracks(video_tracks); |
| 161 for (size_t i = 0; i < video_tracks.size(); ++i) | 161 for (size_t i = 0; i < video_tracks.size(); ++i) |
| 162 didStopMediaStreamTrack(video_tracks[i]); | 162 didStopMediaStreamTrack(video_tracks[i]); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void MediaStreamCenter::didCreateMediaStream(blink::WebMediaStream& stream) { | 165 void MediaStreamCenter::didCreateMediaStream(blink::WebMediaStream& stream) { |
| 166 DVLOG(1) << "MediaStreamCenter::didCreateMediaStream"; | 166 DVLOG(1) << "MediaStreamCenter::didCreateMediaStream"; |
| 167 blink::WebMediaStream writable_stream(stream); | 167 blink::WebMediaStream writable_stream(stream); |
| 168 MediaStream* native_stream( | 168 MediaStream* native_stream(new MediaStream(stream)); |
|
tommi (sloooow) - chröme
2015/11/18 12:22:19
nit: could even skip this variable.
writable_strea
perkj_chrome
2015/11/19 09:39:18
No, if a track later is added through didAddMediaS
tommi (sloooow) - chröme
2015/11/19 09:46:50
I don't understand? I'm just saying:
MediaStream
| |
| 169 new MediaStream(stream)); | |
| 170 writable_stream.setExtraData(native_stream); | 169 writable_stream.setExtraData(native_stream); |
| 171 | |
| 172 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | |
| 173 stream.videoTracks(video_tracks); | |
| 174 for (size_t i = 0; i < video_tracks.size(); ++i) { | |
| 175 if (!MediaStreamTrack::GetTrack(video_tracks[i])) | |
| 176 CreateNativeMediaStreamTrack(video_tracks[i], rtc_factory_); | |
| 177 } | |
| 178 } | 170 } |
| 179 | 171 |
| 180 bool MediaStreamCenter::didAddMediaStreamTrack( | 172 bool MediaStreamCenter::didAddMediaStreamTrack( |
| 181 const blink::WebMediaStream& stream, | 173 const blink::WebMediaStream& stream, |
| 182 const blink::WebMediaStreamTrack& track) { | 174 const blink::WebMediaStreamTrack& track) { |
| 183 DVLOG(1) << "MediaStreamCenter::didAddMediaStreamTrack"; | 175 DVLOG(1) << "MediaStreamCenter::didAddMediaStreamTrack"; |
| 184 MediaStream* native_stream = MediaStream::GetMediaStream(stream); | 176 MediaStream* native_stream = MediaStream::GetMediaStream(stream); |
| 185 return native_stream->AddTrack(track); | 177 return native_stream->AddTrack(track); |
| 186 } | 178 } |
| 187 | 179 |
| 188 bool MediaStreamCenter::didRemoveMediaStreamTrack( | 180 bool MediaStreamCenter::didRemoveMediaStreamTrack( |
| 189 const blink::WebMediaStream& stream, | 181 const blink::WebMediaStream& stream, |
| 190 const blink::WebMediaStreamTrack& track) { | 182 const blink::WebMediaStreamTrack& track) { |
| 191 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; | 183 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; |
| 192 MediaStream* native_stream = MediaStream::GetMediaStream(stream); | 184 MediaStream* native_stream = MediaStream::GetMediaStream(stream); |
| 193 return native_stream->RemoveTrack(track); | 185 return native_stream->RemoveTrack(track); |
| 194 } | 186 } |
| 195 | 187 |
| 196 } // namespace content | 188 } // namespace content |
| OLD | NEW |