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/peer_connection_handler.h" | 5 #include "content/renderer/media/peer_connection_handler.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 if (!message_loop_proxy_->BelongsToCurrentThread()) { | 145 if (!message_loop_proxy_->BelongsToCurrentThread()) { |
146 message_loop_proxy_->PostTask(FROM_HERE, base::Bind( | 146 message_loop_proxy_->PostTask(FROM_HERE, base::Bind( |
147 &PeerConnectionHandler::OnRemoveStreamCallback, | 147 &PeerConnectionHandler::OnRemoveStreamCallback, |
148 base::Unretained(this), | 148 base::Unretained(this), |
149 stream)); | 149 stream)); |
150 } else { | 150 } else { |
151 OnRemoveStreamCallback(stream); | 151 OnRemoveStreamCallback(stream); |
152 } | 152 } |
153 } | 153 } |
154 | 154 |
| 155 void PeerConnectionHandler::OnIceCandidate( |
| 156 const webrtc::IceCandidateInterface* candidate) { |
| 157 NOTIMPLEMENTED(); |
| 158 } |
| 159 |
| 160 void PeerConnectionHandler::OnIceComplete() { |
| 161 NOTIMPLEMENTED(); |
| 162 } |
| 163 |
155 void PeerConnectionHandler::AddStreams( | 164 void PeerConnectionHandler::AddStreams( |
156 const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams) { | 165 const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams) { |
157 for (size_t i = 0; i < streams.size(); ++i) { | 166 for (size_t i = 0; i < streams.size(); ++i) { |
158 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream = | 167 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream = |
159 dependency_factory_->CreateLocalMediaStream( | 168 dependency_factory_->CreateLocalMediaStream( |
160 UTF16ToUTF8(streams[i].label())); | 169 UTF16ToUTF8(streams[i].label())); |
161 WebKit::WebVector<WebKit::WebMediaStreamSource> source_vector; | 170 WebKit::WebVector<WebKit::WebMediaStreamSource> source_vector; |
162 streams[i].sources(source_vector); | 171 streams[i].sources(source_vector); |
163 | 172 |
164 // Get and add all tracks. | 173 // Get and add all tracks. |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 UTF8ToUTF16(video_track->label()), | 251 UTF8ToUTF16(video_track->label()), |
243 WebKit::WebMediaStreamSource::TypeVideo, | 252 WebKit::WebMediaStreamSource::TypeVideo, |
244 UTF8ToUTF16(video_track->label())); | 253 UTF8ToUTF16(video_track->label())); |
245 } | 254 } |
246 | 255 |
247 WebKit::WebMediaStreamDescriptor descriptor; | 256 WebKit::WebMediaStreamDescriptor descriptor; |
248 descriptor.initialize(UTF8ToUTF16(stream->label()), source_vector); | 257 descriptor.initialize(UTF8ToUTF16(stream->label()), source_vector); |
249 | 258 |
250 return descriptor; | 259 return descriptor; |
251 } | 260 } |
OLD | NEW |