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_dependency_factory.h" | 5 #include "content/renderer/media/media_stream_dependency_factory.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "content/renderer/media/video_capture_impl_manager.h" | 9 #include "content/renderer/media/video_capture_impl_manager.h" |
10 #include "content/renderer/media/video_capture_module_impl.h" | 10 #include "content/renderer/media/video_capture_module_impl.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 webrtc::AudioDeviceModule* audio_device) { | 138 webrtc::AudioDeviceModule* audio_device) { |
139 return pc_factory_->CreateLocalAudioTrack(label, audio_device); | 139 return pc_factory_->CreateLocalAudioTrack(label, audio_device); |
140 } | 140 } |
141 | 141 |
142 webrtc::SessionDescriptionInterface* | 142 webrtc::SessionDescriptionInterface* |
143 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) { | 143 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) { |
144 return webrtc::CreateSessionDescription(sdp); | 144 return webrtc::CreateSessionDescription(sdp); |
145 } | 145 } |
146 | 146 |
147 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( | 147 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( |
148 const std::string& label, | 148 const std::string& media_id, |
| 149 int m_line_index, |
149 const std::string& sdp) { | 150 const std::string& sdp) { |
150 return webrtc::CreateIceCandidate(label, sdp); | 151 return webrtc::CreateIceCandidate(media_id, m_line_index, sdp); |
151 } | 152 } |
OLD | NEW |