streamState Fixes

Andrewiski · May 3, 2023 · e65d4ec · e65d4ec
1 parent 0eb85b6
commit e65d4ec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/modules/ffmpegRtmp.js b/modules/ffmpegRtmp.js
@@ -243,6 +243,7 @@ var FfmpegRtmp = function (options, videoOverlayParser, logUtilHelper) {
         }
         commonData.streamStats.status = "connected"; 
         commonData.streamStats.error = null;
+        commonData.streamStats.rtmpUrl = self.options.rtmpUrl;
         self.emit('streamStats', commonData.streamStats);
         logUtilHelper.log(appLogName, "app", "debug", "Source Video", self.options.input, "Destination", self.options.rtmpUrl)
         command = ffmpeg({ source: self.options.input });    

diff --git a/modules/ffmpegVideoOutputFile.js b/modules/ffmpegVideoOutputFile.js
@@ -243,6 +243,8 @@ var FfmpegVideoOutputFile = function (options, videoOverlayParser, logUtilHelper
             command.kill();
         }
         commonData.streamStats.status = "connected"; 
+        commonData.streamStats.error = null;
+        commonData.streamStats.filename = self.options.outputFile;
         self.emit('streamStats', commonData.streamStats);
         logUtilHelper.log(appLogName, "app", "info", "file destination", self.options.outputFile)
         command = ffmpeg({ source: incomingTransStream });    

diff --git a/modules/ffmpegVideoOutputRtmp.js b/modules/ffmpegVideoOutputRtmp.js
@@ -259,6 +259,8 @@ var FfmpegVideoOutputRtmp = function (options, videoOverlayParser, logUtilHelper
             command.kill();
         }
         commonData.streamStats.status = "connected"; 
+        commonData.streamStats.error = null;
+        commonData.streamStats.rtmpUrl = self.options.rtmpUrl;
         self.emit('streamStats', commonData.streamStats);
         logUtilHelper.log(appLogName, "app", "info", "RTMP destination", self.options.rtmpUrl)
         command = ffmpeg({ source: incomingTransStream });    

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "radargunmonitor",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "private": false,
   "license": "Apache-2.0",
   "keywords": [

diff --git a/public/app/scoreboard/scoreboard.tpl.html b/public/app/scoreboard/scoreboard.tpl.html
@@ -1241,6 +1241,7 @@
                                         <label>fps: </label> <span ng-bind="commonData.videoStreamStats.file.file.info.fps"></span>
                                         <label>bitrate: </label><span ng-bind="commonData.videoStreamStats.file.file.info.bitrate"></span>
                                         <label>speed: </label><span ng-bind="commonData.videoStreamStats.file.file.info.speed"></span>
+                                        <label>filename: </label><span ng-bind="commonData.videoStreamStats.file.file.filename"></span>
                                         <label ng-show="commonData.videoStreamStats.file.file.error !== null">error: </label><span ng-show="commonData.videoStreamStats.file.file.error !== null" ng-bind="commonData.videoStreamStats.file.file.error"></span>
                                     </div>
                                 </div>
@@ -1272,6 +1273,7 @@
                                     <label>fps: </label> <span ng-bind="commonData.videoStreamStats.youtube.info.fps"></span>
                                     <label>bitrate: </label><span ng-bind="commonData.videoStreamStats.youtube.info.bitrate"></span>
                                     <label>speed: </label><span ng-bind="commonData.videoStreamStats.youtube.info.speed"></span>
+                                    <label>output: </label><span ng-bind="commonData.videoStreamStats.youtube.rtmpUrl"></span>
                                     <label ng-show="commonData.videoStreamStats.youtube.error !== null">error: </label><span ng-show="commonData.videoStreamStats.youtube.error !== null" ng-bind="commonData.videoStreamStats.youtube.error"></span>
                                 </div>
                                 <!--<div class="btn-group" role="group" aria-label="Buttons">
@@ -1305,6 +1307,7 @@
                                     <label>fps: </label> <span ng-bind="commonData.videoStreamStats.gamechanger.info.fps"></span>
                                     <label>bitrate: </label><span ng-bind="commonData.videoStreamStats.gamechanger.info.bitrate"></span>
                                     <label>speed: </label><span ng-bind="commonData.videoStreamStats.gamechanger.info.speed"></span>
+                                    <label>output: </label><span ng-bind="commonData.videoStreamStats.gamechanger.rtmpUrl"></span>
                                     <label ng-show="commonData.videoStreamStats.gamechanger.error !== null">error: </label><span ng-show="commonData.videoStreamStats.gamechanger.error !== null" ng-bind="commonData.videoStreamStats.gamechanger.error"></span>
                                 </div>
                             </div>