diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2021-02-05 23:23:13 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2021-02-05 23:23:13 +0100 |
| commit | d050f277fc248f5b3907459e6d3adac9ba7df3ff (patch) | |
| tree | 347f12fe4258566088c1db8f04631b31ea3bb28e | |
| parent | 326e51f83df911fc1b89b89d53cb2e93bd043b4c (diff) | |
fix unconditionally avoid melt with GPU acceleration: unsupported until melt v6.26
| -rwxr-xr-x | localvideowebencode | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/localvideowebencode b/localvideowebencode index bd64c5f..ed3e378 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -323,14 +323,12 @@ case "$gpu" in preset_vp9=medium preset_h264= profile_h264=578 - use_ffmpeg_h264=yes qkey_h264=qp ;; vaapi) multipass= preset_h264= profile_h264=578 - use_ffmpeg_h264=yes qkey_h264=qp case "$compression" in dirty) @@ -552,6 +550,8 @@ for vformat in vp8 vp9 h264; do # melt supports dual-pass only for h.264 [ h264 = "$vformat" ] || [ -n "$vpxenc" ] || eval "[ -z \"$multipass\" ] || use_ffmpeg_$vformat=yes" + # melt (before v6.26) does not support encode-only hardware acceleration + [ h264 = "$vformat" ] || [ -n "$vpxenc$gpu_vaapi" ] || eval "[ -z \"$multipass\" ] || use_ffmpeg_$vformat=yes" done [ -n "$use_ffmpeg_h264" ] || use_melt_h264=yes if [ -n "$use_ffmpeg_vp8$use_ffmpeg_vp9$use_vpxenc" ]; then @@ -583,7 +583,7 @@ opusenc="opusenc" _melt_infiles="${notsample:+$infiles}${sample:+$infile_first in=$((samplestart)) out=$((samplestart + samplelength))}" # filter options -_melt_video="${no_gpu:+progressive=1${framerate:+ frame_rate_num="$framerate_num" frame_rate_den="$framerate_den"}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}}" +_melt_video="progressive=1${framerate:+ frame_rate_num="$framerate_num" frame_rate_den="$framerate_den"}${size:+ s=${width:+$width}x${height:+$height}}${aspect:+ aspect=$aspect}" _ffmpeg_video="${no_gpu:+${do_deinterlace:+-filter:v yadif}${framerate:+ -r $framerate_num/$framerate_den}${size:+ -s ${width:+$width}x${height:+$height}}${aspect:+ -aspect $aspect}}" _melt_downmix="${downmix_melt:+ac=$channels}" _ffmpeg_downmix="${downmix_ffmpeg:+-ac $channels}" |