diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-09-26 12:30:04 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-09-26 12:30:20 +0200 |
| commit | 46ba785c97adfc4e98b7cbb1725adec549acd8e1 (patch) | |
| tree | a5293d7d407c437b50d59cd8756ad80a534f4236 /localvideowebencode | |
| parent | fc11def3a807e3b98a213c682f5920789ba555a1 (diff) | |
Tidy: Reorder options to apply detailed customizations after preset profile and tune (should occur already internally in libav/x264).
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/localvideowebencode b/localvideowebencode index 49f0af6..ea2eff1 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -346,10 +346,10 @@ melt="melt -progress" _melt_in="${_melt_in:+$_melt_in }${sample:+in=${samplestart:-0} out=$((${samplestart:-0} + samplelength))}" _melt_video="progressive=1${framerate:+ frame_rate_den="$framerate_den" frame_rate_num="$framerate_num"}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}" _melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:+ vb=$bitrate}${bitrate_fixed:- qscale=5}" -_melt_h264="$_melt_video f=mp4 vcodec=libx264${bitrate_fixed:+ vb=$bitrate} threads=0 movflags=+faststart vpre=medium vprofile=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" +_melt_h264="$_melt_video f=mp4 vcodec=libx264 vpre=medium vprofile=baseline${x264tune:+ tune=$x264tune}${bitrate_fixed:+ vb=$bitrate} threads=0 movflags=+faststart${bitrate_fixed:- crf=23}" +_melt_webm="$_melt_video f=webm vcodec=libvpx vpre=libvpx-$webmpreset${bitrate:+ vb=$bitrate}${bitrate_fixed:- crf=10} cpu-used=3" # CRF ignored with libvpx 1.3 -_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_vp9="$_melt_video f=webm vcodec=libvpx-vp9 vpre=libvpx-$webmpreset${bitrate_vp9:+ vb=$bitrate_vp9}${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}" @@ -358,8 +358,8 @@ _melt_opus="$_melt_audio acodec=libopus ab=$(($channels*$bitrate_opus))k" _melt_aac="$_melt_audio acodec=aac ab=$(($channels*$bitrate_aac))k" avconv="avconv -threads auto -y -v warning" -_avconv_vp8="-c:v libvpx${bitrate:+ -b:v $bitrate} -pre:v libvpx-$webmpreset${bitrate_fixed:- -crf 10} -cpu-used 3" -_avconv_vp9="-c:v libvpx-vp9${bitrate_vp9:+ -b:v $bitrate_vp9} -pre:v libvpx-$webmpreset${bitrate_fixed:- -crf 10} -cpu-used 5" +_avconv_vp8="-c:v libvpx -pre:v libvpx-$webmpreset${bitrate:+ -b:v $bitrate}${bitrate_fixed:- -crf 10} -cpu-used 3" +_avconv_vp9="-c:v libvpx-vp9 -pre:v libvpx-$webmpreset${bitrate_vp9:+ -b:v $bitrate_vp9}${bitrate_fixed:- -crf 10} -cpu-used 5" # resolve EBU R128 audio normalizing # TODO: normalize each infile separately when xml fed as infile keeps sync |