From 786cfa4c5f2ae1f3c0d40d6a389701115420fa28 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 22 Sep 2014 03:13:40 +0200 Subject: Fix apply limiter as last filter. --- localvideowebencode | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'localvideowebencode') diff --git a/localvideowebencode b/localvideowebencode index cba1c78..105554a 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -351,7 +351,7 @@ _melt_h264="$_melt_video $_melt_h264${bitrate_fixed:- qscale=5}" _melt_webm="$_melt_video vpre=libvpx-${webmpreset:-360p}" _melt_audio="${channels:+ac=$channels}" # limit (i.e. avoid peaks "clipping") -_melt_audio_filters="${limit:+-filter ladspa.1077}" +_melt_postfilters_audio="${limit:+-filter ladspa.1077}" _melt_vorbis="$_melt_audio acodec=libvorbis ab=$(($channels*$bitrate_vorbis))k" _melt_aac="$_melt_audio acodec=aac ab=$(($channels*$bitrate_aac))k" @@ -363,12 +363,12 @@ if [ -n "$loudness" ] && [ -z "$_melt_loudness" ]; then fi if [ -n "$ogg" ]; then - $melt -group $_melt_in $infiles -group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"} $_melt_audio_filters }$filters -consumer avformat:"$stem.ogv" $_melt_ogg $_melt_vorbis $_melt_out + $melt -group $_melt_in $infiles -group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"}} $filters${channels:+ $_melt_postfilters_audio} -consumer avformat:"$stem.ogv" $_melt_ogg $_melt_vorbis $_melt_out fi if [ -n "$mp4" ]; then [ -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:+$audioprefilters${_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 + $melt -group $_melt_in $infiles -group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"}} $filters${channels:+ $_melt_postfilters_audio} -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" @@ -378,7 +378,7 @@ fi if [ -n "$webm" ]; then # TODO: use two-pass when supported by melt - $melt -group $_melt_in $infiles -group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"} $_melt_audio_filters }$filters -consumer avformat:"$stem.webm" properties=webm $_melt_webm $_melt_vorbis $_melt_out + $melt -group $_melt_in $infiles -group ${channels:+$audioprefilters${_melt_loudness:+ -filter loudness results="$_melt_loudness"}} $filters${channels:+ $_melt_postfilters_audio} -consumer avformat:"$stem.webm" properties=webm $_melt_webm $_melt_vorbis $_melt_out fi # cleanup audio normalize hinting -- cgit v1.2.3