From 1caaa3807180736a6f3b8068009cdf043098868c Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:33:31 +0000 Subject: [PATCH] Quieten a few debug messages and simplify one of two. --- ap2_buffered_audio_processor.c | 25 +++++++++++++------------ rtp.c | 5 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ap2_buffered_audio_processor.c b/ap2_buffered_audio_processor.c index c26bf372..fd3df1d6 100644 --- a/ap2_buffered_audio_processor.c +++ b/ap2_buffered_audio_processor.c @@ -269,8 +269,20 @@ void *rtp_buffered_audio_processor(void *arg) { previous_timestamp = timestamp; timestamp = nctohl(&packet[4]); - previous_ssrc = payload_ssrc; + if (payload_ssrc != SSRC_NONE) + previous_ssrc = payload_ssrc; payload_ssrc = nctohl(&packet[8]); + + + + if ((payload_ssrc != previous_ssrc) && (payload_ssrc != SSRC_NONE)) { + if (ssrc_is_recognised(payload_ssrc) == 0) { + debug(2, "Unrecognised SSRC: %u.", payload_ssrc); + } else { + debug(2, "Connection %d: incoming audio encoding is%s \"%s\".", + conn->connection_number, previous_ssrc == SSRC_NONE ? "" : " switching to", get_ssrc_name(payload_ssrc)); + } + } if ((payload_ssrc != previous_ssrc) && (ssrc_is_recognised(payload_ssrc) == 0)) { debug(2, "Unrecognised SSRC: %u.", payload_ssrc); @@ -286,17 +298,6 @@ void *rtp_buffered_audio_processor(void *arg) { if (blocks_read_since_play_began > 1) { -/* - if (payload_ssrc != previous_ssrc) { - if (ssrc_is_recognised(payload_ssrc) == 0) { - debug(2, "Unrecognised SSRC: %u.", payload_ssrc); - } else { - debug(2, "Connection %d: incoming audio switching to \"%s\".", - conn->connection_number, get_ssrc_name(payload_ssrc)); - } - } -*/ - uint32_t t_expected_seqno = (previous_seqno + 1) & 0x7fffff; if (t_expected_seqno != seq_no) { debug(2, diff --git a/rtp.c b/rtp.c index 079be6f8..1ac5fa6b 100644 --- a/rtp.c +++ b/rtp.c @@ -1387,10 +1387,9 @@ int get_ptp_anchor_local_time_info(rtsp_conn_info *conn, uint32_t *anchorRTP, if ((previous_offset != 0) && (previous_clock_id == actual_clock_id) && ((jitter > 3000000) || (jitter < -3000000))) debug(1, - "Clock jitter: %" PRId64 " ns. Time since sample: %" PRId64 - " ns. Time since start of mastership: %f " + "Clock jitter: %.3f mS. Time since sample: %.3f mS. Time since start of mastership: %.3f " "seconds.", - jitter, time_since_sample, time_since_start_of_mastership * 0.000000001); + jitter * 0.000001, time_since_sample * 0.000001, time_since_start_of_mastership * 0.000000001); previous_offset = actual_offset; previous_clock_id = actual_clock_id;