Merge pull request #181 from Sofie-Automation/Julusian-patch-1

fix: support for ffmpeg 7.0

Author: nytamin

shared/packages/worker/src/worker/workers/genericWorker/expectationHandlers/lib/scan.ts

@@ -568,7 +568,7 @@ function scanLoudnessStream(
 				const LayoutRegex = /Output #0, null[\S\s]+Stream #0:0: Audio: [\w]+, [\d]+ Hz, (?<layout>\w+),/
 
 				const LoudnessRegex =
-					/Integrated loudness:\s+I:\s+(?<integrated>[\d-.,]+)\s+LUFS\s+Threshold:\s+(?<threshold>[\d-.,]+)\s+LUFS\s+Loudness range:\s+LRA:\s+(?<lra>[\d-.,]+)\s+LU\s+Threshold:\s+(?<rangeThreshold>[\d-.,]+)\s+LUFS\s+LRA low:\s+(?<lraLow>[\d-.,]+)\s+LUFS\s+LRA high:\s+(?<lraHigh>[\d-.,]+)\s+LUFS\s+True peak:\s+Peak:\s+(?<truePeak>[\d-.,]+)\s+dBFS\s*$/i
+					/Integrated loudness:\s+I:\s+(?<integrated>[\d-.,]+)\s+LUFS\s+Threshold:\s+(?<threshold>[\d-.,]+)\s+LUFS\s+Loudness range:\s+LRA:\s+(?<lra>[\d-.,]+)\s+LU\s+Threshold:\s+(?<rangeThreshold>[\d-.,]+)\s+LUFS\s+LRA low:\s+(?<lraLow>[\d-.,]+)\s+LUFS\s+LRA high:\s+(?<lraHigh>[\d-.,]+)\s+LUFS\s+True peak:\s+Peak:\s+(?<truePeak>[\d-.,]+)\s+dBFS/i
 
 				const loudnessRes = LoudnessRegex.exec(stderr)
 				const layoutRes = LayoutRegex.exec(stderr)

tests/ffmpegReleases.json

@@ -15,6 +15,10 @@
 		{
 			"id": "6.1",
 			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-6.1-amd64-static.tar.xz"
+		},
+		{
+			"id": "7.0.2",
+			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-7.0.2-amd64-static.tar.xz"
 		}
 	],
 	"win32-x64": [
@@ -33,6 +37,18 @@
 		{
 			"id": "6.1",
 			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-6.1-essentials_build.zip"
+		},
+		{
+			"id": "7.0",
+			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-7.0-essentials_build.zip"
+		},
+		{
+			"id": "7.1.1",
+			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-7.1.1-essentials_build.zip"
+		},
+		{
+			"id": "8.0.1",
+			"url": "https://github.com/CasparCG/dependencies/releases/download/ffmpeg-binaries/ffmpeg-8.0.1-essentials_build.zip"
 		}
 	]
 }