| OLD | NEW |
| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 // ACM | 163 // ACM |
| 164 public ACMVADCallback, // receive voice activity from the ACM | 164 public ACMVADCallback, // receive voice activity from the ACM |
| 165 public MixerParticipant // supplies output mixer with audio frames | 165 public MixerParticipant // supplies output mixer with audio frames |
| 166 { | 166 { |
| 167 public: | 167 public: |
| 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( |
| 174 int32_t channelId, | 174 Channel*& channel, |
| 175 uint32_t instanceId, | 175 int32_t channelId, |
| 176 RtcEventLog* const event_log, | 176 uint32_t instanceId, |
| 177 const Config& config); | 177 RtcEventLog* const event_log, |
| 178 const Config& config, |
| 179 std::shared_ptr<AudioDecoderFactory> decoder_factory); |
| 178 Channel(int32_t channelId, | 180 Channel(int32_t channelId, |
| 179 uint32_t instanceId, | 181 uint32_t instanceId, |
| 180 RtcEventLog* const event_log, | 182 RtcEventLog* const event_log, |
| 181 const Config& config); | 183 const Config& config, |
| 184 std::shared_ptr<AudioDecoderFactory> decoder_factory); |
| 182 int32_t Init(); | 185 int32_t Init(); |
| 183 int32_t SetEngineInformation(Statistics& engineStatistics, | 186 int32_t SetEngineInformation(Statistics& engineStatistics, |
| 184 OutputMixer& outputMixer, | 187 OutputMixer& outputMixer, |
| 185 TransmitMixer& transmitMixer, | 188 TransmitMixer& transmitMixer, |
| 186 ProcessThread& moduleProcessThread, | 189 ProcessThread& moduleProcessThread, |
| 187 AudioDeviceModule& audioDeviceModule, | 190 AudioDeviceModule& audioDeviceModule, |
| 188 VoiceEngineObserver* voiceEngineObserver, | 191 VoiceEngineObserver* voiceEngineObserver, |
| 189 rtc::CriticalSection* callbackCritSect); | 192 rtc::CriticalSection* callbackCritSect); |
| 190 int32_t UpdateLocalTimeStamp(); | 193 int32_t UpdateLocalTimeStamp(); |
| 191 | 194 |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 PacketRouter* packet_router_ = nullptr; | 576 PacketRouter* packet_router_ = nullptr; |
| 574 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; | 577 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; |
| 575 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; | 578 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; |
| 576 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; | 579 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; |
| 577 }; | 580 }; |
| 578 | 581 |
| 579 } // namespace voe | 582 } // namespace voe |
| 580 } // namespace webrtc | 583 } // namespace webrtc |
| 581 | 584 |
| 582 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ | 585 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ |
| OLD | NEW |