diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-10-01 20:05:55 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-10-02 19:30:21 +0200 |
| commit | b262c3a0be14f0eb0f75a9a96b64a3e3d1bc7321 (patch) | |
| tree | e0de5e448662f2c3ee84665236cf795a22a941a8 /localvideowebencode | |
| parent | b848a53ccdd574a0ad20c9420a23bd02da32d622 (diff) | |
Tidy: Rename variable webmpreset → sizepreset_vpx, and add prefix when defining (not applying).
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/localvideowebencode b/localvideowebencode index e048121..87bb36b 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -307,11 +307,11 @@ if [ -n "$_width" ] && [ -n "$_height" ]; then fi _frames="${framerate:-$framerate_in}" -webmpreset=360p +sizepreset_vpx=libvpx-360p if [ -n "$_pixels" ] && [ $_pixels -ge $((1024*768)) ]; then - webmpreset=720p + sizepreset_vpx=libvpx-720p if [ -n "$_frames" ] && [ $_frames -gt 40 ]; then - webmpreset=720p50_60 + sizepreset_vpx=libvpx-720p50_60 fi fi @@ -378,11 +378,11 @@ _melt_postfilters_audio="${limit:+-filter ladspa.1077}" # codec options _melt_theora="vcodec=libtheora${bitrate:+ vb=$bitrate} qscale=$qscale_theora" -_melt_vp8="vcodec=libvpx vpreset=libvpx-$webmpreset${bitrate_vp8:+ vb=$bitrate_vp8 minrate=$((bitrate_vp8/20)) maxrate=$((bitrate_vp8*12))} crf=$crf_vp8 cpu-used=$cpu_vp8" -_avconv_vp8="-c:v libvpx -pre:v libvpx-$webmpreset${bitrate_vp8:+ -b:v $bitrate_vp8 -minrate $((bitrate_vp8/20)) -maxrate $((bitrate_vp8*12))} -crf $crf_vp8 -cpu-used $cpu_vp8" +_melt_vp8="vcodec=libvpx vpreset=$sizepreset_vpx${bitrate_vp8:+ vb=$bitrate_vp8 minrate=$((bitrate_vp8/20)) maxrate=$((bitrate_vp8*12))} crf=$crf_vp8 cpu-used=$cpu_vp8" +_avconv_vp8="-c:v libvpx -pre:v $sizepreset_vpx${bitrate_vp8:+ -b:v $bitrate_vp8 -minrate $((bitrate_vp8/20)) -maxrate $((bitrate_vp8*12))} -crf $crf_vp8 -cpu-used $cpu_vp8" # CRF ignored with libvpx 1.3 -_melt_vp9="vcodec=libvpx-vp9 vpreset=libvpx-$webmpreset${bitrate_vp9:+ vb=$bitrate_vp9 minrate=$((bitrate_vp9/20)) maxrate=$((bitrate_vp9*12))} crf=$crf_vp9 cpu-used=$cpu_vp9" -_avconv_vp9="-c:v libvpx-vp9 -pre:v libvpx-$webmpreset${bitrate_vp9:+ -b:v $bitrate_vp9 -minrate $((bitrate_vp9/20)) -maxrate $((bitrate_vp9*12))} -crf $crf_vp9 -cpu-used $cpu_vp9" +_melt_vp9="vcodec=libvpx-vp9 vpreset=$sizepreset_vpx${bitrate_vp9:+ vb=$bitrate_vp9 minrate=$((bitrate_vp9/20)) maxrate=$((bitrate_vp9*12))} crf=$crf_vp9 cpu-used=$cpu_vp9" +_avconv_vp9="-c:v libvpx-vp9 -pre:v $sizepreset_vpx${bitrate_vp9:+ -b:v $bitrate_vp9 -minrate $((bitrate_vp9/20)) -maxrate $((bitrate_vp9*12))} -crf $crf_vp9 -cpu-used $cpu_vp9" _melt_h264="vcodec=libx264 vpreset=$speedpreset_h264 vprofile=baseline${x264tune:+ tune=$x264tune} threads=0 movflags=+faststart crf=$crf_h264" _melt_vorbis="$_melt_audio acodec=libvorbis${channels:+ ab=$(($channels*$bitrate_vorbis))k}" _melt_opus="$_melt_audio acodec=libopus${channels:+ ab=$(($channels*$bitrate_opus))k}${opusapp:+ application=$opusapp}" |