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

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

Issue 2390883004: Hooking up audio network adaptor to VoE. (Closed)
Patch Set: adding a comment Created 4 years, 2 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 | « webrtc/voice_engine/BUILD.gn ('k') | 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 14 matching lines...) Expand all
25 #include "webrtc/modules/audio_processing/rms_level.h" 25 #include "webrtc/modules/audio_processing/rms_level.h"
26 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 26 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
27 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 27 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
28 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 28 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
29 #include "webrtc/modules/utility/include/file_player.h" 29 #include "webrtc/modules/utility/include/file_player.h"
30 #include "webrtc/modules/utility/include/file_recorder.h" 30 #include "webrtc/modules/utility/include/file_recorder.h"
31 #include "webrtc/voice_engine/include/voe_audio_processing.h" 31 #include "webrtc/voice_engine/include/voe_audio_processing.h"
32 #include "webrtc/voice_engine/include/voe_base.h" 32 #include "webrtc/voice_engine/include/voe_base.h"
33 #include "webrtc/voice_engine/include/voe_network.h" 33 #include "webrtc/voice_engine/include/voe_network.h"
34 #include "webrtc/voice_engine/level_indicator.h" 34 #include "webrtc/voice_engine/level_indicator.h"
35 #include "webrtc/voice_engine/network_predictor.h"
36 #include "webrtc/voice_engine/shared_data.h" 35 #include "webrtc/voice_engine/shared_data.h"
37 #include "webrtc/voice_engine/voice_engine_defines.h" 36 #include "webrtc/voice_engine/voice_engine_defines.h"
38 37
39 namespace rtc { 38 namespace rtc {
40 class TimestampWrapAroundHandler; 39 class TimestampWrapAroundHandler;
41 } 40 }
42 41
43 namespace webrtc { 42 namespace webrtc {
44 43
45 class AudioDeviceModule; 44 class AudioDeviceModule;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 int32_t SetSendCodec(const CodecInst& codec); 200 int32_t SetSendCodec(const CodecInst& codec);
202 void SetBitRate(int bitrate_bps); 201 void SetBitRate(int bitrate_bps);
203 int32_t SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX); 202 int32_t SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX);
204 int32_t GetVADStatus(bool& enabledVAD, ACMVADMode& mode, bool& disabledDTX); 203 int32_t GetVADStatus(bool& enabledVAD, ACMVADMode& mode, bool& disabledDTX);
205 int32_t SetRecPayloadType(const CodecInst& codec); 204 int32_t SetRecPayloadType(const CodecInst& codec);
206 int32_t GetRecPayloadType(CodecInst& codec); 205 int32_t GetRecPayloadType(CodecInst& codec);
207 int32_t SetSendCNPayloadType(int type, PayloadFrequencies frequency); 206 int32_t SetSendCNPayloadType(int type, PayloadFrequencies frequency);
208 int SetOpusMaxPlaybackRate(int frequency_hz); 207 int SetOpusMaxPlaybackRate(int frequency_hz);
209 int SetOpusDtx(bool enable_dtx); 208 int SetOpusDtx(bool enable_dtx);
210 int GetOpusDtx(bool* enabled); 209 int GetOpusDtx(bool* enabled);
210 bool EnableAudioNetworkAdaptor(const std::string& config_string);
211 void DisableAudioNetworkAdaptor();
212 void SetReceiverFrameLengthRange(int min_frame_length_ms,
213 int max_frame_length_ms);
211 214
212 // VoENetwork 215 // VoENetwork
213 int32_t RegisterExternalTransport(Transport* transport); 216 int32_t RegisterExternalTransport(Transport* transport);
214 int32_t DeRegisterExternalTransport(); 217 int32_t DeRegisterExternalTransport();
215 int32_t ReceivedRTPPacket(const uint8_t* received_packet, 218 int32_t ReceivedRTPPacket(const uint8_t* received_packet,
216 size_t length, 219 size_t length,
217 const PacketTime& packet_time); 220 const PacketTime& packet_time);
218 int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length); 221 int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length);
219 222
220 // VoEFile 223 // VoEFile
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 int8_t _lastPayloadType; 529 int8_t _lastPayloadType;
527 bool _includeAudioLevelIndication; 530 bool _includeAudioLevelIndication;
528 // VoENetwork 531 // VoENetwork
529 AudioFrame::SpeechType _outputSpeechType; 532 AudioFrame::SpeechType _outputSpeechType;
530 // VoEVideoSync 533 // VoEVideoSync
531 rtc::CriticalSection video_sync_lock_; 534 rtc::CriticalSection video_sync_lock_;
532 // VoEAudioProcessing 535 // VoEAudioProcessing
533 bool restored_packet_in_use_; 536 bool restored_packet_in_use_;
534 // RtcpBandwidthObserver 537 // RtcpBandwidthObserver
535 std::unique_ptr<VoERtcpObserver> rtcp_observer_; 538 std::unique_ptr<VoERtcpObserver> rtcp_observer_;
536 std::unique_ptr<NetworkPredictor> network_predictor_;
537 // An associated send channel. 539 // An associated send channel.
538 rtc::CriticalSection assoc_send_channel_lock_; 540 rtc::CriticalSection assoc_send_channel_lock_;
539 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); 541 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
540 542
541 bool pacing_enabled_; 543 bool pacing_enabled_;
542 PacketRouter* packet_router_ = nullptr; 544 PacketRouter* packet_router_ = nullptr;
543 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 545 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
544 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 546 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
545 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 547 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
546 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 548 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
547 549
548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 550 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 551 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
550 }; 552 };
551 553
552 } // namespace voe 554 } // namespace voe
553 } // namespace webrtc 555 } // namespace webrtc
554 556
555 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 557 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/BUILD.gn ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698