mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-19 08:37:54 +01:00
Remove RtpPacketSendInfo.has_rtp_sequence_number
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 <terelius@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30857}
This commit is contained in:
parent
7eab0a820f
commit
2028a772df
7 changed files with 1 additions and 8 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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<RtpPacketMediaType> packet_type;
|
||||
PacedPacketInfo pacing_info;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue