zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use newer version of TimeDelta and TimeStamp factories in modules/

Browse Source 
This change generated with following commands:
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::Micros<\(.*\)>()/TimeDelta::Micros(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::Millis<\(.*\)>()/TimeDelta::Millis(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::Seconds<\(.*\)>()/TimeDelta::Seconds(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::us/TimeDelta::Micros/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::ms/TimeDelta::Millis/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/TimeDelta::seconds/TimeDelta::Seconds/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::Micros<\(.*\)>()/Timestamp::Micros(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::Millis<\(.*\)>()/Timestamp::Millis(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::Seconds<\(.*\)>()/Timestamp::Seconds(\1)/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::us/Timestamp::Micros/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::ms/Timestamp::Millis/g"
find modules -type f \( -name "*.h" -o -name "*.cc" \) | xargs sed -i -e "s/Timestamp::seconds/Timestamp::Seconds/g"
git cl format

Bug: None
Change-Id: I117d64a54950be040d996035c54bc0043310943a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168340
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30489}
This commit is contained in:
Danil Chapovalov
2020-02-07 14:53:52 +01:00
committed by Commit Bot
parent 2fe31a47b6
commit 5528402ef8
71 changed files with 517 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/congestion_controller/rtp/transport_feedback_adapter.cc
View File

@ -26,7 +26,7 @@
namespace webrtc {
constexpr TimeDelta kSendTimeHistoryWindow = TimeDelta::Seconds<60>();
constexpr TimeDelta kSendTimeHistoryWindow = TimeDelta::Seconds(60);
void InFlightBytesTracker::AddInFlightPacketBytes(
const PacketFeedback& packet) {
@ -91,7 +91,7 @@ void TransportFeedbackAdapter::AddPacket(const RtpPacketSendInfo& packet_info,
}
absl::optional<SentPacket> TransportFeedbackAdapter::ProcessSentPacket(
const rtc::SentPacket& sent_packet) {
auto send_time = Timestamp::ms(sent_packet.send_time_ms);
auto send_time = Timestamp::Millis(sent_packet.send_time_ms);
// TODO(srte): Only use one way to indicate that packet feedback is used.
if (sent_packet.info.included_in_feedback || sent_packet.packet_id != -1) {
int64_t unwrapped_seq_num =
@ -179,7 +179,7 @@ TransportFeedbackAdapter::ProcessTransportFeedbackInner(
} else {
// TODO(srte): We shouldn't need to do rounding here.
const TimeDelta delta = feedback.GetBaseDelta(last_timestamp_)
.RoundDownTo(TimeDelta::Millis<1>());
.RoundDownTo(TimeDelta::Millis(1));
// Protect against assigning current_offset_ negative value.
if (delta < Timestamp::Zero() - current_offset_) {
RTC_LOG(LS_WARNING) << "Unexpected feedback timestamp received.";
@ -227,7 +227,7 @@ TransportFeedbackAdapter::ProcessTransportFeedbackInner(
if (packet.received()) {
packet_offset += packet.delta();
packet_feedback.receive_time =
current_offset_ + packet_offset.RoundDownTo(TimeDelta::Millis<1>());
current_offset_ + packet_offset.RoundDownTo(TimeDelta::Millis(1));
// Note: Lost packets are not removed from history because they might be
// reported as received by a later feedback.
history_.erase(it);

28
modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
View File

@ -69,8 +69,8 @@ PacketResult CreatePacket(int64_t receive_time_ms,
size_t payload_size,
const PacedPacketInfo& pacing_info) {
PacketResult res;
res.receive_time = Timestamp::ms(receive_time_ms);
res.sent_packet.send_time = Timestamp::ms(send_time_ms);
res.receive_time = Timestamp::Millis(receive_time_ms);
res.sent_packet.send_time = Timestamp::Millis(send_time_ms);
res.sent_packet.sequence_number = sequence_number;
res.sent_packet.size = DataSize::bytes(payload_size);
res.sent_packet.pacing_info = pacing_info;
@ -294,21 +294,21 @@ TEST_F(TransportFeedbackAdapterTest, TimestampDeltas) {
std::vector<PacketResult> sent_packets;
// TODO(srte): Consider using us resolution in the constants.
const TimeDelta kSmallDelta =
TimeDelta::us(rtcp::TransportFeedback::kDeltaScaleFactor * 0xFF)
.RoundDownTo(TimeDelta::ms(1));
TimeDelta::Micros(rtcp::TransportFeedback::kDeltaScaleFactor * 0xFF)
.RoundDownTo(TimeDelta::Millis(1));
const TimeDelta kLargePositiveDelta =
TimeDelta::us(rtcp::TransportFeedback::kDeltaScaleFactor *
std::numeric_limits<int16_t>::max())
.RoundDownTo(TimeDelta::ms(1));
TimeDelta::Micros(rtcp::TransportFeedback::kDeltaScaleFactor *
std::numeric_limits<int16_t>::max())
.RoundDownTo(TimeDelta::Millis(1));
const TimeDelta kLargeNegativeDelta =
TimeDelta::us(rtcp::TransportFeedback::kDeltaScaleFactor *
std::numeric_limits<int16_t>::min())
.RoundDownTo(TimeDelta::ms(1));
TimeDelta::Micros(rtcp::TransportFeedback::kDeltaScaleFactor *
std::numeric_limits<int16_t>::min())
.RoundDownTo(TimeDelta::Millis(1));
PacketResult packet_feedback;
packet_feedback.sent_packet.sequence_number = 1;
packet_feedback.sent_packet.send_time = Timestamp::ms(100);
packet_feedback.receive_time = Timestamp::ms(200);
packet_feedback.sent_packet.send_time = Timestamp::Millis(100);
packet_feedback.receive_time = Timestamp::Millis(200);
packet_feedback.sent_packet.size = DataSize::bytes(1500);
sent_packets.push_back(packet_feedback);
@ -331,8 +331,8 @@ TEST_F(TransportFeedbackAdapterTest, TimestampDeltas) {
// Too large, delta - will need two feedback messages.
packet_feedback.sent_packet.send_time +=
kLargePositiveDelta + TimeDelta::ms(1);
packet_feedback.receive_time += kLargePositiveDelta + TimeDelta::ms(1);
kLargePositiveDelta + TimeDelta::Millis(1);
packet_feedback.receive_time += kLargePositiveDelta + TimeDelta::Millis(1);
++packet_feedback.sent_packet.sequence_number;
// Packets will be added to send history.