Skip to content

Commit 925c9e5

Browse files
committed
DeckLink: added more help for DeckLink IP
- example for IP-specific opts in capture - hint in display to consult capture help - help:FourCC - in help usage
1 parent abc30c2 commit 925c9e5

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/blackmagic_common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ bmd_opt_help()
971971
color_printf(TBOLD("aacl=on") " - set audio consumer levels (flag)\n");
972972
color_printf(TBOLD("voio=blac") " - display black when no output\n");
973973
color_printf(TBOLD("DHCP=yes") " - use DHCP config for DeckLink IP\n");
974-
color_printf(TBOLD(
974+
color_printf(TBOLD("DHCP=no:"
975975
"nsip=10.0.0.3:nssm=255.255.255.0:nsgw=10.0.0.1") " - use static "
976976
"net config for "
977977
"DeckLink IP\n");

src/video_capture/decklink.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,11 @@ decklink_help(bool full, const char *query_prop_fcc = nullptr)
516516
{
517517
col() << "\nDeckLink options:\n";
518518
col() << SBOLD(SRED("\t-t decklink") << ":[full]help") << " | "
519-
<< SBOLD(SRED("-t decklink") << ":query=<FourCC>") << "\n";
519+
<< SBOLD(SRED("-t decklink") << ":query=<FourCC>") << " | "
520+
<< SBOLD(SRED("-t decklink") << ":help=FourCC") << "\n";
520521
col() << SBOLD(SRED("\t-t decklink")
521-
<< "{:m[ode]=<mode>|:d[evice]=<idx|ID|name>|:c[odec]=<colorspace>...<key>=<"
522+
<< "{:m[ode]=<mode>|:d[evice]=<idx|ID|name>|:c[odec]=<"
523+
"colorspace>...<key>=<"
522524
"val>}*")
523525
<< "\n";
524526
col() << SBOLD(SRED("\t-t decklink")
@@ -692,6 +694,12 @@ decklink_help(bool full, const char *query_prop_fcc = nullptr)
692694
<< " -t decklink:d=\"DeckLink 8K Pro (1)\":profile=1dfd")
693695
<< " # capture from 8K Pro and set profile to 1-subdevice "
694696
"full-duplex (useful for 3D capture)\n";
697+
col() << "\t"
698+
<< SBOLD(uv_argv[0] << " -t "
699+
"decklink:d=670600:con=Ethernet:DHCP=no:"
700+
"nsip=10.0.0.3:nssm=255.255.255.0")
701+
<< " # DeckLink IP (identified by topological ID), use \""
702+
<< SBOLD(":help=FourCC") << "\" for list of options\n";
695703

696704
printf("\n");
697705

src/video_display/decklink.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,9 @@ show_help(bool full, const char *query_prop_fcc = nullptr)
557557
<< "[:d[evice]=<device>][:Level{A|B}][:3D][:half-"
558558
"duplex][:HDR[=<t>][:drift_fix]]\n");
559559
col() << SBOLD(SRED("\t-d decklink") << ":[full]help") << " | "
560-
<< SBOLD(SRED("-d decklink") << ":query=<FourCC>"
561-
"\n");
560+
<< SBOLD(SRED("-d decklink") << ":query=<FourCC>") << " | "
561+
<< SBOLD(SRED("-d decklink") << ":help=FourCC")
562+
<< "\n";
562563
col() << "\nOptions:\n";
563564
if (!full) {
564565
col() << SBOLD("\tfullhelp") << "\tdisplay additional options and more details\n";
@@ -671,6 +672,8 @@ show_help(bool full, const char *query_prop_fcc = nullptr)
671672
if (!full) {
672673
col() << "(use \"" << SBOLD("fullhelp") << "\" to see device modes)\n";
673674
}
675+
col() << "(see also \"" << SBOLD("-t decklink:help")
676+
<< "\" for examples and other information)\n";
674677

675678
decklink_uninitialize(&com_initialized);
676679

0 commit comments

Comments
 (0)