From 01278dc9049efa904f5a85cca6ceec3efa1b6f5a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 24 Sep 2014 16:46:18 +0200 Subject: Drop options --h264profile --h264preset --webmpreset. --- localvideowebencode | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'localvideowebencode') diff --git a/localvideowebencode b/localvideowebencode index 26a808b..be43942 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -66,12 +66,6 @@ html favoring open formats with optional non-JavaScript Flash fallback. webm WebM VP8 Vorbis mp4 MPEG-4 H.264 AAC (default: webm,mp4) - --h264profile MPEG-4 AVC target profile: baseline main high - (default: baseline) - --h264preset MPEG-4 AVC target preset: slow ultrafast etc. - (default: medium) - --webmpreset WebM target preset: 360p 720p 720p50_60 etc. - (default: profile-related or 360p) --audio Audio style: channels limit music max 2 @@ -127,12 +121,11 @@ exit1() { # defaults formats=webm,mp4 -h264profile=baseline samplestart=0 samplelength=150 # parse cmdline options -TEMP="`getopt -s sh -o hp:s:a:r:b:t: -l help,profile:,size:,aspect:,rate:,video:,refbpp:,bitrate:,formats:,h264profile:,h264preset:,webmpreset:,audio:,audioprefilter:,loudness,loudness-results:,filter:,stem:,title:,sample,sample-start:,sample-length: -n "$PRG" -- "$@"`" || exit1 "Internal getopt error." +TEMP="`getopt -s sh -o hp:s:a:r:b:t: -l help,profile:,size:,aspect:,rate:,video:,refbpp:,bitrate:,formats:,audio:,audioprefilter:,loudness,loudness-results:,filter:,stem:,title:,sample,sample-start:,sample-length: -n "$PRG" -- "$@"`" || exit1 "Internal getopt error." eval set -- "$TEMP" while true ; do case "$1" in @@ -145,9 +138,6 @@ while true ; do --refbpp) refbpp="$2"; shift 2;; -b|--bitrate) bitrate="$2"; bitrate_fixed=yes; shift 2;; --formats) formats="$2"; shift 2;; - --h264profile) h264profile="$2"; shift 2;; - --h264preset) h264preset="$2"; shift 2;; - --webmpreset) webmpreset="$2"; shift 2;; --audio) audio="$2"; shift 2;; --audioprefilter) audioprefilters="${audioprefilters:+$audioprefilters }-filter $2"; shift 2;; --loudness) loudness=yes; shift;; @@ -286,16 +276,6 @@ for format in $(echo "$formats" | sed -e 's/,/ /g'); do esac done -case "$h264profile" in - baseline|main) - _melt_h264="properties=x264-medium-$h264profile ${h264preset:+-vpre=libx264-$h264preset}" - ;; - high) - _melt_h264="properties=x264-medium ${h264preset:+-vpre=libx264-$h264preset}" - ;; - *) exit1 "Unknown MPEG-4 AVC profile \"$h264profile\".";; -esac - _width="${width:-$width_in}" _height="${height:-$height_in}" @@ -304,10 +284,11 @@ if [ -n "$_width" ] && [ -n "$_height" ]; then fi _frames="${framerate:-$framerate_in}" +webmpreset=360p if [ -n "$_pixels" ] && [ $_pixels -ge $((1024*768)) ]; then - webmpreset="${webmpreset:-720p}" + webmpreset=720p if [ -n "$_frames" ] && [ $_frames -gt 40 ]; then - webmpreset="${webmpreset:-720p50_60}" + webmpreset=720p50_60 fi fi @@ -356,8 +337,8 @@ 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"}${bitrate:+ vb=$bitrate}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}" _melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate_fixed:- qscale=5}" -_melt_h264="$_melt_video $_melt_h264${bitrate_fixed:- crf=23}" -_melt_webm="$_melt_video vpre=libvpx-${webmpreset:-360p} qmin=0 qmax=63${bitrate_fixed:- crf=23}" +_melt_h264="$_melt_video properties=x264-medium-baseline${bitrate_fixed:- crf=23}" +_melt_webm="$_melt_video vpre=libvpx-$webmpreset qmin=0 qmax=63${bitrate_fixed:- crf=23}" _melt_audio="${channels:+ac=$channels}" # limit (i.e. avoid peaks "clipping") _melt_postfilters_audio="${limit:+-filter ladspa.1077}" -- cgit v1.2.3