Video: Fix null fps structure

stephendade · Feb 4, 2024 · 954ffc2 · 954ffc2
1 parent 1fba8e2
commit 954ffc2
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/server/videostream.js b/server/videostream.js
@@ -75,7 +75,8 @@ class videoStream {
         if (!this.active) {
           return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
             { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
-            this.devices[0].caps[0].fps, this.devices[0].caps[0].fpsmax, this.devices[0].caps)
+            (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
+            this.devices[0].caps[0].fpsmax, this.devices[0].caps)
         } else {
           // format saved settings
           const seldevice = this.devices.filter(it => it.value === this.savedDevice.device)
@@ -86,7 +87,8 @@ class videoStream {
             this.resetVideo()
             return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
               { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
-              this.devices[0].caps[0].fps, this.devices[0].caps[0].fpsmax, this.devices[0].caps)
+              (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
+              this.devices[0].caps[0].fpsmax, this.devices[0].caps)
           }
           const selRes = seldevice[0].caps.filter(it => it.value === this.savedDevice.width.toString() + 'x' + this.savedDevice.height.toString() + 'x' + this.savedDevice.format.toString().split('/')[1])
           let selFPS = this.savedDevice.fps
@@ -99,7 +101,7 @@ class videoStream {
             return callback(null, this.devices, this.active, seldevice[0], selRes[0],
               { label: this.savedDevice.rotation.toString() + '°', value: this.savedDevice.rotation },
               this.savedDevice.bitrate, selFPS, this.savedDevice.useUDP, this.savedDevice.useUDPIP,
-              this.savedDevice.useUDPPort, this.savedDevice.useTimestamp, selRes[0].fps,
+              this.savedDevice.useUDPPort, this.savedDevice.useTimestamp, (selRes[0].fps !== undefined) ? selRes[0].fps : [],
               selRes[0].fpsmax, seldevice[0].caps)
           } else {
             // bad settings
@@ -108,7 +110,8 @@ class videoStream {
             this.resetVideo()
             return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
               { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
-              this.devices[0].caps[0].fps, this.devices[0].caps[0].fpsmax, this.devices[0].caps)
+              (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
+              this.devices[0].caps[0].fpsmax, this.devices[0].caps)
           }
         }
       }