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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix code review issues found by Wei. Created 8 years, 4 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_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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return pc_factory_.get() != NULL; 106 return pc_factory_.get() != NULL;
107 } 107 }
108 108
109 talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 109 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
110 MediaStreamDependencyFactory::CreatePeerConnection( 110 MediaStreamDependencyFactory::CreatePeerConnection(
111 const std::string& config, 111 const std::string& config,
112 webrtc::PeerConnectionObserver* observer) { 112 webrtc::PeerConnectionObserver* observer) {
113 return pc_factory_->CreatePeerConnection(config, observer); 113 return pc_factory_->CreatePeerConnection(config, observer);
114 } 114 }
115 115
116 talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
117 MediaStreamDependencyFactory::CreatePeerConnection(
118 const webrtc::JsepInterface::IceServers& ice_servers,
119 const webrtc::MediaConstraintsInterface* constraints,
120 webrtc::PeerConnectionObserver* observer) {
121 return pc_factory_->CreatePeerConnection(ice_servers, constraints, observer);
122 }
123
116 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 124 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
117 MediaStreamDependencyFactory::CreateLocalMediaStream( 125 MediaStreamDependencyFactory::CreateLocalMediaStream(
118 const std::string& label) { 126 const std::string& label) {
119 return pc_factory_->CreateLocalMediaStream(label); 127 return pc_factory_->CreateLocalMediaStream(label);
120 } 128 }
121 129
122 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 130 talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
123 MediaStreamDependencyFactory::CreateLocalVideoTrack( 131 MediaStreamDependencyFactory::CreateLocalVideoTrack(
124 const std::string& label, 132 const std::string& label,
125 int video_session_id) { 133 int video_session_id) {
(...skipping 11 matching lines...) Expand all
137 const std::string& label, 145 const std::string& label,
138 webrtc::AudioDeviceModule* audio_device) { 146 webrtc::AudioDeviceModule* audio_device) {
139 return pc_factory_->CreateLocalAudioTrack(label, audio_device); 147 return pc_factory_->CreateLocalAudioTrack(label, audio_device);
140 } 148 }
141 149
142 webrtc::SessionDescriptionInterface* 150 webrtc::SessionDescriptionInterface*
143 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) { 151 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& sdp) {
144 return webrtc::CreateSessionDescription(sdp); 152 return webrtc::CreateSessionDescription(sdp);
145 } 153 }
146 154
155 webrtc::SessionDescriptionInterface*
156 MediaStreamDependencyFactory::CreateSessionDescription(const std::string& type,
157 const std::string& sdp) {
158 return webrtc::CreateSessionDescription(type, sdp);
159 }
147 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate( 160 webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate(
148 const std::string& sdp_mid, 161 const std::string& sdp_mid,
149 int sdp_mline_index, 162 int sdp_mline_index,
150 const std::string& sdp) { 163 const std::string& sdp) {
151 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp); 164 return webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, sdp);
152 } 165 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698