summaryrefslogtreecommitdiff
path: root/localvideowebencode
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-09-17 16:07:01 +0200
committerJonas Smedegaard <dr@jones.dk>2014-09-17 16:07:01 +0200
commit058960d2359eb5064f769f2d1b57d1248316196c (patch)
tree79c93d2748858cfa8bfa2424cdff341c40d959e2 /localvideowebencode
parent17584887d900adc6cbf756683805b1ef86b9fecf (diff)
Always apply WebM profile - 360p by default.
Diffstat (limited to 'localvideowebencode')
-rwxr-xr-xlocalvideowebencode12
1 files changed, 2 insertions, 10 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 00613e1..65e4d90 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -54,7 +54,7 @@ html favoring open formats with optional non-JavaScript Flash fallback.
--h264preset MPEG-4 AVC target preset: slow ultrafast etc.
(default: medium)
--webmpreset WebM target preset: 360p 720p 720p50_60 etc.
- (default: profile-related or none)
+ (default: profile-related or 360p)
--audio Audio style:
channels compress normalize limit
music max 2 X X
@@ -172,22 +172,18 @@ case "$profile" in
320x240|qvga)
_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=320 height=240}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
480x360|hvga)
_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=480 height=360}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
640x480|vga)
_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=640 height=480}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
800x600|svga)
_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=800 height=600}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
1024x768|xga)
_melt_in="-profile=quarter_pal${_melt_in:+ $_melt_in}"
@@ -197,22 +193,18 @@ case "$profile" in
240p|424x240|wqvga)
_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=424 height=240}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
360p|640x360|nhd)
_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=640 height=360}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
480p|848x480|wvga)
_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=848 height=480}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
576p|1024x576|wsvga)
_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
_melt_video="${size:-width=1024 height=576}${_melt_video:+ $_melt_video}"
- webmpreset="${webmpreset:-360p}"
;;
720p|1280x720|wxga|hd)
_melt_in="-profile=atsc_720p_25${_melt_in:+ $_melt_in}"
@@ -275,7 +267,7 @@ _melt_in="${_melt_in:+$_melt_in }$sample"
_melt_video="progressive=1 $_melt_video${bitrate:+ vb=${bitrate}}${size:+ s=$size}${aspect:+ aspect=$aspect}"
_melt_ogg="$_melt_video f=ogg vcodec=libtheora${bitrate:- qscale=5}"
_melt_h264="$_melt_video $_melt_h264${bitrate:- qscale=5}"
-_melt_webm="$_melt_video${webmpreset:+ vpre=libvpx-$webmpreset}"
+_melt_webm="$_melt_video vpre=libvpx-${webmpreset:-360p}"
_melt_audio="${channels:+ac=$channels}"
_melt_vorbis="$_melt_audio acodec=libvorbis ab=$(($channels*$bitrate_vorbis))k"
_melt_aac="$_melt_audio acodec=aac ab=$(($channels*$bitrate_aac))k"