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

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

Issue 2503713003: Smooth BWE and pass it to Audio Network Adaptor. (Closed)
Patch Set: Created 4 years, 1 month 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') | webrtc/voice_engine/channel.cc » ('J')
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
11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/audio/audio_mixer.h" 16 #include "webrtc/api/audio/audio_mixer.h"
17 #include "webrtc/api/call/audio_sink.h" 17 #include "webrtc/api/call/audio_sink.h"
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/optional.h" 19 #include "webrtc/base/optional.h"
20 #include "webrtc/base/smoothing_filter.h"
20 #include "webrtc/common_audio/resampler/include/push_resampler.h" 21 #include "webrtc/common_audio/resampler/include/push_resampler.h"
21 #include "webrtc/common_types.h" 22 #include "webrtc/common_types.h"
22 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 23 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
23 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 24 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
24 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 25 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
25 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 26 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
26 #include "webrtc/modules/audio_processing/rms_level.h" 27 #include "webrtc/modules/audio_processing/rms_level.h"
27 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 28 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
28 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 29 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
29 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 30 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 void UpdatePlayoutTimestamp(bool rtcp); 437 void UpdatePlayoutTimestamp(bool rtcp);
437 void RegisterReceiveCodecsToRTPModule(); 438 void RegisterReceiveCodecsToRTPModule();
438 439
439 int SetSendRtpHeaderExtension(bool enable, 440 int SetSendRtpHeaderExtension(bool enable,
440 RTPExtensionType type, 441 RTPExtensionType type,
441 unsigned char id); 442 unsigned char id);
442 443
443 int GetRtpTimestampRateHz() const; 444 int GetRtpTimestampRateHz() const;
444 int64_t GetRTT(bool allow_associate_channel) const; 445 int64_t GetRTT(bool allow_associate_channel) const;
445 446
447 void OnUplinkBandwidthUpdated(int bitrate_bps);
448
446 rtc::CriticalSection _fileCritSect; 449 rtc::CriticalSection _fileCritSect;
447 rtc::CriticalSection _callbackCritSect; 450 rtc::CriticalSection _callbackCritSect;
448 rtc::CriticalSection volume_settings_critsect_; 451 rtc::CriticalSection volume_settings_critsect_;
449 uint32_t _instanceId; 452 uint32_t _instanceId;
450 int32_t _channelId; 453 int32_t _channelId;
451 454
452 ChannelState channel_state_; 455 ChannelState channel_state_;
453 456
454 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_; 457 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_;
455 458
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 542
540 bool pacing_enabled_; 543 bool pacing_enabled_;
541 PacketRouter* packet_router_ = nullptr; 544 PacketRouter* packet_router_ = nullptr;
542 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 545 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
543 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 546 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
544 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 547 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
545 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 548 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
546 549
547 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 550 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
548 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 551 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
552
553 SmoothingFilterImpl bitrate_bps_smoothed_;
minyue-webrtc 2016/11/15 14:36:03 I hope to call this uplink_bandwidth_estimator an
stefan-webrtc 2016/11/15 14:41:58 I would prefer not using uplink bandwidth, as it's
minyue-webrtc 2016/11/16 08:56:45 ok. Then please add "we give smoothed bitrate allo
michaelt 2016/11/16 09:50:24 Done.
549 }; 554 };
550 555
551 } // namespace voe 556 } // namespace voe
552 } // namespace webrtc 557 } // namespace webrtc
553 558
554 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 559 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | webrtc/voice_engine/channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698