diff options
| author | Sebastian Jansson <srte@webrtc.org> | 2019-01-23 12:37:49 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-01-23 12:13:29 +0000 |
| commit | 470a5eae9306f8b2b95613e5df9f64aa0438ebd1 (patch) | |
| tree | beec8569413befa79eaa633d0358957803488596 /modules/pacing | |
| parent | 33b716f7ddb98c2c14be750b4243e49ec0fd31d5 (diff) | |
| download | webrtc-470a5eae9306f8b2b95613e5df9f64aa0438ebd1.tar.gz | |
Introduces common AudioAllocationSettings class.
This class collects the field trial based configuration of audio
allocation and bandwidth in one place. This makes it easier
overview and prepares for future cleanup of the trials.
Bug: webrtc:9718
Change-Id: I34a441c0165b423f1e2ee63894337484684146ac
Reviewed-on: https://webrtc-review.googlesource.com/c/118282
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26370}
Diffstat (limited to 'modules/pacing')
| -rw-r--r-- | modules/pacing/paced_sender.cc | 5 | ||||
| -rw-r--r-- | modules/pacing/paced_sender.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 1a160d854c..9ab8cdb585 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -51,7 +51,7 @@ PacedSender::PacedSender(const Clock* clock, drain_large_queues_(!field_trial::IsDisabled("WebRTC-Pacer-DrainQueue")), send_padding_if_silent_( field_trial::IsEnabled("WebRTC-Pacer-PadInSilence")), - video_blocks_audio_(!field_trial::IsDisabled("WebRTC-Pacer-BlockAudio")), + pace_audio_(!field_trial::IsDisabled("WebRTC-Pacer-BlockAudio")), min_packet_limit_ms_("", kDefaultMinPacketLimitMs), last_timestamp_ms_(clock_->TimeInMilliseconds()), paused_(false), @@ -408,8 +408,7 @@ const RoundRobinPacketQueue::Packet* PacedSender::GetPendingPacket( // reinsert it if send fails. const RoundRobinPacketQueue::Packet* packet = &packets_.BeginPop(); bool audio_packet = packet->priority == kHighPriority; - bool apply_pacing = - !audio_packet || account_for_audio_ || video_blocks_audio_; + bool apply_pacing = !audio_packet || pace_audio_; if (apply_pacing && (Congested() || (media_budget_.bytes_remaining() == 0 && pacing_info.probe_cluster_id == PacedPacketInfo::kNotAProbe))) { diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 1949dc00ed..0c7a90cc60 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -174,7 +174,7 @@ class PacedSender : public Pacer { const bool drain_large_queues_; const bool send_padding_if_silent_; - const bool video_blocks_audio_; + const bool pace_audio_; FieldTrialParameter<int> min_packet_limit_ms_; rtc::CriticalSection critsect_; |