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

Side by Side Diff: webrtc/api/peerconnectionfactory.cc

Issue 2070833002: Added a builtin audio decoder factory to the default PeerConnectionFactory constructor. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return nullptr; 78 return nullptr;
79 } 79 }
80 return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory); 80 return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory);
81 } 81 }
82 82
83 PeerConnectionFactory::PeerConnectionFactory() 83 PeerConnectionFactory::PeerConnectionFactory()
84 : owns_ptrs_(true), 84 : owns_ptrs_(true),
85 wraps_current_thread_(false), 85 wraps_current_thread_(false),
86 network_thread_(rtc::Thread::CreateWithSocketServer().release()), 86 network_thread_(rtc::Thread::CreateWithSocketServer().release()),
87 worker_thread_(rtc::Thread::Create().release()), 87 worker_thread_(rtc::Thread::Create().release()),
88 signaling_thread_(rtc::Thread::Current()) { 88 signaling_thread_(rtc::Thread::Current()),
89 audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()) {
89 if (!signaling_thread_) { 90 if (!signaling_thread_) {
90 signaling_thread_ = rtc::ThreadManager::Instance()->WrapCurrentThread(); 91 signaling_thread_ = rtc::ThreadManager::Instance()->WrapCurrentThread();
91 wraps_current_thread_ = true; 92 wraps_current_thread_ = true;
92 } 93 }
93 network_thread_->Start(); 94 network_thread_->Start();
94 worker_thread_->Start(); 95 worker_thread_->Start();
95 } 96 }
96 97
97 PeerConnectionFactory::PeerConnectionFactory( 98 PeerConnectionFactory::PeerConnectionFactory(
98 rtc::Thread* network_thread, 99 rtc::Thread* network_thread,
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { 329 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
329 ASSERT(worker_thread_ == rtc::Thread::Current()); 330 ASSERT(worker_thread_ == rtc::Thread::Current());
330 return cricket::WebRtcMediaEngineFactory::Create( 331 return cricket::WebRtcMediaEngineFactory::Create(
331 default_adm_.get(), 332 default_adm_.get(),
332 audio_decoder_factory_, 333 audio_decoder_factory_,
333 video_encoder_factory_.get(), 334 video_encoder_factory_.get(),
334 video_decoder_factory_.get()); 335 video_decoder_factory_.get());
335 } 336 }
336 337
337 } // namespace webrtc 338 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698