summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/encode-aerial-lite132
-rwxr-xr-xbin/fetch-aerial-recent3
-rwxr-xr-xbin/install-aerial-videos94
3 files changed, 153 insertions, 76 deletions
diff --git a/bin/encode-aerial-lite b/bin/encode-aerial-lite
index 5592568..56621e0 100755
--- a/bin/encode-aerial-lite
+++ b/bin/encode-aerial-lite
@@ -1,77 +1,29 @@
#!/usr/bin/env bash
# Downsample Aerial masters into ~/Videos/Screensavers/Aerial:
-# 1920x1080, 24fps, 8-bit HEVC via VAAPI (~2 Mb/s).
+# 1920x1080, 24fps. Tries VAAPI HEVC, then software x265, then x264.
#
# Usage:
# encode-aerial-lite /path/to/4k-sources
# SRC_DIR=/path/to/4k DST_DIR=~/Videos/Screensavers/Aerial encode-aerial-lite
set -euo pipefail
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+# shellcheck source=../lib/detect-vaapi.sh
+source "$ROOT/lib/detect-vaapi.sh"
+
SRC_DIR="${1:-${SRC_DIR:-}}"
DST_DIR="${DST_DIR:-$HOME/Videos/Screensavers/Aerial}"
-CONFIG_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver/config"
BITRATE="${BITRATE:-2M}"
MAXRATE="${MAXRATE:-2.5M}"
-detect_vaapi() {
- if [[ -n "${VAAPI_DEVICE:-}" && -e "$VAAPI_DEVICE" ]]; then
- printf '%s
-' "$VAAPI_DEVICE"
- return 0
- fi
- if [[ -f "${CONFIG_FILE:-}" ]]; then
- local from_cfg
- from_cfg="$(awk -F= '/^VAAPI_DEVICE=/{print $2; exit}' "$CONFIG_FILE" | tr -d '"' || true)"
- if [[ -n "$from_cfg" && -e "$from_cfg" ]]; then
- printf '%s
-' "$from_cfg"
- return 0
- fi
- fi
- # Prefer AMD/Intel iGPU (PCI class 0x038000 Display) over dGPU VGA (0x030000).
- local best="" best_score=99 p real cls score
- if [[ -d /dev/dri/by-path ]]; then
- for p in /dev/dri/by-path/*-render; do
- [[ -e "$p" ]] || continue
- [[ "$(basename "$p")" == *usb* ]] && continue
- real="$(readlink -f "$p")"
- cls="$(cat "/sys/class/drm/$(basename "$real")/device/class" 2>/dev/null || true)"
- score=1
- [[ "$cls" == 0x038* ]] && score=0
- [[ "$cls" == 0x030* ]] && score=2
- if [[ "$score" -lt "$best_score" ]]; then
- best="$p"
- best_score="$score"
- fi
- done
- fi
- if [[ -n "$best" ]]; then
- printf '%s
-' "$best"
- return 0
- fi
- for p in /dev/dri/renderD*; do
- [[ -e "$p" ]] || continue
- printf '%s
-' "$p"
- return 0
- done
- return 1
-}
-
if [[ -z "$SRC_DIR" ]]; then
echo "Usage: encode-aerial-lite /path/to/4k-source-folder" >&2
echo "Encodes into: $DST_DIR" >&2
exit 1
fi
-VAAPI_DEVICE="$(detect_vaapi)" || {
- echo "No VAAPI render node found. Set VAAPI_DEVICE=/dev/dri/renderD128" >&2
- exit 1
-}
-
+VAAPI_DEVICE="$(detect_vaapi || true)"
mkdir -p "$DST_DIR"
-shopt -s nullglob nocaseglob
encode_one() {
local src="$1"
@@ -89,7 +41,8 @@ encode_one() {
tmp="$DST_DIR/.${base}.partial.mp4"
rm -f "$tmp"
- if ffmpeg -y -hide_banner -loglevel error -stats \
+ # 1) Full VAAPI path (AMD / Intel media-driver)
+ if [[ -n "${VAAPI_DEVICE:-}" ]] && ffmpeg -y -hide_banner -loglevel error -stats \
-hwaccel vaapi -hwaccel_device "$VAAPI_DEVICE" -hwaccel_output_format vaapi \
-i "$src" \
-vf "fps=24,scale_vaapi=w=1920:h=1080:format=nv12" \
@@ -97,28 +50,55 @@ encode_one() {
-an -movflags +faststart \
"$tmp"; then
mv -f "$tmp" "$dest"
- echo "OK $base ($(du -h "$dest" | cut -f1))"
- else
- echo "FAIL $base — retrying with software decode" >&2
- rm -f "$tmp"
- if ffmpeg -y -hide_banner -loglevel error -stats \
- -vaapi_device "$VAAPI_DEVICE" \
- -i "$src" \
- -vf "fps=24,scale=1920:1080:flags=bicubic,format=nv12,hwupload" \
- -c:v hevc_vaapi -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \
- -an -movflags +faststart \
- "$tmp"; then
- mv -f "$tmp" "$dest"
- echo "OK $base (sw-decode, $(du -h "$dest" | cut -f1))"
- else
- rm -f "$tmp"
- echo "FAIL $base" >&2
- return 1
- fi
+ echo "OK $base (hevc_vaapi, $(du -h "$dest" | cut -f1))"
+ return 0
+ fi
+ rm -f "$tmp"
+
+ # 2) Software decode + VAAPI encode
+ if [[ -n "${VAAPI_DEVICE:-}" ]] && ffmpeg -y -hide_banner -loglevel error -stats \
+ -vaapi_device "$VAAPI_DEVICE" \
+ -i "$src" \
+ -vf "fps=24,scale=1920:1080:flags=bicubic,format=nv12,hwupload" \
+ -c:v hevc_vaapi -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \
+ -an -movflags +faststart \
+ "$tmp"; then
+ mv -f "$tmp" "$dest"
+ echo "OK $base (hevc_vaapi/sw-decode, $(du -h "$dest" | cut -f1))"
+ return 0
+ fi
+ rm -f "$tmp"
+
+ # 3) Software x265 (good for ThinkPad when VAAPI encode is missing)
+ if ffmpeg -y -hide_banner -loglevel error -stats \
+ -i "$src" \
+ -vf "fps=24,scale=1920:1080:flags=bicubic" \
+ -c:v libx265 -pix_fmt yuv420p -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \
+ -tag:v hvc1 -an -movflags +faststart \
+ "$tmp" 2>/dev/null; then
+ mv -f "$tmp" "$dest"
+ echo "OK $base (libx265, $(du -h "$dest" | cut -f1))"
+ return 0
+ fi
+ rm -f "$tmp"
+
+ # 4) Software x264 — universally decodable on Intel UHD 620
+ if ffmpeg -y -hide_banner -loglevel error -stats \
+ -i "$src" \
+ -vf "fps=24,scale=1920:1080:flags=bicubic" \
+ -c:v libx264 -pix_fmt yuv420p -preset medium -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \
+ -an -movflags +faststart \
+ "$tmp"; then
+ mv -f "$tmp" "$dest"
+ echo "OK $base (libx264, $(du -h "$dest" | cut -f1))"
+ return 0
fi
+
+ rm -f "$tmp"
+ echo "FAIL $base" >&2
+ return 1
}
-shopt -u nocaseglob
mapfile -t files < <(find "$SRC_DIR" -maxdepth 1 -type f \( -iname '*.mov' -o -iname '*.mp4' -o -iname '*.mkv' \) | sort)
if [[ ${#files[@]} -eq 0 ]]; then
echo "No source videos in $SRC_DIR" >&2
@@ -127,7 +107,7 @@ fi
echo "Source: $SRC_DIR (${#files[@]} files)"
echo "Dest: $DST_DIR"
-echo "Device: $VAAPI_DEVICE"
+echo "Device: ${VAAPI_DEVICE:-none (software encode fallbacks enabled)}"
echo
failures=0
@@ -137,7 +117,7 @@ for f in "${files[@]}"; do
fi
done
-rm -f "$DST_DIR/_test_lite.mp4" "$DST_DIR"/.*.partial.mp4
+rm -f "$DST_DIR/_test_lite.mp4" "$DST_DIR"/.*.partial.mp4 2>/dev/null || true
echo
echo "Done. Lite library:"
diff --git a/bin/fetch-aerial-recent b/bin/fetch-aerial-recent
index 852bee8..23f4a57 100755
--- a/bin/fetch-aerial-recent
+++ b/bin/fetch-aerial-recent
@@ -5,6 +5,9 @@
# Usage:
# fetch-aerial-recent # download masters only
# fetch-aerial-recent --encode # download + encode-aerial-lite
+#
+# Note: recent Tahoe/Sequoia/Sonoma clips are 4K@240. On a ThinkPad T480,
+# prefer install-aerial-videos --from-zip aerial-videos-lite.zip instead.
set -euo pipefail
ENCODE=0
diff --git a/bin/install-aerial-videos b/bin/install-aerial-videos
new file mode 100755
index 0000000..5e6b313
--- /dev/null
+++ b/bin/install-aerial-videos
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+# Install Aerial lite clips into ~/Videos/Screensavers/Aerial.
+#
+# Modes:
+# install-aerial-videos # download from Apple + encode
+# install-aerial-videos --from-zip FILE.zip # unpack a LocalSend video pack
+# install-aerial-videos --from-dir DIR # copy already-lite .mp4 files
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+VIDEO_DIR="${VIDEO_DIR:-$HOME/Videos/Screensavers/Aerial}"
+MODE="fetch"
+FROM=""
+
+usage() {
+ cat <<EOF
+Usage:
+ install-aerial-videos Download recent Apple pack and encode
+ install-aerial-videos --from-zip ZIP Install from aerial-videos-lite.zip
+ install-aerial-videos --from-dir DIR Copy .mp4/.mov/.mkv from DIR
+
+Dest: $VIDEO_DIR
+EOF
+}
+
+while [[ $# -gt 0 ]]; do
+ case "$1" in
+ --from-zip)
+ MODE="zip"
+ FROM="${2:-}"
+ shift 2
+ ;;
+ --from-dir)
+ MODE="dir"
+ FROM="${2:-}"
+ shift 2
+ ;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
+ *)
+ echo "Unknown option: $1" >&2
+ usage >&2
+ exit 1
+ ;;
+ esac
+done
+
+mkdir -p "$VIDEO_DIR"
+
+case "$MODE" in
+ zip)
+ [[ -n "$FROM" && -f "$FROM" ]] || { echo "ZIP not found: $FROM" >&2; exit 1; }
+ echo "Installing videos from $FROM -> $VIDEO_DIR"
+ # Accept either flat mp4s or a single top-level folder of mp4s
+ tmp="$(mktemp -d)"
+ trap 'rm -rf "$tmp"' EXIT
+ unzip -q -o "$FROM" -d "$tmp"
+ mapfile -t files < <(find "$tmp" -type f \( -iname '*.mp4' -o -iname '*.mov' -o -iname '*.mkv' \) | sort)
+ if [[ ${#files[@]} -eq 0 ]]; then
+ echo "No videos inside zip" >&2
+ exit 1
+ fi
+ for f in "${files[@]}"; do
+ install -m 0644 "$f" "$VIDEO_DIR/$(basename "$f")"
+ done
+ echo "Installed ${#files[@]} clips ($(du -sh "$VIDEO_DIR" | cut -f1))"
+ ;;
+ dir)
+ [[ -n "$FROM" && -d "$FROM" ]] || { echo "DIR not found: $FROM" >&2; exit 1; }
+ echo "Copying videos from $FROM -> $VIDEO_DIR"
+ count=0
+ while IFS= read -r -d '' f; do
+ install -m 0644 "$f" "$VIDEO_DIR/$(basename "$f")"
+ count=$((count + 1))
+ done < <(find "$FROM" -maxdepth 1 -type f \( -iname '*.mp4' -o -iname '*.mov' -o -iname '*.mkv' \) -print0 | sort -z)
+ echo "Installed $count clips ($(du -sh "$VIDEO_DIR" | cut -f1))"
+ ;;
+ fetch)
+ need() { command -v "$1" >/dev/null 2>&1 || { echo "Missing dependency: $1" >&2; exit 1; }; }
+ need curl
+ need aria2c
+ need ffmpeg
+ FETCH="$ROOT/bin/fetch-aerial-recent"
+ [[ -x "$FETCH" ]] || FETCH="$(command -v fetch-aerial-recent)"
+ echo "Fetching + encoding recent Apple Aerial pack (needs network)..."
+ echo "On a ThinkPad T480 this can take a while; prefer --from-zip if you have the video pack."
+ DST_DIR="$VIDEO_DIR" "$FETCH" --encode
+ ;;
+esac
+
+echo "Video dir: $VIDEO_DIR"
+ls -lh "$VIDEO_DIR"