From 4e83b4b9552a9f18239ad97939a1ea0742f48b07 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 5 Oct 2026 11:32:02 -0400 Subject: [PATCH] MT#55283 use packet reception time directly Change-Id: Idfce8eddf6f80dea4bad3fb3840bc7b63c1b1362 --- daemon/media_socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 6a3c48faf..31ca82e28 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -2746,14 +2746,14 @@ static int media_loop_detect(struct packet_handler_ctx *phc) { dbg_int("packet dupe"); /* not a loop if duplicates arrive more than 1s apart */ - if (rtpe_now - phc->mp.stream->lp_buf[i].recv_us > 1000000LL) { + if (phc->mp.tv - phc->mp.stream->lp_buf[i].recv_us > 1000000LL) { dbg_int("duplicate packet too old to indicate a loop, resetting count"); phc->mp.stream->lp_count = 0; - phc->mp.stream->lp_buf[i].recv_us = rtpe_now; + phc->mp.stream->lp_buf[i].recv_us = phc->mp.tv; return 0; } - phc->mp.stream->lp_buf[i].recv_us = rtpe_now; + phc->mp.stream->lp_buf[i].recv_us = phc->mp.tv; if (phc->mp.stream->lp_count >= RTP_LOOP_MAX_COUNT) { ilog(LOG_WARNING, "More than %d duplicate packets detected, dropping packet from %s%s%s" @@ -2771,7 +2771,7 @@ static int media_loop_detect(struct packet_handler_ctx *phc) { phc->mp.stream->lp_count = 0; phc->mp.stream->lp_buf[phc->mp.stream->lp_idx].len = phc->s.len; memcpy(phc->mp.stream->lp_buf[phc->mp.stream->lp_idx].buf, phc->s.s, MIN(phc->s.len, RTP_LOOP_PROTECT)); - phc->mp.stream->lp_buf[phc->mp.stream->lp_idx].recv_us = rtpe_now; + phc->mp.stream->lp_buf[phc->mp.stream->lp_idx].recv_us = phc->mp.tv; phc->mp.stream->lp_idx = (phc->mp.stream->lp_idx + 1) % RTP_LOOP_PACKETS; return 0; @@ -3654,7 +3654,7 @@ static int stream_packet(struct packet_handler_ctx *phc) { atomic64_add_na(&phc->mp.stream->stats_in->bytes, phc->s.len); atomic64_inc_na(&phc->mp.sfd->local_intf->stats->in.packets); atomic64_add_na(&phc->mp.sfd->local_intf->stats->in.bytes, phc->s.len); - atomic64_set(&phc->mp.stream->last_packet_us, rtpe_now); + atomic64_set(&phc->mp.stream->last_packet_us, phc->mp.tv); RTPE_STATS_INC(packets_user); RTPE_STATS_ADD(bytes_user, phc->s.len);