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

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

Issue 1949533002: WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual rtc::Thread* signaling_thread(); 92 virtual rtc::Thread* signaling_thread();
93 virtual rtc::Thread* worker_thread(); 93 virtual rtc::Thread* worker_thread();
94 const Options& options() const { return options_; } 94 const Options& options() const { return options_; }
95 95
96 protected: 96 protected:
97 PeerConnectionFactory(); 97 PeerConnectionFactory();
98 PeerConnectionFactory( 98 PeerConnectionFactory(
99 rtc::Thread* worker_thread, 99 rtc::Thread* worker_thread,
100 rtc::Thread* signaling_thread, 100 rtc::Thread* signaling_thread,
101 AudioDeviceModule* default_adm, 101 AudioDeviceModule* default_adm,
102 std::shared_ptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
the sun 2016/05/03 21:07:30 We should use rtc::scoped_refptr instead.
102 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 103 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
103 cricket::WebRtcVideoDecoderFactory* video_decoder_factory); 104 cricket::WebRtcVideoDecoderFactory* video_decoder_factory);
104 virtual ~PeerConnectionFactory(); 105 virtual ~PeerConnectionFactory();
105 106
106 private: 107 private:
107 cricket::MediaEngineInterface* CreateMediaEngine_w(); 108 cricket::MediaEngineInterface* CreateMediaEngine_w();
108 109
109 bool owns_ptrs_; 110 bool owns_ptrs_;
110 bool wraps_current_thread_; 111 bool wraps_current_thread_;
111 rtc::Thread* signaling_thread_; 112 rtc::Thread* signaling_thread_;
112 rtc::Thread* worker_thread_; 113 rtc::Thread* worker_thread_;
113 Options options_; 114 Options options_;
114 // External Audio device used for audio playback. 115 // External Audio device used for audio playback.
115 rtc::scoped_refptr<AudioDeviceModule> default_adm_; 116 rtc::scoped_refptr<AudioDeviceModule> default_adm_;
117 std::shared_ptr<AudioDecoderFactory> audio_decoder_factory_;
116 std::unique_ptr<cricket::ChannelManager> channel_manager_; 118 std::unique_ptr<cricket::ChannelManager> channel_manager_;
117 // External Video encoder factory. This can be NULL if the client has not 119 // External Video encoder factory. This can be NULL if the client has not
118 // injected any. In that case, video engine will use the internal SW encoder. 120 // injected any. In that case, video engine will use the internal SW encoder.
119 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_; 121 std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
120 // External Video decoder factory. This can be NULL if the client has not 122 // External Video decoder factory. This can be NULL if the client has not
121 // injected any. In that case, video engine will use the internal SW decoder. 123 // injected any. In that case, video engine will use the internal SW decoder.
122 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_; 124 std::unique_ptr<cricket::WebRtcVideoDecoderFactory> video_decoder_factory_;
123 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_; 125 std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
124 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 126 std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
125 127
126 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 128 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
127 }; 129 };
128 130
129 } // namespace webrtc 131 } // namespace webrtc
130 132
131 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 133 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698