delta_board_type_is_dv changes

- delta_board_type_is_dv takes the VHD_BOARD_TYPE now
- to acquire the type from board index, delta_get_board_type() is now
externally linked
- delta_board_type_is_dv: handle types with switch (compiler warns about
unhandled enum values)
- changed compat macros a bit (works at least for VHD 5.19, 6.{19,20,21,30,32})

Author: MartinPulec

src/deltacast_common.cpp

@@ -58,8 +58,8 @@
 
 #define MOD_NAME "[DELTACAST] "
 
-static VHD_BOARDTYPE
-get_board_type(ULONG BoardIndex)
+VHD_BOARDTYPE
+delta_get_board_type(ULONG BoardIndex)
 {
         HANDLE BoardHandle = nullptr;
         ULONG  BoardType     = 0U;
@@ -87,7 +87,7 @@ delta_get_model_name(ULONG BoardIndex)
         thread_local char buf[128];
 #if !defined VHD_MIN_6_00
 #define VHD_GetBoardModel(BoardIndex) \
-        delta_get_board_type_name(get_board_type(BoardIndex))
+        delta_get_board_type_name(delta_get_board_type(BoardIndex))
 #endif
         snprintf_ch(buf, "%s #%" PRIu_ULONG,
                     VHD_GetBoardModel(BoardIndex),
@@ -1039,18 +1039,30 @@ delta_print_slot_stats(HANDLE StreamHandle, ULONG *SlotsDroppedLast,
 }
 
 bool
-delta_board_type_is_dv(ULONG BoardIndex, [[maybe_unused]] bool include_mixed)
+delta_board_type_is_dv(VHD_BOARDTYPE         BoardType,
+                       [[maybe_unused]] bool include_mixed)
 {
-        const ULONG BoardType = get_board_type(BoardIndex);
-        return BoardType == VHD_BOARDTYPE_DVI ||
-               BoardType == VHD_BOARDTYPE_HDMI ||
+        switch (BoardType) {
+        case VHD_BOARDTYPE_HD: return false;
+        case VHD_BOARDTYPE_HDKEY: return false;
+        case VHD_BOARDTYPE_SD: return false;
+        case VHD_BOARDTYPE_SDKEY: return false;
+        case VHD_BOARDTYPE_DVI: return true;
+        case VHD_BOARDTYPE_CODEC: return include_mixed; // _MIXEDINTERFACE
+        case VHD_BOARDTYPE_3G: return false;
+        case VHD_BOARDTYPE_3GKEY: return false;
+        case VHD_BOARDTYPE_HDMI: return true;
+        case VHD_BOARDTYPE_FLEX: return include_mixed;
+        case VHD_BOARDTYPE_ASI: return false;
 #if defined VHD_MIN_6_00
-               BoardType == VHD_BOARDTYPE_HDMI20 ||
-               (include_mixed && BoardType == VHD_BOARDTYPE_FLEX_DP) ||
-               (include_mixed && BoardType == VHD_BOARDTYPE_FLEX_HMI) ||
+        case VHD_BOARDTYPE_IP: return false;
+        case VHD_BOARDTYPE_HDMI20: return true;
+        case VHD_BOARDTYPE_FLEX_DP: return include_mixed;
+        case VHD_BOARDTYPE_FLEX_SDI: return false;
+        case VHD_BOARDTYPE_12G: return false;
+        case VHD_BOARDTYPE_FLEX_HMI: return include_mixed;
 #endif
-#if defined VHD_MIN_6_21
-               (include_mixed && BoardType == VHD_BOARDTYPE_MIXEDINTERFACE) ||
-#endif
-               false;
+        case NB_VHD_BOARDTYPES: return false;
+        }
+        return false;
 }

src/deltacast_common.hpp

@@ -157,7 +157,9 @@
         #define VHD_CHNTYPE_12GSDI_ASI VHD_CHNTYPE_DISABLE
 #endif // not defined VHD_MIN_6_20
 
-#if !defined VHD_MIN_6_00
+#if defined VHD_MIN_6_00
+        #define VHD_BOARDTYPE_FLEX VHD_BOARDTYPE_FLEX_DEPRECATED
+#else
         #define VHD_CHNTYPE_12GSDI VHD_CHNTYPE_DISABLE
 #endif
 
@@ -205,8 +207,9 @@ const char *delta_get_board_type_name(ULONG BoardType);
 bool        delta_chn_type_is_sdi(ULONG ChnType);
 void        delta_print_slot_stats(HANDLE StreamHandle, ULONG *SlotsDroppedLast,
                                    const char *action);
-bool        delta_board_type_is_dv(ULONG BoardIndex, bool include_mixed);
-const char *delta_get_model_name(ULONG BoardIndex);
+VHD_BOARDTYPE delta_get_board_type(ULONG BoardIndex);
+bool          delta_board_type_is_dv(VHD_BOARDTYPE BoardType, bool include_mixed);
+const char   *delta_get_model_name(ULONG BoardIndex);
 
 #ifdef HAVE_VHD_STRING
         #define DELTA_PRINT_ERROR(error_code, error_message, ...) \

src/video_capture/deltacast.cpp

@@ -150,8 +150,8 @@ static void vidcap_deltacast_probe(device_info **available_cards, int *count, vo
         *available_cards =
             (struct device_info *) calloc(NbBoards, sizeof(struct device_info));
         for (ULONG i = 0; i < NbBoards; ++i) {
-                if (delta_board_type_is_dv(i, false)) { // skip DVI/HDMI-only boards
-                        continue;
+                if (delta_board_type_is_dv(delta_get_board_type(i), false)) {
+                        continue; // skip DVI/HDMI-only boards
                 }
                 auto &card = (*available_cards)[*count];
                 snprintf_ch(card.dev, ":device=%" PRIu_ULONG, i);
@@ -516,7 +516,7 @@ vidcap_deltacast_init(struct vidcap_params *params, void **state)
         VHD_GetBoardProperty(s->BoardHandle, Property, &ChnType);
         if (!delta_chn_type_is_sdi(ChnType)) {
                 MSG(ERROR, "ERROR : The selected channel is not a SDI one\n");
-                if (delta_board_type_is_dv(BrdId, false)) {
+                if (!delta_board_type_is_dv(delta_get_board_type(BrdId), false)) {
                         MSG(NOTICE, "Use 'deltacast-dv' capture device\n");
                 }
                 HANDLE_ERROR

src/video_capture/deltacast_dvi.cpp

@@ -243,8 +243,8 @@ static void vidcap_deltacast_dvi_probe(device_info **available_cards, int *count
 
         *available_cards = (struct device_info *) calloc(NbBoards, sizeof(struct device_info));
         for (ULONG i = 0; i < NbBoards; ++i) {
-                if (!delta_board_type_is_dv(i, true)) { // skip SDI baords
-                        continue;
+                if (!delta_board_type_is_dv(delta_get_board_type(i), true)) {
+                        continue; // skip SDI-only boards
                 }
                 auto &card = (*available_cards)[*count];
                 snprintf(card.dev, sizeof card.dev, ":device=%" PRIu_ULONG, i);

src/video_display/deltacast.cpp

@@ -312,8 +312,8 @@ static void display_deltacast_probe(struct device_info **available_cards, int *c
         /* Query DELTA boards information */
         for (ULONG i = 0; i < NbBoards; i++)
         {
-                if (delta_board_type_is_dv(i, false)) { // skip DVI/HDMI-only boards
-                        continue;
+                if (delta_board_type_is_dv(delta_get_board_type(i), false)) {
+                        continue; // skip DVI/HDMI-only boards
                 }
                 *count += 1;
                 *available_cards = (struct device_info *)