Skip to content

Commit 569aec2

Browse files
dericeddericed
authored
Merge pull request #942 from amiaopensource/Added-addional-HD-formats
Added addional hd formats
2 parents f0f8518 + 2bdf7a7 commit 569aec2

2 files changed

Lines changed: 175 additions & 9 deletions

File tree

‎Resources/vrecord_functions‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ _update_config_file(){
8989
echo "DV_RESCUE_OPTION_TC=\"${DV_RESCUE_OPTION_TC}\""
9090
echo "CC2VTT=\"${CC2VTT}\""
9191
echo "CC2SRT=\"${CC2SRT}\""
92+
echo "HD_CHOICE=\"${HD_CHOICE}\""
9293
} > "${CONFIG_FILE}"
9394
. "${CONFIG_FILE}"
9495
}
@@ -205,6 +206,30 @@ _get_decklink_input_list(){
205206
"${FFMPEG_BIN}" -nostdin -v 0 -sources decklink | awk -F'[][]' '{print $2}' | grep -v "^$"
206207
}
207208

209+
_get_format_list(){
210+
if [ -z ${HD_CHOICE} ] ; then
211+
. "${CONFIG_FILE}"
212+
fi
213+
if [ ${HD_CHOICE} != "true" ] ; then
214+
echo "NTSC
215+
PAL"
216+
else
217+
echo "NTSC
218+
PAL
219+
23ps - 1080p23.98
220+
24ps - 1080p24
221+
Hp25 - 1080p25
222+
Hp29 - 1080p29.97
223+
Hp30 - 1080p30
224+
Hi50 - 1080i50
225+
Hi59 - 1080i59.94
226+
Hi60 - 1080i60
227+
hp50 - 720p50
228+
hp59 - 720p59.94
229+
hp60 - 720p60"
230+
fi
231+
}
232+
208233
_get_dvrescue_input_list(){
209234
# set dvrescue input options
210235
unset DVRESCUE_DEVICES

‎vrecord‎

Lines changed: 150 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ _gtk_vbox_list() {
383383
LIST="<input>_get_dvrescue_input_list</input>"
384384
elif [[ "${VARIABLE_NAME}" == "AUDIO_DEV_CHOICE" ]] ; then
385385
LIST="<input>_get_audio_device_list</input>"
386+
elif [[ "${VARIABLE_NAME}" == "STANDARD_CHOICE" ]] ; then
387+
LIST="<input>_get_format_list</input>"
386388
else
387389
LIST="$(_expand_list2items "${OPTION_LIST[@]}")"
388390
fi
@@ -416,6 +418,16 @@ _gtk_vbox_list() {
416418
<action>_update_config_file</action>
417419
<action type=\"exit\">timecode_scan</action>
418420
</button>"
421+
elif [[ "${VARIABLE_NAME}" == "STANDARD_CHOICE" ]] ; then
422+
echo "
423+
<checkbox>
424+
<label>Show HD Formats</label>
425+
<default>\"${HD_CHOICE}\"</default>
426+
<variable>HD_CHOICE</variable>
427+
<action>_update_config_file</action>
428+
<action type=\"clear\">STANDARD_CHOICE</action>
429+
<action type=\"refresh\">STANDARD_CHOICE</action>
430+
</checkbox>"
419431
elif [[ "${VARIABLE_NAME}" == "EMBED_LOGS_CHOICE" ]] ; then
420432
echo "<sensitive>$(if $MKVPROPEDIT_INSTALLED ; then echo true ; else echo false ; fi)</sensitive>"
421433
elif [[ "${VARIABLE_NAME}" == "QCTOOLSXML_CHOICE" ]] ; then
@@ -979,10 +991,10 @@ DECKLINK_INPUT_GUI=$(cat << DECKLINK_FORM
979991
$(_gtk_vbox_list "VIDEO_INPUT_CHOICE" "80" "Video Input" "${VIDEO_INPUT_OPTIONS[@]}")
980992
$(_gtk_vbox_list "AUDIO_INPUT_CHOICE" "130" "Audio Input" "${AUDIO_INPUT_OPTIONS[@]}")
981993
$(_gtk_vbox_list "AUDIO_MAPPING_CHOICE" "-1" "Audio Channel Mapping" "${CHANNEL_MAPPING_OPTIONS[@]}" )
982-
$(_gtk_vbox_list "STANDARD_CHOICE" "50" "Standard" "${STANDARD_OPTIONS[@]}")
983-
$(_gtk_vbox_list "VIDEO_BIT_DEPTH_CHOICE" "60" "Video Bit Depth" "${VIDEO_BITDEPTH_OPTIONS[@]}")
984-
$(_gtk_vbox_list "ASPECT_RATIO_CHOICE" "60" "Display Aspect Ratio" "${ASPECT_RATIO_OPTIONS[@]}")
985-
$(_gtk_vbox_list "TIMECODE_CHOICE" "6 0" "Timecode format" "${TIMECODE_OPTIONS[@]}")
994+
$(_gtk_vbox_list "STANDARD_CHOICE" "110" "Standard" "${STANDARD_OPTIONS[@]}")
995+
$(_gtk_vbox_list "VIDEO_BIT_DEPTH_CHOICE" "40" "Video Bit Depth" "${VIDEO_BITDEPTH_OPTIONS[@]}")
996+
$(_gtk_vbox_list "ASPECT_RATIO_CHOICE" "40" "Display Aspect Ratio" "${ASPECT_RATIO_OPTIONS[@]}")
997+
$(_gtk_vbox_list "TIMECODE_CHOICE" "40" "Timecode format" "${TIMECODE_OPTIONS[@]}")
986998
</hbox>
987999
<frame Output file options>
9881000
<hbox space-expand="true">
@@ -1943,16 +1955,116 @@ _lookup_choice(){
19431955
SET_COLOR_TRC="bt709"
19441956
SET_COLORSPACE="bt470bg"
19451957
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
1946-
"Hi59")
1958+
"23ps - 1080p23.98")
1959+
STANDARD="23ps"
1960+
DECKLINK_FPS="24000/1001"
1961+
SIG_GEN_SIZE="1920x1080"
1962+
SIG_INTERLACEMENT="prog"
1963+
_set_some_params
1964+
SET_COLOR_PRIMARIES="bt709"
1965+
SET_COLOR_TRC="bt709"
1966+
SET_COLORSPACE="bt709"
1967+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
1968+
"24ps - 1080p24")
1969+
STANDARD="24ps"
1970+
DECKLINK_FPS="24000/1000"
1971+
SIG_GEN_SIZE="1920x1080"
1972+
SIG_INTERLACEMENT="prog"
1973+
_set_some_params
1974+
SET_COLOR_PRIMARIES="bt709"
1975+
SET_COLOR_TRC="bt709"
1976+
SET_COLORSPACE="bt709"
1977+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
1978+
"Hp25 - 1080p25")
1979+
STANDARD="Hp25"
1980+
DECKLINK_FPS="25000/1000"
1981+
SIG_GEN_SIZE="1920x1080"
1982+
SIG_INTERLACEMENT="prog"
1983+
_set_some_params
1984+
SET_COLOR_PRIMARIES="bt709"
1985+
SET_COLOR_TRC="bt709"
1986+
SET_COLORSPACE="bt709"
1987+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
1988+
"Hp29 - 1080p29.97")
1989+
STANDARD="Hp29"
1990+
DECKLINK_FPS="30000/1001"
1991+
SIG_GEN_SIZE="1920x1080"
1992+
SIG_INTERLACEMENT="prog"
1993+
_set_some_params
1994+
SET_COLOR_PRIMARIES="bt709"
1995+
SET_COLOR_TRC="bt709"
1996+
SET_COLORSPACE="bt709"
1997+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
1998+
"Hp30 - 1080p30")
1999+
STANDARD="Hp30"
2000+
DECKLINK_FPS="30000/1000"
2001+
SIG_GEN_SIZE="1920x1080"
2002+
SIG_INTERLACEMENT="prog"
2003+
_set_some_params
2004+
SET_COLOR_PRIMARIES="bt709"
2005+
SET_COLOR_TRC="bt709"
2006+
SET_COLORSPACE="bt709"
2007+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2008+
"Hi50 - 1080i50")
2009+
STANDARD="Hi50"
2010+
DECKLINK_FPS="25000/1000"
2011+
SIG_GEN_SIZE="1920x1080"
2012+
SIG_INTERLACEMENT="tff"
2013+
_set_some_params
2014+
SET_COLOR_PRIMARIES="bt709"
2015+
SET_COLOR_TRC="bt709"
2016+
SET_COLORSPACE="bt709"
2017+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2018+
"Hi59 - 1080i59.94")
19472019
STANDARD="Hi59"
19482020
DECKLINK_FPS="30000/1001"
1949-
SIG_GEN_SIZE="1920X1080"
2021+
SIG_GEN_SIZE="1920x1080"
2022+
SIG_INTERLACEMENT="tff"
2023+
_set_some_params
2024+
SET_COLOR_PRIMARIES="bt709"
2025+
SET_COLOR_TRC="bt709"
2026+
SET_COLORSPACE="bt709"
2027+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2028+
"Hi60 - 1080i60")
2029+
STANDARD="Hi60"
2030+
DECKLINK_FPS="30000/1000"
2031+
SIG_GEN_SIZE="1920x1080"
19502032
SIG_INTERLACEMENT="tff"
19512033
_set_some_params
19522034
SET_COLOR_PRIMARIES="bt709"
19532035
SET_COLOR_TRC="bt709"
19542036
SET_COLORSPACE="bt709"
19552037
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2038+
"hp50 - 720p50")
2039+
STANDARD="hp50"
2040+
DECKLINK_FPS="50000/1000"
2041+
SIG_GEN_SIZE="1280x720"
2042+
SIG_INTERLACEMENT="prog"
2043+
_set_some_params
2044+
SET_COLOR_PRIMARIES="bt709"
2045+
SET_COLOR_TRC="bt709"
2046+
SET_COLORSPACE="bt709"
2047+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2048+
"hp59 - 720p59.94")
2049+
STANDARD="hp59"
2050+
DECKLINK_FPS="60000/1001"
2051+
SIG_GEN_SIZE="1280x720"
2052+
SIG_INTERLACEMENT="prog"
2053+
_set_some_params
2054+
SET_COLOR_PRIMARIES="bt709"
2055+
SET_COLOR_TRC="bt709"
2056+
SET_COLORSPACE="bt709"
2057+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
2058+
"hp60 - 720p60")
2059+
STANDARD="hp60"
2060+
DECKLINK_FPS="60000/1000"
2061+
SIG_GEN_SIZE="1280x720"
2062+
SIG_INTERLACEMENT="prog"
2063+
_set_some_params
2064+
SET_COLOR_PRIMARIES="bt709"
2065+
SET_COLOR_TRC="bt709"
2066+
SET_COLORSPACE="bt709"
2067+
RECORDINGFILTER+=",setparams=range=${SET_RANGE}:color_primaries=${SET_COLOR_PRIMARIES}:color_trc=${SET_COLOR_TRC}:colorspace=${SET_COLORSPACE}:field_mode=${SET_FIELD_MODE}" ;;
19562068
# aspect ratio options
19572069
"4/3")
19582070
if [[ "${STANDARD}" = "ntsc" ]] ; then
@@ -1961,7 +2073,19 @@ _lookup_choice(){
19612073
elif [[ "${STANDARD}" = "pal " ]] ; then
19622074
RECORDINGFILTER+=",setsar=${PAL_43_SAR_CHOICE}"
19632075
RECORDINGFILTER_MP4+=",setsar=${PAL_43_SAR_CHOICE}"
1964-
elif [[ "${STANDARD}" = "Hi59" ]] ; then
2076+
elif [[ "${STANDARD}" = "23ps" ]] ; then
2077+
RECORDINGFILTER+=",setdar=4/3"
2078+
RECORDINGFILTER_MP4+=",setdar=4/3"
2079+
elif [[ "${STANDARD}" = "24ps" ]] ; then
2080+
RECORDINGFILTER+=",setdar=4/3"
2081+
RECORDINGFILTER_MP4+=",setdar=4/3"
2082+
elif [[ "${STANDARD:0:2}" = "Hp" ]] ; then
2083+
RECORDINGFILTER+=",setdar=4/3"
2084+
RECORDINGFILTER_MP4+=",setdar=4/3"
2085+
elif [[ "${STANDARD:0:2}" = "Hi" ]] ; then
2086+
RECORDINGFILTER+=",setdar=4/3"
2087+
RECORDINGFILTER_MP4+=",setdar=4/3"
2088+
elif [[ "${STANDARD:0:2}" = "hp" ]] ; then
19652089
RECORDINGFILTER+=",setdar=4/3"
19662090
RECORDINGFILTER_MP4+=",setdar=4/3"
19672091
else
@@ -1974,7 +2098,19 @@ _lookup_choice(){
19742098
elif [[ "${STANDARD}" = "pal " ]] ; then
19752099
RECORDINGFILTER+=",setsar=${PAL_169_SAR_CHOICE}"
19762100
RECORDINGFILTER_MP4+=",setsar=${PAL_169_SAR_CHOICE}"
1977-
elif [[ "${STANDARD}" = "Hi59" ]] ; then
2101+
elif [[ "${STANDARD}" = "23ps" ]] ; then
2102+
RECORDINGFILTER+=",setdar=16/9"
2103+
RECORDINGFILTER_MP4+=",setdar=16/9"
2104+
elif [[ "${STANDARD}" = "24ps" ]] ; then
2105+
RECORDINGFILTER+=",setdar=16/9"
2106+
RECORDINGFILTER_MP4+=",setdar=16/9"
2107+
elif [[ "${STANDARD:0:2}" = "Hp" ]] ; then
2108+
RECORDINGFILTER+=",setdar=16/9"
2109+
RECORDINGFILTER_MP4+=",setdar=16/9"
2110+
elif [[ "${STANDARD:0:2}" = "Hi" ]] ; then
2111+
RECORDINGFILTER+=",setdar=16/9"
2112+
RECORDINGFILTER_MP4+=",setdar=16/9"
2113+
elif [[ "${STANDARD:0:2}" = "hp" ]] ; then
19782114
RECORDINGFILTER+=",setdar=16/9"
19792115
RECORDINGFILTER_MP4+=",setdar=16/9"
19802116
else
@@ -2636,7 +2772,12 @@ PAL_43_SAR_OPTIONS=("12/11" "16/15" "128/117")
26362772
PAL_169_SAR_OPTIONS=("16/11" "64/45" "512/351")
26372773
CHANNEL_MAPPING_OPTIONS=("2 Stereo Tracks (Channels 1 & 2 -> 1st Track Stereo, Channels 3 & 4 -> 2nd Track Stereo)" "1 Stereo Track (From Channels 1 & 2)" "1 Stereo Track (From Channels 3 & 4)" "Channel 1 -> 1st Track Mono, Channel 2 -> 2nd Track Mono" "Channel 2 -> 1st Track Mono, Channel 1 -> 2nd Track Mono" "Channel 1 -> Single Track Mono" "Channel 2 -> Single Track Mono")
26382774
TIMECODE_OPTIONS=("none" "rp188vitc" "rp188vitc2" "rp188ltc" "rp188any" "vitc" "vitc2" "serial")
2639-
STANDARD_OPTIONS=("NTSC" "PAL" "Hi59")
2775+
if [[ ${HD_CHOICE} != "true" ]] ; then
2776+
STANDARD_OPTIONS=("NTSC" "PAL")
2777+
else
2778+
STANDARD_OPTIONS=("NTSC" "PAL" "23ps - 1080p23.98" "24ps - 1080p24" "Hp25 - 1080p25" "Hp29 - 1080p29.97" "Hp30 - 1080p30" "Hi50 - 1080i50" "Hi59 - 1080i59.94" "Hi60 - 1080i60" "hp50 - 720p50" "hp59 - 720p59.94" "hp60 - 720p60")
2779+
fi
2780+
# STANDARD_OPTIONS list must be synced with Resources/vrecord_functions in _get_format_list
26402781
QCTOOLSXML_OPTIONS=("Yes, concurrent with recording" "Yes, after recording" "No")
26412782
EMBED_LOGS_OPTIONS=("Yes" "No")
26422783
PLAYBACKVIEW_OPTIONS=("Unfiltered" "Visual" "Audio + Video" "Visual + Numerical" "Color Matrix" "Bit Planes" "Frame Positioning" "Captions")

0 commit comments

Comments
 (0)