From e399260daa252c1b961d27d33e0f4f70df08cb00 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Tue, 1 Apr 2025 11:17:43 +0800
Subject: [PATCH] [fix] mark original sequence number as sent for rtx packets

---
 src/qos/transport_feedback_adapter.cc        | 3 ++-
 src/rtp/rtp_packet/rtp_packet_to_send.cpp    | 2 --
 src/transport/channel/rtp_video_receiver.cpp | 5 +----
 src/transport/channel/video_channel_send.cpp | 6 ------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/qos/transport_feedback_adapter.cc b/src/qos/transport_feedback_adapter.cc
index 0be6ff3..2454a12 100644
--- a/src/qos/transport_feedback_adapter.cc
+++ b/src/qos/transport_feedback_adapter.cc
@@ -283,7 +283,8 @@ std::optional<PacketFeedback> TransportFeedbackAdapter::RetrievePacketFeedback(
   auto it = history_.find(transport_seq_num);
   if (it == history_.end()) {
     LOG_WARN(
-        "Failed to lookup send time for packet with {}. Send time history too "
+        "Failed to lookup send time for packet with transport_seq_num {}. Send "
+        "time history too "
         "small?",
         transport_seq_num);
     return std::nullopt;
diff --git a/src/rtp/rtp_packet/rtp_packet_to_send.cpp b/src/rtp/rtp_packet/rtp_packet_to_send.cpp
index 86bdce6..fb1f166 100644
--- a/src/rtp/rtp_packet/rtp_packet_to_send.cpp
+++ b/src/rtp/rtp_packet/rtp_packet_to_send.cpp
@@ -111,8 +111,6 @@ bool RtpPacketToSend::BuildRtxPacket() {
   if (has_extension) {
     std::vector<Extension> extensions = Extensions();
     AddAbsSendTimeExtension(rtp_packet_frame_);
-    uint32_t abs_send_time = 0;
-    LOG_WARN("abs {}", GetAbsoluteSendTimestamp(&abs_send_time));
   }
 
   rtp_packet_frame_.push_back((retransmitted_sequence_number_.value() >> 8) &
diff --git a/src/transport/channel/rtp_video_receiver.cpp b/src/transport/channel/rtp_video_receiver.cpp
index fe6a470..a3f61ed 100644
--- a/src/transport/channel/rtp_video_receiver.cpp
+++ b/src/transport/channel/rtp_video_receiver.cpp
@@ -224,10 +224,7 @@ void RtpVideoReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
         size_t osn_offset = rtp_packet.HeaderSize();
         uint16_t osn = rtp_packet.Buffer().data()[osn_offset] << 8 |
                        rtp_packet.Buffer().data()[osn_offset + 1];
-        uint32_t abs_send_time = 0;
-        LOG_WARN("!!!!!!!!!!! osn = {}, abs {}", osn,
-                 rtp_packet.GetAbsoluteSendTimestamp(&abs_send_time));
-        nack_->OnReceivedPacket(rtp_packet.SequenceNumber(), true);
+        nack_->OnReceivedPacket(osn, true);
       } else {
         nack_->OnReceivedPacket(rtp_packet.SequenceNumber(), false);
       }
diff --git a/src/transport/channel/video_channel_send.cpp b/src/transport/channel/video_channel_send.cpp
index 5463e20..189c5bd 100644
--- a/src/transport/channel/video_channel_send.cpp
+++ b/src/transport/channel/video_channel_send.cpp
@@ -49,9 +49,6 @@ void VideoChannelSend::OnSentRtpPacket(
   if (packet->retransmitted_sequence_number()) {
     rtp_packet_history_.MarkPacketAsSent(
         *packet->retransmitted_sequence_number());
-    LOG_WARN("resend seq {}, original seq {} mark as sent",
-             packet->SequenceNumber(),
-             packet->retransmitted_sequence_number().value());
   } else if (packet->PayloadType() != rtp::PAYLOAD_TYPE::H264 - 1) {
     rtp_packet_history_.PutRtpPacket(std::move(packet), clock_->CurrentTime());
   }
@@ -132,9 +129,6 @@ int32_t VideoChannelSend::ReSendPacket(uint16_t packet_id) {
 
             retransmit_packet->set_retransmitted_sequence_number(
                 stored_packet.SequenceNumber());
-            LOG_WARN(
-                "???????????? resend seq {}",
-                retransmit_packet->retransmitted_sequence_number().value());
             retransmit_packet->set_original_ssrc(stored_packet.Ssrc());
             retransmit_packet->BuildRtxPacket();