From 421868df45e6dd292316e3ad5a4a5cfa5e08811c Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 28 May 2026 11:57:49 -0400 Subject: [PATCH] MT#55283 remove unused flag from metafile also update "tag" to long as it should be Change-Id: I8716c3f914af3705123efbdf886a3e18c171b5a6 --- daemon/recording.c | 4 ++-- recording-daemon/metafile.c | 7 ++++--- recording-daemon/stream.c | 2 +- recording-daemon/stream.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/daemon/recording.c b/daemon/recording.c index 7df055814..1a9b79bbd 100644 --- a/daemon/recording.c +++ b/daemon/recording.c @@ -1058,8 +1058,8 @@ static void setup_stream_proc(struct packet_stream *stream) { media_rec_slot = media_rec_slots; } - len = snprintf(buf, sizeof(buf), "TAG %u MEDIA %u TAG-MEDIA %u COMPONENT %u FLAGS %" PRIu64 " MEDIA-SDP-ID %i MEDIA-REC-SLOT %i MEDIA-REC-SLOTS %i", - ml->unique_id, media->unique_id, media->index, stream->component, + len = snprintf(buf, sizeof(buf), "TAG %u MEDIA %u COMPONENT %u FLAGS %" PRIu64 " MEDIA-SDP-ID %i MEDIA-REC-SLOT %i MEDIA-REC-SLOTS %i", + ml->unique_id, media->unique_id, stream->component, atomic64_get_na(&stream->ps_flags), media->media_sdp_id, media_rec_slot, media_rec_slots); append_meta_chunk(recording, buf, len, "STREAM %u details", stream->unique_id); diff --git a/recording-daemon/metafile.c b/recording-daemon/metafile.c index 2b848d8ac..a0ffce798 100644 --- a/recording-daemon/metafile.c +++ b/recording-daemon/metafile.c @@ -165,10 +165,11 @@ static void meta_stream_interface(metafile_t *mf, unsigned long snum, char *cont // mf is locked static void meta_stream_details(metafile_t *mf, unsigned long snum, char *content) { dbg("stream %lu details %s", snum, content); - unsigned int tag, media, tm, cmp, media_sdp_id, media_rec_slot, media_rec_slots; + unsigned long tag; + unsigned int media, cmp, media_sdp_id, media_rec_slot, media_rec_slots; uint64_t flags; - if (sscanf_match(content, "TAG %u MEDIA %u TAG-MEDIA %u COMPONENT %u FLAGS %" PRIu64 " MEDIA-SDP-ID %i MEDIA-REC-SLOT %i MEDIA-REC-SLOTS %i", - &tag, &media, &tm, &cmp, &flags, &media_sdp_id, &media_rec_slot, &media_rec_slots) != 8) + if (sscanf_match(content, "TAG %lu MEDIA %u COMPONENT %u FLAGS %" PRIu64 " MEDIA-SDP-ID %i MEDIA-REC-SLOT %i MEDIA-REC-SLOTS %i", + &tag, &media, &cmp, &flags, &media_sdp_id, &media_rec_slot, &media_rec_slots) != 7) return; mf->media_rec_slots = media_rec_slots; diff --git a/recording-daemon/stream.c b/recording-daemon/stream.c index 398db769d..254cd0fc5 100644 --- a/recording-daemon/stream.c +++ b/recording-daemon/stream.c @@ -138,7 +138,7 @@ void stream_open(metafile_t *mf, unsigned long id, char *name) { epoll_add(stream->fd, EPOLLIN, &stream->handler); } -void stream_details(metafile_t *mf, unsigned long id, unsigned int tag, unsigned int media_sdp_id, +void stream_details(metafile_t *mf, unsigned long id, unsigned long tag, unsigned int media_sdp_id, unsigned int channel_slot) { stream_t *stream = stream_get(mf, id); diff --git a/recording-daemon/stream.h b/recording-daemon/stream.h index a1a3c9384..be26784da 100644 --- a/recording-daemon/stream.h +++ b/recording-daemon/stream.h @@ -4,7 +4,7 @@ #include "types.h" void stream_open(metafile_t *mf, unsigned long id, char *name); -void stream_details(metafile_t *mf, unsigned long id, unsigned int tag, unsigned int media_sdp_id, unsigned int channel_slot); +void stream_details(metafile_t *mf, unsigned long id, unsigned long tag, unsigned int media_sdp_id, unsigned int channel_slot); void stream_forwarding_on(metafile_t *mf, unsigned long id, unsigned int on); void stream_sdp_label(metafile_t *mf, unsigned long id, unsigned long *label); void stream_close(stream_t *stream);