Merge branch 'CESNET:master' into master

Author: armelvil

.github/scripts/environment.sh

@@ -105,10 +105,6 @@ case "$RUNNER_OS" in
 --enable-libbacktrace \
 --enable-syphon \
 "
-                macos_major=$(sw_vers -productVersion | cut -d. -f1)
-                if [ "$macos_major" -ge 15 ]; then
-                        FEATURES="$FEATURES --disable-screen"
-                fi
                 ;;
         Windows)
                 FEATURES="$FEATURES $CUDA_FEATURES --enable-dshow --enable-spout --enable-wasapi"

.github/workflows/arm-build.yml

@@ -41,7 +41,9 @@ jobs:
     - name: Fetch SDKs ETags
       id: etags
       run: |
-        echo "ndi=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://downloads.ndi.tv/SDK/NDI_SDK_Linux/Install_NDI_SDK_v5_Linux.tar.gz)" >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ndi\
+         https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
+        Install_NDI_SDK_v6_Linux.tar.gz >> $GITHUB_OUTPUT
     - name: Run actions/cache for NDI
       id: cache-ndi
       uses: actions/cache@main
@@ -51,7 +53,7 @@ jobs:
     - name: Download NDI
       if: steps.cache-ndi.outputs.cache-hit != 'true'
       run: "curl -Lf https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
-       Install_NDI_SDK_v5_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz"
+       Install_NDI_SDK_v6_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz"
 
     - name: Run actions/cache for ARM Chroot
       id: cache-bootstrap

configure.ac

@@ -155,8 +155,9 @@ fi
 
 if test $system = MacOSX; then
         MACOS_LEGACY=no
-        os_version_major=`uname -r |cut -d . -f 1`
-        if test $os_version_major -lt 19; then # Darwin 19.0.0 is macOS 10.15
+        macos_major=$(sw_vers -productVersion | cut -d. -f1)
+        macos_minor=$(sw_vers -productVersion | cut -d. -f2)
+        if test ${macos_major?} -eq 10 && test ${macos_minor?} -lt 15; then
                 MACOS_LEGACY=yes
         fi
 	CFLAGS="$CFLAGS $COMMON_OSX_FLAGS"
@@ -447,7 +448,8 @@ AC_ARG_VAR([AJA_DIRECTORY], [Directory to AJA NTV2 SDK.])
 AC_ARG_VAR([BLUE_LATEST_SDK], [Placement of Bluefish444 SDK.])
 AC_ARG_VAR([CINEFORM_DIRECTORY], [Directory to Cineform SDK.])
 AC_ARG_VAR([CUDA_FLAGS], [Flags to be passed to CUDA compiler, eg. -arch=native; alterntatively CUDAFLAGS])
-AC_ARG_VAR([CUDA_PATH], [Directory of your Nvidia toolkit instalation.])
+AC_ARG_VAR([CUDA_PATH], [Directory of your Nvidia toolkit instalation.]dnl
+ [Alternative: CUDACXX (path to nvcc executable)])
 AC_ARG_VAR([DELTACAST_DIRECTORY], [Placement of VideoMasterHD directory (Deltacast).])
 AC_ARG_VAR([DVS_DIRECTORY], [Path to DVS installation.])
 AC_ARG_VAR([GENICAM_GENTL64_PATH], [XIMEA SDK library path])
@@ -520,7 +522,7 @@ if test $cuda_req != no; then
         # nvcc is intentional here
         AC_PATH_PROG(NVCC, nvcc, [], [$CUDA_PATH_SEP$PATH]dnl
                 [$PATH_SEPARATOR/opt/cuda/bin$PATH_SEPARATOR/usr/local/cuda/bin])
-        if -z "$NVCC" && -e "$CUDACXX"; then
+        if test -z "$NVCC" && test -x "$CUDACXX"; then
                 NVCC=$CUDACXX
         fi
 fi
@@ -2210,23 +2212,43 @@ sc_details=
 
 AC_ARG_ENABLE(screen,
 [  --disable-screen        disable screen capture (default is auto)]
-[  --enable-screen@<:@=x11,pipewire@:>@  @<:@Linux only@:>@ choose implementation (can be both)]
-[                          Requires: none (OSX) x11 or pipewire (Linux) dshow (Win)],
+AS_HELP_STRING([--enable-screen@<:@=x11,pipewire,cg@:>@],
+[choose implementation (Linux: can be both x11 and pipewire; macOS: cg]
+[ - use Core Graphics implementation instead of AV Foundation).]
+[Requires: macOS<15 (cg), AVF (macOS otherwise); X11 or PipeWire (Linux); DShow (Win)]),
     [screen_cap_req=$enableval],
     [screen_cap_req=$build_default]
     )
 
-case "$system" in
-	MacOSX)
-                if test "$os_version_major" -lt 24; then # Darwin 24.0.0 is macOS 15
-                        screen_cap=yes
+if test "${system?}" = Linux && test "${screen_cap_req?}" = yes; then
+        screen_cap_req=pipewire,x11
+fi
+
+if test "${system?}" = Windows && test "${screen_cap_req?}" != no; then
+        SCREEN_CAP_OBJ="src/video_capture/screen_win.o"
+        DLL_LIBS="${DLL_LIBS:+$DLL_LIBS }${srcdir}/data/screen-capture-recorder-x64.dll"
+        screen_cap=$dshow
+fi
+
+if test "${system?}" = MacOSX && test "${screen_cap_req?}" != no; then
+        if test "${avfoundation?}" = no || test "${screen_cap_req?}" = cg; then
+                if test "${macos_major?}" -ge 15; then
+                        AC_MSG_WARN([Core Graphics screen capture]dnl
+ [unsupported since macOS 15!])
+                else
+                        SCREEN_CAP_OBJ="src/video_capture/screen_osx.o"
                         SCREEN_CAP_LIB="-framework CoreFoundation"
+                        screen_modules="Core Graphics"
+                        screen_cap=yes
                 fi
-	;;
-        Windows)
-                screen_cap=$dshow
-        ;;
-esac
+        else
+                if test "${avfoundation?}" = yes; then
+                        SCREEN_CAP_OBJ="src/video_capture/screen_avf.o"
+                        screen_modules="AV Foundation"
+                        screen_cap=yes
+                fi
+        fi
+fi
 
 # X11
 screen_cap_x11=no
@@ -2260,7 +2282,8 @@ fi
 # PipeWire
 found_screen_screen_pw_deps=no
 screen_cap_pw=no
-if test $screen_cap_req != no && test $screen_cap_req != x11; then
+if test ${system?} = Linux && test ${screen_cap_req?} != no &&
+                test ${screen_cap_req} != x11; then
         PKG_CHECK_MODULES([SCREEN_PW_DEPS], [glib-2.0 gobject-2.0 gio-unix-2.0 ], [found_screen_screen_pw_deps=yes], [found_screen_screen_pw_deps=no])
 fi
 
@@ -2283,23 +2306,22 @@ fi
 
 if test $screen_cap_req != no && test $screen_cap = yes
 then
-        if test $system = MacOSX; then
-                SCREEN_CAP_OBJ="src/video_capture/screen_osx.o"
-        elif test $system = Linux; then
+        if test $system = Linux; then
                 SCREEN_CAP_OBJ="src/video_capture/screen_linux.o"
-        else
-                SCREEN_CAP_OBJ="src/video_capture/screen_win.o"
-                DLL_LIBS="${DLL_LIBS:+$DLL_LIBS }${srcdir}/data/screen-capture-recorder-x64.dll"
         fi
         add_module vidcap_screen "$SCREEN_CAP_OBJ" "$SCREEN_CAP_LIB"
 else
         screen_cap=no
 fi
 
-if { test $screen_cap_req = yes && { test $screen_cap = no || { test $system = Linux && { test $screen_cap_x11 = no || test $screen_cap_pw = no; }; }; }; } \
-        || { test $screen_cap_req = x11 && test $screen_cap_x11 = no; } || { test $screen_cap_req = pipewire && test $screen_cap_pw = no; }
-then
-        AC_MSG_ERROR([Screen capture not found]);
+ENSURE_FEATURE_PRESENT([$screen_cap_req], [$screen_cap], [Screen capture not found])
+
+if { expr "x${screen_cap_req?}" : "x.*x11" >/dev/null &&
+        test "${screen_cap_x11?}" = no; } ||
+   { expr "x${screen_cap_req?}" : "x.*pipewire" >/dev/null &&
+        test "${screen_cap_pw?}" = no; }; then
+        AC_MSG_ERROR([Desired screen capture implementation not found!]
+ [Wanted: ${screen_cap_req?}])
 fi
 
 if test -n "$screen_modules"; then
@@ -3255,7 +3277,8 @@ ENSURE_FEATURE_PRESENT([$cmpto_j2k_req], [$cmpto_j2k], [Comprimato J2K not found
 # ------------------------------------------------------------------------------
 ndi=no
 AC_ARG_ENABLE(ndi,
-      AS_HELP_STRING([--enable-ndi@<:@=ver@:>@], [enables NDI support (default is auto)]),
+      AS_HELP_STRING([--enable-ndi@<:@=ver@:>@], [enables NDI support (default is auto).]
+[Set ver to 5 if using NDI 5.]),
     [ndi_req=$enableval],
     [ndi_req=$build_default]
     )

src/audio/audio.cpp

@@ -9,7 +9,7 @@
  *          Martin Pulec     <martin.pulec@cesnet.cz>
  *          Ian Wesley-Smith <iwsmith@cct.lsu.edu>
  *
- * Copyright (c) 2005-2025 CESNET
+ * 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
@@ -77,6 +77,7 @@
 #include "config.h"                     // for HAVE_SPEEXDSP
 #include "debug.h"
 #include "host.h"
+#include "messaging.h"                  // for check_message...
 #include "module.h"
 #include "pdb.h"
 #include "rtp/audio_decoders.h"
@@ -90,6 +91,7 @@
 #include "ug_runtime_error.hpp"
 #include "utils/color_out.h"
 #include "utils/net.h"
+#include "utils/macros.h"               // for STR_LEN, snprintf_ch
 #include "utils/misc.h"                 // for get_stat_color
 #include "utils/sdp.h"
 #include "utils/string_view_utils.hpp"

src/audio/capture/fluidsynth.c

@@ -47,6 +47,7 @@
 #include "audio/audio_capture.h"  // for AUDIO_CAPTURE_ABI_VERSION, audio_ca...
 #include "audio/types.h"          // for audio_frame
 #include "audio/utils.h"          // for mux_channel
+#include "compat/c23.h"           // for countof
 #include "compat/usleep.h"        // for usleep
 #include "debug.h"                // for LOG_LEVEL_ERROR, MSG, log_msg, LOG_...
 #include "host.h"                 // for audio_capture_sample_rate, INIT_NOERR
@@ -56,7 +57,7 @@
 #include "types.h"                // for device_info
 #include "utils/color_out.h"      // for color_printf, TBOLD, TRED
 #include "utils/fs.h"             // for get_install_root, get_temp_file
-#include "utils/macros.h"         // for IS_KEY_PREFIX, countof
+#include "utils/macros.h"         // for IS_KEY_PREFIX
 
 struct module;
 

src/audio/filter/delay.cpp

@@ -3,7 +3,7 @@
  * @author Martin Piatka     <piatka@cesnet.cz>
  */
 /*
- * Copyright (c) 2022 CESNET, z. s. p. o.
+ * Copyright (c) 2022-2026 CESNET, zájmové sdružení právických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 #include "audio/audio_filter.h"
 #include "audio/types.h"
 #include "lib_common.h"
+#include "messaging.h"                  // for free_message, new_response
 #include "utils/ring_buffer.h"
 #include "utils/misc.h"
 #include "utils/string_view_utils.hpp"

src/audio/filter_chain.cpp

@@ -3,7 +3,7 @@
  * @author Martin Piatka     <piatka@cesnet.cz>
  */
 /*
- * Copyright (c) 2021 CESNET, z. s. p. o.
+ * Copyright (c) 2021-2026 CESNET, zájmové sdružení právických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
 #include "debug.h"
 #include "audio/types.h"
 #include "filter_chain.hpp"
+#include "messaging.h"               // for check_message...
 #include "utils/string_view_utils.hpp"
 
 Filter_chain::Filter_chain(struct module *parent) :

src/audio/playback/alsa.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2011-2025 CESNET, zájmové sdružení právnických osob
+ * 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
@@ -68,6 +68,7 @@
 #include "tv.h"
 #include "types.h"                 // for device_info
 #include "utils/color_out.h"
+#include "utils/macros.h"          // for STR_LEN, snprintf_ch
 
 #define BUF_LEN_DEFAULT_MS      60
 #define BUF_LEN_DEFAULT_SYNC_MS 200 // default buffer len for sync API

src/audio/portaudio_common.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2018-2025 CESNET
+ * Copyright (c) 2018-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,7 @@
 #include "portaudio_common.h"
 #include "types.h"
 #include "utils/color_out.h"
+#include "utils/macros.h"     // for snprintf_ch
 
 #define MOD_NAME "[PortAudio] "
 

src/blackmagic_common.cpp

@@ -49,7 +49,7 @@
 #include <cstdlib>               // for free
 #include <cstring>               // for strlen, NULL, strdup, memcpy, size_t
 #include <iomanip>
-#include <iterator>              // for pair
+#include <iterator>              // for pair, size
 #include <map>
 #include <mutex>                 // for mutex, lock_guard, unique_lock
 #include <sstream>
@@ -66,7 +66,7 @@
 #include "tv.h"
 #include "utils/color_out.h"
 #include "utils/debug.h"         // for DEBUG_TIMER_*
-#include "utils/macros.h"        // for countof
+#include "utils/macros.h"        // for STR_LEN, snprintf_ch, IS_FCC
 #include "utils/string.h"        // for DELDEL
 #include "utils/windows.h"
 #include "utils/worker.h"
@@ -786,12 +786,12 @@ static const struct {
 #undef BMDFCC
 
 static string fcc_to_string(uint32_t fourcc) {
-        for (unsigned i = 0; i < countof(opt_name_map); ++i) {
+        for (unsigned i = 0; i < std::size(opt_name_map); ++i) {
                 if (opt_name_map[i].fourcc == fourcc) {
                         return opt_name_map[i].name;
                 }
         }
-        for (unsigned i = 0; i < countof(val_name_map); ++i) {
+        for (unsigned i = 0; i < std::size(val_name_map); ++i) {
                 if (val_name_map[i].fourcc == fourcc) {
                         return val_name_map[i].name;
                 }
@@ -936,7 +936,7 @@ bmd_opt_help()
         color_printf("\n");
 
         color_printf("List of keys:\n");
-        for (unsigned i = 0; i < countof(opt_name_map); ++i) {
+        for (unsigned i = 0; i < std::size(opt_name_map); ++i) {
                 if (opt_name_map[i].fourcc == 0) {
                         color_printf("\n%s:\n", opt_name_map[0].name);
                 } else {
@@ -952,7 +952,7 @@ bmd_opt_help()
         color_printf("\n");
         color_printf("Incomplete " TBOLD("(!)") " list of values:\n");
         color_printf("(note that the value belongs to its appropriate key)\n");
-        for (unsigned i = 0; i < countof(val_name_map); ++i) {
+        for (unsigned i = 0; i < std::size(val_name_map); ++i) {
                 uint32_t val = htonl(val_name_map[i].fourcc);
                 color_printf("- " TBOLD("%.4s") " - %s\n", (char *) &val,
                              val_name_map[i].name);
@@ -1589,7 +1589,7 @@ print_status_item(IDeckLinkStatus *deckLinkStatus, BMDDeckLinkStatusID prop,
 {
         const struct status_property *s_prop = nullptr;
 
-        for (unsigned i = 0; i < countof(status_map); ++i) {
+        for (unsigned i = 0; i < std::size(status_map); ++i) {
                 if (status_map[i].prop == prop) {
                         s_prop = &status_map[i];
                         break;
@@ -1835,7 +1835,7 @@ bmd_print_status_subscribe_notify(IDeckLink *deckLink, const char *log_prefix,
                   "Cannot obtain IID_IDeckLinkStatus from DeckLink",
                   return nullptr);
         // print status_map values now
-        for (unsigned u = 0; u < countof(status_map); ++u) {
+        for (unsigned u = 0; u < std::size(status_map); ++u) {
                 if (capture && status_map[u].playback_only) {
                         continue;
                 }