get rid of additional_audio_data

MartinPulec · MartinPulec · commit 4a92c72cfecb · 2026-03-26T08:49:01.000+01:00
set in struct audio_options instead
diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
@@ -187,7 +187,6 @@ struct state_audio {
         double volume = 1.0; // receiver volume scale
         bool muted_receiver = false;
         bool muted_sender = false;
-        bool playback_is_sdi = false; // delegating to vdisplay
 
         size_t recv_buf_size = DEFAULT_AUDIO_RECV_BUF_SIZE;
 
@@ -295,7 +294,7 @@ audio_init_real(struct state_audio *s, const struct audio_options *opt,
 
         s->audio_channel_map = opt->channel_map;
         s->audio_scale = opt->scale;
-
+        s->vrxtx = opt->vrxtx;
         s->resample_to = parse_audio_codec_params(opt->codec_cfg).sample_rate;
 
         s->exporter = common->exporter;
@@ -385,11 +384,19 @@ audio_init_real(struct state_audio *s, const struct audio_options *opt,
         opts.parent = s->audio_receiver_module.get();
         int ret =
             audio_playback_init(playback_dev, &opts, &s->audio_playback_device);
-        s->playback_is_sdi = (bool) audio_get_display_flags(playback_dev);
+        bool playback_is_sdi = (audio_get_display_flags(playback_dev) &
+                                DISPLAY_FLAG_AUDIO_ANY) != 0U;
         free(playback_dev);
         if (ret != 0) {
                 return ret;
         }
+        if (playback_is_sdi) {
+                auto *sdi_playback = (struct state_sdi_playback *)
+                    audio_playback_get_state_pointer(s->audio_playback_device);
+                sdi_register_display_callbacks(
+                    sdi_playback, opt->display, display_put_audio_frame,
+                    display_reconfigure_audio, display_ctl_property);
+        }
 
         if (s->audio_tx_mode != 0) {
                 if ((s->audio_network_device = initialize_audio_network(
@@ -1205,27 +1212,6 @@ void audio_sdi_send(struct state_audio *s, struct audio_frame *frame) {
         sdi_capture_new_incoming_frame(sdi_capture, frame);
 }
 
-void
-audio_register_aux_data(struct state_audio          *s,
-                        struct additional_audio_data data)
-{
-        s->vrxtx = data.vrxtx;
-        if (!s->playback_is_sdi) {
-                return;
-        }
-        auto *sdi_playback =
-            (struct state_sdi_playback *) audio_playback_get_state_pointer(
-                s->audio_playback_device);
-        sdi_register_display_callbacks(
-            sdi_playback, data.display_callbacks.udata,
-            (void (*)(void *,
-                      const struct audio_frame *)) data.display_callbacks.putf,
-            (bool (*)(void *, int, int,
-                      int)) data.display_callbacks.reconfigure,
-            (bool (*)(void *, int, void *,
-                      size_t *)) data.display_callbacks.get_property);
-}
-
 unsigned int
 audio_get_display_flags(const char *playback_dev)
 {
diff --git a/src/audio/audio.h b/src/audio/audio.h
@@ -62,19 +62,21 @@
 struct state_audio;
 
 struct audio_options {
-        const char *host;
-        int         recv_port;
-        int         send_port;
-        const char *recv_cfg;
-        const char *send_cfg;
-        const char *proto;
-        const char *proto_cfg;
-        const char *fec_cfg;
-        char       *channel_map;
-        const char *scale;
-        bool        echo_cancellation;
-        const char *codec_cfg;
-        const char *filter_cfg;
+        const char        *host;
+        int                recv_port;
+        int                send_port;
+        const char        *recv_cfg;
+        const char        *send_cfg;
+        const char        *proto;
+        const char        *proto_cfg;
+        const char        *fec_cfg;
+        char              *channel_map;
+        const char        *scale;
+        bool               echo_cancellation;
+        const char        *codec_cfg;
+        const char        *filter_cfg;
+        struct video_rxtx *vrxtx;
+        struct display    *display;
 };
 
 #define AUDIO_OPTIONS_INIT \
@@ -92,6 +94,8 @@ struct audio_options {
                 .echo_cancellation = false, \
                 .codec_cfg         = "PCM", \
                 .filter_cfg        = "", \
+                .vrxtx             = nullptr, \
+                .display           = nullptr, \
         }
 
 #ifdef __cplusplus
@@ -110,20 +114,6 @@ void audio_sdi_send(struct state_audio *s, struct audio_frame *frame);
 struct audio_frame * sdi_get_frame(void *state);
 void sdi_put_frame(void *state, struct audio_frame *frame);
 
-struct display;
-struct video_rxtx;
-struct additional_audio_data {
-        struct {
-                void *udata;
-                void (*putf)(struct display *, const struct audio_frame *);
-                bool (*reconfigure)(struct display *, int, int, int);
-                bool (*get_property)(struct display *, int, void *, size_t *);
-        } display_callbacks;
-        struct video_rxtx *vrxtx;
-};
-void audio_register_aux_data(struct state_audio          *s,
-                             struct additional_audio_data data);
-
 struct audio_frame * audio_get_frame(struct state_audio *s);
 
 unsigned int audio_get_display_flags(const char *playback_dev);
diff --git a/src/audio/audio_playback.h b/src/audio/audio_playback.h
@@ -136,7 +136,6 @@ bool audio_playback_reconfigure(struct state_audio_playback *state,
                                 int quant_samples, int channels,
                                 int sample_rate);
 void                            audio_playback_put_frame(struct state_audio_playback *state, const struct audio_frame *frame);
-void                            audio_playback_finish(struct state_audio_playback *state);
 void                            audio_playback_done(struct state_audio_playback *state);
 
 /**
diff --git a/src/audio/playback/sdi.c b/src/audio/playback/sdi.c
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2011-2023 CESNET z.s.p.o.
+ * Copyright (c) 2011-2026 CESNET zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,11 +50,11 @@
 #include "video_display.h"
 
 struct state_sdi_playback {
-        void *udata;
-        void (*put_callback)(void *, const struct audio_frame *);
-        bool (*reconfigure_callback)(void *state, int quant_samples,
+        struct display *display;
+        void (*put_callback)(struct display *, const struct audio_frame *);
+        bool (*reconfigure_callback)(struct display *state, int quant_samples,
                                      int channels, int sample_rate);
-        bool (*get_property_callback)(void *, int, void *, size_t *);
+        bool (*get_property_callback)(struct display *, int, void *, size_t *);
 };
 
 static void audio_play_sdi_probe_common(struct device_info **available_devices, int *count, 
@@ -113,16 +113,16 @@ audio_play_sdi_init(const struct audio_playback_opts *opts)
 }
 
 void
-sdi_register_display_callbacks(void *state, void *udata,
-                               void (*putf)(void *, const struct audio_frame *),
-                               bool (*reconfigure)(void *, int, int, int),
-                               bool (*get_property)(void *, int, void *,
-                                                   size_t *))
+sdi_register_display_callbacks(
+    void *state, struct display *display,
+    void (*putf)(struct display *, const struct audio_frame *),
+    bool (*reconfigure)(struct display *, int, int, int),
+    bool (*get_property)(struct display *, int, void *, size_t *))
 {
-        struct state_sdi_playback *s = (struct state_sdi_playback *) state;
-        
-        s->udata = udata;
-        s->put_callback = putf;
+        struct state_sdi_playback *s = state;
+
+        s->display               = display;
+        s->put_callback          = putf;
         s->reconfigure_callback = reconfigure;
         s->get_property_callback = get_property;
 }
@@ -133,24 +133,23 @@ static void audio_play_sdi_put_frame(void *state, const struct audio_frame *fram
         s = (struct state_sdi_playback *) state;
 
         if(s->put_callback)
-                s->put_callback(s->udata, frame);
+                s->put_callback(s->display, frame);
 }
 
 static bool audio_play_sdi_query_format(struct state_sdi_playback *s, void *data, size_t *len)
 {
-        if (s->get_property_callback(s->udata, DISPLAY_PROPERTY_AUDIO_FORMAT, data, len)) {
+        if (s->get_property_callback(s->display, DISPLAY_PROPERTY_AUDIO_FORMAT, data, len)) {
                 return true;
-        } else {
-                log_msg(LOG_LEVEL_WARNING, "Cannot get audio format from playback card!\n");
-		struct audio_desc desc = {2, 48000, 2, AC_PCM};
-		if (*len >= sizeof desc) {
-			memcpy(data, &desc, sizeof desc);
-			*len = sizeof desc;
-                        return true;
-                } else {
-                        return false;
-                }
         }
+        log_msg(LOG_LEVEL_WARNING,
+                "Cannot get audio format from playback card!\n");
+        struct audio_desc desc = { 2, 48000, 2, AC_PCM };
+        if (*len < sizeof desc) {
+                return false;
+        }
+        memcpy(data, &desc, sizeof desc);
+        *len = sizeof desc;
+        return true;
 }
 
 static bool audio_play_sdi_ctl(void *state, int request, void *data, size_t *len)
@@ -169,7 +168,7 @@ static bool audio_play_sdi_reconfigure(void *state, struct audio_desc desc)
         struct state_sdi_playback *s = state;
 
         if(s->reconfigure_callback) {
-                return s->reconfigure_callback(s->udata, desc.bps * 8,
+                return s->reconfigure_callback(s->display, desc.bps * 8,
                                 desc.ch_count, desc.sample_rate);
         }
         return false;
diff --git a/src/audio/playback/sdi.h b/src/audio/playback/sdi.h
@@ -3,7 +3,7 @@
  * @author Martin Pulec     <martin.pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2012-2023 CESNET, z. s. p. o.
+ * Copyright (c) 2012-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,11 +44,13 @@ extern "C" {
  #endif
 
 struct audio_frame;
+struct display;
 
- void sdi_register_display_callbacks(
-     void *state, void *udata, void (*putf)(void *, const struct audio_frame *),
-     bool (*reconfigure)(void *, int, int, int),
-     bool (*get_property)(void *, int, void *, size_t *));
+void sdi_register_display_callbacks(
+    void *state, struct display *display,
+    void (*putf)(struct display *, const struct audio_frame *),
+    bool (*reconfigure)(struct display *, int, int, int),
+    bool (*get_property)(struct display *, int, void *, size_t *));
 
 #ifdef __cplusplus
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -1422,12 +1422,6 @@ int main(int argc, char *argv[])
                 }
         }
 
-        ret = audio_init(&uv.audio, &opt.audio, &opt.common);
-        if (ret != 0) {
-                exit_uv(ret < 0 ? EXIT_FAIL_AUDIO : 0);
-                goto cleanup;
-        }
-
         display_flags |= audio_get_display_flags(opt.audio.recv_cfg);
 
         // Display initialization should be prior to modules that may use graphic card (eg. GLSL) in order
@@ -1494,6 +1488,14 @@ int main(int argc, char *argv[])
                         }
                 }
 
+                opt.audio.vrxtx = uv.state_video_rxtx;
+                opt.audio.display = uv.display_device;
+                ret = audio_init(&uv.audio, &opt.audio, &opt.common);
+                if (ret != 0) {
+                        exit_uv(ret < 0 ? EXIT_FAIL_AUDIO : 0);
+                        goto cleanup;
+                }
+
                 if ((opt.video.rxtx_mode & MODE_RECEIVER) != 0U) {
                         if (!uv.state_video_rxtx->supports_receiving()) {
                                 fprintf(stderr, "Selected RX/TX mode doesn't support receiving.\n");
@@ -1520,13 +1522,6 @@ int main(int argc, char *argv[])
                         }
                 }
 
-                struct additional_audio_data aux = {
-                        { uv.display_device, display_put_audio_frame,
-                         display_reconfigure_audio, display_ctl_property },
-                        uv.state_video_rxtx,
-                };
-                audio_register_aux_data(uv.audio, aux);
-
                 if (opt.requested_capabilities != nullptr) {
                         print_capabilities(opt.requested_capabilities);
                         exit_uv(EXIT_SUCCESS);
diff --git a/src/video_capture/ug_input.cpp b/src/video_capture/ug_input.cpp
@@ -192,21 +192,14 @@ static int vidcap_ug_input_init(const struct vidcap_params *cap_params, void **s
                 opt.send_port            = 0;
                 opt.recv_cfg             = "embedded";
                 opt.proto                = "ultragrid_rtp";
+                opt.display              = s->display;
+                opt.vrxtx                = s->video_rxtx.get();
 
                 if (audio_init(&s->audio, &opt, &s->common) != 0) {
                         delete s;
                         return VIDCAP_INIT_FAIL;
                 }
 
-                struct additional_audio_data aux_aud_data = {
-                        { s->display, display_put_audio_frame,
-                         display_reconfigure_audio, display_ctl_property
-
-                        },
-                        s->video_rxtx.get()
-                };
-                audio_register_aux_data(s->audio, aux_aud_data);
-
                 audio_start(s->audio);
         }
         s->t0 = steady_clock::now();
