OverlayParser

Andrewiski · May 17, 2023 · 184cc7a · 184cc7a
1 parent e7db580
commit 184cc7a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/app.js b/app.js
@@ -390,29 +390,29 @@ routes.get('/data/audioFiles/fullSongs/:filename', (req, res) => {
 
         // If a range header was provided, only send the requested portion of the file
         if (range) {
-        const parts = range.replace(/bytes=/, "").split("-");
-        const start = parseInt(parts[0], 10);
-        const end = parts[1] 
-            ? parseInt(parts[1], 10)
-            : fileSize-1;
-        const chunksize = (end-start)+1;
-        const file = fs.createReadStream(filePath, {start, end});
-        const head = {
-            'Content-Range': `bytes ${start}-${end}/${fileSize}`,
-            'Accept-Ranges': 'bytes',
-            'Content-Length': chunksize,
-            'Content-Type': 'audio/mp4',
-        };
-        res.writeHead(206, head);
-        file.pipe(res);
+            const parts = range.replace(/bytes=/, "").split("-");
+            const start = parseInt(parts[0], 10);
+            const end = parts[1] 
+                ? parseInt(parts[1], 10)
+                : fileSize-1;
+            const chunksize = (end-start)+1;
+            const file = fs.createReadStream(filePath, {start, end});
+            const head = {
+                'Content-Range': `bytes ${start}-${end}/${fileSize}`,
+                'Accept-Ranges': 'bytes',
+                'Content-Length': chunksize,
+                'Content-Type': 'audio/mp4',
+            };
+            res.writeHead(206, head);
+            file.pipe(res);
         } else {
-        // If no range header was provided, send the entire file
-        const head = {
-            'Content-Length': fileSize,
-            'Content-Type': 'audio/mp4',
-        };
-        res.writeHead(200, head);
-        fs.createReadStream(filePath).pipe(res);
+            // If no range header was provided, send the entire file
+            const head = {
+                'Content-Length': fileSize,
+                'Content-Type': 'audio/mp4',
+            };
+            res.writeHead(200, head);
+            fs.createReadStream(filePath).pipe(res);
         }
     } catch (err) {
         logUtilHelper.log(appLogName, "browser", "error", "Error getting audio file.", req.params.filename);

diff --git a/modules/ffmpegRtmp.js b/modules/ffmpegRtmp.js
@@ -33,6 +33,7 @@ var FfmpegRtmp = function (options, videoOverlayParser, logUtilHelper) {
     }
 
     self.options = extend({}, defaultOptions, options);
+    self.videoOverlayParser = videoOverlayParser;
 
     if (process.platform === 'win32' && (process.env.FFMPEG_PATH === undefined || process.env.FFMPEG_PATH === '')) {
         process.env.FFMPEG_PATH = path.join(__dirname, '..', 'ffmpeg', 'ffmpeg.exe');
@@ -376,7 +377,7 @@ var FfmpegRtmp = function (options, videoOverlayParser, logUtilHelper) {
 
     var updateOverlay= function (options) {
         try {
-            if(self.videoOverlayParser !== null){
+            if(self.videoOverlayParser && self.videoOverlayParser.getOverlayText){
                 var overlayText = self.videoOverlayParser.getOverlayText(options)
                 if(self.options.overlayFileName != null ){
                     var overlayFilePath = path.join(__dirname, '..', self.options.overlayFileName);

diff --git a/modules/ffmpegVideoInput.js b/modules/ffmpegVideoInput.js
@@ -534,7 +534,7 @@ var FfmpegVideoInput = function (options, videoOverlayParser, logUtilHelper) {
 
     var updateOverlay= function (options) {
         try {
-            if(self.videoOverlayParser !== null){
+            if(self.videoOverlayParser && self.videoOverlayParser.getOverlayText ){
                 var overlayText = self.videoOverlayParser.getOverlayText(options)
                 if(self.options.overlayFileName != null ){
                     var overlayFilePath = path.join(__dirname, '..', self.options.overlayFileName);

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