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 2082483003: voice_engine: Removed old variants of Channel constructor and CreateChannel (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 4 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 | webrtc/voice_engine/channel.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 (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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // ACM 164 // ACM
165 public ACMVADCallback, // receive voice activity from the ACM 165 public ACMVADCallback, // receive voice activity from the ACM
166 public MixerParticipant // supplies output mixer with audio frames 166 public MixerParticipant // supplies output mixer with audio frames
167 { 167 {
168 public: 168 public:
169 friend class VoERtcpObserver; 169 friend class VoERtcpObserver;
170 170
171 enum { KNumSocketThreads = 1 }; 171 enum { KNumSocketThreads = 1 };
172 enum { KNumberOfSocketBuffers = 8 }; 172 enum { KNumberOfSocketBuffers = 8 };
173 virtual ~Channel(); 173 virtual ~Channel();
174 static int32_t CreateChannel(Channel*& channel,
175 int32_t channelId,
176 uint32_t instanceId,
177 const Config& config);
178 static int32_t CreateChannel( 174 static int32_t CreateChannel(
179 Channel*& channel, 175 Channel*& channel,
180 int32_t channelId, 176 int32_t channelId,
181 uint32_t instanceId, 177 uint32_t instanceId,
182 const Config& config, 178 const Config& config,
183 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); 179 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
184 Channel(int32_t channelId, 180 Channel(int32_t channelId,
185 uint32_t instanceId, 181 uint32_t instanceId,
186 const Config& config, 182 const Config& config,
187 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); 183 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 588 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
593 589
594 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 590 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
595 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 591 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
596 }; 592 };
597 593
598 } // namespace voe 594 } // namespace voe
599 } // namespace webrtc 595 } // namespace webrtc
600 596
601 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 597 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698