dvs,blue: compilation fixes

+ IWYU

Author: MartinPulec

src/video_capture/bluefish444.cpp

@@ -35,20 +35,29 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>                 // for assert
+#include <cstdint>                 // for uint32_t
+#include <cstdio>                  // for NULL, printf, snprintf
+#include <cstdlib>                 // for atoi, free, calloc
+#include <cstring>                 // for strlen, memset, strcmp, strdup
 #include <iomanip>
 #include <iostream>
+#include <pthread.h>               // for pthread_cond_signal, pthread_mutex...
 #include <queue>
 
 #include "bluefish444_common.h"
 
 #include "audio/types.h"
 #include "audio/utils.h"
+#include "compat/strings.h"         // for strcasecmp, strncasecmp
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
 #include "tv.h"
+#include "types.h"                 // for video_frame, tile, video_desc, dev...
 #include "video.h"
 #include "video_capture.h"
+#include "video_capture_params.h"  // for vidcap_params_get_fmt, vidcap_para...
 
 #ifndef UINT
 #define UINT uint32_t

src/video_capture/dvs.c

@@ -49,12 +49,16 @@
  *
  */
 
+#include <errno.h>                 // for ETIMEDOUT
+#include <ctype.h>                 // for isdigit
+#include <pthread.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
-
+#include <string.h>                // for strtok, strchr, strncmp, memset
+#include <time.h>                  // for timespec
+#include <sys/time.h>              // for timeval, gettimeofday
 
 #include "host.h"
 #include "audio/types.h"
@@ -63,11 +67,13 @@
 #include "lib_common.h"
 #include "video.h"
 #include "video_capture.h"
+#include "video_capture_params.h"  // for vidcap_params_get_fmt, vidcap_para...
 #include "video_display.h"
 #include "video_display/dvs.h"
 #include "tv.h"
 #include "types.h"
 #include "dvs_clib.h"           /* From the DVS SDK */
+#include "dvs_errors.h"            // for SV_OK
 #include "dvs_fifo.h"           /* From the DVS SDK */
 
 struct vidcap_dvs_state {
@@ -411,7 +417,7 @@ static int vidcap_dvs_init(const struct vidcap_params *params, void **state)
                 }
                 s->hd_video_mode |= val;
                 if (s->mode == NULL) {
-                        log_msg(LOG_LEVEL_ERROR, "[DVS] Mode detected, however unknown. Report to " PACKAGE_BUGREPORT ".\n");
+                        bug_msg(LOG_LEVEL_ERROR, "[DVS] Mode detected, however unknown. ");
                         goto error_detect;
                 }
                 printf("[DVS] Autodetected video mode: %dx%d @ %2.2fFPS.\n", s->mode->width, s->mode->height, s->mode->fps);
@@ -667,7 +673,7 @@ static void vidcap_dvs_probe(struct device_info **available_cards, int *count, v
                 snprintf(cards[card_idx].name, sizeof cards[card_idx].name,
                                 "DVS card #%d", card_idx);
                 snprintf(cards[card_idx].extra, sizeof cards[card_idx].extra,
-                                "\"embeddedAudioAvailable\":\"t\"", card_idx);
+                                "\"embeddedAudioAvailable\":\"t\"");
 
                 sv_close(sv);
                 card_idx++;

src/video_display/bluefish444.cpp

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2013-2025 CESNET
+ * Copyright (c) 2013-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,24 +46,30 @@
 
 #include "video_display.h"
 
+#include <algorithm>             // for max
 #include <cassert>
+#include <cmath>                 // for fabs
 #include <cstdint>
+#include <cstdlib>               // for abort, atoi, calloc
 #include <cstdio>
+#include <cstring>               // for memcpy, memset, strlen, strcmp
 #include <iomanip>
 #include <iostream>
+#include <pthread.h>             // for pthread_mutex_lock, pthread_mutex_un...
 #include <queue>
 #include <sstream>
 #include <stdexcept>
-#include <string>
 #include <vector>
 
 #include "bluefish444_common.h"
 
 #include "audio/types.h"
+#include "compat/strings.h"      // for strncasecmp
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
 #include "tv.h"
+#include "types.h"               // for video_desc, device_info, tile, inter...
 #include "utils/ring_buffer.h"
 #include "video.h"
 #include "video_display.h"

src/video_display/dvs.c

@@ -9,7 +9,7 @@
  *          Ian Wesley-Smith <iwsmith@cct.lsu.edu>
  *          Colin Perkins    <csp@isi.edu>
  *
- * Copyright (c) 2005-2023 CESNET z.s.p.o.
+ * Copyright (c) 2005-2026 CESNET, zájmové sdružené právnických osob
  * Copyright (c) 2001-2003 University of Southern California
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,9 +49,11 @@
  *
  */
 
-#include <stdbool.h>
-
 #include <assert.h>
+#include <math.h>               // for fabs
+#include <pthread.h>            // for pthread_mutex_unlock, pthread_cond_init
+#include <stdbool.h>            // for false, true, bool
+#include <stdint.h>             // for int32_t, uint32_t
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -67,9 +69,11 @@
 #include "video_display.h"
 #include "video_display/dvs.h"
 #include "tv.h"
+#include "types.h"              // for video_desc, tile, device_info, video_...
 #include "utils/ring_buffer.h"
 
 #include "dvs_clib.h"           /* From the DVS SDK */
+#include "dvs_errors.h"         // for SV_OK
 #include "dvs_fifo.h"           /* From the DVS SDK */
 
 #define HDSP_MAGIC	0x12345678
@@ -331,7 +335,6 @@ volatile int worker_waiting;
         int                     frames;
         struct timeval          t, t0;
 
-        pthread_t thread_id;
         bool should_exit;
 };
 
@@ -805,7 +808,7 @@ static void *display_dvs_init(struct module *parent, const char *cfg, unsigned i
 
         free(name);
 
-        pthread_create(&s->thread_id, NULL, display_aggregate_run, s);
+        pthread_create(&s->thread_id, NULL, display_dvs_run, s);
         return (void *)s;
 
 error:
@@ -887,7 +890,7 @@ static void display_dvs_put_audio_frame(void *state, const struct audio_frame *f
         ring_buffer_write(s->audio_ring_buffer, frame->data, frame->data_len);
 }
 
-static int display_dvs_reconfigure_audio(void *state, int quant_samples, int channels,
+static bool display_dvs_reconfigure_audio(void *state, int quant_samples, int channels,
                 int sample_rate) {
         bool ret;
         struct state_hdsp *s = (struct state_hdsp *)state;

src/video_display/sage.cpp

@@ -8,7 +8,7 @@
  *          Dalibor Matura   <255899@mail.muni.cz>
  *          Ian Wesley-Smith <iwsmith@cct.lsu.edu>
  *
- * Copyright (c) 2005-2023 CESNET z.s.p.o.
+ * Copyright (c) 2005-2026 CESNET, zájmové sdružení právnických osob
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, is permitted provided that the following conditions
@@ -46,9 +46,17 @@
  *
  */
 
+#include <cstdint>          // for uint32_t
+#include <cstdio>           // for printf, fprintf, stderr, perror
+#include <cstdlib>          // for free, calloc, abort
+#include <cstring>          // for NULL, strlen, memcpy, strcmp, strncmp
+#include <sys/stat.h>       // for stat
+
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
+#include "types.h"          // for tile, video_desc, device_info, DXT1, codec_t
+#include "video_frame.h"    // for vf_alloc, vf_free, vf_get_tile
 #include "video.h"
 #include "video_display.h"
 
@@ -101,8 +109,6 @@ struct state_sage {
         volatile bool           should_exit;
         bool                    is_tx;
         bool                    deinterlace;
-
-        pthread_t               thread_id;
 };
 
 /** Prototyping */
@@ -111,7 +117,7 @@ static int display_sage_handle_events(void)
         return 0;
 }
 
-static void display_sage_run(void *arg)
+static void *display_sage_run(void *arg)
 {
         struct state_sage *s = (struct state_sage *)arg;
         s->magic = MAGIC_SAGE;
@@ -160,6 +166,7 @@ static void display_sage_run(void *arg)
                         s->frames = 0;
                 }
         }
+        return nullptr;
 }
 
 static void *display_sage_init(struct module *parent, const char *fmt, unsigned int flags)