From c8cb180e4c32c2abd6722ca10b3985bde4d9cc38 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 12 Oct 2026 07:37:40 -0400 Subject: [PATCH] MT#55283 typed containers for RTCP Change-Id: I812a5b1850c6f1d8d134af0bcb2b62ef0cab452a --- daemon/call_interfaces.c | 2 +- daemon/rtcp.c | 6 +++--- daemon/ssrc.c | 10 +++++----- include/ssrc.h | 10 +++++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index fcc0587c7..86f78b640 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -1152,7 +1152,7 @@ static void ng_stats_ssrc_1(const ng_parser_t *parser, parser_arg ent, struct ss parser_arg progdict = parser->dict_add_dict(ent, "MOS progression"); // aim for about 10 entries to the list - GList *listent = se->stats_blocks.head; + __auto_type listent = se->stats_blocks.head; struct ssrc_stats_block *sb = listent->data; int64_t interval = ((struct ssrc_stats_block *) se->stats_blocks.tail->data)->reported diff --git a/daemon/rtcp.c b/daemon/rtcp.c index 1bd4d3750..f0f302ca7 100644 --- a/daemon/rtcp.c +++ b/daemon/rtcp.c @@ -1517,9 +1517,9 @@ static GString *rtcp_sender_report(struct ssrc_sender_report *ssr, uint32_t ntp_middle_bits = 0; mutex_lock(&s->h.lock); if (s->sender_reports.length) { - struct ssrc_time_item *si = s->sender_reports.tail->data; - tv_diff = rtpe_now - si->received; - ntp_middle_bits = si->ntp_middle_bits; + __auto_type si = s->sender_reports.tail->data; + tv_diff = rtpe_now - si->time_item.received; + ntp_middle_bits = si->time_item.ntp_middle_bits; } uint32_t jitter = s->jitter; mutex_unlock(&s->h.lock); diff --git a/daemon/ssrc.c b/daemon/ssrc.c index 7c20c149d..2a2a15652 100644 --- a/daemon/ssrc.c +++ b/daemon/ssrc.c @@ -58,9 +58,9 @@ static void free_stats_block(struct ssrc_stats_block *ssb) { g_free(ssb); } static void __free_ssrc_entry_call(struct ssrc_entry_call *e) { - g_queue_clear_full(&e->sender_reports, (GDestroyNotify) free_sender_report); - g_queue_clear_full(&e->rr_time_reports, (GDestroyNotify) free_rr_time); - g_queue_clear_full(&e->stats_blocks, (GDestroyNotify) free_stats_block); + t_queue_clear_full(&e->sender_reports, free_sender_report); + t_queue_clear_full(&e->rr_time_reports, free_rr_time); + t_queue_clear_full(&e->stats_blocks, free_stats_block); if (e->sequencers) g_hash_table_destroy(e->sequencers); bufferpool_unref(e->stats); @@ -501,14 +501,14 @@ void ssrc_receiver_report(struct call_media *m, stream_fd *sfd, const struct ssr // discard stats block if last has been received less than a second ago if (G_LIKELY(other_e->stats_blocks.length > 0)) { - struct ssrc_stats_block *last_ssb = g_queue_peek_tail(&other_e->stats_blocks); + struct ssrc_stats_block *last_ssb = t_queue_peek_tail(&other_e->stats_blocks); if (G_UNLIKELY(tv - last_ssb->reported < 1000000LL)) { free_stats_block(ssb); goto out_ul_oe; } } - g_queue_push_tail(&other_e->stats_blocks, ssb); + t_queue_push_tail(&other_e->stats_blocks, ssb); if (ssb->mos && ((G_UNLIKELY(!other_e->lowest_mos) || ssb->mos < other_e->lowest_mos->mos))) other_e->lowest_mos = ssb; diff --git a/include/ssrc.h b/include/ssrc.h index 66087ba1b..f2e49e47e 100644 --- a/include/ssrc.h +++ b/include/ssrc.h @@ -40,6 +40,10 @@ struct ssrc_stats_block { uint64_t mos; // nominal range of 10 - 50 for MOS values 1.0 to 5.0 }; +TYPED_GQUEUE(stats_block, struct ssrc_stats_block) +TYPED_GQUEUE(sender_report, struct ssrc_sender_report_item) +TYPED_GQUEUE(rr_time, struct ssrc_rr_time_item) + struct ssrc_entry_call { struct ssrc_entry h; // must be first @@ -68,9 +72,9 @@ struct ssrc_entry_call { int64_t next_rtcp; // for self-generated RTCP reports - GQueue sender_reports; // as received via RTCP - GQueue rr_time_reports; // as received via RTCP - GQueue stats_blocks; // calculated + sender_report_q sender_reports; // as received via RTCP + rr_time_q rr_time_reports; // as received via RTCP + stats_block_q stats_blocks; // calculated struct ssrc_stats_block *lowest_mos, *highest_mos, average_mos; // contains a running tally of all stats blocks