diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-09-17 19:15:38 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-09-17 19:59:05 +0200 |
| commit | fd56a60c4c9a46642af2957899adf20d0a7dabcd (patch) | |
| tree | c4b8406b0f1b4d92c31743134d3db53e54ac616b /localvideowebencode | |
| parent | 5c9130ff452f1aad3567cf2343c4eabceb2da31d (diff) | |
Distinguish bitrate value from fact it was explicitly set.
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/localvideowebencode b/localvideowebencode index 4974dad..d4670da 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -119,7 +119,7 @@ while true ; do -s|--size) size="$2"; shift 2;; -a|--aspect) aspect="$2"; shift 2;; -r|--rate) framerate="$2"; shift 2;; - -b|--bitrate) bitrate="$2"; shift 2;; + -b|--bitrate) bitrate_fixed="$2"; shift 2;; --h264profile) h264profile="$2"; shift 2;; --h264preset) h264preset="$2"; shift 2;; --webmpreset) webmpreset="$2"; shift 2;; @@ -263,6 +263,8 @@ if [ -n "$_pixels" ] && [ $_pixels -ge $((1024*768)) ]; then fi fi +bitrate="$bitrate_fixed" + # default per-codec-channel bitrates bitrate_vorbis=64 bitrate_aac=96 @@ -299,8 +301,8 @@ esac melt="melt -progress" _melt_in="${_melt_in:+$_melt_in }$sample" _melt_video="progressive=1${framerate:+ frame_rate_den="$framerate_den" frame_rate_num="$framerate_num"}${bitrate:+ vb=$bitrate}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}" -_melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:- qscale=5}" -_melt_h264="$_melt_video $_melt_h264${bitrate:- qscale=5}" +_melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate_fixed:- qscale=5}" +_melt_h264="$_melt_video $_melt_h264${bitrate_fixed:- qscale=5}" _melt_webm="$_melt_video vpre=libvpx-${webmpreset:-360p}" _melt_audio="${channels:+ac=$channels}" _melt_vorbis="$_melt_audio acodec=libvorbis ab=$(($channels*$bitrate_vorbis))k" @@ -317,8 +319,8 @@ fi $melt -group $_melt_in $infiles -group ${channels:+$_melt_audio_filters_early${_melt_loudness:+ -filter loudness results="$_melt_loudness"} $_melt_audio_filters }$filters -consumer avformat:"$stem.ogv" $_melt_ogg $_melt_vorbis $_melt_out ## H.264/AAC/MP4 -[ -z "$bitrate" ] || $melt -group $_melt_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 $_melt_h264 $_melt_out -$melt -group $_melt_in $infiles -group ${channels:+$_melt_audio_filters_early${_melt_loudness:+ -filter loudness results="$_melt_loudness"} $_melt_audio_filters }$filters -consumer avformat:"$stem.mp4" ${bitrate:+pass=2} $_melt_h264 $_melt_aac $_melt_out +[ -z "$bitrate_fixed" ] || $melt -group $_melt_in $infiles -group $filters -consumer avformat:/dev/null properties=x264-medium-pass1 $_melt_h264 $_melt_out +$melt -group $_melt_in $infiles -group ${channels:+$_melt_audio_filters_early${_melt_loudness:+ -filter loudness results="$_melt_loudness"} $_melt_audio_filters }$filters -consumer avformat:"$stem.mp4" ${bitrate_fixed:+pass=2} $_melt_h264 $_melt_aac $_melt_out if [ -z "$melt_recent" ]; then mv "$stem.mp4" "$stem.mp4"~ qt-faststart "$stem.mp4"~ "$stem.mp4" |