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

[fix] fix frame out of order in pending queue

Browse Source
This commit is contained in:
dijunkun
2025-04-03 15:54:17 +08:00
parent c69818bb1d
commit a36b352039
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/transport/channel/rtp_video_receiver.cpp
View File

@@ -447,6 +447,11 @@ bool RtpVideoReceiver::CheckIsH264FrameCompleted(RtpPacketH264& rtp_packet_h264,
uint32_t timestamp = rtp_packet_h264.Timestamp(); uint32_t timestamp = rtp_packet_h264.Timestamp();
uint16_t seq, start_seq, end_seq; uint16_t seq, start_seq, end_seq;
if (pending_frames_.find(timestamp) == pending_frames_.end()) {
std::lock_guard<std::mutex> lock(pending_frames_mtx_);
pending_frames_[timestamp] = {nullptr, false, clock_->CurrentTime().ms()};
}
if (is_rtx) { if (is_rtx) {
seq = rtp_packet_h264.GetOsn(); seq = rtp_packet_h264.GetOsn();
} else { } else {
@@ -488,6 +493,9 @@ bool RtpVideoReceiver::CheckIsH264FrameCompleted(RtpPacketH264& rtp_packet_h264,
MAX_WAIT_TIME_MS) { MAX_WAIT_TIME_MS) {
missing_sequence_numbers_wait_time_.erase(missing_seqs_wait_ts_iter); missing_sequence_numbers_wait_time_.erase(missing_seqs_wait_ts_iter);
std::lock_guard<std::mutex> lock(pending_frames_mtx_); std::lock_guard<std::mutex> lock(pending_frames_mtx_);
LOG_WARN(
"retransmit packet [seq {} | ts {}] timeout, remove pending frame",
seq, timestamp);
pending_frames_.erase(timestamp); pending_frames_.erase(timestamp);
return false; return false;
} }
@@ -498,8 +506,6 @@ bool RtpVideoReceiver::CheckIsH264FrameCompleted(RtpPacketH264& rtp_packet_h264,
++sequence_number) { ++sequence_number) {
if (incomplete_h264_frame_list_.find(sequence_number) == if (incomplete_h264_frame_list_.find(sequence_number) ==
incomplete_h264_frame_list_.end()) { incomplete_h264_frame_list_.end()) {
std::lock_guard<std::mutex> lock(pending_frames_mtx_);
pending_frames_[timestamp] = {nullptr, false, clock_->CurrentTime().ms()};
return false; return false;
} }
} }
@@ -733,7 +739,11 @@ bool RtpVideoReceiver::Process() {
} else { } else {
if (clock_->CurrentTime().ms() - it->second.arrival_time > if (clock_->CurrentTime().ms() - it->second.arrival_time >
MAX_WAIT_TIME_MS) { MAX_WAIT_TIME_MS) {
it = pending_frames_.erase(it); LOG_WARN("pending frame [ts {}] timeout, remove it", it->first);
// it = pending_frames_.erase(it);
pending_frames_.clear();
RequestKeyFrame();
return false;
} else { } else {
return false; return false;
} }