vcap,vdisp/deltacast: add ch_layout option

For cards with bidirectional channels, it allow setting RX/TX layout
(actually the ratio of RX/TX channel count, not arbitrary selection).

Author: MartinPulec

src/deltacast_common.cpp

@@ -299,6 +299,23 @@ print_available_delta_boards(bool full)
         std::cout << "\n";
 }
 
+void
+delta_print_ch_layout_help(bool full)
+{
+        color_printf(
+            "\t" TBOLD("ch_layout") " - configure bidirectional channels%s\n",
+            full ? ":" : ", see \":fullhelp\" for details");
+        if (full) {
+                color_printf("\t\tSet the layout with a number in format RxTx, "
+                             "examples:\n"
+                             "\t\t\t- 80 - 8 Rx and 0 TX\n"
+                             "\t\t\t- 44 - 4 Rx and 4 TX\n"
+                             "\t\t\t- 13 - 1 Rx and 3 TX (4 channel device)\n"
+                             "\t\tIt is user responsibility to enter the valid "
+                             "number (not exceeding device channels).\n");
+        }
+}
+
 /// from SDK SetNbChannels()
 bool
 delta_set_nb_channels(ULONG BrdId, HANDLE BoardHandle, ULONG RequestedRx,
@@ -399,6 +416,8 @@ delta_set_nb_channels(ULONG BrdId, HANDLE BoardHandle, ULONG RequestedRx,
             "ERROR: Cannot set bidirectional channels. Result = "
             "0x%08" PRIX_ULONG "\n",
             Result);
+        MSG(WARNING, "See also option \":ch_layout\" to switch "
+                     "bidirectional channels layout.\n");
         return false;
 }
 

src/deltacast_common.hpp

@@ -206,7 +206,10 @@ static std::unordered_map<ULONG, std::string> board_type_map = {
  */
 const char *delta_get_error_description(ULONG CodeError);
 std::string delta_format_version(uint32_t version, bool long_out);
+
 void print_available_delta_boards(bool full);
+void delta_print_ch_layout_help(bool full);
+
 bool delta_set_nb_channels(ULONG BrdId, HANDLE BoardHandle, ULONG RequestedRx, ULONG RequestedTx);
 
 VHD_STREAMTYPE delta_rx_ch_to_stream_t(unsigned channel);

src/video_capture/deltacast.cpp

@@ -95,14 +95,15 @@ usage(bool full)
 {
         color_printf("Usage:\n");
         color_printf("\t" TBOLD(TRED("-t "
-                     "deltacast") "[:device=<index>][:channel=<idx>][:mode=<mode>]["
+                     "deltacast") "[:device=<index>][:channel=<idx>][:ch_layout=RL][:mode=<mode>]["
                      ":codec=<codec>]") "\n");
         color_printf("\t" TBOLD("-t "
                                 "deltacast:[full]help") "\n");
 
         printf("\nOptions:\n");
         color_printf("\t" TBOLD("device") " - board index\n");
         color_printf("\t" TBOLD("channel") " - card channel index (default 0)\n");
+        delta_print_ch_layout_help(full);
         color_printf("\t" TBOLD("mode") " - capture mode (see below)\n");
         color_printf("\t" TBOLD("codec") " - pixel format to capture (see list below)\n");
 
@@ -350,8 +351,8 @@ static bool wait_for_channel(struct vidcap_deltacast_state *s)
         return true;
 }
 
-static bool
-parse_fmt(struct vidcap_deltacast_state *s, char *init_fmt, ULONG *BrdId)
+static bool parse_fmt(struct vidcap_deltacast_state *s, char *init_fmt,
+                      ULONG *BrdId, ULONG *NbRxRequired, ULONG *NbTxRequired)
 {
         char *save_ptr = NULL;
         char *tok      = NULL;
@@ -385,6 +386,10 @@ parse_fmt(struct vidcap_deltacast_state *s, char *init_fmt, ULONG *BrdId)
                                     s->channel);
                                 return false;
                         }
+                } else if (IS_KEY_PREFIX(tok, "ch_layout")) {
+                        int val = stoi(strchr(tok, '=') + 1);
+                        *NbRxRequired = val / 10;
+                        *NbTxRequired = val % 10;
                 } else {
                         MSG(ERROR, "Wrong config option '%s'!\n", tok);
                         usage(false);
@@ -402,6 +407,8 @@ vidcap_deltacast_init(struct vidcap_params *params, void **state)
 	struct vidcap_deltacast_state *s = nullptr;
         ULONG             Result,DllVersion,NbBoards,ChnType;
         ULONG             BrdId = 0;
+        ULONG             NbRxRequired = 0;
+        ULONG             NbTxRequired = 0;
 
 	printf("vidcap_deltacast_init\n");
 
@@ -431,7 +438,7 @@ vidcap_deltacast_init(struct vidcap_params *params, void **state)
         s->BoardHandle = s->StreamHandle = s->SlotHandle = NULL;
 
         char *init_fmt = strdup(fmt);
-        if (!parse_fmt(s, init_fmt, &BrdId)) {
+        if (!parse_fmt(s, init_fmt, &BrdId, &NbRxRequired, &NbTxRequired)) {
                 free(init_fmt);
                 HANDLE_ERROR
         }
@@ -474,9 +481,12 @@ vidcap_deltacast_init(struct vidcap_params *params, void **state)
                 HANDLE_ERROR
         }
 
-        assert(!s->quad_channel || s->channel == 0);
-        ULONG NbRxRequired = s->quad_channel ? 4 : s->channel + 1;
-        if (!delta_set_nb_channels(BrdId, s->BoardHandle, NbRxRequired, 0)) {
+        if (NbRxRequired == 0 && NbTxRequired == 0) {
+                assert(!s->quad_channel || s->channel == 0);
+                NbRxRequired = s->quad_channel ? 4 : s->channel + 1;
+        }
+        if (!delta_set_nb_channels(BrdId, s->BoardHandle, NbRxRequired,
+                                   NbTxRequired)) {
                 HANDLE_ERROR
         }
 

src/video_display/deltacast.cpp

@@ -98,12 +98,14 @@ show_help(bool full)
 {
         printf("deltacast (output) options:\n");
         color_printf("\t" TBOLD(
-            TRED("-d deltacast") "[:device=<index>][:channel=<ch>]") "\n");
+            TRED("-d deltacast") "[:device=<index>][:channel=<ch>]"
+            "[:ch_layout=RT]") "\n");
         color_printf("\t" TBOLD("-d deltacast:[full]help") "\n");
 
         printf("\nOptions:\n");
         color_printf("\t" TBOLD("device") " - board index\n");
         color_printf("\t" TBOLD("channel") " - card channel index (default 0)\n");
+        delta_print_ch_layout_help(full);
 
         print_available_delta_boards(full);
 
@@ -331,7 +333,8 @@ static void display_deltacast_probe(struct device_info **available_cards, int *c
 }
 
 static bool
-parse_fmt(struct state_deltacast *s, char *fmt, ULONG *BrdId)
+parse_fmt(struct state_deltacast *s, char *fmt, ULONG *BrdId,
+          ULONG *NbRxRequired, ULONG *NbTxRequired)
 {
         char *save_ptr = nullptr;
         while (char *tok = strtok_r(fmt, ":", &save_ptr)) {
@@ -345,6 +348,10 @@ parse_fmt(struct state_deltacast *s, char *fmt, ULONG *BrdId)
                                     s->channel);
                                 return false;
                         }
+                } else if (IS_KEY_PREFIX(tok, "ch_layout")) {
+                        int val = std::stoi(strchr(tok, '=') + 1);
+                        *NbRxRequired = val / 10;
+                        *NbTxRequired = val % 10;
                 } else {
                         MSG(ERROR, "Unknown option: %s\n\n", tok);
                         show_help(false);
@@ -361,6 +368,8 @@ static void *display_deltacast_init(struct module *parent, const char *fmt, unsi
         struct state_deltacast *s;
         ULONG             Result,DllVersion,NbBoards,ChnType;
         ULONG             BrdId = 0;
+        ULONG             NbRxRequired = 0;
+        ULONG             NbTxRequired = 0;
 
         if (strcmp(fmt, "help") == 0 || strcmp(fmt, "fullhelp") == 0) {
                 show_help(strcmp(fmt, "fullhelp") == 0);
@@ -388,7 +397,7 @@ static void *display_deltacast_init(struct module *parent, const char *fmt, unsi
         s->audio_configured = FALSE;
 
         char *tmp = strdup(fmt);
-        if (!parse_fmt(s, tmp, &BrdId)) {
+        if (!parse_fmt(s, tmp, &BrdId, &NbRxRequired, &NbTxRequired)) {
                 free(tmp);
                 HANDLE_ERROR
         }
@@ -420,7 +429,11 @@ static void *display_deltacast_init(struct module *parent, const char *fmt, unsi
                 HANDLE_ERROR
         }
 
-        if (!delta_set_nb_channels(BrdId, s->BoardHandle, 0, s->channel + 1)) {
+        if (NbRxRequired == 0 && NbTxRequired == 0) {
+                NbTxRequired = s->channel + 1;
+        }
+        if (!delta_set_nb_channels(BrdId, s->BoardHandle, NbRxRequired,
+                                   NbTxRequired)) {
                 HANDLE_ERROR
         }