From 2028a772df8f69e5642bc7be86becb4ba4a58ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Sat, 21 Mar 2020 12:57:57 +0100 Subject: [PATCH] Remove RtpPacketSendInfo.has_rtp_sequence_number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As far as I can tell, every call site already populates this field, so we can now remove it. Bug: webrtc:8975 Change-Id: I58515dd16d4ad8bf8872077b67a67f6e92e7b542 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171222 Reviewed-by: Björn Terelius Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#30857} --- .../rtp/transport_feedback_adapter_unittest.cc | 1 - modules/congestion_controller/rtp/transport_feedback_demuxer.cc | 2 +- .../rtp/transport_feedback_demuxer_unittest.cc | 1 - modules/rtp_rtcp/include/rtp_rtcp_defines.h | 2 -- modules/rtp_rtcp/source/rtp_sender_egress.cc | 1 - rtc_tools/rtc_event_log_visualizer/analyzer.cc | 1 - rtc_tools/rtc_event_log_visualizer/log_simulation.cc | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc index 8356928ba7..1c74b196d8 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc @@ -110,7 +110,6 @@ class TransportFeedbackAdapterTest : public ::testing::Test { packet_info.transport_sequence_number = packet_feedback.sent_packet.sequence_number; packet_info.rtp_sequence_number = 0; - packet_info.has_rtp_sequence_number = true; packet_info.length = packet_feedback.sent_packet.size.bytes(); packet_info.pacing_info = packet_feedback.sent_packet.pacing_info; packet_info.packet_type = RtpPacketMediaType::kVideo; diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc index c7893d71a9..045ba38cd3 100644 --- a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc +++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc @@ -38,7 +38,7 @@ void TransportFeedbackDemuxer::DeRegisterStreamFeedbackObserver( void TransportFeedbackDemuxer::AddPacket(const RtpPacketSendInfo& packet_info) { rtc::CritScope cs(&lock_); - if (packet_info.has_rtp_sequence_number && packet_info.ssrc != 0) { + if (packet_info.ssrc != 0) { StreamFeedbackObserver::StreamPacketInfo info; info.ssrc = packet_info.ssrc; info.rtp_sequence_number = packet_info.rtp_sequence_number; diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc index 144e3e135d..dce52de557 100644 --- a/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc +++ b/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc @@ -32,7 +32,6 @@ RtpPacketSendInfo CreatePacket(uint32_t ssrc, res.ssrc = ssrc; res.transport_sequence_number = transport_sequence_number; res.rtp_sequence_number = rtp_sequence_number; - res.has_rtp_sequence_number = true; return res; } } // namespace diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index b2bda626ce..0d19a4e312 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -227,8 +227,6 @@ struct RtpPacketSendInfo { uint16_t transport_sequence_number = 0; uint32_t ssrc = 0; uint16_t rtp_sequence_number = 0; - // Get rid of this flag when all code paths populate |rtp_sequence_number|. - bool has_rtp_sequence_number = false; size_t length = 0; absl::optional packet_type; PacedPacketInfo pacing_info; diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.cc b/modules/rtp_rtcp/source/rtp_sender_egress.cc index ec546c47bf..f421f83f20 100644 --- a/modules/rtp_rtcp/source/rtp_sender_egress.cc +++ b/modules/rtp_rtcp/source/rtp_sender_egress.cc @@ -304,7 +304,6 @@ void RtpSenderEgress::AddPacketToTransportFeedback( RtpPacketSendInfo packet_info; packet_info.ssrc = ssrc_; packet_info.transport_sequence_number = packet_id; - packet_info.has_rtp_sequence_number = true; packet_info.rtp_sequence_number = packet.SequenceNumber(); packet_info.length = packet_size; packet_info.pacing_info = pacing_info; diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc index bd9f56d881..6a43388d08 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc @@ -1294,7 +1294,6 @@ void EventLogAnalyzer::CreateSendSideBweSimulationGraph(Plot* plot) { packet_info.transport_sequence_number = rtp_packet.rtp.header.extension.transportSequenceNumber; packet_info.rtp_sequence_number = rtp_packet.rtp.header.sequenceNumber; - packet_info.has_rtp_sequence_number = true; packet_info.length = rtp_packet.rtp.total_length; transport_feedback.AddPacket( packet_info, diff --git a/rtc_tools/rtc_event_log_visualizer/log_simulation.cc b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc index d3016e86e6..0e5b5d04a9 100644 --- a/rtc_tools/rtc_event_log_visualizer/log_simulation.cc +++ b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc @@ -86,7 +86,6 @@ void LogBasedNetworkControllerSimulation::OnPacketSent( packet_info.ssrc = packet.ssrc; packet_info.transport_sequence_number = packet.transport_seq_no; packet_info.rtp_sequence_number = packet.stream_seq_no; - packet_info.has_rtp_sequence_number = true; packet_info.length = packet.size; packet_info.pacing_info = probe_info; transport_feedback_.AddPacket(packet_info, packet.overhead,