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

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: Parental Advisory: Explicit Content 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 | « webrtc/api/DEPS ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | 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 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 virtual rtc::Thread* network_thread(); 94 virtual rtc::Thread* network_thread();
95 const Options& options() const { return options_; } 95 const Options& options() const { return options_; }
96 96
97 protected: 97 protected:
98 PeerConnectionFactory(); 98 PeerConnectionFactory();
99 PeerConnectionFactory( 99 PeerConnectionFactory(
100 rtc::Thread* network_thread, 100 rtc::Thread* network_thread,
101 rtc::Thread* worker_thread, 101 rtc::Thread* worker_thread,
102 rtc::Thread* signaling_thread, 102 rtc::Thread* signaling_thread,
103 AudioDeviceModule* default_adm, 103 AudioDeviceModule* default_adm,
104 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
105 audio_decoder_factory,
104 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 106 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
105 cricket::WebRtcVideoDecoderFactory* video_decoder_factory); 107 cricket::WebRtcVideoDecoderFactory* video_decoder_factory);
106 virtual ~PeerConnectionFactory(); 108 virtual ~PeerConnectionFactory();
107 109
108 private: 110 private:
109 cricket::MediaEngineInterface* CreateMediaEngine_w(); 111 cricket::MediaEngineInterface* CreateMediaEngine_w();
110 112
111 bool owns_ptrs_; 113 bool owns_ptrs_;
112 bool wraps_current_thread_; 114 bool wraps_current_thread_;
113 rtc::Thread* network_thread_; 115 rtc::Thread* network_thread_;
114 rtc::Thread* worker_thread_; 116 rtc::Thread* worker_thread_;
115 rtc::Thread* signaling_thread_; 117 rtc::Thread* signaling_thread_;
116 Options options_; 118 Options options_;
117 // External Audio device used for audio playback. 119 // External Audio device used for audio playback.
118 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 120 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
121 rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory_;
119 std::unique_ptr<cricket::ChannelManager> channel_manager_; 122 std::unique_ptr<cricket::ChannelManager> channel_manager_;
120 // External Video encoder factory. This can be NULL if the client has not 123 // External Video encoder factory. This can be NULL if the client has not
121 // injected any. In that case, video engine will use the internal SW encoder. 124 // injected any. In that case, video engine will use the internal SW encoder.
122 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 125 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
123 // External Video decoder factory. This can be NULL if the client has not 126 // External Video decoder factory. This can be NULL if the client has not
124 // injected any. In that case, video engine will use the internal SW decoder. 127 // injected any. In that case, video engine will use the internal SW decoder.
125 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 128 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
126 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 129 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
127 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 130 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
128 }; 131 };
129 132
130 } // namespace webrtc 133 } // namespace webrtc
131 134
132 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 135 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/DEPS ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698