fix explicitly set singlepass/multipass for vpxenc (VP8 does singlepass by default, VP9 does multipass by default)

1 files changed, 6 insertions, 8 deletions

diff --git a/localvideowebencode b/localvideowebencode
index 78a8e06..5cdf995 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -639,10 +639,10 @@ _ffmpeg_bitrate_avc="${do_bitrate_avc:+ -maxrate $bitrate_avc${no_gpu:+ -bufsize
 # format low-level options
 _melt_misc_vp8=" qmin=$qmin_vp8 qmax=$qmax_vp8 g=120 deadline=good cpu-used=$cpu_vp8${profile_vp8:+ vprofile=$profile_vp8} auto-alt-ref=1 lag-in-frames=$lag_vp8 arnr-maxframes=7 arnr-strength=5 arnr-type=centered"
 _ffmpeg_misc_vp8=" -qmin $qmin_vp8 -qmax $qmax_vp8 -g 120 -deadline good -cpu-used $cpu_vp8${profile_vp8:+ -profile:v $profile_vp8} -auto-alt-ref 1 -lag-in-frames $lag_vp8 -arnr-maxframes 7 -arnr-strength 5 -arnr-type centered"
-_vpxenc_misc_vp8=" --min-q=$qmin_vp8 --max-q=$qmax_vp8 --kf-max-dist=120 --good --cpu-used=$cpu_vp8${profile_vp8:+ --profile=$profile_vp8} --token-parts=$tokenparts_log2_vp8 --auto-alt-ref=1 --lag-in-frames=$lag_vp8 --arnr-maxframes=7 --arnr-strength=5 --arnr-type=3"
+_vpxenc_misc_vp8="${multipass_vp8:+ --passes=2} --min-q=$qmin_vp8 --max-q=$qmax_vp8 --kf-max-dist=120 --good --cpu-used=$cpu_vp8${profile_vp8:+ --profile=$profile_vp8} --token-parts=$tokenparts_log2_vp8 --auto-alt-ref=1 --lag-in-frames=$lag_vp8 --arnr-maxframes=7 --arnr-strength=5 --arnr-type=3"
 _melt_misc_vp9=" qmin=$qmin_vp9 qmax=$qmax_vp9 g=120 deadline=good cpu-used=$cpu_vp9${profile_vp9:+ vprofile=$profile_vp9} auto-alt-ref=1 lag-in-frames=$lag_vp9 arnr-maxframes=7 arnr-strength=5 arnr-type=centered"
 _ffmpeg_misc_vp9=" -qmin $qmin_vp9 -qmax $qmax_vp9 -g 120 -deadline good -cpu-used $cpu_vp9${profile_vp9:+ -profile:v $profile_vp9} -auto-alt-ref 1 -lag-in-frames $lag_vp9 -arnr-maxframes 7 -arnr-strength 5 -arnr-type centered"
-_vpxenc_misc_vp9=" --min-q=$qmin_vp9 --max-q=$qmax_vp9 --kf-max-dist=120 --good --cpu-used=$cpu_vp9${profile_vp9:+ --profile=$profile_vp9} --tile-columns=$tokenparts_log2_vp9 --tile-rows=$tokenparts_log2_vp9 --auto-alt-ref=1 --lag-in-frames=$lag_vp9 --arnr-maxframes=7 --arnr-strength=5 --arnr-type=3"
+_vpxenc_misc_vp9="${singlepass_vp9:+ --passes=1} --min-q=$qmin_vp9 --max-q=$qmax_vp9 --kf-max-dist=120 --good --cpu-used=$cpu_vp9${profile_vp9:+ --profile=$profile_vp9} --tile-columns=$tokenparts_log2_vp9 --tile-rows=$tokenparts_log2_vp9 --auto-alt-ref=1 --lag-in-frames=$lag_vp9 --arnr-maxframes=7 --arnr-strength=5 --arnr-type=3"
 _melt_misc_avc="${no_gpu:+ movflags=+faststart}"
 _ffmpeg_misc_avc="${no_gpu:+ -movflags +faststart}"
 
@@ -717,9 +717,9 @@ if [ -n "${webm:+$multipass_vp8}${webm_vp9:+$multipass_vp9}${mp4:+$multipass_avc
 		$melt $_melt_infiles $filters $_melt_stdout \
 			| pee \
 			${webm:+"$vpxenc_chained - $_vpxenc_vp8 \
-			-p 2 --pass=1 --fpf=${stem}_vp8.log -o /dev/null"} \
+			--pass=1 --fpf=${stem}_vp8.log -o /dev/null"} \
 			${webm_vp9:+"$vpxenc_chained - $_vpxenc_vp9 \
-			-p 2 --pass=1 --fpf=${stem}_vp9.log -o /dev/null"} \
+			--pass=1 --fpf=${stem}_vp9.log -o /dev/null"} \
 			${mp4:+${use_ffmpeg_avc:+$_ffmpeg_rawvideo $_ffmpeg_avc -an \
 			-pass 1 -passlogfile ${stem}_avc /dev/null}}
 	elif [ -n "${webm:+$use_ffmpeg_vp8}${webm_vp9:+$use_ffmpeg_vp9}${mp4:+$use_ffmpeg_avc}" ]; then
@@ -770,16 +770,14 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${webm_vp9:+$use_vpxenc$u
 			${multipass_vp8:+-pass 2 -passlogfile ${stem}_vp8} \
 			${stem}${channels:+_silent}.webm"}} \
 		${webm:+${use_vpxenc:+"$vpxenc_chained - $_vpxenc_vp8 \
-			${singlepass_vp8:+-p 1} \
-			${multipass_vp8:+-p 2 --pass=2 --fpf=${stem}_vp8.log} \
+			${multipass_vp8:+--pass=2 --fpf=${stem}_vp8.log} \
 			-o ${stem}${channels:+_silent}.webm"}} \
 		${webm_vp9:+${use_ffmpeg_vp9:+"$ffmpeg_chained \
 			$_ffmpeg_stdin $_ffmpeg_webm_vp9_onlyvideo \
 			${multipass_vp9:+-pass 2 -passlogfile ${stem}_vp9} \
 			${stem}_vp9${channels:+_silent}.webm"}} \
 		${webm_vp9:+${use_vpxenc:+"$vpxenc_chained - $_vpxenc_vp9 \
-			${singlepass_vp9:+-p 1} \
-			${multipass_vp9:+-p 2 --pass=2 --fpf=${stem}_vp9.log} \
+			${multipass_vp9:+--pass=2 --fpf=${stem}_vp9.log} \
 			-o ${stem}_vp9${channels:+_silent}.webm"}} \
 		${mp4:+${use_ffmpeg_avc:+"$ffmpeg_chained \
 			$_ffmpeg_stdin $_ffmpeg_mp4_onlyvideo \