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

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 1993783002: Moved CreateBuiltinDecoderFactory out to VoEBaseImpl. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-2
Patch Set: Rebass! How low can you go? 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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 friend class VoERtcpObserver; 168 friend class VoERtcpObserver;
169 169
170 enum { KNumSocketThreads = 1 }; 170 enum { KNumSocketThreads = 1 };
171 enum { KNumberOfSocketBuffers = 8 }; 171 enum { KNumberOfSocketBuffers = 8 };
172 virtual ~Channel(); 172 virtual ~Channel();
173 static int32_t CreateChannel(Channel*& channel, 173 static int32_t CreateChannel(Channel*& channel,
174 int32_t channelId, 174 int32_t channelId,
175 uint32_t instanceId, 175 uint32_t instanceId,
176 RtcEventLog* const event_log, 176 RtcEventLog* const event_log,
177 const Config& config); 177 const Config& config);
178 static int32_t CreateChannel(
179 Channel*& channel,
180 int32_t channelId,
181 uint32_t instanceId,
182 RtcEventLog* const event_log,
183 const Config& config,
184 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
178 Channel(int32_t channelId, 185 Channel(int32_t channelId,
179 uint32_t instanceId, 186 uint32_t instanceId,
180 RtcEventLog* const event_log, 187 RtcEventLog* const event_log,
181 const Config& config); 188 const Config& config,
189 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
182 int32_t Init(); 190 int32_t Init();
183 int32_t SetEngineInformation(Statistics& engineStatistics, 191 int32_t SetEngineInformation(Statistics& engineStatistics,
184 OutputMixer& outputMixer, 192 OutputMixer& outputMixer,
185 TransmitMixer& transmitMixer, 193 TransmitMixer& transmitMixer,
186 ProcessThread& moduleProcessThread, 194 ProcessThread& moduleProcessThread,
187 AudioDeviceModule& audioDeviceModule, 195 AudioDeviceModule& audioDeviceModule,
188 VoiceEngineObserver* voiceEngineObserver, 196 VoiceEngineObserver* voiceEngineObserver,
189 rtc::CriticalSection* callbackCritSect); 197 rtc::CriticalSection* callbackCritSect);
190 int32_t UpdateLocalTimeStamp(); 198 int32_t UpdateLocalTimeStamp();
191 199
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 PacketRouter* packet_router_ = nullptr; 583 PacketRouter* packet_router_ = nullptr;
576 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 584 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
577 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 585 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
578 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 586 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
579 }; 587 };
580 588
581 } // namespace voe 589 } // namespace voe
582 } // namespace webrtc 590 } // namespace webrtc
583 591
584 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 592 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698