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

Side by Side Diff: talk/app/webrtc/peerconnectionfactory.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004--2011 Google Inc. 3 * Copyright 2004--2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 rtc::scoped_refptr<AudioTrackInterface> 273 rtc::scoped_refptr<AudioTrackInterface>
274 PeerConnectionFactory::CreateAudioTrack(const std::string& id, 274 PeerConnectionFactory::CreateAudioTrack(const std::string& id,
275 AudioSourceInterface* source) { 275 AudioSourceInterface* source) {
276 RTC_DCHECK(signaling_thread_->IsCurrent()); 276 RTC_DCHECK(signaling_thread_->IsCurrent());
277 rtc::scoped_refptr<AudioTrackInterface> track( 277 rtc::scoped_refptr<AudioTrackInterface> track(
278 AudioTrack::Create(id, source)); 278 AudioTrack::Create(id, source));
279 return AudioTrackProxy::Create(signaling_thread_, track); 279 return AudioTrackProxy::Create(signaling_thread_, track);
280 } 280 }
281 281
282 cricket::ChannelManager* PeerConnectionFactory::channel_manager() { 282 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController()
283 const {
283 RTC_DCHECK(signaling_thread_->IsCurrent()); 284 RTC_DCHECK(signaling_thread_->IsCurrent());
284 return channel_manager_.get(); 285 return MediaControllerInterface::Create(worker_thread_,
286 channel_manager_.get());
285 } 287 }
286 288
287 rtc::Thread* PeerConnectionFactory::signaling_thread() { 289 rtc::Thread* PeerConnectionFactory::signaling_thread() {
288 // This method can be called on a different thread when the factory is 290 // This method can be called on a different thread when the factory is
289 // created in CreatePeerConnectionFactory(). 291 // created in CreatePeerConnectionFactory().
290 return signaling_thread_; 292 return signaling_thread_;
291 } 293 }
292 294
293 rtc::Thread* PeerConnectionFactory::worker_thread() { 295 rtc::Thread* PeerConnectionFactory::worker_thread() {
294 RTC_DCHECK(signaling_thread_->IsCurrent()); 296 RTC_DCHECK(signaling_thread_->IsCurrent());
295 return worker_thread_; 297 return worker_thread_;
296 } 298 }
297 299
298 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 300 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
299 ASSERT(worker_thread_ == rtc::Thread::Current()); 301 ASSERT(worker_thread_ == rtc::Thread::Current());
300 return cricket::WebRtcMediaEngineFactory::Create( 302 return cricket::WebRtcMediaEngineFactory::Create(
301 default_adm_.get(), video_encoder_factory_.get(), 303 default_adm_.get(), video_encoder_factory_.get(),
302 video_decoder_factory_.get()); 304 video_decoder_factory_.get());
303 } 305 }
304 306
305 } // namespace webrtc 307 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698