diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-09-25 14:54:44 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-09-25 14:54:44 +0200 |
| commit | 6060d68b4a621d07e1671fc9a6c2af9437f25dfa (patch) | |
| tree | 0a3e41c6c7210c4a47d03f3339c9ea2586a54dc1 /localvideowebencode | |
| parent | e268cbbd07b6ba31c00f4172c5b52d27ea614c0e (diff) | |
Fix apply VP9 bitrate only when set/resolved.
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/localvideowebencode b/localvideowebencode index 9a71d8f..1d36e0a 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -297,10 +297,11 @@ if [ -n "$_pixels" ] && [ $_pixels -ge $((1024*768)) ]; then fi # compute average bitrate from reference data and "power of .75" rule +bitrate_vp9="$bitrate" if [ -z "$bitrate" ] && [ -n "$_pixels" ] && [ -n "$_frames" ]; then bitrate=$(perl -E '$refsize=640*360;' \ -E "say int( +(($_pixels/\$refsize)**0.75*\$refsize*$_frames*$refbpp) )") - bitrate_half=$(perl -E "say int( $bitrate/2 )") #" + bitrate_vp9=$(perl -E "say int( $bitrate/2 )") #" fi # default per-codec-channel bitrates @@ -348,7 +349,7 @@ _melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:+ vb=$bitrate}${bitrate_ _melt_h264="$_melt_video f=mp4 vcodec=libx264${bitrate:+ vb=$bitrate} threads=0 movflags=+faststart vpre=baseline${x264tune:+ tune=$x264tune}${bitrate_fixed:- crf=23}" _melt_webm="$_melt_video f=webm vcodec=libvpx${bitrate:+ vb=$bitrate} vpre=libvpx-$webmpreset${bitrate_fixed:- crf=10} cpu-used=3" # CRF ignored with libvpx 1.3 -_melt_vp9="$_melt_video f=webm vcodec=libvpx-vp9${bitrate:+ vb=$bitrate_half} vpre=libvpx-$webmpreset${bitrate_fixed:- crf=10} cpu-used=5" +_melt_vp9="$_melt_video f=webm vcodec=libvpx-vp9${bitrate_vp9:+ vb=$bitrate_vp9} vpre=libvpx-$webmpreset${bitrate_fixed:- crf=10} cpu-used=5" _melt_audio="${channels:+ac=$channels}" # limit (i.e. avoid peaks "clipping") _melt_postfilters_audio="${limit:+-filter ladspa.1077}" |