diff options
| author | Mirko Bonadei <mbonadei@webrtc.org> | 2020-01-29 15:29:36 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-29 16:38:57 +0000 |
| commit | 4356490b7b66714550221273479de77ace320226 (patch) | |
| tree | 8bdf5e1c63f07cff668c75c8b1ce2f43c6dd713a /modules/audio_coding | |
| parent | 740ed473dcba496cae526f9b280ab058e5937ccf (diff) | |
| download | webrtc-4356490b7b66714550221273479de77ace320226.tar.gz | |
Revert "Reland "Only include overhead if using send side bandwidth estimation.""
This reverts commit 086055d0fd9b9b9efe8bcf85884324a019e9bd33.
Reason for revert: Causes some perf regressions.
Original change's description:
> Reland "Only include overhead if using send side bandwidth estimation."
>
> This is a reland of 8c79c6e1af354c526497082c79ccbe12af03a33e
>
> Original change's description:
> > Only include overhead if using send side bandwidth estimation.
> >
> > Bug: webrtc:11298
> > Change-Id: Ia2daf690461b55d394c1b964d6a7977a98be8be2
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166820
> > Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
> > Reviewed-by: Sam Zackrisson <saza@webrtc.org>
> > Reviewed-by: Ali Tofigh <alito@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#30382}
>
> Bug: webrtc:11298
> Change-Id: I33205e869a8ae27c15ffe991f6d985973ed6d15a
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167524
> Reviewed-by: Ali Tofigh <alito@webrtc.org>
> Reviewed-by: Sam Zackrisson <saza@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30390}
TBR=saza@webrtc.org,ossu@webrtc.org,sprang@webrtc.org,srte@webrtc.org,alito@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:11298
Change-Id: Id38de92ac25a1ce9a1360f0e37f65747d4cfb31b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167881
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30411}
Diffstat (limited to 'modules/audio_coding')
| -rw-r--r-- | modules/audio_coding/codecs/opus/audio_encoder_opus.cc | 5 | ||||
| -rw-r--r-- | modules/audio_coding/codecs/opus/audio_encoder_opus.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc index 168bcec241..44cfe9e5a2 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc @@ -593,11 +593,6 @@ void AudioEncoderOpusImpl::OnReceivedUplinkPacketLossFraction( ApplyAudioNetworkAdaptor(); } -void AudioEncoderOpusImpl::OnReceivedTargetAudioBitrate( - int target_audio_bitrate_bps) { - SetTargetBitrate(target_audio_bitrate_bps); -} - void AudioEncoderOpusImpl::OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, absl::optional<int64_t> bwe_period_ms, diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h index 40fd167c10..66c489f79b 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -104,7 +104,6 @@ class AudioEncoderOpusImpl final : public AudioEncoder { void DisableAudioNetworkAdaptor() override; void OnReceivedUplinkPacketLossFraction( float uplink_packet_loss_fraction) override; - void OnReceivedTargetAudioBitrate(int target_audio_bitrate_bps) override; void OnReceivedUplinkBandwidth( int target_audio_bitrate_bps, absl::optional<int64_t> bwe_period_ms) override; |