Add support for --vi-output and --vi-monitor parameters.

ChangeLog

@@ -2,6 +2,8 @@
 xxxx-xx-xx : Version -next
  * Add support for --list-proc-units and --list-frames.
  * Add support for setting device friendly name using --set-name option.
+ * Add support for routing inputs to outputs/mon_ports using
+  --vi-output and --vi-monitor parameters.
 
 2014-12-03 : Version 1.0
  * Add missing documentation for --list-moutputs parameter.

README

@@ -63,6 +63,8 @@ Commands:
 
 Video inputs configuration:
  --vi-name <in_X> <name>    | Set video input port X name.
+ --vi-output <in_X> <out_Y> | Route video input X to output Y.
+ --vi-monitor <in_X> <mout_Y> | Route video input X to mon port Y.
 
 Video outputs configuration:
  --vo-name <out_X> <name>   | Set video output port X name.
@@ -150,6 +152,14 @@ Example usage
    videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
 
 
+ # Set one input to go out two outputs and two monitoring ports
+
+   videohubctrl -h sdi --vi-output  "Windows 4 HD" "Output 8" \
+                       --vi-output  "Windows 4 HD" "Output 7" \
+                       --vi-monitor "Windows 4 HD" "Monitor 1" \
+                       --vi-monitor "Windows 4 HD" "Monitor 2"
+
+
  # Run several commands at once
  # Rename video input 11 and 12
  # Rename video output 5,

cmd.c

@@ -506,6 +506,16 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 			);
 			break;
 		}
+		if (e->reversed_args) {
+			printf("%sset %s %d \"%s\" to go out of %s %d \"%s\"\n",
+				prefix,
+				e->cmd->port_id2,
+				e->p2.port_no + 1, d_port->port[e->p2.port_no].name,
+				e->cmd->port_id1,
+				e->p1.port_no + 1, s_port->port [e->p1.port_no].name
+			);
+			break;
+		}
 		printf("%sset %s %d \"%s\" to read from %s %d \"%s\"\n",
 			prefix,
 			e->cmd->port_id1,

cmd.h

@@ -83,6 +83,7 @@ struct vcmd_entry {
 	enum port_lock	lock;
 	enum serial_dir	direction;
 	bool			clear_port;
+	bool			reversed_args;
 };
 
 void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e);

test/run

@@ -34,6 +34,8 @@ check test/test-03 "Test --backup restore"
 videohubctrl --test-input test/input-00.txt \
 	--set-name "Test name" \
 	--vi-name "Windows 4 HD" "Windows 4 HighDef" \
+	--vi-output "Windows 1" "Output 15" \
+	--vi-monitor "Windows 3" "Monitor 1" \
 	--vi-name 5 "In 5" \
 	--vi-name "Input 6" "Camera 6" \
 	--vo-name "Enc1 1" "Encoder 1" \
@@ -82,6 +84,10 @@ check test/test-05 "Test if --backup restored correct config."
 ./videohubctrl --test-input test/input-00.txt --vi-name "Input 18"  "Test Input 18"  $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --vo-name 18          "Test Output 18" $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --vo-name "Output 18" "Test Output 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --vi-output "Input 22" "Output 15"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --vi-output "Input 14" "Output 22"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --vi-monitor "Input 22" "Monitor 3"    $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --vi-monitor "Input 14" "Monitor 33"   $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --vo-lock 18                           $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --vo-lock "Output 18"                  $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --vo-unlock 18                         $@ >> test/test-06.out 2>&1

test/test-04.ok

@@ -1,5 +1,7 @@
 videohub: set device "Friendly name" to "Test name"
 videohub: rename video input 4 "Windows 4 HD" to "Windows 4 HighDef"
+videohub: set video input 1 "Windows 1" to go out of video output 15 "Output 15"
+videohub: set video input 3 "Windows 3" to go out of monitoring output 1 "Monitor 1"
 videohub: rename video input 5 "Input 5" to "In 5"
 videohub: rename video input 6 "Input 6" to "Camera 6"
 videohub: rename video output 1 "Enc1 1" to "Encoder 1"
@@ -66,8 +68,9 @@ Video inputs
   ----------------------------------------------------------------------
   | ### | Video input name         | nn | Routed to output         | s |
   ----------------------------------------------------------------------
-  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |   1 | Windows 1                |  3 | Enc1 3                   | B |
   |     |                          |    | Enc1 4                   |   |
+  |     |                          |    | Output 15                |   |
   |   2 | Windows 2                |  1 | Enc1 2                   | B |
   |   3 | Windows 3                |  2 | Encoder 1                | B |
   |     |                          |    | Output 5                 |   |
@@ -83,7 +86,7 @@ Video inputs
   |  12 | DPlay1                   |  1 | Output 13                |   |
   |  13 | DPlay2                   |  1 | Denc                     |   |
   |  14 | Input 14                 |  1 | Output 14                | x |
-  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  15 | Input 15                 |  0 | -                        | x |
   |  16 | Loopback                 |  1 | Dev-Lo                   |   |
   ----------------------------------------------------------------------
 
@@ -105,7 +108,7 @@ Video outputs
   |  12 |   | Denc                     | DPlay2                   | B |
   |  13 | O | Output 13                | DPlay1                   | o |
   |  14 |   | Output 14                | Input 14                 | o |
-  |  15 | O | Output 15                | Input 15                 | o |
+  |  15 | O | Output 15                | Windows 1                | o |
   |  16 | O | Dev-Lo                   | Loopback                 | o |
   ---------------------------------------------------------------------
 
@@ -113,7 +116,7 @@ Monitoring outputs
   -----------------------------------------------------------------
   | ### | x | Monitoring output name   | Connected video input    |
   -----------------------------------------------------------------
-  |   1 |   | PC 1 Mon                 | Windows 1                |
+  |   1 |   | PC 1 Mon                 | Windows 3                |
   |   2 |   | Monitor 2                | Windows 2                |
   |   3 | L | Loopback                 | Loopback                 |
   |   4 | O | Decklink                 | Windows 4 HighDef        |

test/test-06.ok

@@ -3,6 +3,10 @@ ERROR: Unknown video input port number/name: 18
 ERROR: Unknown video input port number/name: Input 18
 ERROR: Unknown video output port number/name: 18
 ERROR: Unknown video output port number/name: Output 18
+ERROR: Unknown video input port number/name: Input 22
+ERROR: Unknown video output port number/name: Output 22
+ERROR: Unknown video input port number/name: Input 22
+ERROR: Unknown monitoring output port number/name: Monitor 33
 ERROR: Unknown video output port number/name: 18
 ERROR: Unknown video output port number/name: Output 18
 ERROR: Unknown video output port number/name: 18

videohubctrl.1

@@ -107,6 +107,12 @@ command will fail. Using port numbers always works.
 .TP
 \fB\-\-vi\-name\fR <in_X> <name>
 Set video input port X name.
+.TP
+\fB\-\-vi\-output\fR <in_X> <out_Y>
+Set video input X to be outputted via output Y.
+.TP
+\fB\-\-vi\-monitor\fR <in_X> <mout_Y>
+Set video input X to be outputted via monitoring port Y.
 .SH VIDEO OUTPUTS CONFIGURATION
 .PP
 .TP
@@ -247,6 +253,12 @@ To get a quick start here are some example command lines.
    videohubctrl -h sdi --vo-input "Output 8" "Windows 4 HD"
    videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
 
+ # Set one input to go out two outputs and two monitoring ports
+   videohubctrl -h sdi --vi-output  "Windows 4 HD" "Output 8" \\
+                       --vi-output  "Windows 4 HD" "Output 7" \\
+                       --vi-monitor "Windows 4 HD" "Monitor 1" \\
+                       --vi-monitor "Windows 4 HD" "Monitor 2"
+
  # Run several commands at once
  # Rename video input 11 and 12
  # Rename video output 5,

videohubctrl.c

@@ -71,6 +71,8 @@ static const struct option long_options[] = {
 	{ "list-frames",		no_argument,       NULL, 907 },
 	{ "set-name",			required_argument, NULL, 950 },
 	{ "vi-name",			required_argument, NULL, 1001 },
+	{ "vi-output",			required_argument, NULL, 1002 },
+	{ "vi-monitor",			required_argument, NULL, 1003 },
 	{ "vo-name",			required_argument, NULL, 2001 },
 	{ "vo-input",			required_argument, NULL, 2002 },
 	{ "vo-route",			required_argument, NULL, 2002 }, // Alias of --vo-input
@@ -135,6 +137,8 @@ static void show_help(struct videohub_data *data) {
 	printf("\n");
 	printf("Video inputs configuration:\n");
 	printf(" --vi-name <in_X> <name>    | Set video input port X name.\n");
+	printf(" --vi-output <in_X> <out_Y> | Route video input X to output Y.\n");
+	printf(" --vi-monitor <in_X> <mout_Y> | Route video input X to mon port Y.\n");
 	printf("\n");
 	printf("Video outputs configuration:\n");
 	printf(" --vo-name <out_X> <name>   | Set video output port X name.\n");
@@ -236,6 +240,15 @@ static void set_device_option(char *setting, char *value) {
 	num_parsed_cmds++;
 }
 
+static void switch_cmd_args(void) {
+	char *p1, *p2;
+	parsed_cmds.entry[num_parsed_cmds-1].reversed_args = 1;
+	p1 = parsed_cmds.entry[num_parsed_cmds-1].p1.param;
+	p2 = parsed_cmds.entry[num_parsed_cmds-1].p2.param;
+	parsed_cmds.entry[num_parsed_cmds-1].p1.param = p2;
+	parsed_cmds.entry[num_parsed_cmds-1].p2.param = p1;
+}
+
 static void parse_options(struct videohub_data *data, int argc, char **argv) {
 	int j, err = 0;
 	// Check environment
@@ -295,6 +308,8 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 907: show_list |= action_list_frames; break; // --list-frames
 			case 950: set_device_option("Friendly name", optarg); break; // --set-name
 			case 1001: parse_cmd2(argc, argv, CMD_INPUT_LABELS); break; // --vi-name
+			case 1002: parse_cmd2(argc, argv, CMD_VIDEO_OUTPUT_ROUTING); switch_cmd_args(); break; // --vi-output
+			case 1003: parse_cmd2(argc, argv, CMD_MONITORING_OUTPUT_ROUTING); switch_cmd_args(); break; // --vi-monitor
 			case 2001: parse_cmd2(argc, argv, CMD_OUTPUT_LABELS); break; // --vo-name
 			case 2002: parse_cmd2(argc, argv, CMD_VIDEO_OUTPUT_ROUTING); break; // --vo-input
 			case 2003: parse_cmd1(argc, argv, CMD_VIDEO_OUTPUT_LOCKS, true); break; // --vo-lock