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

Reland "Replaced magic numbers with constants for PacketFeedback."

Browse Source 
This is a reland of 37b52232895fc200188c0e3ded261aedcb558b7b
Original change's description:
> Replaced magic numbers with constants for PacketFeedback.
> 
> Bug: None
> Change-Id: Ie22475227406f4e800052b52fa644ea6966db3f1
> Reviewed-on: https://webrtc-review.googlesource.com/27100
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20938}

Bug: None
Change-Id: I131b509212345a620519b17c1c17e84532ac089c
Reviewed-on: https://webrtc-review.googlesource.com/27401
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20957}
This commit is contained in:
srte
2017-11-30 09:59:33 +01:00
committed by Commit Bot
parent d21bf131bd
commit e0572e5c16
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/congestion_controller/acknowledged_bitrate_estimator.cc
View File

@ -19,7 +19,7 @@ namespace webrtc {
namespace { namespace {
bool IsInSendTimeHistory(const PacketFeedback& packet) { bool IsInSendTimeHistory(const PacketFeedback& packet) {
return packet.send_time_ms >= 0; return packet.send_time_ms != PacketFeedback::kNoSendTime;
} }
} // namespace } // namespace

10
modules/congestion_controller/delay_based_bwe_unittest.cc
View File

@ -34,10 +34,12 @@ TEST_F(DelayBasedBweTest, NoCrashEmptyFeedback) {
TEST_F(DelayBasedBweTest, NoCrashOnlyLostFeedback) { TEST_F(DelayBasedBweTest, NoCrashOnlyLostFeedback) {
std::vector<PacketFeedback> packet_feedback_vector; std::vector<PacketFeedback> packet_feedback_vector;
packet_feedback_vector.push_back( packet_feedback_vector.push_back(PacketFeedback(PacketFeedback::kNotReceived,
PacketFeedback(-1, -1, 0, 1500, PacedPacketInfo())); PacketFeedback::kNoSendTime,
packet_feedback_vector.push_back( 0, 1500, PacedPacketInfo()));
PacketFeedback(-1, -1, 1, 1500, PacedPacketInfo())); packet_feedback_vector.push_back(PacketFeedback(PacketFeedback::kNotReceived,
PacketFeedback::kNoSendTime,
1, 1500, PacedPacketInfo()));
bitrate_estimator_->IncomingPacketFeedbackVector(packet_feedback_vector, bitrate_estimator_->IncomingPacketFeedbackVector(packet_feedback_vector,
rtc::nullopt); rtc::nullopt);
} }

2
modules/congestion_controller/send_side_congestion_controller_unittest.cc
View File

@ -384,7 +384,7 @@ TEST_F(SendSideCongestionControllerTest, LongFeedbackDelays) {
// Check that packets have timed out. // Check that packets have timed out.
for (PacketFeedback& packet : packets) { for (PacketFeedback& packet : packets) {
packet.send_time_ms = -1; packet.send_time_ms = PacketFeedback::kNoSendTime;
packet.payload_size = 0; packet.payload_size = 0;
packet.pacing_info = PacedPacketInfo(); packet.pacing_info = PacedPacketInfo();
} }

4
modules/remote_bitrate_estimator/send_time_history_unittest.cc
View File

@ -116,8 +116,8 @@ TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) {
} }
for (size_t i = 0; i < num_items; ++i) { for (size_t i = 0; i < num_items; ++i) {
PacketFeedback packet = sent_packets[i]; PacketFeedback packet = sent_packets[i];
packet.arrival_time_ms = -1; packet.arrival_time_ms = PacketFeedback::kNotReceived;
packet.send_time_ms = -1; packet.send_time_ms = PacketFeedback::kNoSendTime;
history_.AddAndRemoveOld(packet); history_.AddAndRemoveOld(packet);
} }
for (size_t i = 0; i < num_items; ++i) for (size_t i = 0; i < num_items; ++i)

7
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -289,7 +289,7 @@ struct PacketFeedback {
PacketFeedback(int64_t arrival_time_ms, uint16_t sequence_number) PacketFeedback(int64_t arrival_time_ms, uint16_t sequence_number)
: PacketFeedback(-1, : PacketFeedback(-1,
arrival_time_ms, arrival_time_ms,
-1, kNoSendTime,
sequence_number, sequence_number,
0, 0,
0, 0,
@ -317,8 +317,8 @@ struct PacketFeedback {
uint16_t remote_net_id, uint16_t remote_net_id,
const PacedPacketInfo& pacing_info) const PacedPacketInfo& pacing_info)
: PacketFeedback(creation_time_ms, : PacketFeedback(creation_time_ms,
-1, kNotReceived,
-1, kNoSendTime,
sequence_number, sequence_number,
payload_size, payload_size,
local_net_id, local_net_id,
@ -344,6 +344,7 @@ struct PacketFeedback {
static constexpr int kNotAProbe = -1; static constexpr int kNotAProbe = -1;
static constexpr int64_t kNotReceived = -1; static constexpr int64_t kNotReceived = -1;
static constexpr int64_t kNoSendTime = -1;
// NOTE! The variable |creation_time_ms| is not used when testing equality. // NOTE! The variable |creation_time_ms| is not used when testing equality.
// This is due to |creation_time_ms| only being used by SendTimeHistory // This is due to |creation_time_ms| only being used by SendTimeHistory

2
rtc_tools/event_log_visualizer/analyzer.cc
View File

@ -1443,7 +1443,7 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
float x = float x =
static_cast<float>(clock.TimeInMicroseconds() - begin_time_) / static_cast<float>(clock.TimeInMicroseconds() - begin_time_) /
1000000; 1000000;
if (packet.send_time_ms == -1) { if (packet.send_time_ms == PacketFeedback::kNoSendTime) {
late_feedback_series.points.emplace_back(x, prev_y); late_feedback_series.points.emplace_back(x, prev_y);
continue; continue;
} }