diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-05-19 12:53:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-05-19 12:53:10 +0200 |
| commit | c853ebd6d6a4ca5aa3f3d359c55e9582fcc6bf76 (patch) | |
| tree | 331f263d544d213737e7ecfed7fa77fbf06b3ead | |
| parent | dde6df18d4f0a183f8b68c9d0314a080d2f3fe13 (diff) | |
Fix sync decode+edit+encode: Resolve bitrate and speed from bits (not simply height).
| -rwxr-xr-x | bin/decode+edit+encode | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/bin/decode+edit+encode b/bin/decode+edit+encode index 2df0a78..5fb0b20 100755 --- a/bin/decode+edit+encode +++ b/bin/decode+edit+encode @@ -24,20 +24,25 @@ HEIGHT=360 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 +# * 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 +# + best (i.e. high-modulo) 16:9 heights: 216 288 360 432 576 720 +# + best (i.e. high-modulo) 4:3 heights: 288 312 384 480 624 816 +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 -elif [ $HEIGHT -le 270 ]; then +elif [ $BITS -le 150528 ]; then # 270p → 129600 VBITRATE=365000 -elif [ $HEIGHT -le 360 ]; then +elif [ $BITS -le 196608 ]; then # 360p → 172800 VBITRATE=730000 -elif [ $HEIGHT -le 432 ]; then +elif [ $BITS -le 331776 ]; then # 432p → 331776 VBITRATE=1100000 -elif [ $HEIGHT -le 540 ]; then +elif [ $BITS -le 589824 ]; then # 540p → 518400 VBITRATE=2000000 -elif [ $HEIGHT -le 720 ]; then # 720p → 921600 +elif [ $BITS -le 921600 ]; then # 720p → 921600 VBITRATE=3000000 fi |