From b71f30db7f2546aee52cf135100f534d129eb78f Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 14 Oct 2026 07:57:40 -0400 Subject: [PATCH] MT#55283 set PTS after input reset Closes #2208 Change-Id: If0759971b19e2e0571ccc09583a7e106884a5439 (cherry picked from commit cecad6d5778cea3159fea4e54943223c82a29192) --- recording-daemon/mix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recording-daemon/mix.c b/recording-daemon/mix.c index ad717c8bb..a1e507cab 100644 --- a/recording-daemon/mix.c +++ b/recording-daemon/mix.c @@ -90,11 +90,12 @@ void mix_set_channel_slots(mix_t *mix, unsigned int channel_slots) { } -static void mix_input_reset(mix_t *mix, unsigned int idx) { +static void mix_input_reset(mix_t *mix, unsigned int idx, void *ref) { mix->pts_offs[idx] = (uint64_t) -1LL; ZERO(mix->last_use[idx]); mix->input_ref[idx] = NULL; - mix->in_pts[idx] = 0; + mix->in_pts[idx] = mix->out_pts; + mix->input_ref[idx] = ref; } @@ -133,8 +134,7 @@ unsigned int mix_get_index(mix_t *mix, void *ptr, unsigned int media_sdp_id, uns } ilog(LOG_DEBUG, "requested slot is %u, Re-using mix input index #%u", stream_channel_slot, next); - mix_input_reset(mix, next); - mix->input_ref[next] = ptr; + mix_input_reset(mix, next, ptr); mix->next_idx[stream_channel_slot] = next; return next; }