Replace DataSize and DataRate factories with newer versions
This is search and replace change:
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataSize::Bytes<\(.*\)>()/DataSize::Bytes(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataSize::bytes/DataSize::Bytes/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::BitsPerSec<\(.*\)>()/DataRate::BitsPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::BytesPerSec<\(.*\)>()/DataRate::BytesPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::KilobitsPerSec<\(.*\)>()/DataRate::KilobitsPerSec(\1)/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::bps/DataRate::BitsPerSec/g"
find . -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/DataRate::kbps/DataRate::KilobitsPerSec/g"
git cl format
Bug: webrtc:9709
Change-Id: I65aaca69474ba038c1fe2dd8dc30d3f8e7b94c29
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168647
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30545}
diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc
index e80713c..50c34f9 100644
--- a/call/rtp_transport_controller_send.cc
+++ b/call/rtp_transport_controller_send.cc
@@ -40,12 +40,14 @@
Clock* clock) {
TargetRateConstraints msg;
msg.at_time = Timestamp::Millis(clock->TimeInMilliseconds());
- msg.min_data_rate =
- min_bitrate_bps >= 0 ? DataRate::bps(min_bitrate_bps) : DataRate::Zero();
- msg.max_data_rate = max_bitrate_bps > 0 ? DataRate::bps(max_bitrate_bps)
- : DataRate::Infinity();
+ msg.min_data_rate = min_bitrate_bps >= 0
+ ? DataRate::BitsPerSec(min_bitrate_bps)
+ : DataRate::Zero();
+ msg.max_data_rate = max_bitrate_bps > 0
+ ? DataRate::BitsPerSec(max_bitrate_bps)
+ : DataRate::Infinity();
if (start_bitrate_bps > 0)
- msg.starting_rate = DataRate::bps(start_bitrate_bps);
+ msg.starting_rate = DataRate::BitsPerSec(start_bitrate_bps);
return msg;
}
@@ -114,8 +116,8 @@
initial_config_.key_value_config = trials;
RTC_DCHECK(bitrate_config.start_bitrate_bps > 0);
- pacer()->SetPacingRates(DataRate::bps(bitrate_config.start_bitrate_bps),
- DataRate::Zero());
+ pacer()->SetPacingRates(
+ DataRate::BitsPerSec(bitrate_config.start_bitrate_bps), DataRate::Zero());
if (!use_task_queue_pacer_) {
process_thread_->Start();
@@ -426,7 +428,7 @@
}
pacer()->SetTransportOverhead(
- DataSize::bytes(transport_overhead_bytes_per_packet));
+ DataSize::Bytes(transport_overhead_bytes_per_packet));
// TODO(holmer): Call AudioRtpSenders when they have been moved to
// RtpTransportControllerSend.
@@ -448,7 +450,7 @@
void RtpTransportControllerSend::OnReceivedEstimatedBitrate(uint32_t bitrate) {
RemoteBitrateReport msg;
msg.receive_time = Timestamp::Millis(clock_->TimeInMilliseconds());
- msg.bandwidth = DataRate::bps(bitrate);
+ msg.bandwidth = DataRate::BitsPerSec(bitrate);
task_queue_.PostTask([this, msg]() {
RTC_DCHECK_RUN_ON(&task_queue_);
if (controller_)