diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-10-06 01:07:14 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-10-06 01:07:14 +0200 |
| commit | e24ee60df2daa2c314445a389a4db93addaae805 (patch) | |
| tree | 8e70215db5c7b58a4f1afd7e2aaf9fb32df4020b /localvideowebencode | |
| parent | 437949ae89e22979d6f48f3fbe859c7752c4c2e6 (diff) | |
Declare PCM format explicitly, and resolve downmixing as part of that rather than WAV container.
Diffstat (limited to 'localvideowebencode')
| -rwxr-xr-x | localvideowebencode | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/localvideowebencode b/localvideowebencode index bbaa21b..8afe6df 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -451,6 +451,7 @@ _melt_vp9="vcodec=libvpx-vp9 vpreset=$sizepreset_vpx${bitrate_vp9:+ vb=$bitrate_ _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" _vpxenc_vp9="--codec=vp9${bitrate_vp9:+ --target-bitrate=$bitrate_vp9} --good --end-usage=cq --cq-level=$crf_vp9 --cpu-used=$cpu_vp9 $_vpxenc_vpx --tile-columns=$webm_tokenparts_log2 --tile-rows=$webm_tokenparts_log2" _melt_h264="vcodec=libx264 vpreset=$speedpreset_h264 vprofile=baseline${x264tune:+ tune=$x264tune} threads=0 movflags=+faststart crf=$crf_h264" +_melt_pcm="$_melt_downmix acodec=pcm_s16le" _melt_vorbis="$_melt_downmix acodec=libvorbis aq=$quality_vorbis" _avconv_vorbis="$_avconv_downmix -c:a libvorbis -aq $quality_vorbis" _oggenc_vorbis="$_oggenc_downmix -q $quality_vorbis" @@ -463,7 +464,7 @@ _melt_aac="$_melt_downmix acodec=aac ab=$(($channels*$bitrate_aac))k" _melt_yuv4mpeg2="f=yuv4mpegpipe $_melt_video pix_fmt=yuv420p an=1 audio_off=1" _avconv_yuv4mpeg2_in="-f yuv4mpegpipe" _avconv_rawvideo="-f rawvideo" -_melt_wav="f=wav $_melt_downmix vn=1 video_off=1" +_melt_wav="f=wav $_melt_pcm vn=1 video_off=1" _avconv_wav_in="-f wav" _oggenc_wav_in= _opusenc_wav_in= |