deltacast probes: filter by dev type + better name

- do not return SDI devices with deltacast_dv and vice versa
- use better names by delta_get_model_name
- vcap/deltacast: early return

Author: MartinPulec

src/deltacast_common.cpp

@@ -81,8 +81,8 @@ get_board_type(ULONG BoardIndex)
         return (VHD_BOARDTYPE) BoardType;
 }
 
-static const char *
-get_model_name(ULONG BoardIndex)
+const char *
+delta_get_model_name(ULONG BoardIndex)
 {
         thread_local char buf[128];
 #if !defined VHD_MIN_6_00
@@ -306,7 +306,7 @@ static void
 print_board_info(int BoardIndex, ULONG DllVersion, bool full)
 {
         color_printf("\tBoard " TBOLD("%d") ": " TBOLD("%s") "\n", BoardIndex,
-                     get_model_name(BoardIndex));
+                     delta_get_model_name(BoardIndex));
 
         ULONG  DriverVersion = 0U;
         HANDLE BoardHandle   = nullptr;

src/deltacast_common.hpp

@@ -202,6 +202,7 @@ 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);
+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

@@ -144,16 +144,21 @@ static void vidcap_deltacast_probe(device_info **available_cards, int *count, vo
 
         ULONG             Result,DllVersion,NbBoards;
         Result = VHD_GetApiInfo(&DllVersion,&NbBoards);
-        if (Result == VHDERR_NOERROR) {
-                *available_cards = (struct device_info *) calloc(NbBoards, sizeof(struct device_info));
-                *count = NbBoards;
-                for (ULONG i = 0; i < NbBoards; ++i) {
-                        auto& card = (*available_cards)[i];
-                        snprintf(card.dev, sizeof(card.dev), ":device=%" PRIu_ULONG, i);
-                        snprintf(card.name, sizeof(card.name), "DELTACAST SDI board %" PRIu_ULONG, i);
-                        snprintf(card.extra, sizeof(card.extra), "\"embeddedAudioAvailable\":\"t\"");
+        if (Result != VHDERR_NOERROR) {
+                return;
+        }
+        *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
+                        continue;
                 }
-	}
+                auto &card = (*available_cards)[*count];
+                snprintf_ch(card.dev, ":device=%" PRIu_ULONG, i);
+                snprintf_ch(card.name, "DELTACAST %s", delta_get_model_name(i));
+                snprintf_ch(card.extra, "\"embeddedAudioAvailable\":\"t\"");
+                *count += 1;
+        }
 }
 
 class delta_init_exception {

src/video_capture/deltacast_dvi.cpp

@@ -224,22 +224,14 @@ static void vidcap_deltacast_dvi_probe(device_info **available_cards, int *count
         }
 
         *available_cards = (struct device_info *) calloc(NbBoards, sizeof(struct device_info));
-        *count = NbBoards;
         for (ULONG i = 0; i < NbBoards; ++i) {
-                ULONG BoardType;
-                HANDLE BoardHandle = NULL;
-                Result = VHD_OpenBoardHandle(i, &BoardHandle, NULL, 0);
-                VHD_GetBoardProperty(BoardHandle, VHD_CORE_BP_BOARD_TYPE, &BoardType);
-                const char *board = "Unknown board type";
-                if (Result == VHDERR_NOERROR)
-                {
-                        board = delta_get_board_type_name(BoardType);
+                if (!delta_board_type_is_dv(i)) { // skip SDI baords
+                        continue;
                 }
-                VHD_CloseBoardHandle(BoardHandle);
-
-                auto& card = (*available_cards)[i];
+                auto &card = (*available_cards)[*count];
                 snprintf(card.dev, sizeof card.dev, ":device=%" PRIu_ULONG, i);
-                snprintf_ch(card.name, "DELTACAST %s #%" PRIu_ULONG, board, i);
+                snprintf_ch(card.name, "DELTACAST %s", delta_get_model_name(i));
+                *count += 1;
         }
 }
 

src/video_display/deltacast.cpp

@@ -312,26 +312,18 @@ static void display_deltacast_probe(struct device_info **available_cards, int *c
         /* Query DELTA boards information */
         for (ULONG i = 0; i < NbBoards; i++)
         {
-                ULONG BoardType;
-                HANDLE            BoardHandle = NULL;
-                ULONG Result = VHD_OpenBoardHandle(i,&BoardHandle,NULL,0);
-                VHD_GetBoardProperty(BoardHandle, VHD_CORE_BP_BOARD_TYPE, &BoardType);
-
+                if (delta_board_type_is_dv(i)) { // skip DVI/HDMI boards
+                        continue;
+                }
                 *count += 1;
                 *available_cards = (struct device_info *)
                         realloc(*available_cards, *count * sizeof(struct device_info));
                 memset(*available_cards + *count - 1, 0, sizeof(struct device_info));
                 snprintf((*available_cards)[*count - 1].dev, sizeof (*available_cards)[*count - 1].dev, ":device=%d", *count - 1);
                 snprintf((*available_cards)[*count - 1].extra, sizeof (*available_cards)[*count - 1].extra, R"("embeddedAudioAvailable":"t")");
+                snprintf_ch((*available_cards)[*count - 1].name, "DELTACAST %s",
+                            delta_get_model_name(i));
                 (*available_cards)[*count - 1].repeatable = false;
-
-                if (Result == VHDERR_NOERROR)
-                {
-                        const char *board = delta_get_board_type_name(BoardType);
-                        snprintf_ch((*available_cards)[*count - 1].name,
-                                    "DELTACAST %s", board);
-                        VHD_CloseBoardHandle(BoardHandle);
-                }
         }
 
 }