v1.1.12

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# v1.1.12 - 2022-04-23
+
+## Other Changes
+- Improved probe stream
+- Minor improvements
+- Bump dependencies
+
+## Bugfixes
+- Fixed an issue where recording information such as motion label was not correctly saved in the image data
+- Fixed an issue where prebuffering and/or video analysis was started for disabled cameras anyway
+- Minor bugfixes
+
 # v1.1.11 - 2022-04-23
 
 ## Notable Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "camera.ui",
-  "version": "1.1.11",
+  "version": "1.1.12-beta.1",
   "description": "NVR like user interface for RTSP capable cameras.",
   "author": "SeydX (https://github.com/SeydX/camera.ui)",
   "scripts": {
@@ -27,7 +27,7 @@
     "connect-history-api-fallback": "^1.6.0",
     "cors": "^2.8.5",
     "express": "^4.17.3",
-    "ffmpeg-for-homebridge": "^0.0.9",
+    "ffmpeg-for-homebridge": "0.0.9",
     "fs-extra": "^10.1.0",
     "ftp-srv": "^4.6.0",
     "got": "^12.0.3",
@@ -65,7 +65,7 @@
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.1.4",
+    "eslint-plugin-jest": "^26.1.5",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-unicorn": "^42.0.0",
     "jest": "^27.5.1",

src/api/components/notifications/notifications.model.js

@@ -105,13 +105,12 @@ export const createNotification = async (data) => {
   const cameraSetting = camerasSettings.find((cameraSetting) => cameraSetting && cameraSetting.name === camera.name);
 
   const id = data.id || (await nanoid());
-  const cameraName = camera.name;
   const room = cameraSetting ? cameraSetting.room : 'Standard';
   const timestamp = data.timestamp || moment().unix();
   const time = moment.unix(timestamp).format('YYYY-MM-DD HH:mm:ss');
 
   const fileName =
-    cameraName.replace(/\s+/g, '_') +
+    camera.name.replace(/\s+/g, '_') +
     '-' +
     id +
     '-' +
@@ -124,7 +123,7 @@ export const createNotification = async (data) => {
 
   const notification = {
     id: id,
-    camera: cameraName,
+    camera: camera.name,
     fileName: `${fileName}.${extension}`,
     name: fileName,
     extension: extension,
@@ -139,7 +138,7 @@ export const createNotification = async (data) => {
 
   const notify = {
     ...notification,
-    title: cameraName,
+    title: camera.name,
     message: `${data.trigger} - ${time}`,
     subtxt: room,
     mediaSource: data.storing ? `/files/${fileName}.${extension}` : false,

src/api/components/recordings/recordings.model.js

@@ -113,6 +113,7 @@ export const createRecording = async (data, fileBuffer) => {
   const cameraSetting = camerasSettings.find((cameraSetting) => cameraSetting && cameraSetting.name === camera.name);
 
   const id = data.id || (await nanoid());
+  const room = cameraSetting ? cameraSetting.room : 'Standard';
   const timestamp = data.timestamp || moment().unix();
   const time = moment.unix(timestamp).format('YYYY-MM-DD HH:mm:ss');
 
@@ -137,15 +138,15 @@ export const createRecording = async (data, fileBuffer) => {
     recordStoring: true,
     recordType: data.type,
     trigger: data.trigger,
-    room: cameraSetting.room,
+    room: room,
     time: time,
     timestamp: timestamp,
     label: label,
   };
 
   if (fileBuffer) {
     await storeVideoBuffer(camera, fileBuffer, data.path, fileName);
-    await storeSnapshotFromVideo(camera, data.path, fileName);
+    await storeSnapshotFromVideo(camera, data.path, fileName, label);
   } else {
     const isPlaceholder = data.type === 'Video';
     const externRecording = false;

src/api/database.js

@@ -310,7 +310,7 @@ export default class Database {
         let extension = isPlaceholder ? 'mp4' : 'jpeg';
         let id = rec.match(/(?<=-)([\dA-z]{10})(?=-)/)[0];
         let timestamp = rec.match(/(?<=-)(\d{10})(?=_)/)[0];
-        let cameraName = rec.match(/(.*?)(?=-[\dA-z]{10})/)[0];
+        let cameraName = rec.match(/(.*?)(?=-[\dA-z]{10})/)[0]?.replace(/_/g, ' ');
         let cameraSetting = cameras.find((camera) => camera?.name === cameraName);
 
         const jpeg = fs.readFileSync(filePath);
@@ -327,7 +327,7 @@ export default class Database {
 
         return {
           id: id,
-          camera: cameraName.replace(/_/g, ' '),
+          camera: cameraName,
           fileName: `${fileName}.${extension}`,
           name: fileName,
           extension: extension,

src/common/ffmpeg.js

@@ -242,7 +242,7 @@ export const getAndStoreSnapshot = (
   });
 };
 
-export const storeSnapshotFromVideo = async (camera, recordingPath, fileName) => {
+export const storeSnapshotFromVideo = async (camera, recordingPath, fileName, label) => {
   return new Promise((resolve, reject) => {
     const videoProcessor = ConfigService.ui.options.videoProcessor;
     const videoName = `${recordingPath}/${fileName}.mp4`;
@@ -282,6 +282,9 @@ export const storeSnapshotFromVideo = async (camera, recordingPath, fileName) =>
         reject(new Error(errors.join(' - ')));
       } else {
         log.debug('FFmpeg snapshot process exited (expected)', camera.name, 'ffmpeg');
+
+        replaceJpegWithExifJPEG(camera.name, destination, label);
+
         resolve();
       }
     });

src/controller/camera/camera.controller.js

@@ -79,6 +79,10 @@ export default class CameraController {
 
     await controller.media.probe();
 
+    if (controller.options?.disable) {
+      return;
+    }
+
     if (controller.options?.prebuffering) {
       await controller.prebuffer.start();
     }
@@ -87,7 +91,7 @@ export default class CameraController {
       await controller.videoanalysis.start();
     }
 
-    await controller.stream.configureStreamOptions();
+    //await controller.stream.configureStreamOptions();
   }
 
   static async reconfigureController(cameraName) {
@@ -97,6 +101,10 @@ export default class CameraController {
       throw new Error(`Can not reconfigure controller, controller for ${cameraName} not found!`);
     }
 
+    if (camera.disable) {
+      return;
+    }
+
     const camera = ConfigService.ui.cameras.find((camera) => camera.name === cameraName);
 
     if (!camera) {

src/controller/camera/services/media.service.js

@@ -22,6 +22,9 @@ export default class MediaService {
       timedout: false,
       audio: [],
       video: [],
+      bitrate: '? kb/s',
+      mapvideo: '',
+      mapaudio: '',
     };
   }
 
@@ -67,16 +70,24 @@ export default class MediaService {
           ConfigService.ffmpegVersion = line.split(' ')[2];
         }
 
+        const bitrateLine = line.includes('start: ') && line.includes('bitrate: ') ? line.split('bitrate: ')[1] : false;
+
+        if (bitrateLine) {
+          this.codecs.bitrate = bitrateLine;
+        }
+
         const audioLine = line.includes('Audio: ') ? line.split('Audio: ')[1] : false;
 
         if (audioLine) {
           this.codecs.audio = audioLine.split(', ');
+          this.codecs.mapaudio = line.split('Stream #')[1]?.split(': Audio')[0];
         }
 
         const videoLine = line.includes('Video: ') ? line.split('Video: ')[1] : false;
 
         if (videoLine) {
           this.codecs.video = videoLine.split(', ');
+          this.codecs.mapvideo = line.split('Stream #')[1]?.split(': Video')[0];
         }
 
         lines++;

src/main.js

@@ -71,6 +71,10 @@ export default class Interface extends EventEmitter {
 
         await controller[1].media.probe();
 
+        if (controller[1].options?.disable) {
+          return;
+        }
+
         if (controller[1].options.prebuffering) {
           await controller[1].prebuffer.start();
         }
@@ -79,7 +83,7 @@ export default class Interface extends EventEmitter {
           await controller[1].videoanalysis.start();
         }
 
-        await controller[1].stream.configureStreamOptions();
+        //await controller[1].stream.configureStreamOptions();
       })
     );