diff --git a/src/channel/rtp_channel/rtp_video_sender.cpp b/src/channel/rtp_channel/rtp_video_sender.cpp index 74fa821..aaeb57f 100644 --- a/src/channel/rtp_channel/rtp_video_sender.cpp +++ b/src/channel/rtp_channel/rtp_video_sender.cpp @@ -69,6 +69,7 @@ int RtpVideoSender::SendRtpPacket(RtpPacket& rtp_packet) { webrtc::RtpPacketToSend rtp_packet_to_send; rtp_packet_to_send.SetSequenceNumber(rtp_packet.SequenceNumber()); 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_packet_type(webrtc::RtpPacketMediaType::kVideo); on_sent_packet_func_(rtp_packet_to_send); diff --git a/src/channel/video_channel_send.cpp b/src/channel/video_channel_send.cpp index 236d33b..00c5c4c 100644 --- a/src/channel/video_channel_send.cpp +++ b/src/channel/video_channel_send.cpp @@ -12,7 +12,7 @@ VideoChannelSend::VideoChannelSend( std::shared_ptr ice_io_statistics) : ice_agent_(ice_agent), ice_io_statistics_(ice_io_statistics), - clock_(clock){}; + clock_(clock) {}; void VideoChannelSend::Initialize(rtp::PAYLOAD_TYPE payload_type) { controller_ = std::make_unique(); diff --git a/src/qos/congestion_control.cpp b/src/qos/congestion_control.cpp index 51c6de2..772bbbb 100644 --- a/src/qos/congestion_control.cpp +++ b/src/qos/congestion_control.cpp @@ -133,19 +133,9 @@ NetworkControlUpdate CongestionControl::OnTransportPacketsFeedback( } 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( report.SortedByReceiveTime()); 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, report.feedback_time); for (const auto& feedback : report.SortedByReceiveTime()) { diff --git a/src/qos/transport_feedback_adapter.cc b/src/qos/transport_feedback_adapter.cc index a313660..243d509 100644 --- a/src/qos/transport_feedback_adapter.cc +++ b/src/qos/transport_feedback_adapter.cc @@ -96,7 +96,6 @@ void TransportFeedbackAdapter::AddPacket(const RtpPacketToSend& packet_to_send, feedback.sent.sequence_number = seq_num_unwrapper_.Unwrap( packet_to_send.transport_sequence_number().value_or(0)); feedback.sent.size = DataSize::Bytes(packet_to_send.size() + overhead_bytes); - LOG_WARN("!!! packet_to_send.size: {}", packet_to_send.size()); feedback.sent.audio = packet_to_send.packet_type() == RtpPacketMediaType::kAudio; feedback.network_route = network_route_; diff --git a/src/rtp/rtp_packet/rtp_packet.h b/src/rtp/rtp_packet/rtp_packet.h index 3c9c2d6..f6cb7cd 100644 --- a/src/rtp/rtp_packet/rtp_packet.h +++ b/src/rtp/rtp_packet/rtp_packet.h @@ -207,6 +207,7 @@ class RtpPacket { void SetTimestamp(uint64_t timestamp) { timestamp_ = timestamp; } void SetSsrc(uint32_t ssrc) { ssrc_ = ssrc; } void SetCsrcs(std::vector &csrcs) { csrcs_ = csrcs; } + void SetSize(size_t size) { size_ = size; } void SetAbsoluteSendTimestamp(uint32_t abs_send_time) { // Absolute Send Time is a 24-bit field, we need to ensure it fits in 24