| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/webrtc/peer_connection_dependency_factory.h" | 5 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 const std::string& sdp, | 562 const std::string& sdp, |
| 563 webrtc::SdpParseError* error) { | 563 webrtc::SdpParseError* error) { |
| 564 return webrtc::CreateSessionDescription(type, sdp, error); | 564 return webrtc::CreateSessionDescription(type, sdp, error); |
| 565 } | 565 } |
| 566 | 566 |
| 567 webrtc::IceCandidateInterface* | 567 webrtc::IceCandidateInterface* |
| 568 PeerConnectionDependencyFactory::CreateIceCandidate( | 568 PeerConnectionDependencyFactory::CreateIceCandidate( |
| 569 const std::string& sdp_mid, | 569 const std::string& sdp_mid, |
| 570 int sdp_mline_index, | 570 int sdp_mline_index, |
| 571 const std::string& sdp) { | 571 const std::string& sdp) { |
| 572 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp); | 572 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp, nullptr); |
| 573 } | 573 } |
| 574 | 574 |
| 575 WebRtcAudioDeviceImpl* | 575 WebRtcAudioDeviceImpl* |
| 576 PeerConnectionDependencyFactory::GetWebRtcAudioDevice() { | 576 PeerConnectionDependencyFactory::GetWebRtcAudioDevice() { |
| 577 return audio_device_.get(); | 577 return audio_device_.get(); |
| 578 } | 578 } |
| 579 | 579 |
| 580 void PeerConnectionDependencyFactory::InitializeWorkerThread( | 580 void PeerConnectionDependencyFactory::InitializeWorkerThread( |
| 581 rtc::Thread** thread, | 581 rtc::Thread** thread, |
| 582 base::WaitableEvent* event) { | 582 base::WaitableEvent* event) { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 } | 691 } |
| 692 | 692 |
| 693 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { | 693 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { |
| 694 if (audio_device_.get()) | 694 if (audio_device_.get()) |
| 695 return; | 695 return; |
| 696 | 696 |
| 697 audio_device_ = new WebRtcAudioDeviceImpl(); | 697 audio_device_ = new WebRtcAudioDeviceImpl(); |
| 698 } | 698 } |
| 699 | 699 |
| 700 } // namespace content | 700 } // namespace content |
| OLD | NEW |