YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix sent packet size in congestion control feedbacks

Browse Source
This commit is contained in:
dijunkun
2025-02-10 16:06:19 +08:00
parent 2c48ce12c5
commit 0595112d4f
5 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/channel/rtp_channel/rtp_video_sender.cpp
View File

@@ -69,6 +69,7 @@ int RtpVideoSender::SendRtpPacket(RtpPacket& rtp_packet) {
webrtc::RtpPacketToSend rtp_packet_to_send; webrtc::RtpPacketToSend rtp_packet_to_send;
rtp_packet_to_send.SetSequenceNumber(rtp_packet.SequenceNumber()); rtp_packet_to_send.SetSequenceNumber(rtp_packet.SequenceNumber());
rtp_packet_to_send.SetSsrc(rtp_packet.Ssrc()); rtp_packet_to_send.SetSsrc(rtp_packet.Ssrc());
rtp_packet_to_send.SetSize(rtp_packet.Size());
rtp_packet_to_send.set_transport_sequence_number(transport_seq_++); rtp_packet_to_send.set_transport_sequence_number(transport_seq_++);
rtp_packet_to_send.set_packet_type(webrtc::RtpPacketMediaType::kVideo); rtp_packet_to_send.set_packet_type(webrtc::RtpPacketMediaType::kVideo);
on_sent_packet_func_(rtp_packet_to_send); on_sent_packet_func_(rtp_packet_to_send);

10
src/qos/congestion_control.cpp
View File

@@ -133,19 +133,9 @@ NetworkControlUpdate CongestionControl::OnTransportPacketsFeedback(
} }
previously_in_alr_ = alr_start_time.has_value(); previously_in_alr_ = alr_start_time.has_value();
int count = 0;
for (auto r : report.SortedByReceiveTime()) {
count++;
LOG_WARN("{} packet.sent_packet.size: {}", count,
ToString(r.sent_packet.size));
}
acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
report.SortedByReceiveTime()); report.SortedByReceiveTime());
auto acknowledged_bitrate = acknowledged_bitrate_estimator_->bitrate(); auto acknowledged_bitrate = acknowledged_bitrate_estimator_->bitrate();
LOG_WARN("acknowledged_bitrate:{}", acknowledged_bitrate->kbps());
// TODO: fix acknowledged_bitrate
// acknowledged_bitrate = DataRate::KilobitsPerSec(1000);
bandwidth_estimation_->SetAcknowledgedRate(acknowledged_bitrate, bandwidth_estimation_->SetAcknowledgedRate(acknowledged_bitrate,
report.feedback_time); report.feedback_time);
for (const auto& feedback : report.SortedByReceiveTime()) { for (const auto& feedback : report.SortedByReceiveTime()) {

1
src/qos/transport_feedback_adapter.cc
View File

@@ -96,7 +96,6 @@ void TransportFeedbackAdapter::AddPacket(const RtpPacketToSend& packet_to_send,
feedback.sent.sequence_number = seq_num_unwrapper_.Unwrap( feedback.sent.sequence_number = seq_num_unwrapper_.Unwrap(
packet_to_send.transport_sequence_number().value_or(0)); packet_to_send.transport_sequence_number().value_or(0));
feedback.sent.size = DataSize::Bytes(packet_to_send.size() + overhead_bytes); feedback.sent.size = DataSize::Bytes(packet_to_send.size() + overhead_bytes);
LOG_WARN("!!! packet_to_send.size: {}", packet_to_send.size());
feedback.sent.audio = feedback.sent.audio =
packet_to_send.packet_type() == RtpPacketMediaType::kAudio; packet_to_send.packet_type() == RtpPacketMediaType::kAudio;
feedback.network_route = network_route_; feedback.network_route = network_route_;

1
src/rtp/rtp_packet/rtp_packet.h
View File

@@ -207,6 +207,7 @@ class RtpPacket {
void SetTimestamp(uint64_t timestamp) { timestamp_ = timestamp; } void SetTimestamp(uint64_t timestamp) { timestamp_ = timestamp; }
void SetSsrc(uint32_t ssrc) { ssrc_ = ssrc; } void SetSsrc(uint32_t ssrc) { ssrc_ = ssrc; }
void SetCsrcs(std::vector<uint32_t> &csrcs) { csrcs_ = csrcs; } void SetCsrcs(std::vector<uint32_t> &csrcs) { csrcs_ = csrcs; }
void SetSize(size_t size) { size_ = size; }
void SetAbsoluteSendTimestamp(uint32_t abs_send_time) { void SetAbsoluteSendTimestamp(uint32_t abs_send_time) {
// Absolute Send Time is a 24-bit field, we need to ensure it fits in 24 // Absolute Send Time is a 24-bit field, we need to ensure it fits in 24