diff --git a/pack-set b/pack-set index 9bbafce..9d22560 100755 --- a/pack-set +++ b/pack-set @@ -12,17 +12,17 @@ do else echo "FILE: $INFILE" - #COMMON="" - #COMMON="--exposure=-2.5 --peak=141" - #COMMON="--exposure=-1 --peak=500" - COMMON="--peak=1000" + #COMMON="$OPTS" + #COMMON="$OPTS --exposure=-2.5 --peak=141" + #COMMON="$OPTS --exposure=-1 --peak=500" + COMMON="$OPTS --peak=1000" SPEED_SMALL="veryslow" SPEED_LARGE="slow" SMALL="$COMMON --size=4m --quality=0.75 --preset=$SPEED_SMALL" LARGE="$COMMON --size=25m --preset=$SPEED_LARGE" - pack-vid $SMALL $OPTS "$INFILE" "${INFILE%.mp4}-small.mp4" - pack-vid $LARGE $OPTS "$INFILE" "${INFILE%.mp4}-large.mp4" + pack-vid $SMALL "$INFILE" "${INFILE%.mp4}-small.mp4" + pack-vid $LARGE "$INFILE" "${INFILE%.mp4}-large.mp4" fi done diff --git a/pack-vid b/pack-vid index 98b37c1..3c83dcc 100755 --- a/pack-vid +++ b/pack-vid @@ -31,9 +31,6 @@ $options = [ 'width' => false, 'height' => false, 'keyframe-int' => 0, - 'vibrance' => 0, - 'crop-width' => false, - 'crop-height' => false, ]; while ( count( $args ) > 0 && substr( $args[0], 0, 2 ) == '--' ) { @@ -159,25 +156,6 @@ function convert( $src, $dest, $options ) { $duration = floatval( $probe->format->duration ); $width = $track->width; $height = $track->height; - $cropLeft = 0; - $cropTop = 0; - - if ( $options['crop-width'] ) { - $cropWidth = intval( $options['crop-width'] ); - $cropLeft = intval( ( $width - $cropWidth ) / 2 ); - $width = $cropWidth; - } - if ( $options['crop-height'] ) { - $cropHeight = intval( $options['crop-height'] ); - $cropTop = intval( ( $height - $cropHeight ) / 2 ); - $height = $cropHeight; - } - if ( $options['crop-top'] ) { - $cropTop = intval( $options['crop-top'] ); - } - if ( $options['crop-left'] ) { - $cropLeft = intval( $options['crop-left'] ); - } // @fixme some files are missing this? trims from qt? //$hdr = $track->color_primaries === 'bt2020' || $options['hdr']; // pix_fmt: "yuv420p10le" @@ -322,13 +300,8 @@ function convert( $src, $dest, $options ) { $peakNits = floatval( $options['peak'] ); $sdrNits = 80; $peak = $peakNits / $sdrNits; - $vibrance = floatval( $options['vibrance'] ); - $filters = []; - if ( $options['crop-width'] || $options['crop-height'] ) { - $filters[] = "crop=w=$width:x=$cropLeft:h=$height:y=$cropTop"; - } - $filters[] = "scale=w=$scaleWidth:h=$scaleHeight"; + $filters = [ "scale=w=$scaleWidth:h=$scaleHeight" ]; if ( $hdr ) { $filters[] = "zscale=t=linear"; if ( $exposure ) { @@ -340,10 +313,8 @@ function convert( $src, $dest, $options ) { } else { $dither = ""; } - $filters[] = "zscale=tin=linear:t=709:p=709:m=709:r=full$dither"; - if ( $vibrance ) { - $filters[] = "vibrance=$vibrance"; - } + $filters[] = "zscale=t=bt709:p=bt709:m=bt709:r=full$dither"; + $filters[] = "vibrance=0.2"; } $filters[] = "format=yuv420p"; if ( $crop ) { @@ -366,6 +337,7 @@ function convert( $src, $dest, $options ) { '-i', $src, '-f', 'mp4', '-fpsmax', $fps, + //'-r', $fps, '-vf', $vf, '-c:v', 'libx264', '-b:v', $bitrate, @@ -382,6 +354,7 @@ function convert( $src, $dest, $options ) { '-i', $src, '-vf', $vf, '-fpsmax', $fps, + //'-r', $fps, '-c:v', 'libx264', '-b:v', $bitrate, '-preset', $preset,