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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 class VoERTPObserver; | 59 class VoERTPObserver; |
60 class VoiceEngineObserver; | 60 class VoiceEngineObserver; |
61 | 61 |
62 struct CallStatistics; | 62 struct CallStatistics; |
63 struct ReportBlock; | 63 struct ReportBlock; |
64 struct SenderInfo; | 64 struct SenderInfo; |
65 | 65 |
66 namespace voe { | 66 namespace voe { |
67 | 67 |
68 class OutputMixer; | 68 class OutputMixer; |
69 class RtcEventLogProxy; | |
70 class RtpPacketSenderProxy; | 69 class RtpPacketSenderProxy; |
71 class Statistics; | 70 class Statistics; |
72 class StatisticsProxy; | 71 class StatisticsProxy; |
73 class TransportFeedbackProxy; | 72 class TransportFeedbackProxy; |
74 class TransmitMixer; | 73 class TransmitMixer; |
75 class TransportSequenceNumberProxy; | 74 class TransportSequenceNumberProxy; |
76 class VoERtcpObserver; | 75 class VoERtcpObserver; |
77 | 76 |
78 // Helper class to simplify locking scheme for members that are accessed from | 77 // Helper class to simplify locking scheme for members that are accessed from |
79 // multiple threads. | 78 // multiple threads. |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 { | 166 { |
168 public: | 167 public: |
169 friend class VoERtcpObserver; | 168 friend class VoERtcpObserver; |
170 | 169 |
171 enum { KNumSocketThreads = 1 }; | 170 enum { KNumSocketThreads = 1 }; |
172 enum { KNumberOfSocketBuffers = 8 }; | 171 enum { KNumberOfSocketBuffers = 8 }; |
173 virtual ~Channel(); | 172 virtual ~Channel(); |
174 static int32_t CreateChannel(Channel*& channel, | 173 static int32_t CreateChannel(Channel*& channel, |
175 int32_t channelId, | 174 int32_t channelId, |
176 uint32_t instanceId, | 175 uint32_t instanceId, |
| 176 RtcEventLog* const event_log, |
177 const Config& config); | 177 const Config& config); |
178 static int32_t CreateChannel( | 178 static int32_t CreateChannel( |
179 Channel*& channel, | 179 Channel*& channel, |
180 int32_t channelId, | 180 int32_t channelId, |
181 uint32_t instanceId, | 181 uint32_t instanceId, |
| 182 RtcEventLog* const event_log, |
182 const Config& config, | 183 const Config& config, |
183 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); | 184 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); |
184 Channel(int32_t channelId, | 185 Channel(int32_t channelId, |
185 uint32_t instanceId, | 186 uint32_t instanceId, |
| 187 RtcEventLog* const event_log, |
186 const Config& config, | 188 const Config& config, |
187 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); | 189 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory); |
188 int32_t Init(); | 190 int32_t Init(); |
189 int32_t SetEngineInformation(Statistics& engineStatistics, | 191 int32_t SetEngineInformation(Statistics& engineStatistics, |
190 OutputMixer& outputMixer, | 192 OutputMixer& outputMixer, |
191 TransmitMixer& transmitMixer, | 193 TransmitMixer& transmitMixer, |
192 ProcessThread& moduleProcessThread, | 194 ProcessThread& moduleProcessThread, |
193 AudioDeviceModule& audioDeviceModule, | 195 AudioDeviceModule& audioDeviceModule, |
194 VoiceEngineObserver* voiceEngineObserver, | 196 VoiceEngineObserver* voiceEngineObserver, |
195 rtc::CriticalSection* callbackCritSect); | 197 rtc::CriticalSection* callbackCritSect); |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 // Used for obtaining RTT for a receive-only channel. | 444 // Used for obtaining RTT for a receive-only channel. |
443 void set_associate_send_channel(const ChannelOwner& channel) { | 445 void set_associate_send_channel(const ChannelOwner& channel) { |
444 assert(_channelId != channel.channel()->ChannelId()); | 446 assert(_channelId != channel.channel()->ChannelId()); |
445 rtc::CritScope lock(&assoc_send_channel_lock_); | 447 rtc::CritScope lock(&assoc_send_channel_lock_); |
446 associate_send_channel_ = channel; | 448 associate_send_channel_ = channel; |
447 } | 449 } |
448 | 450 |
449 // Disassociate a send channel if it was associated. | 451 // Disassociate a send channel if it was associated. |
450 void DisassociateSendChannel(int channel_id); | 452 void DisassociateSendChannel(int channel_id); |
451 | 453 |
452 // Set a RtcEventLog logging object. | |
453 void SetRtcEventLog(RtcEventLog* event_log); | |
454 | |
455 protected: | 454 protected: |
456 void OnIncomingFractionLoss(int fraction_lost); | 455 void OnIncomingFractionLoss(int fraction_lost); |
457 | 456 |
458 private: | 457 private: |
459 bool ReceivePacket(const uint8_t* packet, | 458 bool ReceivePacket(const uint8_t* packet, |
460 size_t packet_length, | 459 size_t packet_length, |
461 const RTPHeader& header, | 460 const RTPHeader& header, |
462 bool in_order); | 461 bool in_order); |
463 bool HandleRtxPacket(const uint8_t* packet, | 462 bool HandleRtxPacket(const uint8_t* packet, |
464 size_t packet_length, | 463 size_t packet_length, |
(...skipping 15 matching lines...) Expand all Loading... |
480 int64_t GetRTT(bool allow_associate_channel) const; | 479 int64_t GetRTT(bool allow_associate_channel) const; |
481 | 480 |
482 rtc::CriticalSection _fileCritSect; | 481 rtc::CriticalSection _fileCritSect; |
483 rtc::CriticalSection _callbackCritSect; | 482 rtc::CriticalSection _callbackCritSect; |
484 rtc::CriticalSection volume_settings_critsect_; | 483 rtc::CriticalSection volume_settings_critsect_; |
485 uint32_t _instanceId; | 484 uint32_t _instanceId; |
486 int32_t _channelId; | 485 int32_t _channelId; |
487 | 486 |
488 ChannelState channel_state_; | 487 ChannelState channel_state_; |
489 | 488 |
490 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_; | 489 RtcEventLog* const event_log_; |
491 | 490 |
492 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; | 491 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; |
493 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_; | 492 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_; |
494 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; | 493 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; |
495 std::unique_ptr<StatisticsProxy> statistics_proxy_; | 494 std::unique_ptr<StatisticsProxy> statistics_proxy_; |
496 std::unique_ptr<RtpReceiver> rtp_receiver_; | 495 std::unique_ptr<RtpReceiver> rtp_receiver_; |
497 TelephoneEventHandler* telephone_event_handler_; | 496 TelephoneEventHandler* telephone_event_handler_; |
498 std::unique_ptr<RtpRtcp> _rtpRtcpModule; | 497 std::unique_ptr<RtpRtcp> _rtpRtcpModule; |
499 std::unique_ptr<AudioCodingModule> audio_coding_; | 498 std::unique_ptr<AudioCodingModule> audio_coding_; |
500 acm2::CodecManager codec_manager_; | 499 acm2::CodecManager codec_manager_; |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; | 589 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; |
591 | 590 |
592 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. | 591 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. |
593 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; | 592 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; |
594 }; | 593 }; |
595 | 594 |
596 } // namespace voe | 595 } // namespace voe |
597 } // namespace webrtc | 596 } // namespace webrtc |
598 | 597 |
599 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ | 598 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ |
OLD | NEW |