diff --git a/pack-1080p b/pack-1080p deleted file mode 100755 index 2059618..0000000 --- a/pack-1080p +++ /dev/null @@ -1,8 +0,0 @@ -pack-vid \ - --size=0 \ - --width=1920 \ - --height=1080 \ - --bitrate=6m \ - --preset=veryslow \ - --keyframe-int=240 \ - "$@" diff --git a/pack-480p b/pack-480p deleted file mode 100755 index ffc8eab..0000000 --- a/pack-480p +++ /dev/null @@ -1,8 +0,0 @@ -pack-vid \ - --size=0 \ - --width=854 \ - --height=480 \ - --bitrate=1.5m \ - --preset=veryslow \ - --keyframe-int=240 \ - "$@" diff --git a/pack-720p b/pack-720p deleted file mode 100755 index af094da..0000000 --- a/pack-720p +++ /dev/null @@ -1,8 +0,0 @@ -pack-vid \ - --size=0 \ - --width=1280 \ - --height=720 \ - --bitrate=3m \ - --preset=veryslow \ - --keyframe-int=240 \ - "$@" diff --git a/pack-atari b/pack-atari deleted file mode 100755 index a680fa4..0000000 --- a/pack-atari +++ /dev/null @@ -1,11 +0,0 @@ -pack-vid \ - --size=0 \ - --width=640 \ - --height=480 \ - --bitrate=0.75m \ - --preset=veryslow \ - --keyframe-int=600 \ - --audio-channels=1 \ - --audio-bitrate=48000 \ - "$@" - diff --git a/pack-preset b/pack-preset index a0a84bb..aff099e 100755 --- a/pack-preset +++ b/pack-preset @@ -1 +1,7 @@ -pack-set --exposure=-2 --tonemap=mobius --dither "$@" +#pack-set --color-temperature=6800 --peak=600 --vibrance=0.2 "$@" +#pack-set --color-temperature=6800 --peak=800 --vibrance=0.2 "$@" +#pack-set --peak=800 --vibrance=0.2 "$@" +#pack-set --exposure=-2 --tonemap=clip "$@" +#pack-set --exposure=-2 --tonemap=mobius "$@" +#pack-set --exposure=-2 --tonemap=mobius "$@" +pack-set --exposure=-2 --tonemap=mobius --peak=500 "$@" diff --git a/pack-set b/pack-set index ee942cb..f943e35 100755 --- a/pack-set +++ b/pack-set @@ -13,9 +13,12 @@ do else echo "FILE: $INFILE" - COMMON="--peak=1000 --dither" + #COMMON="" + #COMMON="--exposure=-2.5 --peak=141" + #COMMON="--exposure=-1 --peak=500" + COMMON="--peak=1000" SPEED_SMALL="veryslow" - SPEED_LARGE="veryslow" + SPEED_LARGE="slow" SMALL="$COMMON --size=4m --quality=0.75 --preset=$SPEED_SMALL" MED="$COMMON --size=10m --preset=$SPEED_SMALL" diff --git a/pack-set-av1 b/pack-set-av1 deleted file mode 100755 index 6d168e6..0000000 --- a/pack-set-av1 +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e - -OPTS="" - -for INFILE in "$@" -do - if [[ "$1" =~ ^--.* ]] - then - echo "OPTION: $1" - OPTS="$OPTS $1" - shift - else - echo "FILE: $INFILE" - - COMMON="--vcodec=libsvtav1 --hdr" - SPEED_SMALL="4" - SPEED_LARGE="4" - - SMALL="$COMMON --size=4m --quality=0.5 --preset=$SPEED_SMALL" - MED="$COMMON --size=10m --quality=0.75 --preset=$SPEED_SMALL" - TEN80="$COMMON --bitrate=4000000 --width=1920 --height=1080 --preset=$SPEED_LARGE" - - pack-vid $SMALL $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-small.webm" - pack-vid $MED $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-med.webm" - pack-vid $TEN80 $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-1080p.webm" - fi -done diff --git a/pack-set-hdr b/pack-set-hdr index 2a085ad..6d168e6 100755 --- a/pack-set-hdr +++ b/pack-set-hdr @@ -13,16 +13,16 @@ do else echo "FILE: $INFILE" - COMMON="--hdr" + COMMON="--vcodec=libsvtav1 --hdr" SPEED_SMALL="4" SPEED_LARGE="4" - SMALL="$COMMON --size=4m --quality=0.9375 --preset=$SPEED_SMALL" - MED="$COMMON --size=10m --quality=1.25 --preset=$SPEED_SMALL" - TEN80="$COMMON --bitrate=5000000 --width=1920 --height=1080 --preset=$SPEED_LARGE" + SMALL="$COMMON --size=4m --quality=0.5 --preset=$SPEED_SMALL" + MED="$COMMON --size=10m --quality=0.75 --preset=$SPEED_SMALL" + TEN80="$COMMON --bitrate=4000000 --width=1920 --height=1080 --preset=$SPEED_LARGE" - pack-vid $SMALL $OPTS "$INFILE" "${INFILE%.mp4}-hdr-small.mp4" - pack-vid $MED $OPTS "$INFILE" "${INFILE%.mp4}-hdr-med.mp4" - pack-vid $TEN80 $OPTS "$INFILE" "${INFILE%.mp4}-hdr-1080p.mp4" + pack-vid $SMALL $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-small.webm" + pack-vid $MED $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-med.webm" + pack-vid $TEN80 $OPTS "$INFILE" "${INFILE%.mp4}-hdr-av1-1080p.webm" fi done diff --git a/pack-vid b/pack-vid index 6e062e2..d8e36f1 100755 --- a/pack-vid +++ b/pack-vid @@ -340,7 +340,6 @@ function convert( $src, $dest, $options ) { if ( $vibrance ) { $filters[] = "vibrance=$vibrance"; } - $filters[] = "format=yuv420p"; } else { $filters[] = "format=yuv420p"; }