lobsters, add embedded URL.

rc_shared.sh

@@ -824,10 +824,11 @@ function pv-test {
 	fi
 	echo -e "  video codecs: '$vcodecs'\n"
 
-	echo ""
+	echo "Please provide any presets to use."
-	read -p "Test the video codec's slowest, medium, and fastest presets? (y/N) " test_vpresets
+	echo "(if testing both H264 and AV1, please select from: vsl slr slw med fst fsr vft)"
-	if [[ "$test_vpresets" == "y"* ]]; then
+	read -p "Add any presets? [$vpresets] " test_vpresets
-		vpresets="slw med fst"
+	if [[ -n "$test_vpresets" ]]; then
+		vpresets="$test_vpresets"
 	fi
 	echo -e "  presets: '$vpresets'\n"
 
@@ -904,6 +905,24 @@ function pv-test {
 	ffprobe -i "$filename_in"
 	echo -e "\n * Testing against '$filename_in' above. * \n"
 
+	typeset -i guess
+	guess=$(( \
+		  `wc -w <<< $vcodecs`   * `wc -w <<< $vpresets` * `wc -w <<< $crfs` \
+		* `wc -w <<< $vbrs`      * `wc -w <<< $overs`    * `wc -w <<< $unders` \
+		* `wc -w <<< $acodecs`   * `wc -w <<< $abrs` \
+		* `wc -w <<< $achannels` * `wc -w <<< $afreqs` \
+	))
+	if (( $guess > 0 )); then
+		plural=""
+		if (( $guess != 1 )); then
+			plural="s"
+		fi
+		echo -e "Expecting ${guess} loop${plural}.\n"
+	else
+		echo "ERROR: Something went wrong, got 0 loops, exiting."
+		return 1
+	fi
+
 	typeset -u okay
 	read -p "Does everything look okay? (Y/n) " okay
 	if [[ "$okay" == "N" || "$okay" == "F"* ]]; then
@@ -933,24 +952,6 @@ function pv-test {
 		echo -e " * Testing with 'pv2' complete! * \n"
 	fi
 
-	typeset -i guess
-	guess=$(( \
-		  `wc -w <<< $vcodecs`   * `wc -w <<< $vpresets` * `wc -w <<< $crfs` \
-		* `wc -w <<< $vbrs`      * `wc -w <<< $overs`    * `wc -w <<< $unders` \
-		* `wc -w <<< $acodecs`   * `wc -w <<< $abrs` \
-		* `wc -w <<< $achannels` * `wc -w <<< $afreqs` \
-	))
-	if (( $guess > 0 )); then
-		plural=""
-		if (( $guess != 1 )); then
-			plural="s"
-		fi
-		echo -e "Expecting ${guess} loop${plural}, please be patient.\n"
-	else
-		echo "ERROR: Something went wrong, got 0 loops, exiting."
-		return 1
-	fi
-
 	typeset -i count
 	unset vcodec vpreset crf vbr acodec abr ext
 	for vcodec in $vcodecs; do for vpreset in $vpresets; do for crf in $crfs; do
@@ -964,16 +965,24 @@ function pv-test {
 						if [[ "$vpreset" != "default" ]]; then
 							if [[ "$vcodec" == "libsvtav1" ]]; then
 								case $vpreset in
-									slw) preset="0" ;;
+									vsl) preset="0" ;;
+									slr) preset="2" ;;
+									slw) preset="4" ;;
 									med) preset="6" ;;
-									fst) preset="13" ;;
+									fst) preset="8" ;; # default
+									fsr) preset="10" ;;
+									vft) preset="12" ;;
 									*) preset="$vpreset" ;;
 								esac
 							else
 								case $vpreset in
-									slw) preset="veryslow" ;;
+									vsl) preset="veryslow" ;;
-									med) preset="medium" ;;
+									slr) preset="slower" ;;
-									fst) preset="ultrafast" ;;
+									slw) preset="slow" ;;
+									med) preset="medium" ;; # default
+									fst) preset="fast" ;;
+									fsr) preset="faster" ;;
+									vft) preset="veryfast" ;;
 									*) preset="$vpreset" ;;
 								esac
 							fi