From f6c914aa597b5506e7fbf76d7770816f42ac1a96 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Fri, 7 Jun 2019 13:46:39 +0000 Subject: [PATCH] Revert "Reland "Cleanup of video packet overhead calculation."" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 35d4e43f169e7cb237bce9501db29ea4b69820cd. Reason for revert: Breaks downstream. Original change's description: > Reland "Cleanup of video packet overhead calculation." > > This is a reland of 890bc3069cbababa19b40ec02684253d60e051b2 > > The calculation was rewritten using the new Frequency type to > avoid the division by zero error introduced by the previous CL. > > Original change's description: > > Cleanup of video packet overhead calculation. > > > > This CL updates the video packet overhead calculation to make it more > > clear. This prepares for future work on improving the accuracy of the > > calculation. > > > > Bug: webrtc:9883 > > Change-Id: I1d623a3e0de45be7b6e4a1f9e3cbe54fd2b8a45a > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138077 > > Commit-Queue: Sebastian Jansson > > Reviewed-by: Erik Språng > > Cr-Commit-Position: refs/heads/master@{#28040} > > Bug: webrtc:10674 > Change-Id: Ib5cb6f05cfa7d097f89ac6fdcf198f2fc1b26b58 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138219 > Commit-Queue: Sebastian Jansson > Reviewed-by: Niels Moller > Reviewed-by: Erik Språng > Cr-Commit-Position: refs/heads/master@{#28194} TBR=nisse@webrtc.org,sprang@webrtc.org,srte@webrtc.org Change-Id: Ib6c3c123590b815c4be12966cdae02f91c61ab34 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10674 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140889 Reviewed-by: Sebastian Jansson Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#28195} --- call/rtp_video_sender.cc | 63 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc index eb00c480a5..424c32df36 100644 --- a/call/rtp_video_sender.cc +++ b/call/rtp_video_sender.cc @@ -189,13 +189,19 @@ std::unique_ptr MaybeCreateFlexfecSender( RTPSender::FecExtensionSizes(), rtp_state, clock); } -DataRate CalculateOverheadRate(DataRate data_rate, - DataSize packet_size, - DataSize overhead_per_packet) { - Frequency packet_rate = data_rate / packet_size; - // TOSO(srte): We should not need to round to nearest whole packet per second - // rate here. - return packet_rate.RoundUpTo(Frequency::hertz(1)) * overhead_per_packet; +uint32_t CalculateOverheadRateBps(int packets_per_second, + size_t overhead_bytes_per_packet, + uint32_t max_overhead_bps) { + uint32_t overhead_bps = + static_cast(8 * overhead_bytes_per_packet * packets_per_second); + return std::min(overhead_bps, max_overhead_bps); +} + +int CalculatePacketRate(uint32_t bitrate_bps, size_t packet_size_bytes) { + size_t packet_size_bits = 8 * packet_size_bytes; + // Ceil for int value of bitrate_bps / packet_size_bits. + return static_cast((bitrate_bps + packet_size_bits - 1) / + packet_size_bits); } } // namespace @@ -688,17 +694,16 @@ void RtpVideoSender::OnBitrateUpdated(uint32_t bitrate_bps, int framerate) { // Substract overhead from bitrate. rtc::CritScope lock(&crit_); - DataSize packet_overhead = DataSize::bytes( - overhead_bytes_per_packet_ + transport_overhead_bytes_per_packet_); - DataSize max_total_packet_size = DataSize::bytes( - rtp_config_.max_packet_size + transport_overhead_bytes_per_packet_); uint32_t payload_bitrate_bps = bitrate_bps; if (send_side_bwe_with_overhead_) { - DataRate overhead_rate = CalculateOverheadRate( - DataRate::bps(bitrate_bps), max_total_packet_size, packet_overhead); - // TODO(srte): We probably should not accept 0 payload bitrate here. - payload_bitrate_bps = - rtc::saturated_cast(bitrate_bps - overhead_rate.bps()); + uint32_t overhead_bps = CalculateOverheadRateBps( + CalculatePacketRate( + bitrate_bps, + rtp_config_.max_packet_size + transport_overhead_bytes_per_packet_), + overhead_bytes_per_packet_ + transport_overhead_bytes_per_packet_, + bitrate_bps); + RTC_DCHECK_LE(overhead_bps, bitrate_bps); + payload_bitrate_bps = bitrate_bps - overhead_bps; } // Get the encoder target rate. It is the estimated network rate - @@ -719,20 +724,18 @@ void RtpVideoSender::OnBitrateUpdated(uint32_t bitrate_bps, loss_mask_vector_.clear(); - uint32_t encoder_overhead_rate_bps = 0; - if (send_side_bwe_with_overhead_) { - // TODO(srte): The packet size should probably be the same as in the - // CalculateOverheadRate call above (just max_total_packet_size), it doesn't - // make sense to use different packet rates for different overhead - // calculations. - DataRate encoder_overhead_rate = CalculateOverheadRate( - DataRate::bps(encoder_target_rate_bps_), - max_total_packet_size - DataSize::bytes(overhead_bytes_per_packet_), - packet_overhead); - encoder_overhead_rate_bps = - std::min(encoder_overhead_rate.bps(), - bitrate_bps - encoder_target_rate_bps_); - } + uint32_t encoder_overhead_rate_bps = + send_side_bwe_with_overhead_ + ? CalculateOverheadRateBps( + CalculatePacketRate(encoder_target_rate_bps_, + rtp_config_.max_packet_size + + transport_overhead_bytes_per_packet_ - + overhead_bytes_per_packet_), + overhead_bytes_per_packet_ + + transport_overhead_bytes_per_packet_, + bitrate_bps - encoder_target_rate_bps_) + : 0; + // When the field trial "WebRTC-SendSideBwe-WithOverhead" is enabled // protection_bitrate includes overhead. const uint32_t media_rate = encoder_target_rate_bps_ +