delta_board_type_is_dv: distinguish mixed IF

For the deltacast (SDI) probe also mixed interfaces were skipped which
shouldn't be.

Author: MartinPulec

src/deltacast_common.cpp

@@ -1039,18 +1039,18 @@ delta_print_slot_stats(HANDLE StreamHandle, ULONG *SlotsDroppedLast,
 }
 
 bool
-delta_board_type_is_dv(ULONG BoardIndex)
+delta_board_type_is_dv(ULONG BoardIndex, [[maybe_unused]] bool include_mixed)
 {
         const ULONG BoardType = get_board_type(BoardIndex);
         return BoardType == VHD_BOARDTYPE_DVI ||
                BoardType == VHD_BOARDTYPE_HDMI ||
 #if defined VHD_MIN_6_00
                BoardType == VHD_BOARDTYPE_HDMI20 ||
-               BoardType == VHD_BOARDTYPE_FLEX_DP ||
-               BoardType == VHD_BOARDTYPE_FLEX_HMI ||
+               (include_mixed && BoardType == VHD_BOARDTYPE_FLEX_DP) ||
+               (include_mixed && BoardType == VHD_BOARDTYPE_FLEX_HMI) ||
 #endif
 #if defined VHD_MIN_6_21
-               BoardType == VHD_BOARDTYPE_MIXEDINTERFACE ||
+               (include_mixed && BoardType == VHD_BOARDTYPE_MIXEDINTERFACE) ||
 #endif
                false;
 }

src/deltacast_common.hpp

@@ -205,7 +205,7 @@ 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        delta_board_type_is_dv(ULONG BoardIndex, bool include_mixed);
 const char *delta_get_model_name(ULONG BoardIndex);
 
 #ifdef HAVE_VHD_STRING

src/video_capture/deltacast.cpp

@@ -150,7 +150,7 @@ 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)) { // skip DVI/HDMI boards
+                if (delta_board_type_is_dv(i, false)) { // skip DVI/HDMI-only boards
                         continue;
                 }
                 auto &card = (*available_cards)[*count];
@@ -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)) {
+                if (delta_board_type_is_dv(BrdId, false)) {
                         MSG(NOTICE, "Use 'deltacast-dv' capture device\n");
                 }
                 HANDLE_ERROR

src/video_capture/deltacast_dvi.cpp

@@ -243,7 +243,7 @@ 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)) { // skip SDI baords
+                if (!delta_board_type_is_dv(i, true)) { // skip SDI baords
                         continue;
                 }
                 auto &card = (*available_cards)[*count];

src/video_display/deltacast.cpp

@@ -312,7 +312,7 @@ 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)) { // skip DVI/HDMI boards
+                if (delta_board_type_is_dv(i, false)) { // skip DVI/HDMI-only boards
                         continue;
                 }
                 *count += 1;