mediasnacks 0.1.0 → 0.2.0

package/.zsh/completions/_mediasnacks

@@ -9,7 +9,8 @@ _mediasnacks_commands=(
   'qdir:Sequentially runs all *.sh files in a folder'
   'hev1tohvc1:Fixes video thumbnails not rendering in macOS Finder'
   'framediff:ffplay with a filter for diffing adjacent frames'
-  'videodiff:Plays a video of the difference of two videos'
+  'videodiff:Plays a video with the difference of two videos'
+  'vconcat:Concatenates videos'
 )
 
 _mediasnacks() {
@@ -20,7 +21,7 @@ _mediasnacks() {
 
   local cmd="$words[2]"
   case "$cmd" in
-    avif|resize|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|videodiff)
+    avif|resize|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|videodiff|vconcat)
       _files
       ;;
     qdir)

package/README.md

@@ -18,7 +18,11 @@ Commands:
 - `seqcheck` Finds missing sequence number
 - `qdir` Sequentially runs all *.sh files in a folder
 - `hev1tohvc1`: Fixes video thumbnails not rendering in macOS Finder 
- 
+
+- `framediff`: Plays a video of adjacent frames diff
+- `videodiff`: Plays a video with the difference of two videos
+- 
+- `vconcat`: Concatenates videos
 <br/>
 
 ### Converting Images to AVIF

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasnacks",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Utilities for preparing videos, images, and audio for the web",
   "license": "MIT",
   "author": "Eric Fortis",

package/src/avif.js

@@ -55,7 +55,6 @@ async function toAvif({ file, outFile, overwrite }) {
 		return
 	}
 
-	// TODO test on linux
 	console.log(file)
 	await ffmpeg([
 		'-y', // overwrites

package/src/cli.js

@@ -6,34 +6,27 @@ import pkgJSON from '../package.json' with { type: 'json' }
 
 
 const COMMANDS = {
-	avif: join(import.meta.dirname, 'avif.js'),
-	resize: join(import.meta.dirname, 'resize.js'),
-	moov2front: join(import.meta.dirname, 'moov2front.js'),
-	
-	dropdups: join(import.meta.dirname, 'dropdups.js'),
-	seqcheck: join(import.meta.dirname, 'seqcheck.js'),
-	qdir: join(import.meta.dirname, 'qdir.js'),
-	hev1tohvc1: join(import.meta.dirname, 'hev1tohvc1.js'),
+	avif: ['avif.js', 'Converts images to AVIF'],
+	resize: ['resize.js', 'Resizes videos or images'],
+	moov2front: ['moov2front.js', 'Rearranges .mov and .mp4 metadata for fast-start streaming'],
+
+	dropdups: ['dropdups.js', 'Removes duplicate frames in a video'],
+	seqcheck: ['seqcheck.js', 'Finds missing sequence number'],
+	qdir: ['qdir.js', 'Sequentially runs all *.sh files in a folder'],
+	hev1tohvc1: ['hev1tohvc1.js', 'Fixes video thumbnails not rendering in macOS Finder '],
+
+	framediff: ['framediff.sh', 'Plays a video of adjacent frames diff'],
+	videodiff: ['videodiff.sh', 'Plays a video with the difference of two videos'],
 	
-	framediff: join(import.meta.dirname, 'framediff.sh'),
-	videodiff: join(import.meta.dirname, 'videodiff.sh'),
+	vconcat: ['vconcat.sh', 'Concatenates videos'],
 }
 
 const USAGE = `
 Usage: npx mediasnacks <command> <args>
 
 Commands:
-    avif: Converts images to AVIF
-    resize: Resizes videos or images
-    moov2front: Rearranges .mov and .mp4 metadata for fast-start streaming
-    
-    dropdups: Removes duplicate frames in a video
-    seqcheck: Finds missing sequence number
-    qdir: Sequentially runs all *.sh files in a folder
-    hev1tohvc1: Fixes video thumbnails not rendering in macOS Finder 
-    
-    framediff: Plays a video of adjacent frames diff
-    videodiff: Plays a video of the difference of two videos
+${Object.entries(COMMANDS).map(([cmd, [, title]]) =>
+	`    ${cmd}\t${title}`).join('\n')}
 `.trim()
 
 
@@ -55,13 +48,14 @@ if (!opt) {
 }
 
 if (!Object.hasOwn(COMMANDS, opt)) {
-	console.error(`'${opt}' is not a mediasnacks command. See npx mediasnacks --help\n`)
+	console.error(`'${opt}' is not a command. See npx mediasnacks --help\n`)
 	process.exit(1)
 }
 
-const cmd = COMMANDS[opt]
-const executable = cmd.endsWith('.sh') 
-	? 'sh' 
-	: process.execPath
-spawn(executable, [cmd, ...args], { stdio: 'inherit' })
-	.on('exit', code => process.exit(code))
+const cmd = join(import.meta.dirname, COMMANDS[opt][0])
+const isShellScript = cmd.endsWith('.sh')
+spawn(
+	isShellScript ? cmd : process.execPath,
+	isShellScript ? args : [cmd, ...args],
+	{ stdio: 'inherit' }
+).on('exit', process.exit)

package/src/dropdups.js

@@ -14,6 +14,8 @@ const PRORES_PROFILES = {
 	'4444': 4,
 	'4444xq': 5,
 }
+const PROFILE = PRORES_PROFILES.hq
+
 
 const USAGE = `
 Usage: npx mediasnacks dropdups [-n <bad-frame-number>] <video>
@@ -22,8 +24,9 @@ Removes duplicate frames and outputs ProRes 422 HQ.
 
 Options:
   -n, --bad-frame-number <n>  Known frame interval to drop.
-           Example A: Use n=2 when every other frame is repeated.
-		       Example B: Use n=6 if e.g., a 25 fps got upped to 30 fps without interpolation.
+		         (default: n=0) auto-detects repeated frames (slower)
+             Ex.A: Use n=2 when every other frame is repeated.
+		         Ex.B: Use n=6 if e.g., a 25 fps got upped to 30 fps without interpolation.
   -h, --help
 `.trim()
 
@@ -31,7 +34,7 @@ Options:
 async function main() {
 	const { values, positionals } = parseArgs({
 		options: {
-			'bad-frame-number': { short: 'n', type: 'string' },
+			'bad-frame-number': { short: 'n', type: 'string', default: '' },
 			help: { short: 'h', type: 'boolean', default: false },
 		},
 		allowPositionals: true
@@ -45,13 +48,9 @@ async function main() {
 	if (!positionals.length)
 		throw new Error('No video specified. See npx mediasnacks dropdups --help')
 
-	let nBadFrame = null
-	if (values['bad-frame-number'] !== null) {
-		const n = Number(values['bad-frame-number'])
-		if (!Number.isFinite(n) || n <= 0)
-			throw new Error('Invalid --bad-frame-number. It must be a positive integer.')
-		nBadFrame = n
-	}
+	let nBadFrame = values['bad-frame-number']
+	if (nBadFrame && /^\d+$/.test(nBadFrame))
+		throw new Error('Invalid --bad-frame-number. It must be a positive integer.')
 
 	await assertUserHasFFmpeg()
 
@@ -72,7 +71,7 @@ async function drop(video, nBadFrame) {
 			: 'mpdecimate,setpts=N/FRAME_RATE/TB',
 		'-fps_mode', 'cfr',
 		'-c:v', 'prores_ks',
-		'-profile:v', PRORES_PROFILES['hq'],
+		'-profile:v', PROFILE,
 		'-pix_fmt', 'yuv422p10le',
 		makeOutputPath(video)
 	])

package/src/framediff.sh

@@ -1,10 +1,12 @@
+#!/bin/sh
+
 # Plays a video with a filter for diffing adjacent frames.
 # I use this for finding repeated frames. For example, you’ll see 
 # a black frame if two consecutive frames are almost similar.
 
 # The frame number is rendered at the top-left.
 
-ffplay -hide_banner "$1" -vf "
+ffplay -hide_banner -xerror "$1" -vf "
     tblend=all_mode=difference,
     format=gray,
     drawtext=text='%{n}':x=20:y=20:fontcolor=white:fontsize=48

package/src/vconcat.sh

@@ -0,0 +1,22 @@
+#!/bin/zsh
+
+if (( $# < 2 )); then
+  cat << EOF
+Usage:
+    $(basename $0) vid1.mov vid2.mov [...]
+    $(basename $0) *.mp4
+EOF
+  exit 1
+fi
+
+list_file=$(mktemp -p .)
+for file in "$@"; do
+  echo "file '$file'" >> "$list_file"
+done
+
+first_video="$1"
+outfile="${first_video:r}.concat.${first_video:e}"
+
+ffmpeg -v error -f concat -safe 0 -i "$list_file" -c copy "$outfile"
+
+rm "$list_file"

package/src/videodiff.sh

@@ -1,9 +1,15 @@
+#!/bin/sh
+
 # Diffs two video files
 # The videos must have the same resolution and ideally the same framerate.
 video1="$1"
 video2="$2"
 
-ffplay -f lavfi "movie=$video1 [a]; movie=$video2 [b]; [a][b] blend=all_mode=difference128"
+ffprobe -v error "$video1" || exit 1
+ffprobe -v error "$video2" || exit 1
+
+ffplay -hide_banner \
+	-f lavfi "movie=$video1 [a]; movie=$video2 [b]; [a][b] blend=all_mode=difference128"
 
 #all_mode=difference: absolute diff (ideal for detecting visual changes)
 #all_mode=subtract: raw subtraction (can go <0, may appear darker)