Add full support for monitoring video outputs.

ChangeLog

  * Add support for port statuses (types) which are reported by
    Universal Videohub.
  * Rename --vo-route parameter to --vo-input.
+ * Add support for video monitoring outputs (names, routing and locks),
+    --mo-name, mo-input, --mo-lock and --mo-unlock.
 
 2014-11-28 : Version 0.3
  * Rename -v / --verbose parameter to -d / --debug.

README

 videohubctrl currently displays and can configure:
 
   - Video input port names
-  - Video output port names
-  - Video output routing
-  - Video output locking
+  - Video output port names, routing and locking
   - Input/Output port statuses
+  - Monitoring video output port names, routing and locking
 
 The following features found in bigger Videohub models are currently
 not supported (I don't have the hardware):
 
   - Configuration of video processing units
-  - Configuration of Video monitoring outputs
   - Configuration of Serial ports
 
 Configuration of Videohub's network settings can be made using
  --vo-lock <out_X>          | Lock output port X.
  --vo-unlock <out_X>        | Unlock output port X.
 
+Monitoring outputs configuration:
+ --mo-name <mout_X> <name>  | Set monitoring port X name.
+ --mo-route <mout_X> <in_Y> | Connect monitoring X to video input Y
+ --mo-lock <mout_X>         | Lock monitoring port X.
+ --mo-unlock <mout_X>       | Unlock monitoring port X.
+
 Misc options:
  -T --test-input <file>     | Read commands from <file>.
  -d --debug                 | Increase logging verbosity.
   | 16 | O | Loopback                 | Loopback                 | o |
   --------------------------------------------------------------------
 
+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | Monitor 1                | Windows 1                |
+  |  2 | O | Monitor 2                | Windows 2                |
+  |  3 | L | Monitor 3                | Windows 3                |
+  |  4 |   | Monitor 4                | Windows 4 HD             |
+  ----------------------------------------------------------------
+
 |----------------------------------------------------------------------|
 
 

cmd.c

 	[CMD_VIDEO_OUTPUT_ROUTING] = "VIDEO OUTPUT ROUTING",
 	[CMD_VIDEO_INPUT_STATUS]   = "VIDEO INPUT STATUS",
 	[CMD_VIDEO_OUTPUT_STATUS]  = "VIDEO OUTPUT STATUS",
+	[CMD_MONITORING_OUTPUT_LABELS]  = "MONITORING OUTPUT LABELS",
+	[CMD_MONITORING_OUTPUT_LOCKS]   = "MONITORING OUTPUT LOCKS",
+	[CMD_MONITORING_OUTPUT_ROUTING] = "VIDEO MONITORING OUTPUT ROUTING",
 	[CMD_PING]                 = "PING",
 	[CMD_ACK]                  = "ACK",
 	[CMD_NAK]                  = "NAK",
 		.port_id1 = "video output",
 		.opt_prefix = "vo",
 	},
+	[CMD_MONITORING_OUTPUT_LABELS]  = { .cmd = CMD_MONITORING_OUTPUT_LABELS , .type = PARSE_LABEL,
+		.ports1 = OFS(mon_outputs),
+		.port_id1 = "monitoring output",
+		.opt_prefix = "mo",
+	},
+	[CMD_MONITORING_OUTPUT_LOCKS]   = { .cmd = CMD_MONITORING_OUTPUT_LOCKS  , .type = PARSE_LOCK,
+		.ports1 = OFS(mon_outputs),
+		.port_id1 = "monitoring output",
+		.opt_prefix = "mo",
+	},
+	[CMD_MONITORING_OUTPUT_ROUTING] = { .cmd = CMD_MONITORING_OUTPUT_ROUTING, .type = PARSE_ROUTE,
+		.ports1 = OFS(mon_outputs),
+		.ports2 = OFS(inputs),
+		.port_id1 = "monitoring output",
+		.port_id2 = "video input",
+		.opt_prefix = "mo",
+	},
 	[CMD_PING]                 = { .cmd = CMD_PING                , .type = PARSE_NONE },
 	[CMD_ACK]                  = { .cmd = CMD_ACK                 , .type = PARSE_NONE },
 	[CMD_NAK]                  = { .cmd = CMD_NAK                 , .type = PARSE_NONE },

cmd.h

 
 #include <stdbool.h>
 
-#define NUM_COMMANDS 11
+#define NUM_COMMANDS 14
 
 enum vcmd {
 	CMD_PROTOCOL_PREAMBLE,
 	CMD_VIDEO_OUTPUT_ROUTING,
 	CMD_VIDEO_INPUT_STATUS,
 	CMD_VIDEO_OUTPUT_STATUS,
+	CMD_MONITORING_OUTPUT_LABELS,
+	CMD_MONITORING_OUTPUT_LOCKS,
+	CMD_MONITORING_OUTPUT_ROUTING,
 	CMD_PING,
 	CMD_ACK,
 	CMD_NAK = (NUM_COMMANDS - 1),

display.c

 	printf("\n");
 }
 
+void print_device_monitoring_outputs(struct videohub_data *d) {
+	unsigned int i, len = 64;
+	if (!d->mon_outputs.num)
+		return;
+	printf("Monitoring outputs\n");
+	printf_line(len);
+	printf("  | ## | x | %-24s | %-24s |\n", "Monitoring output name", "Connected video input");
+	printf_line(len);
+	for(i = 0; i < d->mon_outputs.num; i++) {
+		printf("  | %2d | %c | %-24s | %-24s |\n",
+			i + 1,
+			port_lock_symbol(d->mon_outputs.port[i].lock),
+			d->mon_outputs.port[i].name,
+			d->inputs.port[d->mon_outputs.port[i].routed_to].name
+		);
+	}
+	printf_line(len);
+	printf("\n");
+}
+
 static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
 	unsigned int i, last = 0;
 	struct videohub_commands *v = &videohub_commands[vcmd];

display.h

 void print_device_info(struct videohub_data *d);
 void print_device_video_inputs(struct videohub_data *d);
 void print_device_video_outputs(struct videohub_data *d);
+void print_device_monitoring_outputs(struct videohub_data *d);
 
 void print_device_backup(struct videohub_data *d);
 

test/input-00.txt

 Video inputs: 16
 Video processing units: 0
 Video outputs: 16
-Video monitoring outputs: 0
+Video monitoring outputs: 4
 Serial ports: 0
 
 INPUT LABELS:
 13 Optical
 14 Optical
 15 Optical
+
+MONITORING OUTPUT LABELS:
+0 Monitor 1
+1 Monitor 2
+2 Monitor 3
+3 Monitor 4
+
+VIDEO MONITORING OUTPUT ROUTING:
+0 0
+1 1
+2 2
+3 3
+
+MONITORING OUTPUT LOCKS:
+0 U
+1 O
+2 L
+3 U

test/input-03.txt

 Video inputs: 16
 Video processing units: 0
 Video outputs: 16
-Video monitoring outputs: 0
+Video monitoring outputs: 4
 Serial ports: 0
 
 VIDEO INPUT STATUS:

test/run

 	--vo-input "Output 5" "Windows 1" \
 	--vo-input 5 2 \
 	--vo-input 5 "Windows 3" \
+	--mo-name 1 "PC 1 Mon" \
+	--mo-name "Monitor 4" "Decklink" \
+	--mo-unlock 2 \
+	--mo-lock 4 \
+	--mo-name 3 "Loopback" \
+	--mo-input 3 16 \
 $@ &> test/test-04.out
 check test/test-04 "Test multiple configuration commands"
 
 ./videohubctrl --test-input test/input-00.txt --vo-input "Input 10" "Output 10"      $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --vo-input "Err Output" "Input 10"     $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --vo-input "Output 10" "Err Input"     $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-name 18          "Test Output 18" $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-name "Output 18" "Test Output 18" $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-lock 18                           $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-lock "Output 18"                  $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-unlock 18                         $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --mo-unlock "Output 18"                $@ &>> test/test-06.out
 check test/test-06 "Test errors on commands with invalid ports."
 
 videohubctrl --test-input test/input-00.txt --list-device $@ &> test/test-07.out
 
 videohubctrl --test-input test/input-14.txt $@ &> test/test-14.out
 check test/test-14 "Test buggy input"
+
+videohubctrl --test-input test/input-00.txt --list-moutputs $@ &> test/test-15.out
+check test/test-15 "Test --list-moutputs option output"

test/test-01.ok

   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
 Video inputs
   | 16 | O | Loopback                 | Loopback                 | o |
   --------------------------------------------------------------------
 
+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | Monitor 1                | Windows 1                |
+  |  2 | O | Monitor 2                | Windows 2                |
+  |  3 | L | Monitor 3                | Windows 3                |
+  |  4 |   | Monitor 4                | Windows 4 HD             |
+  ----------------------------------------------------------------
+

test/test-02.ok

   --vo-name 14 "Output 14" \
   --vo-name 15 "Output 15" \
   --vo-name 16 "Loopback" \
+  --mo-name  1 "Monitor 1" \
+  --mo-name  2 "Monitor 2" \
+  --mo-name  3 "Monitor 3" \
+  --mo-name  4 "Monitor 4" \
   --vo-input  1  3 \
   --vo-input  2  2 \
   --vo-input  3  1 \
   --vo-input 14 14 \
   --vo-input 15 15 \
   --vo-input 16 16 \
+  --mo-input  1  1 \
+  --mo-input  2  2 \
+  --mo-input  3  3 \
+  --mo-input  4  4 \
   --vo-unlock  1 --vo-lock  1 \
   --vo-unlock  2 --vo-lock  2 \
   --vo-unlock  3 --vo-lock  3 \
   --vo-unlock 14 \
   --vo-unlock 15 \
   --vo-unlock 16 --vo-lock 16
+  --mo-unlock  1 \
+  --mo-unlock  2 --mo-lock  2 \
+  --mo-unlock  3 --mo-lock  3 \
+  --mo-unlock  4
 

test/test-03.ok

 videohub: rename video output 14 "" to "Output 14"
 videohub: rename video output 15 "" to "Output 15"
 videohub: rename video output 16 "" to "Loopback"
+videohub: rename monitoring output 1 "" to "Monitor 1"
+videohub: rename monitoring output 2 "" to "Monitor 2"
+videohub: rename monitoring output 3 "" to "Monitor 3"
+videohub: rename monitoring output 4 "" to "Monitor 4"
 videohub: set video output 1 "Enc1 1" to read from video input 3 "Windows 3"
 videohub: set video output 2 "Enc1 2" to read from video input 2 "Windows 2"
 videohub: set video output 3 "Enc1 3" to read from video input 1 "Windows 1"
 videohub: set video output 14 "Output 14" to read from video input 14 "Input 14"
 videohub: set video output 15 "Output 15" to read from video input 15 "Input 15"
 videohub: set video output 16 "Loopback" to read from video input 16 "Loopback"
+videohub: set monitoring output 1 "Monitor 1" to read from video input 1 "Windows 1"
+videohub: set monitoring output 2 "Monitor 2" to read from video input 2 "Windows 2"
+videohub: set monitoring output 3 "Monitor 3" to read from video input 3 "Windows 3"
+videohub: set monitoring output 4 "Monitor 4" to read from video input 4 "Windows 4 HD"
 videohub: unlock video output 1 "Enc1 1"
 videohub: lock video output 1 "Enc1 1"
 videohub: unlock video output 2 "Enc1 2"
 videohub: unlock video output 15 "Output 15"
 videohub: unlock video output 16 "Loopback"
 videohub: lock video output 16 "Loopback"
+videohub: unlock monitoring output 1 "Monitor 1"
+videohub: unlock monitoring output 2 "Monitor 2"
+videohub: lock monitoring output 2 "Monitor 2"
+videohub: unlock monitoring output 3 "Monitor 3"
+videohub: lock monitoring output 3 "Monitor 3"
+videohub: unlock monitoring output 4 "Monitor 4"
 Device info
   -----------------------------------------------------------
   | Device address             | sdi-matrix                 |
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
 Video inputs
   | 16 | O | Loopback                 | Loopback                 | o |
   --------------------------------------------------------------------
 
+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | Monitor 1                | Windows 1                |
+  |  2 | O | Monitor 2                | Windows 2                |
+  |  3 | O | Monitor 3                | Windows 3                |
+  |  4 |   | Monitor 4                | Windows 4 HD             |
+  ----------------------------------------------------------------
+

test/test-04.ok

 videohub: set video output 5 "Output 5" to read from video input 1 "Windows 1"
 videohub: set video output 5 "Output 5" to read from video input 2 "Windows 2"
 videohub: set video output 5 "Output 5" to read from video input 3 "Windows 3"
+videohub: rename monitoring output 1 "Monitor 1" to "PC 1 Mon"
+videohub: rename monitoring output 4 "Monitor 4" to "Decklink"
+videohub: unlock monitoring output 2 "Monitor 2"
+videohub: lock monitoring output 4 "Decklink"
+videohub: rename monitoring output 3 "Monitor 3" to "Loopback"
+videohub: set monitoring output 3 "Loopback" to read from video input 16 "Loopback"
 Device info
   -----------------------------------------------------------
   | Device address             | sdi-matrix                 |
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
 Video inputs
   | 16 | O | Dev-Lo                   | Loopback                 | o |
   --------------------------------------------------------------------
 
+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | PC 1 Mon                 | Windows 1                |
+  |  2 |   | Monitor 2                | Windows 2                |
+  |  3 | L | Loopback                 | Loopback                 |
+  |  4 | O | Decklink                 | Windows 4 HighDef        |
+  ----------------------------------------------------------------
+

test/test-05.ok

   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
 Video inputs
   | 16 | O | Loopback                 | Loopback                 | o |
   --------------------------------------------------------------------
 
+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | Monitor 1                | Windows 1                |
+  |  2 | O | Monitor 2                | Windows 2                |
+  |  3 | O | Monitor 3                | Windows 3                |
+  |  4 |   | Monitor 4                | Windows 4 HD             |
+  ----------------------------------------------------------------
+

test/test-06.ok

 ERROR: Unknown video output port number/name: Input 10
 ERROR: Unknown video output port number/name: Err Output
 ERROR: Unknown video input port number/name: Err Input
+ERROR: Unknown monitoring output port number/name: 18
+ERROR: Unknown monitoring output port number/name: Output 18
+ERROR: Unknown monitoring output port number/name: 18
+ERROR: Unknown monitoring output port number/name: Output 18
+ERROR: Unknown monitoring output port number/name: 18
+ERROR: Unknown monitoring output port number/name: Output 18

test/test-07.ok

   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 

test/test-15.ok

+Monitoring outputs
+  ----------------------------------------------------------------
+  | ## | x | Monitoring output name   | Connected video input    |
+  ----------------------------------------------------------------
+  |  1 |   | Monitor 1                | Windows 1                |
+  |  2 | O | Monitor 2                | Windows 2                |
+  |  3 | L | Monitor 3                | Windows 3                |
+  |  4 |   | Monitor 4                | Windows 4 HD             |
+  ----------------------------------------------------------------
+

videohubctrl.c

 	action_list_device		= (1 << 0),
 	action_list_vinputs		= (1 << 1),
 	action_list_voutputs	= (1 << 2),
+	action_list_moutputs	= (1 << 3),
 };
 
 static const char *program_id = PROGRAM_NAME " Version: " VERSION " Git: " GIT_VER;
 	{ "list-device",		no_argument,       NULL, 901 },
 	{ "list-vinputs",		no_argument,       NULL, 902 },
 	{ "list-voutputs",		no_argument,       NULL, 903 },
+	{ "list-moutputs",		no_argument,       NULL, 904 },
 	{ "vi-name",			required_argument, NULL, 1001 },
 	{ "vo-name",			required_argument, NULL, 2001 },
 	{ "vo-input",			required_argument, NULL, 2002 },
 	{ "vo-route",			required_argument, NULL, 2002 }, // Alias of --vo-input
 	{ "vo-lock",			required_argument, NULL, 2003 },
 	{ "vo-unlock",			required_argument, NULL, 2004 },
+	{ "mo-name",			required_argument, NULL, 3001 },
+	{ "mo-input",			required_argument, NULL, 3002 },
+	{ "mo-route",			required_argument, NULL, 3002 }, // Alias of --mo-input
+	{ "mo-lock",			required_argument, NULL, 3003 },
+	{ "mo-unlock",			required_argument, NULL, 3004 },
 	{ 0, 0, 0, 0 }
 };
 
 	printf(" --list-device              | Display device info.\n");
 	printf(" --list-vinputs             | List device video inputs.\n");
 	printf(" --list-voutputs            | List device video outputs.\n");
+	printf(" --list-moutputs            | List device monitoring outputs.\n");
 	printf("\n");
 	printf("Video inputs configuration:\n");
 	printf(" --vi-name <in_X> <name>    | Set video input port X name.\n");
 	printf(" --vo-lock <out_X>          | Lock output port X.\n");
 	printf(" --vo-unlock <out_X>        | Unlock output port X.\n");
 	printf("\n");
+	printf("Monitoring outputs configuration:\n");
+	printf(" --mo-name <mout_X> <name>  | Set monitoring port X name.\n");
+	printf(" --mo-route <mout_X> <in_Y> | Connect monitoring X to video input Y\n");
+	printf(" --mo-lock <mout_X>         | Lock monitoring port X.\n");
+	printf(" --mo-unlock <mout_X>       | Unlock monitoring port X.\n");
+	printf("\n");
 	printf("Misc options:\n");
 	printf(" -T --test-input <file>     | Read commands from <file>.\n");
 	printf(" -d --debug                 | Increase logging verbosity.\n");
 			case 901: show_list |= action_list_device; break; // --list-device
 			case 902: show_list |= action_list_vinputs; break; // --list-vinputs
 			case 903: show_list |= action_list_voutputs; break; // --list-voutputs
+			case 904: show_list |= action_list_moutputs; break; // --list-moutputs
 			case 1001: parse_cmd2(argc, argv, CMD_INPUT_LABELS); break; // --vi-name
 			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
 			case 2004: parse_cmd1(argc, argv, CMD_VIDEO_OUTPUT_LOCKS, false); break; // --vo-unlock
+			case 3001: parse_cmd2(argc, argv, CMD_MONITORING_OUTPUT_LABELS); break; // --mo-name
+			case 3002: parse_cmd2(argc, argv, CMD_MONITORING_OUTPUT_ROUTING); break; // --mo-route
+			case 3003: parse_cmd1(argc, argv, CMD_MONITORING_OUTPUT_LOCKS, true); break; // --mo-lock
+			case 3004: parse_cmd1(argc, argv, CMD_MONITORING_OUTPUT_LOCKS, false); break; // --mo-unlock
 			case 'H': // --help
 				show_help(data);
 				exit(EXIT_SUCCESS);
 	print_device_info(d);
 	print_device_video_inputs(d);
 	print_device_video_outputs(d);
+	print_device_monitoring_outputs(d);
 	fflush(stdout);
 }
 
 		if (show_list & action_list_device)		print_device_info(data);
 		if (show_list & action_list_vinputs)	print_device_video_inputs(data);
 		if (show_list & action_list_voutputs)	print_device_video_outputs(data);
+		if (show_list & action_list_moutputs)	print_device_monitoring_outputs(data);
 		fflush(stdout);
 	} else if (show_backup) {
 		print_device_backup(data);