scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 11:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

DeckLink cap./disp.: help improvements

Browse Source 
Improved help - hide rare options to "fullhelp" and let user know that
there is fullhelp more clearly.

+ [display] fixed audio_levels to be consistent with help ("mic", not
  "false")
This commit is contained in:
Martin Pulec
2022-05-10 14:23:02 +02:00
parent 656e6fa107
commit 3c285e808b
2 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/video_capture/decklink.cpp
View File

@@ -467,10 +467,10 @@ decklink_help(bool full)
int numDevices = 0;
printf("\nDecklink options:\n");
cout << style::bold << fg::red << "\t-t decklink" << fg::reset << "[:<device_index(indices)>[:<mode>:<colorspace>[:3D][:sync_timecode][:connection=<input>][:audio_level={line|mic}][:detect-format][:conversion=<conv_mode>]]\n" << style::reset;
cout << style::bold << fg::red << "\t-t decklink" << fg::reset << "{:mode=<mode>|:device=<device_index>|:codec=<colorspace>...<key>=<val>}* | decklink:[full]help\n" << style::reset;
printf("\t\tor\n");
cout << style::bold << fg::red << "\t-t decklink" << fg::reset << "{:mode=<mode>|:device=<device_index>|:codec=<colorspace>...<key>=<val>}*|[full]help\n" << style::reset;
printf("\t(Mode specification is mandatory if your card does not support format autodetection.)\n");
cout << style::bold << fg::red << "\t-t decklink" << fg::reset << "[:<device_index(indices)>[:<mode>:<colorspace>[:3D][:sync_timecode][:connection=<input>][:audio_level={line|mic}][:detect-format][:conversion=<conv_mode>]]\n" << style::reset;
cout << "\t(mode specification is mandatory if your card does not support format autodetection; syntax on the first line is recommended, the second is obsolescent)\n";
printf("\n");
cout << style::bold << "3D" << style::reset << "\n";
@@ -484,19 +484,6 @@ decklink_help(bool full)
cout << style::bold << "\tmic" << style::reset << " - analog audio levels are set to maximum gain on audio input.\n";
printf("\n");
if (full) {
cout << style::bold << "conversion\n" << style::reset;
cout << style::bold << "\tnone" << style::reset << " - No video input conversion\n";
cout << style::bold << "\t10lb" << style::reset << " - HD1080 to SD video input down conversion\n";
cout << style::bold << "\t10am" << style::reset << " - Anamorphic from HD1080 to SD video input down conversion\n";
cout << style::bold << "\t72lb" << style::reset << " - Letter box from HD720 to SD video input down conversion\n";
cout << style::bold << "\t72ab" << style::reset << " - Letterbox video input up conversion\n";
cout << style::bold << "\tamup" << style::reset << " - Anamorphic video input up conversion\n";
cout << "\tThen use the set the resulting mode (!) for capture, eg. for 1080p to PAL conversion:\n"
"\t\t-t decklink:mode=pal:conversion=10lb\n";
cout << "\n";
}
cout << style::bold << "detect-format\n" << style::reset;
cout << "\tTry to detect input video format even if the device doesn't support\n"
"\tautodetect, eg. \"-t decklink:connection=HDMI:detect-format\".\n";
@@ -510,7 +497,21 @@ decklink_help(bool full)
cout << "\tSet a profile that allows maximal number of simultaneous IOs.\n";
cout << "\n";
cout << style::bold << "single-/dual-/quad-link\n" << style::reset;
cout << "\tUse single-/dual-/quad-link.\n";
cout << "\n";
if (full) {
cout << style::bold << "conversion\n" << style::reset;
cout << style::bold << "\tnone" << style::reset << " - No video input conversion\n";
cout << style::bold << "\t10lb" << style::reset << " - HD1080 to SD video input down conversion\n";
cout << style::bold << "\t10am" << style::reset << " - Anamorphic from HD1080 to SD video input down conversion\n";
cout << style::bold << "\t72lb" << style::reset << " - Letter box from HD720 to SD video input down conversion\n";
cout << style::bold << "\t72ab" << style::reset << " - Letterbox video input up conversion\n";
cout << style::bold << "\tamup" << style::reset << " - Anamorphic video input up conversion\n";
cout << "\tThen use the set the resulting mode (!) for capture, eg. for 1080p to PAL conversion:\n"
"\t\t-t decklink:mode=pal:conversion=10lb\n";
cout << "\n";
cout << style::bold << "p_not_i\n" << style::reset;
cout << "\tIncoming signal should be treated as progressive even if detected as interlaced (PsF).\n";
cout << "\n";
@@ -536,16 +537,11 @@ decklink_help(bool full)
<< style::bold << "4dhd" << style::reset << ". See SDK manual for details. Use "
<< style::bold << "keep" << style::reset << " to disable automatic selection.\n";
cout << "\n";
}
cout << style::bold << "single-/dual-/quad-link\n" << style::reset;
cout << "\tUse single-/dual-/quad-link.\n";
cout << "\n";
if (full) {
cout << style::bold << "sync_timecode" << style::reset << "\n";
cout << "\tTry to synchronize inputs based on timecode (for multiple inputs, eg. tiled 4K)\n";
cout << "\n";
} else {
cout << "(other options available, use \"fullhelp\" to see complete list of options)\n\n";
}
cout << "Available color spaces:";

37
src/video_display/decklink.cpp
View File

@@ -367,17 +367,26 @@ static void show_help(bool full)
int numDevices = 0;
printf("Decklink (output) options:\n");
cout << style::bold << fg::red << "\t-d decklink" << fg::reset << "[:fullhelp][:device=<device(s)>][:timecode][:<X>-link][:Level{A|B}][:3D[:HDMI3DPacking=<packing>]][:audio_level={line|mic}][:conversion=<fourcc>][:Use1080PsF][:[no-]low-latency][:profile=<X>|:half-duplex][:quad-[no-]square][:HDR[=<t>]]\n" << style::reset;
cout << style::bold << fg::red << "\t-d decklink" << fg::reset << "[:device=<device(s)>][:Level{A|B}][:3D][:audio_level={line|mic}][:half-duplex][:HDR[=<t>]]\n" << style::reset;
cout << style::bold << fg::red << "\t-d decklink" << fg::reset << ":[full]help\n" << style::reset;
cout << "Options:\n";
cout << style::bold << "\tfullhelp" << style::reset << " displays help for further options\n";
cout << style::bold << "\t<device(s)>" << style::reset << " is comma-separated indices or names of output devices\n";
cout << style::bold << "\tsingle-link/dual-link/quad-link" << style::reset << " specifies if the video output will be in a single-link (HD/3G/6G/12G), dual-link HD-SDI mode or quad-link HD/3G/6G/12G\n";
cout << style::bold << "\tLevelA/LevelB" << style::reset << " specifies 3G-SDI output level\n";
cout << style::bold << "\tfullhelp" << style::reset << "\tdisplay additional options and more details\n";
cout << style::bold << "\tdevice" << style::reset << "\t\tindex or name of output device (or comma-separated list of multple devices)\n";
cout << style::bold << "\tLevelA/LevelB" << style::reset << "\tspecifies 3G-SDI output level\n";
cout << style::bold << "\t3D" << style::reset << "\t\t3D stream will be received (see also HDMI3DPacking option)\n";
cout << style::bold << "\taudio_level" << style::reset << "\tset maximum attenuation for mic\n";
cout << style::bold << "\thalf-duplex" << style::reset
<< "\tset a profile that allows maximal number of simultaneous IOs\n";
cout << style::bold << "\tHDR[=HDR|PQ|HLG|<int>|help]" << style::reset << " - enable HDR metadata (optionally specifying EOTF, int 0-7 as per CEA 861.), help for extended help\n";
if (!full) {
cout << style::bold << "\tconversion" << style::reset << " - use '-d decklink:fullhelp' for list of conversions\n";
cout << style::bold << "\tconversion" << style::reset << "\toutput size conversion, use '-d decklink:fullhelp' for list of conversions\n";
cout << "\t(other options available, use \"fullhelp\" to see complete list of options)\n";
} else {
cout << style::bold << "\t[no-]quad-square" << style::reset << " - set Quad-link SDI is output in Square Division Quad Split mode\n";
cout << "\toutput conversion can be:\n" <<
cout << style::bold << "\tsingle-link/dual-link/quad-link" << style::reset << "\tspecifies if the video output will be in a single-link (HD/3G/6G/12G), dual-link HD-SDI mode or quad-link HD/3G/6G/12G\n";
cout << style::bold << "\ttimecode" << style::reset << "\temit timecode\n";
cout << style::bold << "\t[no-]quad-square" << style::reset << " set Quad-link SDI is output in Square Division Quad Split mode\n";
cout << style::bold << "\t[no-]low-latency" << style::reset << " do not use low-latency mode (use regular scheduled mode; low-latency is default)\n";
cout << style::bold << "\tconversion" << style::reset << "\toutput size conversion, can be:\n" <<
style::bold << "\t\tnone" << style::reset << " - no conversion\n" <<
style::bold << "\t\tltbx" << style::reset << " - down-converted letterbox SD\n" <<
style::bold << "\t\tamph" << style::reset << " - down-converted anamorphic SD\n" <<
@@ -388,11 +397,11 @@ static void show_help(bool full)
style::bold << "\t\txcap" << style::reset << " - simultaneous output of 720p and 1080p cross-conversion\n" <<
style::bold << "\t\tua7p" << style::reset << " - simultaneous output of SD and up-converted anamorphic 720p\n" <<
style::bold << "\t\tua1i" << style::reset << " - simultaneous output of SD and up-converted anamorphic 1080i\n" <<
style::bold << "\t\tu47p" << style::reset << " - simultaneous output of SD and up-converted anamorphic widescreen aspcet ratip 14:9 to 720p\n" <<
style::bold << "\t\tu41i" << style::reset << " - simultaneous output of SD and up-converted anamorphic widescreen aspcet ratip 14:9 to 1080i\n" <<
style::bold << "\t\tu47p" << style::reset << " - simultaneous output of SD and up-converted anamorphic widescreen aspect ratio 14:9 to 720p\n" <<
style::bold << "\t\tu41i" << style::reset << " - simultaneous output of SD and up-converted anamorphic widescreen aspect ratio 14:9 to 1080i\n" <<
style::bold << "\t\tup7p" << style::reset << " - simultaneous output of SD and up-converted pollarbox 720p\n" <<
style::bold << "\t\tup1i" << style::reset << " - simultaneous output of SD and up-converted pollarbox 1080i\n";
cout << style::bold << "\tHDMI3DPacking" << style::reset << " can be:\n" <<
cout << style::bold << "\tHDMI3DPacking" << style::reset << " can be (used in conjunction with \"3D\" option):\n" <<
style::bold << "\t\tSideBySideHalf, LineByLine, TopAndBottom, FramePacking, LeftOnly, RightOnly\n" << style::reset;
cout << style::bold << "\tUse1080PsF[=true|false|keep]" << style::reset << " flag sets use of PsF on output instead of progressive (default is false)\n";
cout << style::bold << "\tprofile=<P>\n" << style::reset;
@@ -402,11 +411,7 @@ static void show_help(bool full)
<< style::bold << "2dhd" << style::reset << " or "
<< style::bold << "4dhd" << style::reset << ". See SDK manual for details. Use "
<< style::bold << "keep" << style::reset << " to disable automatic selection.\n";
cout << style::bold << "\tHDR[=HDR|PQ|HLG|<int>|help]" << style::reset << " - enable HDR metadata (optionally specifying EOTF, int 0-7 as per CEA 861.), help for extended help\n";
}
cout << style::bold << "\thalf-duplex" << style::reset
<< " - set a profile that allows maximal number of simultaneous IOs\n";
cout << "\nIf " << style::bold << "audio_level" << style::reset << " is " << style::bold << "mic" << style::reset << " audio analog level is set to maximum attenuation on audio output.\n";
cout << "Recognized pixel formats:";
for_each(uv_to_bmd_codec_map.cbegin(), uv_to_bmd_codec_map.cend(), [](auto const &i) { cout << " " << style::bold << get_codec_name(i.first) << style::reset; } );
@@ -1005,7 +1010,7 @@ static bool settings_init(struct state_decklink *s, const char *fmt,
return false;
}
} else if (strncasecmp(ptr, "audio_level=", strlen("audio_level=")) == 0) {
if (strcasecmp(ptr + strlen("audio_level="), "false") == 0) {
if (strcasecmp(ptr + strlen("audio_level="), "false") || strcasecmp(ptr + strlen("audio_level="), "mic") == 0) {
*audio_consumer_levels = 0;
} else {
*audio_consumer_levels = 1;