streamline codec preset/profile variables

1 files changed, 14 insertions, 11 deletions

diff --git a/localvideowebencode b/localvideowebencode
index 1d6bc2e..4b5c3b0 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -354,21 +354,21 @@ if [ -n "$_width" ] && [ -n "$_height" ]; then
 fi
 _frames="${framerate:-$framerate_in}"
 
-preset_vp8=libvpx-360p
-preset_vp9=libvpx-360p
+pre_vp8=libvpx-360p
+pre_vp9=libvpx-360p
 webm_qmin=0
 webm_qmax=63
 webm_lag=16
 webm_tokenparts_log2=0
 if [ -n "$_pixels" ] && [ $_pixels -ge $((1024*768)) ]; then
-	preset_vp8=libvpx-720p
-	preset_vp9=libvpx-720p
+	pre_vp8=libvpx-720p
+	pre_vp9=libvpx-720p
 	webm_qmin=11
 	webm_qmax=51
 	webm_tokenparts_log2=2
 	if [ -n "$_frames" ] && [ $_frames -gt 40 ]; then
-		preset_vp8=libvpx-720p50_60
-		preset_vp9=libvpx-720p50_60
+		pre_vp8=libvpx-720p50_60
+		pre_vp9=libvpx-720p50_60
 		webm_lag=25
 	fi
 fi
@@ -446,6 +446,9 @@ if [ -n "$stereo$mono" ]; then
 	fi
 fi
 
+encoder_vp8=libvpx
+encoder_vp9=libvpx-vp9
+encoder_h264=libx264
 for vformat in vp8 vp9 h264; do
 	# melt supports dual-pass mode only for h.264
 	[ h264 = "$vformat" ] || [ -n "$vpxenc" ] || [ -z "$multipass" ] || eval "use_ffmpeg_$vformat=yes"
@@ -480,14 +483,14 @@ _melt_postfilters_audio="${limit:+-filter ladspa.1077}"
 
 # codec options
 _melt_theora="vcodec=libtheora${bitrate:+ vb=$bitrate} qscale=$qscale_theora"
-_melt_vp8="vcodec=libvpx${preset_vp8:+ vpreset=$preset_vp8}${bitrate_vp8:+ vb=$bitrate_vp8 minrate=$((bitrate_vp8/20)) maxrate=$((bitrate_vp8*12))}${crf_vp8:+ crf=$crf_vp8} cpu-used=$cpu_vp8"
-_ffmpeg_vp8="-c:v libvpx${preset_vp8:+ -vpre $preset_vp8}${bitrate_vp8:+ -b:v $bitrate_vp8 -minrate $((bitrate_vp8/20)) -maxrate $((bitrate_vp8*12))}${crf_vp8:+ -crf $crf_vp8} -cpu-used $cpu_vp8"
+_melt_vp8="vcodec=$encoder_vp8${pre_vp8:+ vpreset=$pre_vp8}${preset_vp8:+ preset=$preset_vp8}${bitrate_vp8:+ vb=$bitrate_vp8 minrate=$((bitrate_vp8/20)) maxrate=$((bitrate_vp8*12))}${crf_vp8:+ crf=$crf_vp8} cpu-used=$cpu_vp8"
+_ffmpeg_vp8="-c:v $encoder_vp8${pre_vp8:+ -vpre $pre_vp8}${preset_vp8:+ preset $preset_vp8}${bitrate_vp8:+ -b:v $bitrate_vp8 -minrate $((bitrate_vp8/20)) -maxrate $((bitrate_vp8*12))}${crf_vp8:+ -crf $crf_vp8} -cpu-used $cpu_vp8"
 _vpxenc_vpx="--min-q=$webm_qmin --max-q=$webm_qmax${multipass:+ --minsection-pct=5 --maxsection-pct=1200} --kf-max-dist=120 --auto-alt-ref=1 --lag-in-frames=$webm_lag --arnr-maxframes=7 --arnr-strength=5 --arnr-type=3"
 _vpxenc_vp8="--codec=vp8${bitrate_vp8:+ --target-bitrate=$((bitrate_vp8/1000))} --good --end-usage=${vbr_vp8:+vbr}${crf_vp8:+cq --cq-level=$crf_vp8} --cpu-used=$cpu_vp8 $_vpxenc_vpx --token-parts=$webm_tokenparts_log2"
-_melt_vp9="vcodec=libvpx-vp9${preset_vp9:+ vpreset=$preset_vp9}${bitrate_vp9:+ vb=$bitrate_vp9 minrate=$((bitrate_vp9/20)) maxrate=$((bitrate_vp9*12))}${crf_vp9:+ crf=$crf_vp9} cpu-used=$cpu_vp9"
-_ffmpeg_vp9="-c:v libvpx-vp9${preset_vp9:+ -vpre $preset_vp9}${bitrate_vp9:+ -b:v $bitrate_vp9 -minrate $((bitrate_vp9/20)) -maxrate $((bitrate_vp9*12))}${crf_vp9:+ -crf $crf_vp9} -cpu-used $cpu_vp9"
+_melt_vp9="vcodec=$encoder_vp9${pre_vp9:+ vpreset=$pre_vp9}${preset_vp9:+ preset=$preset_vp9}${bitrate_vp9:+ vb=$bitrate_vp9 minrate=$((bitrate_vp9/20)) maxrate=$((bitrate_vp9*12))}${crf_vp9:+ crf=$crf_vp9} cpu-used=$cpu_vp9"
+_ffmpeg_vp9="-c:v $encoder_vp9${pre_vp9:+ -vpre $pre_vp9}${preset_vp9:+ -preset $preset_vp9}${bitrate_vp9:+ -b:v $bitrate_vp9 -minrate $((bitrate_vp9/20)) -maxrate $((bitrate_vp9*12))}${crf_vp9:+ -crf $crf_vp9} -cpu-used $cpu_vp9"
 _vpxenc_vp9="--codec=vp9${bitrate_vp9:+ --target-bitrate=$((bitrate_vp9/1000))} --good --end-usage=${vbr_vp9:+vbr}${crf_vp9:+cq --cq-level=$crf_vp9} --cpu-used=$cpu_vp9 $_vpxenc_vpx --tile-columns=$webm_tokenparts_log2 --tile-rows=$webm_tokenparts_log2"
-_melt_h264="vcodec=libx264${preset_h264:+ vpreset=$preset_h264}${profile_h264:+ vprofile=$profile_h264}${x264tune:+ tune=$x264tune} maxrate=${bitrate} bufsize=$((bitrate*2)) threads=0 movflags=+faststart crf=$crf_h264"
+_melt_h264="vcodec=$encoder_h264${preset_h264:+ vpreset=$preset_h264}${profile_h264:+ vprofile=$profile_h264}${x264tune:+ tune=$x264tune} maxrate=${bitrate} bufsize=$((bitrate*2)) threads=0 movflags=+faststart crf=$crf_h264"
 _melt_pcm="$_melt_downmix acodec=pcm_s16le"
 _melt_vorbis="$_melt_downmix acodec=libvorbis aq=$quality_vorbis"
 _ffmpeg_vorbis="$_ffmpeg_downmix -c:a libvorbis -aq $quality_vorbis"