diff --git a/daemon/call.c b/daemon/call.c index ad55b5b37..644882f22 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -218,7 +218,7 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) { if (!ctx) break; - if (timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&ctx->stats->last_packet) < 2) + if (rtpe_now - atomic64_get_na(&ctx->stats->last_packet_us) < 2000000L) payload_tracker_add(&ctx->tracker, atomic_get_na(&ctx->stats->last_pt)); } @@ -227,7 +227,7 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) { if (!ctx) break; - if (timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&ctx->stats->last_packet) < 2) + if (rtpe_now - atomic64_get_na(&ctx->stats->last_packet_us) < 2000000L) payload_tracker_add(&ctx->tracker, atomic_get_na(&ctx->stats->last_pt)); } diff --git a/kernel-module/common_stats.h b/kernel-module/common_stats.h index 4bc2f655b..26a9134f9 100644 --- a/kernel-module/common_stats.h +++ b/kernel-module/common_stats.h @@ -71,7 +71,7 @@ struct ssrc_stats { atomic_t total_lost; atomic_t transit; atomic_t jitter; - atomic64 last_packet; + atomic64 last_packet_us; atomic_t last_pt; }; diff --git a/kernel-module/xt_RTPENGINE.c b/kernel-module/xt_RTPENGINE.c index 4a48f34e2..883395950 100644 --- a/kernel-module/xt_RTPENGINE.c +++ b/kernel-module/xt_RTPENGINE.c @@ -6370,7 +6370,7 @@ static unsigned int rtpengine46(struct sk_buff *skb, struct sk_buff *oskb, else if (ssrc_idx >= 0 && g->target.ssrc_stats[ssrc_idx]) { atomic_set(&g->target.ssrc_stats[ssrc_idx]->last_pt, g->target.pt_stats[rtp_pt_idx]->payload_type); - atomic64_set(&g->target.ssrc_stats[ssrc_idx]->last_packet, packet_ts / 1000000L); + atomic64_set(&g->target.ssrc_stats[ssrc_idx]->last_packet_us, packet_ts); } errstr = "SRTP decryption failed";