From 80d02c842849ff058282f64cae5f018f815a9829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
Date: Tue, 21 Apr 2020 17:14:21 +0200
Subject: [PATCH] fps no longer optional

Former-commit-id: b99223b39824a078adaff63eef486277958d6429
---
 src/static/client.sh | 16 +++++++++++-----
 src/workunit.rs      |  5 ++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/static/client.sh b/src/static/client.sh
index 25b3801..0f9a9f0 100644
--- a/src/static/client.sh
+++ b/src/static/client.sh
@@ -96,21 +96,27 @@ while true; do
         aompix="--i444"
     fi
 
+
+
     fps=`echo $job | jq -r .description.options.fps`
     if [[ $fps = "null" ]]; then
-        fpsoption=""
+        fffps=""
+        aomfps=""
     else
         fpsrate=`echo $fps | jq -r '.[0]'`
         fpsscale=`echo $fps | jq -r '.[1]'`
-        fpsoption="$fpsrate/$fpsscale"
+        fpsv="$fpsrate/$fpsscale"
+        fffps="fps=fps=$fpsv"
+        aomfps="--fps=$fpsv"
     fi
 
+
     two_pass=`echo $job | jq -r .description.options.two_pass`
 
     if [[ $two_pass = true ]]; then
         set +e
         eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-        -i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \
+        -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
         --pass=1 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
 
         retval=$?
@@ -122,7 +128,7 @@ while true; do
         fi
 
         eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-        -i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \
+        -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
         --pass=2 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
 
         retval=$?
@@ -140,7 +146,7 @@ while true; do
     else
         set +e
         eval 'ffmpeg -nostats -hide_banner -loglevel warning \
-        -i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$fpsoption' '$aompix' '$aomenco' \
+        -i "'$input'" '$ffmpego' -vf scale='$height':'$width','$fffps' -pix_fmt '$ffpix' -f yuv4mpegpipe - | aomenc - '$aomfps' '$aompix' '$aomenco' \
         --passes=1 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
 
         retval=$?
diff --git a/src/workunit.rs b/src/workunit.rs
index fb68c9e..f05bcb8 100644
--- a/src/workunit.rs
+++ b/src/workunit.rs
@@ -48,8 +48,7 @@ pub struct EOptions {
     pub aomenc: String,
     pub two_pass: bool,
     pub pix_fmt: EPixFmt,
-    #[serde(default)]
-    pub fps: Option<(u16, u16)>
+    pub fps: (u16, u16)
 }
 impl Default for EOptions {
     fn default() -> Self {
@@ -58,7 +57,7 @@ impl Default for EOptions {
             aomenc: "--lag-in-frames=25 --tile-columns=0 --tile-rows=0 --enable-fwd-kf=1 --bit-depth=10 --cpu-used=3 --cq-level=30 --end-usage=q".to_string(),
             two_pass: false,
             pix_fmt: EPixFmt::I422,
-            fps: Option::None
+            fps: (25, 1)
         }
     }
 }