Skip to content

Commit 65a625b

Browse files
authored
Merge pull request #971 from amiaopensource/access-mp4-options
Access mp4 options
2 parents b6dd2fb + 07a4da5 commit 65a625b

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

vrecord

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,49 +2102,63 @@ _lookup_choice(){
21022102
if [[ "${STANDARD}" = "ntsc" ]] ; then
21032103
RECORDINGFILTER+=",setsar=${NTSC_43_SAR_CHOICE}"
21042104
RECORDINGFILTER_MP4+=",setsar=${NTSC_43_SAR_CHOICE}"
2105+
ACCESS_MP4_LEVEL="3.1"
21052106
elif [[ "${STANDARD}" = "pal " ]] ; then
21062107
RECORDINGFILTER+=",setsar=${PAL_43_SAR_CHOICE}"
21072108
RECORDINGFILTER_MP4+=",setsar=${PAL_43_SAR_CHOICE}"
2109+
ACCESS_MP4_LEVEL="3.1"
21082110
elif [[ "${STANDARD}" = "23ps" ]] ; then
21092111
RECORDINGFILTER+=",setdar=4/3"
21102112
RECORDINGFILTER_MP4+=",setdar=4/3"
2113+
ACCESS_MP4_LEVEL="4.0"
21112114
elif [[ "${STANDARD}" = "24ps" ]] ; then
21122115
RECORDINGFILTER+=",setdar=4/3"
21132116
RECORDINGFILTER_MP4+=",setdar=4/3"
2117+
ACCESS_MP4_LEVEL="4.0"
21142118
elif [[ "${STANDARD:0:2}" = "Hp" ]] ; then
21152119
RECORDINGFILTER+=",setdar=4/3"
21162120
RECORDINGFILTER_MP4+=",setdar=4/3"
2121+
ACCESS_MP4_LEVEL="4.0"
21172122
elif [[ "${STANDARD:0:2}" = "Hi" ]] ; then
21182123
RECORDINGFILTER+=",setdar=4/3"
21192124
RECORDINGFILTER_MP4+=",setdar=4/3"
2125+
ACCESS_MP4_LEVEL="4.0"
21202126
elif [[ "${STANDARD:0:2}" = "hp" ]] ; then
21212127
RECORDINGFILTER+=",setdar=4/3"
21222128
RECORDINGFILTER_MP4+=",setdar=4/3"
2129+
ACCESS_MP4_LEVEL="3.2"
21232130
else
21242131
_report -w "Error: the standard wasn't set to an expected when it was expected to be."
21252132
fi ;;
21262133
"16/9")
21272134
if [[ "${STANDARD}" = "ntsc" ]] ; then
21282135
RECORDINGFILTER+=",setsar=${NTSC_169_SAR_CHOICE}"
21292136
RECORDINGFILTER_MP4+=",setsar=${NTSC_169_SAR_CHOICE}"
2137+
ACCESS_MP4_LEVEL="3.1"
21302138
elif [[ "${STANDARD}" = "pal " ]] ; then
21312139
RECORDINGFILTER+=",setsar=${PAL_169_SAR_CHOICE}"
21322140
RECORDINGFILTER_MP4+=",setsar=${PAL_169_SAR_CHOICE}"
2141+
ACCESS_MP4_LEVEL="3.1"
21332142
elif [[ "${STANDARD}" = "23ps" ]] ; then
21342143
RECORDINGFILTER+=",setdar=16/9"
21352144
RECORDINGFILTER_MP4+=",setdar=16/9"
2145+
ACCESS_MP4_LEVEL="4.0"
21362146
elif [[ "${STANDARD}" = "24ps" ]] ; then
21372147
RECORDINGFILTER+=",setdar=16/9"
21382148
RECORDINGFILTER_MP4+=",setdar=16/9"
2149+
ACCESS_MP4_LEVEL="4.0"
21392150
elif [[ "${STANDARD:0:2}" = "Hp" ]] ; then
21402151
RECORDINGFILTER+=",setdar=16/9"
21412152
RECORDINGFILTER_MP4+=",setdar=16/9"
2153+
ACCESS_MP4_LEVEL="4.0"
21422154
elif [[ "${STANDARD:0:2}" = "Hi" ]] ; then
21432155
RECORDINGFILTER+=",setdar=16/9"
21442156
RECORDINGFILTER_MP4+=",setdar=16/9"
2157+
ACCESS_MP4_LEVEL="4.0"
21452158
elif [[ "${STANDARD:0:2}" = "hp" ]] ; then
21462159
RECORDINGFILTER+=",setdar=16/9"
21472160
RECORDINGFILTER_MP4+=",setdar=16/9"
2161+
ACCESS_MP4_LEVEL="3.2"
21482162
else
21492163
_report -w "Error: the standard wasn't set to an expected when it was expected to be."
21502164
fi ;;
@@ -3009,10 +3023,10 @@ if [[ "${DEVICE_INPUT_CHOICE}" = "0" ]] ; then
30093023
AUDIOMAP=$(sed "s/0:a:0/1:a:0/g" <<< "$AUDIOMAP")
30103024
fi
30113025
if [[ "${MP4_CHOICE}" = "true" ]] ; then
3012-
RECORDINGFILTER_MP4+=",bwdif"
3026+
RECORDINGFILTER_MP4+=",bwdif,format=yuv420p"
30133027
RECORD_COMMAND_MP4+=(-filter_complex "[0:v:0]${RECORDINGFILTER_MP4#,*}[mp4_v_out];${AUDIOMAP_MP4}")
30143028
MP4NAME="${DIR}/${FULL_OUTPUT_ID}.mp4"
3015-
EXTRAOUTPUTS+=("${MIDDLEOPTIONS_ALL[@]}" -movflags write_colr+faststart "${RECORD_COMMAND_MP4[@]}" -pix_fmt yuv420p -c:v h264 -c:a aac -map "[mp4_v_out]" "${AUDIO_CHANNEL_MAP[@]:2}" "${MP4NAME}")
3029+
EXTRAOUTPUTS+=("${MIDDLEOPTIONS_ALL[@]}" -movflags write_colr+faststart "${RECORD_COMMAND_MP4[@]}" -c:v h264 -profile:v main -level "${ACCESS_MP4_LEVEL}" -c:a aac -map "[mp4_v_out]" "${AUDIO_CHANNEL_MAP[@]:2}" "${MP4NAME}")
30163030
fi
30173031
if [[ "${FORMAT}" = "matroska" ]] ; then
30183032
_review_option "EMBED_LOGS_CHOICE" "${EMBED_LOGS_OPTIONS[@]}"

0 commit comments

Comments
 (0)