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

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

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Removed explicit constructor qualifier. Fixed comment grammar. 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 virtual rtc::Thread* network_thread(); 97 virtual rtc::Thread* network_thread();
98 const Options& options() const { return options_; } 98 const Options& options() const { return options_; }
99 99
100 protected: 100 protected:
101 PeerConnectionFactory(); 101 PeerConnectionFactory();
102 PeerConnectionFactory( 102 PeerConnectionFactory(
103 rtc::Thread* network_thread, 103 rtc::Thread* network_thread,
104 rtc::Thread* worker_thread, 104 rtc::Thread* worker_thread,
105 rtc::Thread* signaling_thread, 105 rtc::Thread* signaling_thread,
106 AudioDeviceModule* default_adm, 106 AudioDeviceModule* default_adm,
107 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
108 audio_decoder_factory,
107 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 109 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
108 cricket::WebRtcVideoDecoderFactory* video_decoder_factory); 110 cricket::WebRtcVideoDecoderFactory* video_decoder_factory);
109 virtual ~PeerConnectionFactory(); 111 virtual ~PeerConnectionFactory();
110 112
111 private: 113 private:
112 cricket::MediaEngineInterface* CreateMediaEngine_w(); 114 cricket::MediaEngineInterface* CreateMediaEngine_w();
113 115
114 bool owns_ptrs_; 116 bool owns_ptrs_;
115 bool wraps_current_thread_; 117 bool wraps_current_thread_;
116 rtc::Thread* network_thread_; 118 rtc::Thread* network_thread_;
117 rtc::Thread* worker_thread_; 119 rtc::Thread* worker_thread_;
118 rtc::Thread* signaling_thread_; 120 rtc::Thread* signaling_thread_;
119 Options options_; 121 Options options_;
120 // External Audio device used for audio playback. 122 // External Audio device used for audio playback.
121 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 123 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
124 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
122 std::unique_ptr<cricket::ChannelManager> channel_manager_; 125 std::unique_ptr<cricket::ChannelManager> channel_manager_;
123 // External Video encoder factory. This can be NULL if the client has not 126 // External Video encoder factory. This can be NULL if the client has not
124 // injected any. In that case, video engine will use the internal SW encoder. 127 // injected any. In that case, video engine will use the internal SW encoder.
125 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 128 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
126 // External Video decoder factory. This can be NULL if the client has not 129 // External Video decoder factory. This can be NULL if the client has not
127 // injected any. In that case, video engine will use the internal SW decoder. 130 // injected any. In that case, video engine will use the internal SW decoder.
128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 131 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 132 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 133 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
131 134
132 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 135 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
133 }; 136 };
134 137
135 } // namespace webrtc 138 } // namespace webrtc
136 139
137 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 140 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698