diff --git a/pack-vid b/pack-vid index d8e36f1..d3634c1 100755 --- a/pack-vid +++ b/pack-vid @@ -355,11 +355,7 @@ function convert( $src, $dest, $options ) { $fps = $options['fps']; if ( $options['preset'] ) { - if ( $options['vcodec'] === 'libvpx' || $options['vcodec'] === 'libvpx-vp9' ) { - $preset = [ '-speed', $options['preset'] ]; - } else { - $preset = [ '-preset', $options[ 'preset' ] ]; - } + $preset = [ '-preset', $options[ 'preset' ] ]; } else { $preset = []; } @@ -373,16 +369,7 @@ function convert( $src, $dest, $options ) { $format = []; } - $vcodec = [ - '-vcodec', $options['vcodec'] - ]; - switch ( $options['vcodec'] ) { - case 'libvpx-vp9': - $vcodec[] = '-row-mt'; - $vcodec[] = 1; - break; - default: - } + $vcodec = $options['vcodec']; $tempPrefix = 'pack-vid-passlog' . rand(0,1 << 31); $passlog = tempnam( '.', $tempPrefix ); @@ -392,7 +379,7 @@ function convert( $src, $dest, $options ) { '-f', 'mp4', '-fpsmax', $fps, '-vf', $vf, - ], $vcodec, [ + '-c:v', $vcodec, '-b:v', $bitrate, ], $preset, [ '-pass', '1', @@ -407,7 +394,7 @@ function convert( $src, $dest, $options ) { '-i', $src, '-vf', $vf, '-fpsmax', $fps, - ], $vcodec, [ + '-c:v', $vcodec, '-b:v', $bitrate, ], $preset, [ '-pass', '2',