From 3a62d9cd315445fbc66e693c4a51683de506eff4 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 26 Aug 2023 21:31:31 -0700 Subject: [PATCH] cli: add ffplay filter args --- packages/cli/.vscode/launch.json | 8 ++++---- packages/cli/package-lock.json | 4 ++-- packages/cli/package.json | 2 +- packages/cli/src/main.ts | 7 +++++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/cli/.vscode/launch.json b/packages/cli/.vscode/launch.json index 0cf3d6181..881315288 100644 --- a/packages/cli/.vscode/launch.json +++ b/packages/cli/.vscode/launch.json @@ -19,11 +19,11 @@ "-r", "ts-node/register" ], + "preLaunchTask": "npm: build", "args": [ "ffplay", - "Kitchen", - "getRecordingStream", - "{\"startTime\":1677699495709}" + "Baby Camera@192.168.2.109", + "getVideoStream", ], "sourceMaps": true, "resolveSourceMapLocations": [ @@ -35,4 +35,4 @@ ], }, ] -} \ No newline at end of file +} diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index e813eec94..87b3247c4 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "scrypted", - "version": "1.0.67", + "version": "1.0.69", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scrypted", - "version": "1.0.67", + "version": "1.0.69", "license": "ISC", "dependencies": { "@scrypted/client": "^1.1.43", diff --git a/packages/cli/package.json b/packages/cli/package.json index 7a7a8fafd..7246b14cb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "scrypted", - "version": "1.0.67", + "version": "1.0.69", "description": "", "main": "./dist/main.js", "bin": { diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts index 24e100eac..de5052164 100644 --- a/packages/cli/src/main.ts +++ b/packages/cli/src/main.ts @@ -172,8 +172,11 @@ async function main() { ffmpegInput.inputArguments = ffmpegInput.inputArguments.map(i => i === ffmpegInput.url ? ffmpegInput.urls?.[0] : i); } } - console.log('ffplay', ...ffmpegInput.inputArguments); - child_process.spawn('ffplay', ffmpegInput.inputArguments, { + const args = [...ffmpegInput.inputArguments]; + if (ffmpegInput.h264FilterArguments) + args.push(...ffmpegInput.h264FilterArguments); + console.log('ffplay', ...args); + child_process.spawn('ffplay', args, { stdio: 'inherit', }); sdk.disconnect();