fix comparisons

Former-commit-id: 96d201d911ce7b9220314ff63498733292cc9af5
This commit is contained in:
Daniel Olsen 2020-05-13 23:25:16 +02:00
parent 26ea062fa4
commit 575356a9b4

View File

@ -73,7 +73,7 @@ while true; do
etype=`echo $job | jq -r '.description.options | keys | .[]'` etype=`echo $job | jq -r '.description.options | keys | .[]'`
if [$etype != "FFMPEG"] || [$etype != "AOMENC" ]; then if [$etype != "FFMPEG"] && [$etype != "AOMENC" ]; then
echo "That's not a valid encoder!! Are you being attacked?" echo "That's not a valid encoder!! Are you being attacked?"
fi fi
@ -85,7 +85,7 @@ while true; do
options=`echo $job | jq .description.options.$etype` options=`echo $job | jq .description.options.$etype`
case $etype in case $etype in
AOMENC) "AOMENC")
aomenco=`echo $options | jq -r .aomenc` aomenco=`echo $options | jq -r .aomenc`
aomenco=${aomenco//[^a-zA-Z0-9_\- =]/} aomenco=${aomenco//[^a-zA-Z0-9_\- =]/}
ffmpego=`echo $options | jq -r .ffmpeg` ffmpego=`echo $options | jq -r .ffmpeg`
@ -171,7 +171,7 @@ while true; do
rm "$input" rm "$input"
fi fi
;; ;;
FFMPEG) "FFMPEG")
echo "Starting FFMPEG encode" echo "Starting FFMPEG encode"
if [[ $two_pass = true ]]; then if [[ $two_pass = true ]]; then
echo "Running in two-pass mode" echo "Running in two-pass mode"
@ -183,7 +183,10 @@ while true; do
lag_in_frames=`echo $options | jq -r .lag_in_frames` lag_in_frames=`echo $options | jq -r .lag_in_frames`
set +e set +e
ffmpeg -i $input -c:v libaom-av1 -strict experimental -pass 1 -an -vf scale=$width:$height -pix_fmt $pix_fmt -tiles $tiles -lag-in-frames $lag_in_frames $flag_g -f ivf /dev/null ffmpeg -i $input -c:v libaom-av1 -strict experimental -pass 1 -an \
-vf scale=$width:$height -pix_fmt $pix_fmt \
-tiles $tiles -lag-in-frames $lag_in_frames $flag_g \
-f ivf /dev/null
fi fi
;; ;;