Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 9567007: libjingle roll 117:119 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_module_impl.h" 9 #include "content/renderer/media/video_capture_module_impl.h"
10 #include "content/renderer/media/webrtc_audio_device_impl.h" 10 #include "content/renderer/media/webrtc_audio_device_impl.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 return pc_factory_.get() != NULL; 104 return pc_factory_.get() != NULL;
105 } 105 }
106 106
107 talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 107 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
108 MediaStreamDependencyFactory::CreatePeerConnection( 108 MediaStreamDependencyFactory::CreatePeerConnection(
109 const std::string& config, 109 const std::string& config,
110 webrtc::PeerConnectionObserver* observer) { 110 webrtc::PeerConnectionObserver* observer) {
111 return pc_factory_->CreatePeerConnection(config, observer); 111 return pc_factory_->CreatePeerConnection(config, observer);
112 } 112 }
113 113
114 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
115 MediaStreamDependencyFactory::CreateRoapPeerConnection(
116 const std::string& config,
117 webrtc::PeerConnectionObserver* observer) {
118 return pc_factory_->CreateRoapPeerConnection(config, observer);
119 }
120
114 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 121 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
115 MediaStreamDependencyFactory::CreateLocalMediaStream( 122 MediaStreamDependencyFactory::CreateLocalMediaStream(
116 const std::string& label) { 123 const std::string& label) {
117 return pc_factory_->CreateLocalMediaStream(label); 124 return pc_factory_->CreateLocalMediaStream(label);
118 } 125 }
119 126
120 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 127 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
121 MediaStreamDependencyFactory::CreateLocalVideoTrack( 128 MediaStreamDependencyFactory::CreateLocalVideoTrack(
122 const std::string& label, 129 const std::string& label,
123 cricket::VideoCapturer* video_device) { 130 cricket::VideoCapturer* video_device) {
124 return pc_factory_->CreateLocalVideoTrack(label, video_device); 131 return pc_factory_->CreateLocalVideoTrack(label, video_device);
125 } 132 }
126 133
127 talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> 134 talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
128 MediaStreamDependencyFactory::CreateLocalAudioTrack( 135 MediaStreamDependencyFactory::CreateLocalAudioTrack(
129 const std::string& label, 136 const std::string& label,
130 webrtc::AudioDeviceModule* audio_device) { 137 webrtc::AudioDeviceModule* audio_device) {
131 return pc_factory_->CreateLocalAudioTrack(label, audio_device); 138 return pc_factory_->CreateLocalAudioTrack(label, audio_device);
132 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698