diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-09-26 16:12:22 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-09-26 16:42:59 +0200 |
| commit | 084d15113beb7551eb6375c90cf97ee2e2c911b4 (patch) | |
| tree | 4e6ece4fffc43c7a43a5cdf7fde2d2129f47c600 /localvideowebencode | |
| parent | 14643a3d7cb2ccbd35b05b2aa13c6157cdd73859 (diff) | |
Tune Opus, and improve help output on audio styles.
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/localvideowebencode b/localvideowebencode index 0b8ef88..8b3a3fd 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -68,12 +68,12 @@ html favoring open formats with optional non-JavaScript Flash fallback. mp4 MPEG-4 H.264 AAC (default: webm,vp9,mp4) --audio Audio style: - channels limit - music max 2 - hqspeech 1 - speech 1 X + channels limit Vorbis Opus AAC + music max 2 48k 48k audio 64k + hqspeech 1 48k 32k voip 64k + speech 1 X 48k 32k voip 64k silence 0 - (default: none - use input channel count) + (default: none - use channel count of 1st input) --audioprefilter Add melt audio filter before loudness. --loudness Add EBU R128 loudness filter. --loudness-results Add EBU R128 loudness filter, applying @@ -312,12 +312,14 @@ bitrate_aac=96 case "$audio" in music) channels=2 + opusapp=audio ;; hqspeech) channels=1 bitrate_vorbis=48 bitrate_opus=32 bitrate_aac=64 + opusapp=voip ;; speech) channels=1 @@ -327,6 +329,7 @@ case "$audio" in compress=yes [ -z "$melt_recent" ] || _melt_loudness="$loudness_results" limit=yes + opusapp=voip ;; silence) channels=0 @@ -355,7 +358,7 @@ _melt_audio="${channels:+ac=$channels}" # limit (i.e. avoid peaks "clipping") _melt_postfilters_audio="${limit:+-filter ladspa.1077}" _melt_vorbis="$_melt_audio acodec=libvorbis ab=$(($channels*$bitrate_vorbis))k" -_melt_opus="$_melt_audio acodec=libopus ab=$(($channels*$bitrate_opus))k" +_melt_opus="$_melt_audio acodec=libopus ab=$(($channels*$bitrate_opus))k${bitrate_fixed:+ vbr=constrained}${opusapp:+ application=$opusapp}" _melt_aac="$_melt_audio acodec=aac ab=$(($channels*$bitrate_aac))k" avconv="avconv -threads auto -y -v warning" |