From 56b7655e67528880778696d32f2d3a3e3ff30782 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 18 May 2017 11:06:33 +0200
Subject: Generalize function videosize.

---
 bin/decode+edit+loop+encode+stream | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'bin/decode+edit+loop+encode+stream')

diff --git a/bin/decode+edit+loop+encode+stream b/bin/decode+edit+loop+encode+stream
index 6fe79ea..3ebb7a1 100755
--- a/bin/decode+edit+loop+encode+stream
+++ b/bin/decode+edit+loop+encode+stream
@@ -5,8 +5,12 @@
 
 set -e
 
+##
+## defaults
+##
 INPUT=../src/omni/show0/earth.mp4
 LOGO=../../content/icon_small.png
+RATIO=4:3
 
 ##
 ## generic functions
@@ -29,8 +33,15 @@ ITERATIONS=${3-0} # endless by default
 
 HEIGHT=384
 
-RATIO_NUM=4
-RATIO_DEN=3
+videosize() { height=$1; width_or_ratio=$2;
+ case $width_or_ratio in
+  *:*) num=${width_or_ratio%:*}; den=${width_or_ratio#*:}; width=$((height*num/den));;
+  *) width=$width_or_ratio;;
+ esac
+ echo_n $((height*width))
+}
+
+BITS=$(videosize "$HEIGHT" "$RATIO")
 
 # * bitrates and bits in parens based on https://developer.apple.com/library/content/documentation/General/Reference/HLSAuthoringSpec/Requirements.html
 #   + bits rounded up to include nearby modulo 16 formats
@@ -38,10 +49,6 @@ RATIO_DEN=3
 #   + best (i.e. high-modulo) 4:3 heights: 288 312 384 480 624 816
 # * speeds tuned to just below 100% cpu usage for each combination on a multi-core computer
 # TODO: Externalize speeds to site-specific configfile
-RATIO_NUM=${RATION_NUM:-16}
-RATIO_DEN=${RATION_DEN:-9}
-WIDTH=${WIDTH:-$((HEIGHT*RATIO_NUM/RATIO_DEN))}
-BITS=$((WIDTH*HEIGHT))
 if [ $BITS -le 110592 ]; then # 234p → 97344
  VBITRATE=145000
  SPEED_VP8=2
-- 
cgit v1.2.3