Merge branch 'feat/audio-waveform-thumbnails' into develop

shared/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/lib.ts

@@ -389,14 +389,21 @@ interface ThumbnailMetadata {
 	}
 }
 /** Returns arguments for FFMpeg to generate a thumbnail image file */
-export function thumbnailFFMpegArguments(input: string, metadata: ThumbnailMetadata, seekTimeCode?: string): string[] {
+export function thumbnailFFMpegArguments(
+	input: string,
+	metadata: ThumbnailMetadata,
+	seekTimeCode?: string,
+	hasVideoStream?: boolean
+): string[] {
 	return [
 		'-hide_banner',
-		seekTimeCode ? `-ss ${seekTimeCode}` : undefined,
+		hasVideoStream && seekTimeCode ? `-ss ${seekTimeCode}` : undefined,
 		`-i "${input}"`,
 		`-f image2`,
 		'-frames:v 1',
-		`-vf ${!seekTimeCode ? 'thumbnail,' : ''}scale=${metadata.version.width}:${metadata.version.height}`,
+		hasVideoStream
+			? `-vf ${!seekTimeCode ? 'thumbnail,' : ''}scale=${metadata.version.width}:${metadata.version.height}` // Creates a thumbnail of the video.
+			: '-filter_complex "showwavespic=s=640x240:split_channels=1:colors=white"', // Creates an image of the audio waveform.
 		'-threads 1',
 	].filter(Boolean) as string[] // remove undefined values
 }

shared/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/mediaFileThumbnail.ts

@@ -30,6 +30,8 @@ import {
 } from './lib'
 import { FFMpegProcess, spawnFFMpeg } from './lib/ffmpeg'
 import { WindowsWorker } from '../windowsWorker'
+import { CancelablePromise } from '../../../lib/cancelablePromise'
+import { scanWithFFProbe, FFProbeScanResult } from './lib/scan'
 
 /**
  * Generates a thumbnail image from a source video file, and stores the resulting file into the target PackageContainer
@@ -149,9 +151,11 @@ export const MediaFileThumbnail: ExpectationWindowsHandler = {
 		if (!lookupTarget.ready) throw new Error(`Can't start working due to target: ${lookupTarget.reason.tech}`)
 
 		let ffMpegProcess: FFMpegProcess | undefined
+		let ffProbeProcess: CancelablePromise<any> | undefined
 		const workInProgress = new WorkInProgress({ workLabel: 'Generating thumbnail' }, async () => {
 			// On cancel
 			ffMpegProcess?.cancel()
+			ffProbeProcess?.cancel()
 		}).do(async () => {
 			if (
 				(lookupSource.accessor.type === Accessor.AccessType.LOCAL_FOLDER ||
@@ -221,8 +225,15 @@ export const MediaFileThumbnail: ExpectationWindowsHandler = {
 					throw new Error(`Unsupported Target AccessHandler`)
 				}
 
+				// Scan with FFProbe:
+				ffProbeProcess = scanWithFFProbe(sourceHandle)
+				const ffProbeScan: FFProbeScanResult = await ffProbeProcess
+				ffProbeProcess = undefined
+				const hasVideoStream =
+					ffProbeScan.streams && ffProbeScan.streams.some((stream) => stream.codec_type === 'video')
+
 				// Use FFMpeg to generate the thumbnail:
-				const args = thumbnailFFMpegArguments(inputPath, metadata, seekTimeCode)
+				const args = thumbnailFFMpegArguments(inputPath, metadata, seekTimeCode, hasVideoStream)
 
 				const fileOperation = await targetHandle.prepareForOperation('Generate thumbnail', lookupSource.handle)