From e30d3e8e31c6546b5fc8ac52db4cb241c2804de4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 17 May 2017 23:27:17 +0200
Subject: Wrap lines.

---
 bin/decode+edit+encode             | 18 ++++++++++++------
 bin/decode+edit+encodeDV           | 18 ++++++++++++------
 bin/decode+edit+loop+encode+stream | 24 ++++++++++++++++++------
 bin/encodevideo+loop+stream        | 24 ++++++++++++++++++------
 bin/loop+encode+stream             | 24 ++++++++++++++++++------
 bin/stream                         | 30 ++++++++++++++++++++++++------
 6 files changed, 102 insertions(+), 36 deletions(-)

(limited to 'bin')

diff --git a/bin/decode+edit+encode b/bin/decode+edit+encode
index 7499130..edd428f 100755
--- a/bin/decode+edit+encode
+++ b/bin/decode+edit+encode
@@ -15,12 +15,18 @@ SPEED_VP8=4
 # * height steps and bitrates based on https://developer.apple.com/library/content/documentation/General/Reference/HLSAuthoringSpec/Requirements.html
 # TODO: adjust height steps or bitrates for 4:3 aspect ratio
 # TODO: resolve steps from source height using http://aarmstrong.org/tutorials/aspect-ratios-and-h264
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
 fi
 
 mkdir -p $(dirname "$OUTPUT")
diff --git a/bin/decode+edit+encodeDV b/bin/decode+edit+encodeDV
index ef1474d..6586b8a 100755
--- a/bin/decode+edit+encodeDV
+++ b/bin/decode+edit+encodeDV
@@ -11,12 +11,18 @@ OUTPUT=../tmp/omni/show0/earth.dv
 HEIGHT=360
 
 # inspired by Apple HLS recommendations
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
 fi
 
 mkdir -p $(dirname "$OUTPUT")
diff --git a/bin/decode+edit+loop+encode+stream b/bin/decode+edit+loop+encode+stream
index 5d9a89e..c91ac96 100755
--- a/bin/decode+edit+loop+encode+stream
+++ b/bin/decode+edit+loop+encode+stream
@@ -26,12 +26,24 @@ HEIGHT=360
 # TODO: adjust height steps or bitrates for 4:3 aspect ratio
 # TODO: resolve steps from source height using http://aarmstrong.org/tutorials/aspect-ratios-and-h264
 # TODO: Externalize speeds to site-specific configfile
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000; SPEED_VP8=2;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000; SPEED_VP8=2;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000; SPEED_VP8=3;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000; SPEED_VP8=4;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000; SPEED_VP8=5;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000; SPEED_VP8=15;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+ SPEED_VP8=3
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+ SPEED_VP8=4
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+ SPEED_VP8=5
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
+ SPEED_VP8=15
 fi
 
 # based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
diff --git a/bin/encodevideo+loop+stream b/bin/encodevideo+loop+stream
index 8a438f7..e4b6b38 100755
--- a/bin/encodevideo+loop+stream
+++ b/bin/encodevideo+loop+stream
@@ -21,12 +21,24 @@ HEIGHT=360
 # TODO: adjust height steps or bitrates for 4:3 aspect ratio
 # TODO: resolve steps from source height using http://aarmstrong.org/tutorials/aspect-ratios-and-h264
 # TODO: Externalize speeds to site-specific configfile
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000; SPEED_VP8=2;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000; SPEED_VP8=2;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000; SPEED_VP8=3;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000; SPEED_VP8=4;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000; SPEED_VP8=5;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000; SPEED_VP8=15;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+ SPEED_VP8=3
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+ SPEED_VP8=4
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+ SPEED_VP8=5
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
+ SPEED_VP8=15
 fi
 
 # based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
diff --git a/bin/loop+encode+stream b/bin/loop+encode+stream
index 5331121..a0a2b1d 100755
--- a/bin/loop+encode+stream
+++ b/bin/loop+encode+stream
@@ -27,12 +27,24 @@ HEIGHT=360
 # TODO: adjust height steps or bitrates for 4:3 aspect ratio
 # TODO: resolve steps from source height using http://aarmstrong.org/tutorials/aspect-ratios-and-h264
 # TODO: Externalize speeds to site-specific configfile
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000; SPEED_VP8=2;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000; SPEED_VP8=2;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000; SPEED_VP8=3;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000; SPEED_VP8=4;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000; SPEED_VP8=5;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000; SPEED_VP8=15;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+ SPEED_VP8=2
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+ SPEED_VP8=3
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+ SPEED_VP8=4
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+ SPEED_VP8=5
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
+ SPEED_VP8=15
 fi
 
 # based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
diff --git a/bin/stream b/bin/stream
index b758a49..9df3b56 100755
--- a/bin/stream
+++ b/bin/stream
@@ -93,12 +93,30 @@ HEIGHTS_MPEG="$HEIGHT"
 # TODO: adjust height steps or bitrates for 4:3 aspect ratio
 # TODO: resolve steps from source height using http://aarmstrong.org/tutorials/aspect-ratios-and-h264
 # TODO: Externalize speeds to site-specific configfile
-  if [ $HEIGHT -le 234 ]; then VBITRATE=145000; SPEED_X264=fast; SPEED_X264_ALONE=fast; SPEED_VP8=3; SPEED_VP8_ALONE=2;
-elif [ $HEIGHT -le 270 ]; then VBITRATE=365000; SPEED_X264=faster; SPEED_X264_ALONE=fast; SPEED_VP8=4; SPEED_VP8_ALONE=2;
-elif [ $HEIGHT -le 360 ]; then VBITRATE=730000; SPEED_X264=veryfast; SPEED_X264_ALONE=fast; SPEED_VP8=5; SPEED_VP8_ALONE=3;
-elif [ $HEIGHT -le 432 ]; then VBITRATE=1100000; SPEED_X264=ultrafast; SPEED_X264_ALONE=fast; SPEED_VP8=8; SPEED_VP8_ALONE=4;
-elif [ $HEIGHT -le 540 ]; then VBITRATE=2000000; SPEED_X264=toofast; SPEED_X264_ALONE=veryfast; SPEED_VP8_ALONE=5;
-elif [ $HEIGHT -le 720 ]; then VBITRATE=3000000; SPEED_X264=toofast; SPEED_X264_ALONE=ultrafast; SPEED_VP8_ALONE=15;
+if [ $HEIGHT -le 234 ]; then
+ VBITRATE=145000
+ SPEED_X264=fast; SPEED_X264_ALONE=fast
+ SPEED_VP8=3; SPEED_VP8_ALONE=2
+elif [ $HEIGHT -le 270 ]; then
+ VBITRATE=365000
+ SPEED_X264=faster; SPEED_X264_ALONE=fast
+ SPEED_VP8=4; SPEED_VP8_ALONE=2
+elif [ $HEIGHT -le 360 ]; then
+ VBITRATE=730000
+ SPEED_X264=veryfast; SPEED_X264_ALONE=fast
+ SPEED_VP8=5; SPEED_VP8_ALONE=3
+elif [ $HEIGHT -le 432 ]; then
+ VBITRATE=1100000
+ SPEED_X264=ultrafast; SPEED_X264_ALONE=fast
+ SPEED_VP8=8; SPEED_VP8_ALONE=4
+elif [ $HEIGHT -le 540 ]; then
+ VBITRATE=2000000
+ SPEED_X264=toofast; SPEED_X264_ALONE=veryfast
+ SPEED_VP8_ALONE=5
+elif [ $HEIGHT -le 720 ]; then
+ VBITRATE=3000000
+ SPEED_X264=toofast; SPEED_X264_ALONE=ultrafast
+ SPEED_VP8_ALONE=15
 fi
 [ toofast != "$SPEED_X264" ] || HEIGHTS_MPEG=
 [ -n "$HEIGHTS_MPEG" ] || SPEED_VP8="$SPEED_VP8_ALONE"
-- 
cgit v1.2.3