From bc96ae630c0bcec9d4a250c7a0993dffa4224918 Mon Sep 17 00:00:00 2001 From: SeydX Date: Sat, 16 Apr 2022 13:32:37 +0200 Subject: [PATCH] v1.1.9 --- CHANGELOG.md | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- src/controller/camera/services/media.service.js | 11 ++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d2cd30..ec561799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. +# v1.1.9 - 2022-04-16 + +## Bugfixes +- Fixed minor issues with FFmpeg v5 + # v1.1.8 - 2022-04-16 ## Other Changes diff --git a/package-lock.json b/package-lock.json index 57562a43..fc7b6dc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "camera.ui", - "version": "1.1.8", + "version": "1.1.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "camera.ui", - "version": "1.1.8", + "version": "1.1.9", "funding": [ { "type": "paypal", diff --git a/package.json b/package.json index 09c4f759..bdb3e35f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "camera.ui", - "version": "1.1.8", + "version": "1.1.9", "description": "NVR like user interface for RTSP capable cameras.", "author": "SeydX (https://github.com/SeydX/camera.ui)", "scripts": { diff --git a/src/controller/camera/services/media.service.js b/src/controller/camera/services/media.service.js index 696e69fd..4eebcb10 100644 --- a/src/controller/camera/services/media.service.js +++ b/src/controller/camera/services/media.service.js @@ -41,10 +41,9 @@ export default class MediaService { async probe() { // eslint-disable-next-line no-unused-vars return new Promise((resolve, reject) => { + let lines = 0; + const arguments_ = [ - '-hide_banner', - '-loglevel', - 'info', '-analyzeduration', '0', '-probesize', @@ -64,6 +63,10 @@ export default class MediaService { }); stderr.on('line', (line) => { + if (lines === 0) { + ConfigService.ffmpegVersion = line.split(' ')[2]; + } + const audioLine = line.includes('Audio: ') ? line.split('Audio: ')[1] : false; if (audioLine) { @@ -75,6 +78,8 @@ export default class MediaService { if (videoLine) { this.codecs.video = videoLine.split(', '); } + + lines++; }); cp.on('exit', () => {