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

DeckLink: renamed audioConsumerLev. to audio_level

Browse Source
This commit is contained in:
Martin Pulec
2017-05-18 17:42:18 +02:00
parent 5db5e08a46
commit 649882d972
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/video_capture/decklink.cpp
View File

@@ -302,7 +302,7 @@ decklink_help()
HRESULT result;
printf("\nDecklink options:\n");
printf("\t-t decklink[:<device_index(indices)>[:<mode>:<colorspace>[:3D][:sync_timecode][:connection=<input>][:audioConsumerLevels={true|false}][:detect-format][:conversion=<conv_mode>]]\n");
printf("\t-t decklink[:<device_index(indices)>[:<mode>:<colorspace>[:3D][:sync_timecode][:connection=<input>][:audio_level={line|mic}][:detect-format][:conversion=<conv_mode>]]\n");
printf("\t\tor\n");
printf("\t-t decklink{:mode=<mode>|:device=<device_index>|:codec=<colorspace>...<key>=<val>}*\n");
printf("\t(Mode specification is mandatory if your card does not support format autodetection.)\n");
@@ -325,9 +325,9 @@ decklink_help()
printf("\tTry to synchronize inputs based on timecode (for multiple inputs, eg. tiled 4K)\n");
printf("\n");
printf("audioConsumerLevels\n");
printf("\tIf set true the analog audio levels are set to maximum gain on audio input.\n");
printf("\tIf set false the selected analog input gain levels are used.\n");
printf("audio_level\n");
printf("\tline - the selected analog input gain levels are used\n");
printf("\tmic - analog audio levels are set to maximum gain on audio input.\n");
printf("\n");
printf("conversion\n");
@@ -467,9 +467,9 @@ static bool parse_option(struct vidcap_decklink_state *s, const char *opt)
fprintf(stderr, "[DeckLink] Unrecognized connection %s.\n", connection);
return false;
}
} else if(strncasecmp(opt, "audioConsumerLevels=",
strlen("audioConsumerLevels=")) == 0) {
const char *levels = opt + strlen("audioConsumerLevels=");
} else if(strncasecmp(opt, "audio_level=",
strlen("audio_level=")) == 0) {
const char *levels = opt + strlen("audio_level=");
if (strcasecmp(levels, "false") == 0) {
s->audio_consumer_levels = 0;
} else {

8
src/video_display/decklink.cpp
View File

@@ -310,7 +310,7 @@ static void show_help(bool full)
HRESULT result;
printf("Decklink (output) options:\n");
printf("\t-d decklink[:device=<device(s)>][:timecode][:single-link|:dual-link|:quad-link][:LevelA|:LevelB][:3D[:HDMI3DPacking=<packing>]][:audioConsumerLevels={true|false}][:conversion=<fourcc>][:Use1080pNotPsF={true|false}][:[no-]low-latency]\n");
printf("\t-d decklink[:device=<device(s)>][:timecode][:single-link|:dual-link|:quad-link][:LevelA|:LevelB][:3D[:HDMI3DPacking=<packing>]][:audio_level={line|mic}][:conversion=<fourcc>][:Use1080pNotPsF={true|false}][:[no-]low-latency]\n");
printf("\t\t<device(s)> is coma-separated indices or names of output devices\n");
printf("\t\tsingle-link/dual-link specifies if the video output will be in a single-link (HD/3G/6G/12G) or in dual-link HD-SDI mode\n");
printf("\t\tLevelA/LevelB specifies 3G-SDI output level\n");
@@ -387,7 +387,7 @@ static void show_help(bool full)
printf("\tRightOnly\n");
printf("\n");
printf("audioConsumerLevels if set to true sets audio analog level to maximum attenuation on audio output.\n");
printf("If audio_level is mic audio analog level is set to maximum attenuation on audio output.\n");
printf("\n");
print_decklink_version();
printf("\n");
@@ -927,8 +927,8 @@ static void *display_decklink_init(struct module *parent, const char *fmt, unsig
delete s;
return NULL;
}
} else if(strncasecmp(ptr, "audioConsumerLevels=", strlen("audioConsumerLevels=")) == 0) {
if (strcasecmp(ptr + strlen("audioConsumerLevels="), "false") == 0) {
} else if(strncasecmp(ptr, "audio_level=", strlen("audio_level=")) == 0) {
if (strcasecmp(ptr + strlen("audio_level="), "false") == 0) {
audio_consumer_levels = 0;
} else {
audio_consumer_levels = 1;