From 377805dce094199b9248987e8c23b5830ada5ba2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:30:51 -0500
Subject: [PATCH 001/501] convert some tags to classes instead of ids.  Add
 margin: 0 auto so that monitor images are centered

---
 web/skins/classic/css/base/views/timeline.css | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/css/base/views/timeline.css b/web/skins/classic/css/base/views/timeline.css
index c2efed713..47e7af1ce 100644
--- a/web/skins/classic/css/base/views/timeline.css
+++ b/web/skins/classic/css/base/views/timeline.css
@@ -40,14 +40,11 @@
     margin: 4px auto 6px;
 }
 
-#topPanel #imagePanel 
-{
-    width: 50%;
-    float: left;
+#topPanel .imagePanel {
     text-align: right;
 }
 
-#topPanel #image {
+#topPanel .image {
     margin: 0 auto;
     text-align: right;
     margin-right: 2px;
@@ -57,7 +54,7 @@
     width: 100%;
 }
 
-#topPanel #image img {
+#topPanel .image img {
     width: auto;
     max-width: 100%;
     height: 100%;
@@ -66,6 +63,7 @@
     bottom: 0;
     left: 0;
     right: 0;
+    margin: 0 auto;
 }
 
 #topPanel #dataPanel {

From 2854f8e0023fecaa5db583a61dedc56690a00b43 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:32:27 -0500
Subject: [PATCH 002/501] simplify some code, pass around zm_event json objects
 instead of event_id.  Each monitor has it's own image so when loading event
 data put it into a div/img referenced by monitor Id

---
 web/skins/classic/views/js/timeline.js | 79 +++++++++-----------------
 1 file changed, 26 insertions(+), 53 deletions(-)

diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 0b4715f75..1fe42c46b 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -36,12 +36,6 @@ function createEventHtml(zm_event, frame) {
   return eventHtml;
 }
 
-function showEventDetail( eventHtml ) {
-  $('instruction').addClass( 'hidden' );
-  $('eventData').empty();
-  $('eventData').adopt( eventHtml );
-  $('eventData').removeClass( 'hidden' );
-}
 
 function eventDataResponse( respObj, respText ) {
   var zm_event = respObj.event;
@@ -79,18 +73,20 @@ function frameDataResponse( respObj, respText ) {
   zm_event['frames'][frame.FrameId] = frame;
   zm_event['frames'][frame.FrameId]['html'] = createEventHtml( zm_event, frame );
 
-  showEventData(frame.EventId, frame.FrameId);
+  showEventData(zm_event, frame.FrameId);
 }
 
-function showEventData(eventId, frameId) {
-  if ( events[eventId] ) {
-    var zm_event = events[eventId];
+function showEventData(zm_event, frameId) {
+  if ( zm_event ) {
     if ( zm_event['frames'] ) {
       if ( zm_event['frames'][frameId] ) {
-        showEventDetail( zm_event['frames'][frameId]['html'] );
+        $('instruction').addClass('hidden');
+        eventData = $('eventData'+zm_event.MonitorId);
+        eventData.empty();
+        eventData.adopt(zm_event['frames'][frameId]['html']);
+        eventData.removeClass('hidden');
         var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
-        var videoName = zm_event.DefaultVideo;
-        loadEventImage( imagePath, eventId, frameId, zm_event.Width, zm_event.Height, zm_event.Frames/zm_event.Length, videoName, zm_event.Length, zm_event.StartTime, monitors[zm_event.MonitorId]);
+        loadEventImage(imagePath, zm_event, frameId);
         return;
       } else {
         console.log('No frames for ' + frameId);
@@ -99,7 +95,7 @@ function showEventData(eventId, frameId) {
       console.log('No frames');
     }
   } else {
-    console.log('No event for ' + eventId);
+    console.log('No event');
   }
 }
 
@@ -133,50 +129,28 @@ function previewEvent(slot) {
   eventId = slot.getAttribute('data-event-id');
   frameId = slot.getAttribute('data-frame-id');
   if ( events[eventId] ) {
-    showEventData(eventId, frameId);
+    showEventData(events[eventId], frameId);
   } else {
     requestFrameData(eventId, frameId);
   }
 }
 
-function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, duration, startTime, Monitor ) {
-  var vid = $('preview');
-  var imageSrc = $('imageSrc');
-  if ( videoName && vid ) {
-    vid.show();
-    imageSrc.hide();
-    var newsource=imagePath.slice(0, imagePath.lastIndexOf('/'))+'/'+videoName;
-    //console.log(newsource);
-    //console.log(sources[0].src.slice(-newsource.length));
-    if ( newsource != vid.currentSrc.slice(-newsource.length) || vid.readyState == 0 ) {
-      //console.log("loading new");
-      //it is possible to set a long source list here will that be unworkable?
-      var sources = vid.getElementsByTagName('source');
-      sources[0].src = newsource;
-      var tracks = vid.getElementsByTagName('track');
-      if (tracks.length) {
-        tracks[0].parentNode.removeChild(tracks[0]);
-      }
-      vid.load();
-      addVideoTimingTrack(vid, Monitor.LabelFormat, Monitor.Name, duration, startTime);
-      vid.currentTime = fid/fps;
-    } else {
-      if ( ! vid.seeking ) {
-        vid.currentTime=fid/fps;
-      }
-    }
-  } else {
-    if ( vid ) vid.hide();
-    imageSrc.show();
-    imageSrc.setProperty('src', imagePath);
-    imageSrc.setAttribute('data-event-id', eid);
-    imageSrc.setAttribute('data-frame-id', fid);
-    imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
-  }
+function loadEventImage( imagePath, zm_event, fid ) {
+  var imageSrc = $('imageSrc'+zm_event.MonitorId);
 
-  var eventData = $('eventData');
-  eventData.removeEvent('click');
-  eventData.addEvent('click', showEvent.pass());
+  imageSrc.show();
+  imageSrc.setProperty('src', imagePath);
+  imageSrc.setAttribute('data-event-id', zm_event.Id);
+  imageSrc.setAttribute('data-frame-id', fid);
+  imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
+
+  var eventData = $('eventData'.zm_event.MonitorId);
+  if ( eventData ) {
+    eventData.removeEvent('click');
+    eventData.addEvent('click', showEvent.pass());
+  } else {
+    console.log("No eventdata area found for monitor " + zm_event.MonitorId);
+  }
 }
 
 function tlZoomBounds( minTime, maxTime ) {
@@ -204,4 +178,3 @@ window.addEventListener("DOMContentLoaded", function() {
     el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
   });
 });
-

From b788c432d42290eb05f7c7b49fd2f48b7a808a9b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:33:36 -0500
Subject: [PATCH 003/501] Split the data by monitor and display a monitor
 image/info for each monitor.

---
 web/skins/classic/views/timeline.php | 40 +++++++++++++++++-----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index 2fe419efd..e07fbc893 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -494,7 +494,7 @@ for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
   } # end foreach MonitorId
 }  # end foreach x
 
-ZM\Logger::Debug(print_r( $monEventSlots,true ));
+#ZM\Logger::Debug(print_r( $monEventSlots,true ));
 //print_r( $monFrameSlots );
 //print_r( $chart );
 
@@ -683,23 +683,32 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
       </div>
     </div>
     <div id="content" class="chartSize">
+      <div id="instruction">
+        <p><?php echo translate('TimelineTip1') ?></p>
+        <p><?php echo translate('TimelineTip2') ?></p>
+        <p><?php echo translate('TimelineTip3') ?></p>
+        <p><?php echo translate('TimelineTip4') ?></p>
+      </div>
       <div id="topPanel" class="graphWidth">
-        <div id="imagePanel">
-          <div id="image" class="imageHeight">
-		        <img id="imageSrc" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
-          </div>
-        </div>
-        <div id="dataPanel">
-          <div id="textPanel">
-            <div id="instruction">
-              <p><?php echo translate('TimelineTip1') ?></p>
-              <p><?php echo translate('TimelineTip2') ?></p>
-              <p><?php echo translate('TimelineTip3') ?></p>
-              <p><?php echo translate('TimelineTip4') ?></p>
-              </div>
-            <div id="eventData">
+<?php 
+foreach ( $monitors as $monitor ) {
+?>
+        <div class="monitorPanel" style="width:<?php echo 100/count($monitors); ?>%;float:left;">
+          <div class="imagePanel">
+            <div class="imageHeight image">
+              <img id="imageSrc<?php echo $monitor->Id() ?>" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
             </div>
           </div>
+          <div id="dataPanel<?php echo $monitor->Id() ?>">
+            <div id="textPanel<?php echo $monitor->Id() ?>">
+              <div id="eventData<?php echo $monitor->Id() ?>">
+              </div>
+            </div>
+          </div>
+        </div>
+<?php 
+} # end foreach monitor
+?>
           <div id="navPanel">
             <button type="button" title="<?php echo translate('PanLeft') ?>" data-on-click="tlPanLeft">
             <i class="material-icons md-18">fast_rewind</i>
@@ -711,7 +720,6 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
             <i class="material-icons md-18">fast_forward</i>
             </button>
           </div>
-        </div>
       </div>
       <div id="chartPanel">
         <div id="chart" class="graphSize">

From aa157bfd78c0704bf9c11b419cff44bc1f5c9317 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 11 Oct 2020 09:56:35 -0400
Subject: [PATCH 004/501] AddManufacturerId and ModelId to Monitors

---
 db/manufacturers.sql     | 24 ++++++++++++++++++++
 db/zm_create.sql.in      |  2 ++
 db/zm_update-1.35.10.sql | 47 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 db/manufacturers.sql
 create mode 100644 db/zm_update-1.35.10.sql

diff --git a/db/manufacturers.sql b/db/manufacturers.sql
new file mode 100644
index 000000000..be15f9c01
--- /dev/null
+++ b/db/manufacturers.sql
@@ -0,0 +1,24 @@
+INSERT INTO Manufacturers VALUES (1, 'Acti');
+INSERT INTO Manufacturers VALUES (2, 'Amcrest');
+INSERT INTO Manufacturers VALUES (3, 'Airlink101');
+INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
+INSERT INTO Manufacturers VALUES (5, 'Axis');
+INSERT INTO Manufacturers VALUES (6, 'Dahua');
+INSERT INTO Manufacturers VALUES (7, 'D-Link');
+INSERT INTO Manufacturers VALUES (8, 'Edimax');
+INSERT INTO Manufacturers VALUES (9, 'Foscam');
+INSERT INTO Manufacturers VALUES (10, 'Gadspot');
+INSERT INTO Manufacturers VALUES (11, 'GrandStream');
+INSERT INTO Manufacturers VALUES (12, 'HikVision');
+INSERT INTO Manufacturers VALUES (13, 'JVC');
+INSERT INTO Manufacturers VALUES (14, 'Maginon');
+INSERT INTO Manufacturers VALUES (15, 'Mobotix');
+INSERT INTO Manufacturers VALUES (16, 'Oncam Grandeye');
+INSERT INTO Manufacturers VALUES (17, 'Panasonic');
+INSERT INTO Manufacturers VALUES (18, 'Pelco');
+INSERT INTO Manufacturers VALUES (19, 'Sony');
+INSERT INTO Manufacturers VALUES (20, 'TP-Link');
+INSERT INTO Manufacturers VALUES (21, 'Trendnet');
+INSERT INTO Manufacturers VALUES (22, 'VisionTek');
+INSERT INTO Manufacturers VALUES (23, 'Vivotek');
+INSERT INTO Manufacturers VALUES (24, 'Wansview');
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index af6a17182..af4e37136 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -441,6 +441,8 @@ CREATE TABLE `Monitors` (
   `Notes` TEXT,
   `ServerId` int(10) unsigned,
   `StorageId`	smallint(5) unsigned default 0,
+  `ManufacturerId`  int unsigned, FOREIGN KEY (`ManufacturerId`) REFERENCES `Manufacturers` (Id),
+  `ModelId`  int unsigned, FOREIGN KEY (`ModelId`) REFERENCES `Models` (Id),
   `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
diff --git a/db/zm_update-1.35.10.sql b/db/zm_update-1.35.10.sql
new file mode 100644
index 000000000..341c5e162
--- /dev/null
+++ b/db/zm_update-1.35.10.sql
@@ -0,0 +1,47 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From a6de3e15f4eb0e9bed6682a6521f26a3b2c77947 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 11 Oct 2020 09:57:08 -0400
Subject: [PATCH 005/501] AddManufacturerId and ModelId to Monitor view

---
 web/skins/classic/views/monitor.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index d64880dff..13ec55633 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -462,7 +462,9 @@ if ( $tab != 'general' ) {
 ?>
       <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>"/>
       <input type="hidden" name="newMonitor[Notes]" value="<?php echo validHtmlStr($monitor->Notes()) ?>"/>
-      <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($monitor->ServerId() ) ?>"/>
+      <input type="hidden" name="newMonitor[ServerId]" value="<?php echo $monitor->ServerId() ?>"/>
+      <input type="hidden" name="newMonitor[ManufacturerId]" value="<?php echo $monitor->ManufacturerId() ?>"/>
+      <input type="hidden" name="newMonitor[ModelId]" value="<?php echo $monitor->ModelId() ?>"/>
       <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo (null !== $monitor->LinkedMonitors())?validHtmlStr($monitor->LinkedMonitors()):'' ?>"/>
 <?php
 foreach ( $monitor->GroupIds() as $group_id ) {
@@ -627,6 +629,24 @@ switch ( $tab ) {
             <td class="text-right pr-3"><?php echo translate('Notes') ?></td>
             <td><textarea name="newMonitor[Notes]" rows="4"><?php echo validHtmlStr($monitor->Notes()) ?></textarea></td>
           </tr>
+          <tr class="Manufacturer">
+            <td class="text-right pr-3"><?php echo translate('Manufacturer') ?></td>
+            <td><?php 
+require_once('includes/Manufacturer.php');
+$manufacturers = ZM\Manufacturer::find();
+echo htmlSelect('newMonitor[ManufacturerId]', $manufacturers, $monitor->ManufacturerId(), array('class'=>'chosen'));
+?>
+            </td>
+          </tr>
+          <tr class="Model">
+            <td class="text-right pr-3"><?php echo translate('Model') ?></td>
+            <td><?php 
+require_once('includes/Model.php');
+$models = ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()));
+echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('class'=>'chosen'));
+?>
+            </td>
+          </tr>
           <tr>
             <td class="text-right pr-3"><?php echo translate('Server') ?></td><td>
 <?php

From fa34d00392a053d72106e21d76ef27ddd576903a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 11 Oct 2020 09:57:51 -0400
Subject: [PATCH 006/501] Add object classes for Manufacturer and Model

---
 web/includes/Manufacturer.php | 23 +++++++++++++++++++++++
 web/includes/Model.php        | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 web/includes/Manufacturer.php
 create mode 100644 web/includes/Model.php

diff --git a/web/includes/Manufacturer.php b/web/includes/Manufacturer.php
new file mode 100644
index 000000000..73c46ad6b
--- /dev/null
+++ b/web/includes/Manufacturer.php
@@ -0,0 +1,23 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+
+
+class Manufacturer extends ZM_Object {
+  protected static $table = 'Manufacturers';
+
+	protected $defaults = array(
+			'Id'                  => null,
+			'Name'                => '',
+			);
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+} # end class Manufacturer
+?>
diff --git a/web/includes/Model.php b/web/includes/Model.php
new file mode 100644
index 000000000..c9b22db8c
--- /dev/null
+++ b/web/includes/Model.php
@@ -0,0 +1,22 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+
+class Model extends ZM_Object {
+  protected static $table = 'Models';
+
+	protected $defaults = array(
+			'Id'                  => null,
+			'Name'                => '',
+			);
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+} # end class Model
+?>

From cc486beed50d12a1513db8d8312af4edfe825bb4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:45:23 -0400
Subject: [PATCH 007/501] Add some Acti models

---
 db/manufacturers.sql | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/db/manufacturers.sql b/db/manufacturers.sql
index be15f9c01..eaee2630c 100644
--- a/db/manufacturers.sql
+++ b/db/manufacturers.sql
@@ -1,4 +1,23 @@
 INSERT INTO Manufacturers VALUES (1, 'Acti');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
 INSERT INTO Manufacturers VALUES (2, 'Amcrest');
 INSERT INTO Manufacturers VALUES (3, 'Airlink101');
 INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');

From 8df915e7a47c0b739d0ac39e3e5e7d2dff55d973 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:45:53 -0400
Subject: [PATCH 008/501] Fix merge.

---
 db/zm_update-1.35.29.sql | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/db/zm_update-1.35.29.sql b/db/zm_update-1.35.29.sql
index 9030e5863..341c5e162 100644
--- a/db/zm_update-1.35.29.sql
+++ b/db/zm_update-1.35.29.sql
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Monitors'
@@ -42,19 +41,6 @@ SET @s = (SELECT IF(
     ) > 0,
 "SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
-=======
---
--- Add AutoUnarchive action to Filters
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoUnarchive'
-    ) > 0,
-"SELECT 'Column AutoUunarchive already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoArchive`"
->>>>>>> master
 ));
 
 PREPARE stmt FROM @s;

From 24a77d7fb365768c200559cc3353343e2b57a8e6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:46:12 -0400
Subject: [PATCH 009/501] Add ManufacturerId to Model

---
 web/includes/Model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/includes/Model.php b/web/includes/Model.php
index c9b22db8c..35562f9f9 100644
--- a/web/includes/Model.php
+++ b/web/includes/Model.php
@@ -9,6 +9,7 @@ class Model extends ZM_Object {
 	protected $defaults = array(
 			'Id'                  => null,
 			'Name'                => '',
+      'ManufacturerId'      => null,
 			);
 
   public static function find( $parameters = array(), $options = array() ) {

From 3bb2b804b3a69f158e54149dc9e707a96cd611b0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:46:36 -0400
Subject: [PATCH 010/501] Include Model and Manufacturer to includes in
 Monitor.php

---
 web/includes/Monitor.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index ad3e95a0d..4f9450a3d 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -1,11 +1,13 @@
 <?php
 namespace ZM;
 require_once('database.php');
-require_once('Server.php');
 require_once('Object.php');
 require_once('Control.php');
-require_once('Storage.php');
 require_once('Group.php');
+require_once('Manufacturer.php');
+require_once('Model.php');
+require_once('Server.php');
+require_once('Storage.php');
 
 $FunctionTypes = null;
 
@@ -658,5 +660,19 @@ class Monitor extends ZM_Object {
   function DisableAlarms() {
     $output = $this->AlarmCommand('disable');
   }
+  function Model() {
+    if (!$this->{'Model'}) {
+      $this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId()));
+      if (!$this->{'Model'}) $this->{'Model'} = new Model();
+    }
+    return $this->{'Model'};
+  }
+  function Manufacturer() {
+    if (!$this->{'Manufacturer'}) {
+      $this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId()));
+      if (!$this->{'Manufacturer'}) $this->{'Manufacturer'} = new Manufacturer();
+    }
+    return $this->{'Manufacturer'};
+  }
 } // end class Monitor
 ?>

From c6209ce460e4b942d42e9c0a84c10e6f06f38ab5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:47:00 -0400
Subject: [PATCH 011/501] Store new Model and Manufacturer when saving Monitor

---
 web/includes/actions/monitor.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 1c6e1f72f..3fafb0f82 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -45,6 +45,25 @@ if ( $action == 'save' ) {
       $x10Monitor = array();
     }
   }
+  if ( !$_REQUEST['newMonitor[ManufacturerId'] and ($_REQUEST['newMonitor[Manufacturer'] != '') ) {
+    # Need to add a new Manufacturer entry
+    $newManufacturer = ZM\Manufacturer::find_one(array('Name'=>$_REQUEST['newMonitor[Manufacturer']));
+    if (!$newManufacturer) {
+      $newManufacturer = new ZM\Manufacturer();
+      $newManufacturer->save(array('Name'=>$_REQUEST['newMonitor[Manufacturer']));
+    }
+    $_REQUEST['newMonitor[ManufacturerId'] = $newManufacturer->Id();
+  }
+
+  if ( !$_REQUEST['newMonitor[ModelId'] and ($_REQUEST['newMonitor[Model'] != '') ) {
+    # Need to add a new Model entry
+    $newModel = ZM\Model::find_one(array('Name'=>$_REQUEST['newMonitor[Model']));
+    if (!$newModel) {
+      $newModel = new ZM\Model();
+      $newMdoel->save(array('Name'=>$_REQUEST['newMonitor[Model'], 'ManufacturerId'=>$_REQUEST['newMonitor[ManufacturerId']));
+    }
+    $_REQUEST['newMonitor[ModelId'] = $newModel->Id();
+  }
 
   $monitor = new ZM\Monitor($mid);
 

From 54f676a501b63bec148b2e951011b50bd0ae1592 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:47:32 -0400
Subject: [PATCH 012/501] Add ManufacturerId_onchange and ModelId_onchange to
 hide/show the text input for custom entry

---
 web/skins/classic/views/js/monitor.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 4b41d8dd2..d28d21bf5 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -323,7 +323,6 @@ function update_estimated_ram_use() {
   var max_buffer_count = parseInt(document.querySelectorAll('input[name="newMonitor[MaxImageBufferCount]"]')[0].value);
   if (max_buffer_count) {
     var max_buffer_size = (min_buffer_count + max_buffer_count) * width * height * colours;
-    console.log(max_buffer_size);
     document.getElementById('estimated_ram_use').innerHTML += ' Max: ' + human_filesize(max_buffer_size);
   } else {
     document.getElementById('estimated_ram_use').innerHTML += ' Max: Unlimited';
@@ -345,4 +344,17 @@ function getLocation() {
   }
 }
 
+function ManufacturerId_onchange(ManufacturerId_select) {
+  if (ManufacturerId_select.value())
+    $j('newMonitor[Manufacturer]').hide();
+  else
+    $j('newMonitor[Manufacturer]').show();
+}
+function ModelId_onchange(ModelId_select) {
+  if (ModelId_select.value())
+    $j('newMonitor[Model]').hide();
+  else
+    $j('newMonitor[Model]').show();
+}
+
 window.addEventListener('DOMContentLoaded', initPage);

From 4ff4e1f7807d650b009384758487527ffc8c7ec5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:47:55 -0400
Subject: [PATCH 013/501] add Manufacturer and Model dropdown/text inputs to
 monitor edit view

---
 web/skins/classic/views/monitor.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 5e30db969..e6645dec5 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -492,18 +492,25 @@ switch ( $name ) {
             <td class="text-right pr-3"><?php echo translate('Manufacturer') ?></td>
             <td><?php 
 require_once('includes/Manufacturer.php');
-$manufacturers = ZM\Manufacturer::find();
-echo htmlSelect('newMonitor[ManufacturerId]', $manufacturers, $monitor->ManufacturerId(), array('class'=>'chosen'));
+$manufacturers = array_merge(
+    array(''=>translate('unknown')),
+    ZM\Manufacturer::find());
+echo htmlSelect('newMonitor[ManufacturerId]', $manufacturers, $monitor->ManufacturerId(), array('class'=>'chosen','data-on-change-this'=>'ManufacturerId_onchange'));
 ?>
+              <input type="text" name="newMonitor[Manufacturer]" value="<?php echo $monitor->Manufacturer()->Name() ?>" style="display:none"/>
             </td>
           </tr>
           <tr class="Model">
             <td class="text-right pr-3"><?php echo translate('Model') ?></td>
             <td><?php 
 require_once('includes/Model.php');
-$models = ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()));
-echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('class'=>'chosen'));
+$models = array_merge(
+    array(''=>translate('unknown')),
+    ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()))
+);
+echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('class'=>'chosen', 'data-on-change-this'=>'ModelId_onchange'));
 ?>
+              <input type="text" name="newMonitor[Model]" value="<?php echo $monitor->Model()->Name() ?>" style="display:none"/>
             </td>
           </tr>
           <tr>

From 413ac984eb3e1f496b38c08eecfda3104e56e8f3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 7 Jul 2021 09:48:24 -0400
Subject: [PATCH 014/501] add models.sql

---
 db/models.sql | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 db/models.sql

diff --git a/db/models.sql b/db/models.sql
new file mode 100644
index 000000000..b7150d816
--- /dev/null
+++ b/db/models.sql
@@ -0,0 +1,45 @@
+/* INSERT INTO Manufacturers VALUES (1, 'Acti'); */
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
+INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
+/*
+INSERT INTO Manufacturers VALUES (2, 'Amcrest');
+INSERT INTO Manufacturers VALUES (3, 'Airlink101');
+INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
+INSERT INTO Manufacturers VALUES (5, 'Axis');
+INSERT INTO Manufacturers VALUES (6, 'Dahua');
+INSERT INTO Manufacturers VALUES (7, 'D-Link');
+INSERT INTO Manufacturers VALUES (8, 'Edimax');
+INSERT INTO Manufacturers VALUES (9, 'Foscam');
+INSERT INTO Manufacturers VALUES (10, 'Gadspot');
+INSERT INTO Manufacturers VALUES (11, 'GrandStream');
+INSERT INTO Manufacturers VALUES (12, 'HikVision');
+INSERT INTO Manufacturers VALUES (13, 'JVC');
+INSERT INTO Manufacturers VALUES (14, 'Maginon');
+INSERT INTO Manufacturers VALUES (15, 'Mobotix');
+INSERT INTO Manufacturers VALUES (16, 'Oncam Grandeye');
+INSERT INTO Manufacturers VALUES (17, 'Panasonic');
+INSERT INTO Manufacturers VALUES (18, 'Pelco');
+INSERT INTO Manufacturers VALUES (19, 'Sony');
+INSERT INTO Manufacturers VALUES (20, 'TP-Link');
+INSERT INTO Manufacturers VALUES (21, 'Trendnet');
+INSERT INTO Manufacturers VALUES (22, 'VisionTek');
+INSERT INTO Manufacturers VALUES (23, 'Vivotek');
+INSERT INTO Manufacturers VALUES (24, 'Wansview');
+*/

From 7ca7d40b6fb94333c6d06a11f03aaf632b8c96cc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 10:32:04 -0400
Subject: [PATCH 015/501] Add defaults for ModelId and ManufacturerId.  Fixes
 the methods for loading them

---
 web/includes/Monitor.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 54bf605cb..bd9987b2c 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -49,6 +49,8 @@ class Monitor extends ZM_Object {
     'Notes' => '',
     'ServerId' => 0,
     'StorageId' => 0,
+    'ManufacturerId'  => null,
+    'ModelId'         => null,
     'Type'      => 'Ffmpeg',
     'Function'  => 'Mocord',
     'Enabled'   => array('type'=>'boolean','default'=>1),
@@ -685,16 +687,26 @@ class Monitor extends ZM_Object {
     $output = $this->AlarmCommand('disable');
   }
   function Model() {
-    if (!$this->{'Model'}) {
-      $this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId()));
-      if (!$this->{'Model'}) $this->{'Model'} = new Model();
+    if (!property_exists($this, 'Model')) {
+      if ($this->{'ModelId'}) {
+        $this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId()));
+        if (!$this->{'Model'})
+          $this->{'Model'} = new Model();
+      } else {
+        $this->{'Model'} = new Model();
+      }
     }
     return $this->{'Model'};
   }
   function Manufacturer() {
-    if (!$this->{'Manufacturer'}) {
-      $this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId()));
-      if (!$this->{'Manufacturer'}) $this->{'Manufacturer'} = new Manufacturer();
+    if (!property_exists($this, 'Manufacturer')) {
+      if ($this->{'ManufacturerId'}) {
+        $this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId()));
+        if (!$this->{'Manufacturer'})
+          $this->{'Manufacturer'} = new Manufacturer();
+      } else {
+          $this->{'Manufacturer'} = new Manufacturer();
+      }
     }
     return $this->{'Manufacturer'};
   }

From 2f12615f088f8026bba909cb16e874947c353d9c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 10:33:16 -0400
Subject: [PATCH 016/501] assign REQUEST['newMonitor'] to a variable to
 simplify code.  Fixup ModelId and ManufacturerId saving.

---
 web/includes/actions/monitor.php | 68 +++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 3fafb0f82..f6cbeca5f 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -45,24 +45,31 @@ if ( $action == 'save' ) {
       $x10Monitor = array();
     }
   }
-  if ( !$_REQUEST['newMonitor[ManufacturerId'] and ($_REQUEST['newMonitor[Manufacturer'] != '') ) {
+
+  # For convenience
+  $newMonitor = $_REQUEST['newMonitor'];
+
+  if ( !$newMonitor['ManufacturerId'] and ($newMonitor['Manufacturer'] != '') ) {
     # Need to add a new Manufacturer entry
-    $newManufacturer = ZM\Manufacturer::find_one(array('Name'=>$_REQUEST['newMonitor[Manufacturer']));
+    $newManufacturer = ZM\Manufacturer::find_one(array('Name'=>$newMonitor['Manufacturer']));
     if (!$newManufacturer) {
       $newManufacturer = new ZM\Manufacturer();
-      $newManufacturer->save(array('Name'=>$_REQUEST['newMonitor[Manufacturer']));
+      $newManufacturer->save(array('Name'=>$newMonitor['Manufacturer']));
     }
-    $_REQUEST['newMonitor[ManufacturerId'] = $newManufacturer->Id();
+    $newMonitor['ManufacturerId'] = $newManufacturer->Id();
   }
 
-  if ( !$_REQUEST['newMonitor[ModelId'] and ($_REQUEST['newMonitor[Model'] != '') ) {
+  if ( !$newMonitor['ModelId'] and ($newMonitor['Model'] != '') ) {
     # Need to add a new Model entry
-    $newModel = ZM\Model::find_one(array('Name'=>$_REQUEST['newMonitor[Model']));
+    $newModel = ZM\Model::find_one(array('Name'=>$newMonitor['Model']));
     if (!$newModel) {
       $newModel = new ZM\Model();
-      $newMdoel->save(array('Name'=>$_REQUEST['newMonitor[Model'], 'ManufacturerId'=>$_REQUEST['newMonitor[ManufacturerId']));
+      $newModel->save(array(
+            'Name'=>$newMonitor['Model'],
+            'ManufacturerId'=>$newMonitor['ManufacturerId']
+            ));
     }
-    $_REQUEST['newMonitor[ModelId'] = $newModel->Id();
+    $newMonitor['ModelId'] = $newModel->Id();
   }
 
   $monitor = new ZM\Monitor($mid);
@@ -88,22 +95,22 @@ if ( $action == 'save' ) {
   # Checkboxes don't return an element in the POST data, so won't be present in newMonitor.
   # So force a value for these fields
   foreach ( $types as $field => $value ) {
-    if ( ! isset($_REQUEST['newMonitor'][$field] ) ) {
-      $_REQUEST['newMonitor'][$field] = $value;
+    if ( ! isset($newMonitor[$field] ) ) {
+      $newMonitor[$field] = $value;
     }
   } # end foreach type
 
-  if ( $_REQUEST['newMonitor']['ServerId'] == 'auto' ) {
-    $_REQUEST['newMonitor']['ServerId'] = dbFetchOne(
+  if ( $newMonitor['ServerId'] == 'auto' ) {
+    $newMonitor['ServerId'] = dbFetchOne(
       'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
-    ZM\Debug('Auto selecting server: Got ' . $_REQUEST['newMonitor']['ServerId']);
-    if ( ( !$_REQUEST['newMonitor'] ) and defined('ZM_SERVER_ID') ) {
-      $_REQUEST['newMonitor']['ServerId'] = ZM_SERVER_ID;
+    ZM\Debug('Auto selecting server: Got ' . $newMonitor['ServerId']);
+    if ((!$newMonitor['ServerId']) and defined('ZM_SERVER_ID')) {
+      $newMonitor['ServerId'] = ZM_SERVER_ID;
       ZM\Debug('Auto selecting server to ' . ZM_SERVER_ID);
     }
   }
 
-  $changes = $monitor->changes($_REQUEST['newMonitor']);
+  $changes = $monitor->changes($newMonitor);
   $restart = false;
 
   if ( count($changes) ) {
@@ -134,13 +141,13 @@ if ( $action == 'save' ) {
           if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
             unlink($OldStorage->Path().'/'.$saferOldName);
 
-          $NewStorage = new ZM\Storage($_REQUEST['newMonitor']['StorageId']);
+          $NewStorage = new ZM\Storage($newMonitor['StorageId']);
           if ( !file_exists($NewStorage->Path().'/'.$mid) ) {
             if ( !mkdir($NewStorage->Path().'/'.$mid, 0755) ) {
               ZM\Error('Unable to mkdir ' . $NewStorage->Path().'/'.$mid);
             }
           }
-          $saferNewName = basename($_REQUEST['newMonitor']['Name']);
+          $saferNewName = basename($newMonitor['Name']);
           $link_path = $NewStorage->Path().'/'.$saferNewName;
           // Use a relative path for the target so the link continues to work from backups or directory changes.
           if ( !symlink($mid, $link_path) ) {
@@ -151,8 +158,8 @@ if ( $action == 'save' ) {
         } // end if Name or Storage Area Change
 
         if ( isset($changes['Width']) || isset($changes['Height']) ) {
-          $newW = $_REQUEST['newMonitor']['Width'];
-          $newH = $_REQUEST['newMonitor']['Height'];
+          $newW = $newMonitor['Width'];
+          $newH = $newMonitor['Height'];
 
           $zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId=?', NULL, array($mid));
 
@@ -236,14 +243,27 @@ if ( $action == 'save' ) {
 
       if ( $monitor->insert($changes) ) {
         $mid = $monitor->Id();
-        $zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
-        dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100)  ) );
-        //$view = 'none';
+        $zoneArea = $newMonitor['Width'] * $newMonitor['Height'];
+        dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid,
+              sprintf( '%d,%d %d,%d %d,%d %d,%d', 0, 0,
+                $newMonitor['Width']-1,
+                0,
+                $newMonitor['Width']-1,
+                $newMonitor['Height']-1,
+                0,
+                $newMonitor['Height']-1),
+              $zoneArea,
+              intval(($zoneArea*3)/100),
+              intval(($zoneArea*75)/100),
+              intval(($zoneArea*3)/100),
+              intval(($zoneArea*75)/100),
+              intval(($zoneArea*2)/100)
+              ));
         $Storage = $monitor->Storage();
 
 				error_reporting(0);
         mkdir($Storage->Path().'/'.$mid, 0755);
-        $saferName = basename($_REQUEST['newMonitor']['Name']);
+        $saferName = basename($newMonitor['Name']);
         symlink($mid, $Storage->Path().'/'.$saferName);
 
       } else {

From 12783f6edfe71dee6b8bf8a92e2c4fcf71404297 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:43:53 -0400
Subject: [PATCH 017/501] Add manufacturers, models and servers routes

---
 web/api/app/Config/routes.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Config/routes.php b/web/api/app/Config/routes.php
index 8dd2c1f63..6b3314d09 100644
--- a/web/api/app/Config/routes.php
+++ b/web/api/app/Config/routes.php
@@ -23,8 +23,6 @@
 /**
  * Load the API / REST routes
  */
-	/* Add new API to retrieve camera controls - for PTZ */
-	/* refer to https://github.com/ZoneMinder/ZoneMinder/issues/799#issuecomment-105233112 */
 	Router::mapResources('configs');
 	Router::mapResources('controls');
 	Router::mapResources('events');
@@ -32,7 +30,10 @@
   Router::mapResources('groups');	
 	Router::mapResources('host');
 	Router::mapResources('logs');
+	Router::mapResources('manufacturers');
+	Router::mapResources('models');
 	Router::mapResources('monitors');
+	Router::mapResources('servers');
 	Router::mapResources('states');
 	Router::mapResources('users');
 	Router::mapResources('zonepresets');

From 34d9f87d6dee2916f7ada7edb7f4ef791c1fbe62 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:44:16 -0400
Subject: [PATCH 018/501] remove cruft from ServersController.php

---
 web/api/app/Controller/ServersController.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web/api/app/Controller/ServersController.php b/web/api/app/Controller/ServersController.php
index c3ac6fad7..bbde27fae 100644
--- a/web/api/app/Controller/ServersController.php
+++ b/web/api/app/Controller/ServersController.php
@@ -89,8 +89,6 @@ class ServersController extends AppController {
 
       $this->Server->create();
       if ( $this->Server->save($this->request->data) ) {
-				# Might be nice to send it a start request
-        #$this->daemonControl($this->Server->id, 'start', $this->request->data);
         return $this->flash(__('The server has been saved.'), array('action' => 'index'));
       }
     }
@@ -126,8 +124,6 @@ class ServersController extends AppController {
       'message' => $message,
       '_serialize' => array('message')
     ));
-    // - restart this server after change
-    #$this->daemonControl($this->Server->id, 'restart', $this->request->data);
   }
 
 /**
@@ -151,8 +147,6 @@ class ServersController extends AppController {
     }
     $this->request->allowMethod('post', 'delete');
 
-    #$this->daemonControl($this->Server->id, 'stop');
-
     if ( $this->Server->delete() ) {
       return $this->flash(__('The server has been deleted.'), array('action' => 'index'));
     } else {

From fe72056d73d84f527437c09dfdfd1c68841a4c47 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:48:14 -0400
Subject: [PATCH 019/501] fixup populating Models dropdown after Manufacturer
 select

---
 web/skins/classic/views/js/monitor.js | 53 ++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index c32b66a0b..44bcddb5b 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -345,17 +345,52 @@ function getLocation() {
   }
 }
 
-function ManufacturerId_onchange(ManufacturerId_select) {
-  if (ManufacturerId_select.value())
-    $j('newMonitor[Manufacturer]').hide();
-  else
-    $j('newMonitor[Manufacturer]').show();
+function populate_models(ManufacturerId) {
+  let dropdown = $j('[name="newMonitor[ModelId]"]');
+  if (!dropdown.length) {
+    console.log("No element found for ModelId");
+    return;
+  }
+
+  dropdown.empty();
+  dropdown.append('<option value="0" selected="true">Unknown</option>');
+  dropdown.prop('selectedIndex', 0);
+
+  // Populate dropdown with list of provinces
+  $j.getJSON(thisUrl+'?request=models&ManufacturerId='+ManufacturerId, function (data) {
+      if (data.result == 'Ok') {
+        $j.each(data.models, function (key, entry) {
+            dropdown.append($j('<option></option>').attr('value', entry.Id).text(entry.Name));
+            });
+        dropdown.chosen("destroy");
+        dropdown.chosen();
+      } else {
+        alert(data.result);
+      }
+      });
 }
+
+function ManufacturerId_onchange(ManufacturerId_select) {
+  if (ManufacturerId_select.value) {
+    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = 'none';
+    populate_models(ManufacturerId_select.value);
+  } else {
+    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = 'inline';
+    // Set models dropdown to Unknown, text area visible
+    let ModelId_dropdown = $j('[name="newMonitor[ModelId]"]');
+    ModelId_dropdown.empty();
+    ModelId_dropdown.append('<option selected="true">Unknown</option>');
+    ModelId_dropdown.prop('selectedIndex', 0);
+    $j('[name="newMonitor[Model]"]').show();
+  }
+}
+
 function ModelId_onchange(ModelId_select) {
-  if (ModelId_select.value())
-    $j('newMonitor[Model]').hide();
-  else
-    $j('newMonitor[Model]').show();
+  if (parseInt(ModelId_select.value)) {
+    $j('[name="newMonitor[Model]"]').hide();
+  } else {
+    $j('[name="newMonitor[Model]"]').show();
+  }
 }
 
 window.addEventListener('DOMContentLoaded', initPage);

From d98d20958ce11244d0775b3b987c51b11ee662dc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:48:43 -0400
Subject: [PATCH 020/501] fixup the Manufacturer and Model ddms and text inputs

---
 web/skins/classic/views/monitor.php | 40 ++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index fa4b3ba4f..327de5def 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -457,27 +457,37 @@ switch ( $name ) {
           </tr>
           <tr class="Manufacturer">
             <td class="text-right pr-3"><?php echo translate('Manufacturer') ?></td>
-            <td><?php 
-require_once('includes/Manufacturer.php');
-$manufacturers = array_merge(
-    array(''=>translate('unknown')),
-    ZM\Manufacturer::find());
-echo htmlSelect('newMonitor[ManufacturerId]', $manufacturers, $monitor->ManufacturerId(), array('class'=>'chosen','data-on-change-this'=>'ManufacturerId_onchange'));
+            <td>
+<?php 
+  require_once('includes/Manufacturer.php');
+  $manufacturers = array(''=>translate('unknown'));
+  foreach ( ZM\Manufacturer::find( null, array('order'=>'lower(Name)')) as $Manufacturer ) {
+    $manufacturers[$Manufacturer->Id()] = $Manufacturer->Name();
+  }
+  echo htmlSelect('newMonitor[ManufacturerId]', $manufacturers, $monitor->ManufacturerId(),
+      array('class'=>'chosen','data-on-change-this'=>'ManufacturerId_onchange'));
 ?>
-              <input type="text" name="newMonitor[Manufacturer]" value="<?php echo $monitor->Manufacturer()->Name() ?>" style="display:none"/>
+              <input type="text" name="newMonitor[Manufacturer]"
+                placeholder="enter new manufacturer name"
+                value="<?php echo $monitor->Manufacturer()->Name() ?>"<?php echo $monitor->ManufacturerId() ? ' style="display:none"' : '' ?>
+              />
             </td>
           </tr>
           <tr class="Model">
             <td class="text-right pr-3"><?php echo translate('Model') ?></td>
-            <td><?php 
-require_once('includes/Model.php');
-$models = array_merge(
-    array(''=>translate('unknown')),
-    ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()))
-);
-echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('class'=>'chosen', 'data-on-change-this'=>'ModelId_onchange'));
+            <td>
+<?php 
+  require_once('includes/Model.php');
+  $models = array(''=>translate('unknown'));
+  foreach ( ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()), array('order'=>'lower(Name)')) as $Model ) {
+    $models[$Model->Id()] = $Model->Name();
+  }
+  echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(),
+      array('class'=>'chosen', 'data-on-change-this'=>'ModelId_onchange'));
 ?>
-              <input type="text" name="newMonitor[Model]" value="<?php echo $monitor->Model()->Name() ?>" style="display:none"/>
+              <input type="text" name="newMonitor[Model]"
+                placeholder="enter new model name"
+                value="<?php echo $monitor->Model()->Name() ?>"<?php echo $monitor->ModelId() ? ' style="display:none"':'' ?>/>
             </td>
           </tr>
           <tr>

From c66489fb303de460fac00c33aeb659f84635db49 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:49:30 -0400
Subject: [PATCH 021/501] rough in api support for Models and Manufacturers

---
 .../app/Controller/CameraModelsController.php | 156 +++++++++++++++++
 .../Controller/ManufacturersController.php    | 162 ++++++++++++++++++
 web/api/app/Model/CameraModel.php             |  70 ++++++++
 web/api/app/Model/Manufacturer.php            |  77 +++++++++
 web/api/app/View/Manufacturers/json/edit.ctp  |   2 +
 web/api/app/View/Manufacturers/json/index.ctp |   1 +
 web/api/app/View/Manufacturers/json/view.ctp  |   1 +
 web/api/app/View/Manufacturers/xml/edit.ctp   |   2 +
 web/api/app/View/Manufacturers/xml/index.ctp  |   2 +
 web/api/app/View/Manufacturers/xml/view.ctp   |   2 +
 10 files changed, 475 insertions(+)
 create mode 100644 web/api/app/Controller/CameraModelsController.php
 create mode 100644 web/api/app/Controller/ManufacturersController.php
 create mode 100644 web/api/app/Model/CameraModel.php
 create mode 100644 web/api/app/Model/Manufacturer.php
 create mode 100644 web/api/app/View/Manufacturers/json/edit.ctp
 create mode 100644 web/api/app/View/Manufacturers/json/index.ctp
 create mode 100644 web/api/app/View/Manufacturers/json/view.ctp
 create mode 100644 web/api/app/View/Manufacturers/xml/edit.ctp
 create mode 100644 web/api/app/View/Manufacturers/xml/index.ctp
 create mode 100644 web/api/app/View/Manufacturers/xml/view.ctp

diff --git a/web/api/app/Controller/CameraModelsController.php b/web/api/app/Controller/CameraModelsController.php
new file mode 100644
index 000000000..691fd0767
--- /dev/null
+++ b/web/api/app/Controller/CameraModelsController.php
@@ -0,0 +1,156 @@
+<?php
+App::uses('AppController', 'Controller');
+/**
+ * Models Controller
+ *
+ * @property Model $Model
+ * @property PaginatorComponent $Paginator
+ */
+class CameraModelsController extends AppController {
+
+/**
+ * Components
+ *
+ * @var array
+ */
+  public $components = array('Paginator', 'RequestHandler');
+
+  public function beforeFilter() {
+    parent::beforeFilter();
+    /*
+     * A user needs the model data to calculate how to view a monitor, and there really isn't anything sensitive in this data.
+     * So it has been decided for now to just let everyone read it.
+     
+    global $user;
+    $canView = (!$user) || ($user['System'] != 'None');
+    if ( !$canView ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+     */
+  }
+
+/**
+ * index method
+ *
+ * @return void
+ */
+  public function index() {
+    $this->CameraModel->recursive = 0;
+    
+    $options = '';
+    $models = $this->CameraModel->find('all', $options);
+		$this->set(array(
+					'models' => $models,
+					'_serialize' => array('models')
+					));
+	}
+
+/**
+ * view method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function view($id = null) {
+    $this->CameraModel->recursive = 0;
+    if ( !$this->CameraModel->exists($id) ) {
+      throw new NotFoundException(__('Invalid model'));
+    }
+    $restricted = '';
+    
+    $options = array('conditions' => array( 
+          array('CameraModel.'.$this->CameraModel->primaryKey => $id),
+          $restricted
+          )
+        );
+    $model = $this->CameraModel->find('first', $options);
+    $this->set(array(
+      'model' => $model,
+      '_serialize' => array('model')
+    ));
+  }
+
+/**
+ * add method
+ *
+ * @return void
+ */
+  public function add() {
+    if ($this->request->is('post')) {
+
+      global $user;
+      $canEdit = (!$user) || ($user['System'] == 'Edit');
+      if (!$canEdit) {
+        throw new UnauthorizedException(__('Insufficient privileges'));
+        return;
+      }
+
+      $this->CameraModel->create();
+      if ($this->CameraModel->save($this->request->data)) {
+        return $this->flash(__('The model has been saved.'), array('action' => 'index'));
+      }
+    }
+  }
+
+/**
+ * edit method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function edit($id = null) {
+    $this->CameraModel->id = $id;
+
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if (!$canEdit) {
+      throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+
+    if (!$this->CameraModel->exists($id)) {
+      throw new NotFoundException(__('Invalid model'));
+    }
+    if ($this->CameraModel->save($this->request->data)) {
+      $message = 'Saved';
+    } else {
+      $message = 'Error';
+    }
+
+    $this->set(array(
+      'message' => $message,
+      '_serialize' => array('message')
+    ));
+  }
+
+/**
+ * delete method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function delete($id = null) {
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if (!$canEdit) {
+      throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+
+    $this->CameraModel->id = $id;
+    if (!$this->CameraModel->exists()) {
+      throw new NotFoundException(__('Invalid model'));
+    }
+    $this->request->allowMethod('post', 'delete');
+
+    if ($this->CameraModel->delete()) {
+      return $this->flash(__('The model has been deleted.'), array('action' => 'index'));
+    } else {
+      return $this->flash(__('The model could not be deleted. Please, try again.'), array('action' => 'index'));
+    }
+  }
+}
diff --git a/web/api/app/Controller/ManufacturersController.php b/web/api/app/Controller/ManufacturersController.php
new file mode 100644
index 000000000..0249af6af
--- /dev/null
+++ b/web/api/app/Controller/ManufacturersController.php
@@ -0,0 +1,162 @@
+<?php
+App::uses('AppController', 'Controller');
+/**
+ * Manufacturers Controller
+ *
+ * @property Manufacturer $Manufacturer
+ * @property PaginatorComponent $Paginator
+ */
+class ManufacturersController extends AppController {
+
+/**
+ * Components
+ *
+ * @var array
+ */
+  public $components = array('Paginator', 'RequestHandler');
+
+  public function beforeFilter() {
+    parent::beforeFilter();
+    /*
+     * A user needs the manufacturer data to calculate how to view a monitor, and there really isn't anything sensitive in this data.
+     * So it has been decided for now to just let everyone read it.
+     
+    global $user;
+    $canView = (!$user) || ($user['System'] != 'None');
+    if ( !$canView ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+     */
+  }
+
+/**
+ * index method
+ *
+ * @return void
+ */
+  public function index() {
+    $this->Manufacturer->recursive = 0;
+    
+    $options = '';
+    $manufacturers = $this->Manufacturer->find('all', $options);
+		$this->set(array(
+					'manufacturers' => $manufacturers,
+					'_serialize' => array('manufacturers')
+					));
+	}
+
+/**
+ * view method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function view($id = null) {
+    $this->Manufacturer->recursive = 0;
+    if ( !$this->Manufacturer->exists($id) ) {
+      throw new NotFoundException(__('Invalid manufacturer'));
+    }
+    $restricted = '';
+    
+    $options = array('conditions' => array( 
+          array('Manufacturer.'.$this->Manufacturer->primaryKey => $id),
+          $restricted
+          )
+        );
+    $manufacturer = $this->Manufacturer->find('first', $options);
+    $this->set(array(
+      'manufacturer' => $manufacturer,
+      '_serialize' => array('manufacturer')
+    ));
+  }
+
+/**
+ * add method
+ *
+ * @return void
+ */
+  public function add() {
+    if ( $this->request->is('post') ) {
+
+      global $user;
+      $canEdit = (!$user) || ($user['System'] == 'Edit');
+      if ( !$canEdit ) {
+        throw new UnauthorizedException(__('Insufficient privileges'));
+        return;
+      }
+
+      $this->Manufacturer->create();
+      if ( $this->Manufacturer->save($this->request->data) ) {
+				# Might be nice to send it a start request
+        #$this->daemonControl($this->Manufacturer->id, 'start', $this->request->data);
+        return $this->flash(__('The manufacturer has been saved.'), array('action' => 'index'));
+      }
+    }
+  }
+
+/**
+ * edit method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function edit($id = null) {
+    $this->Manufacturer->id = $id;
+
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if ( !$canEdit ) {
+      throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+
+    if ( !$this->Manufacturer->exists($id) ) {
+      throw new NotFoundException(__('Invalid manufacturer'));
+    }
+    if ( $this->Manufacturer->save($this->request->data) ) {
+      $message = 'Saved';
+    } else {
+      $message = 'Error';
+    }
+
+    $this->set(array(
+      'message' => $message,
+      '_serialize' => array('message')
+    ));
+    // - restart this manufacturer after change
+    #$this->daemonControl($this->Manufacturer->id, 'restart', $this->request->data);
+  }
+
+/**
+ * delete method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function delete($id = null) {
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if ( !$canEdit ) {
+      throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+
+    $this->Manufacturer->id = $id;
+    if ( !$this->Manufacturer->exists() ) {
+      throw new NotFoundException(__('Invalid manufacturer'));
+    }
+    $this->request->allowMethod('post', 'delete');
+
+    #$this->daemonControl($this->Manufacturer->id, 'stop');
+
+    if ( $this->Manufacturer->delete() ) {
+      return $this->flash(__('The manufacturer has been deleted.'), array('action' => 'index'));
+    } else {
+      return $this->flash(__('The manufacturer could not be deleted. Please, try again.'), array('action' => 'index'));
+    }
+  }
+}
diff --git a/web/api/app/Model/CameraModel.php b/web/api/app/Model/CameraModel.php
new file mode 100644
index 000000000..e953b5db8
--- /dev/null
+++ b/web/api/app/Model/CameraModel.php
@@ -0,0 +1,70 @@
+<?php
+App::uses('AppModel', 'CameraModel');
+/**
+ * Model CameraModel
+ *
+ * @property Name $Name
+ * @property ManufacturerId $ManufacturerId
+ */
+class CameraModel extends AppModel {
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'Models';
+
+/**
+ * Primary key field
+ *
+ * @var string
+ */
+	public $primaryKey = 'Id';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'Name';
+
+	public $recursive = -1;
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public $validate = array(
+		'Name' => array(
+			'notBlank' => array(
+				'rule' => array('notBlank'))),
+		'Id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+
+/**
+ * hasMany associations
+ *
+ * @var array
+ */
+	public $hasOne = array(
+		'Manufacturer' => array(
+			'className' => 'Manufacturer',
+      'joinTable' =>  'Manufacturers',
+			'foreignKey' => 'Id',
+		),
+  );
+  //var $actsAs = array( 'Containable' );
+}
diff --git a/web/api/app/Model/Manufacturer.php b/web/api/app/Model/Manufacturer.php
new file mode 100644
index 000000000..34a6c88c0
--- /dev/null
+++ b/web/api/app/Model/Manufacturer.php
@@ -0,0 +1,77 @@
+<?php
+App::uses('AppModel', 'Model');
+/**
+ * Manufacturer Model
+ *
+ * @property Event $Event
+ * @property Zone $Zone
+ */
+class Manufacturer extends AppModel {
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'Manufacturers';
+
+/**
+ * Primary key field
+ *
+ * @var string
+ */
+	public $primaryKey = 'Id';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'Name';
+
+	public $recursive = -1;
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public $validate = array(
+		'Id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+		'Name' => array(
+			'notBlank' => array(
+				'rule' => array('notBlank'))),
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+
+/**
+ * hasMany associations
+ *
+ * @var array
+ */
+	public $hasMany = array(
+		'Model' => array(
+			'className' => 'Model',
+			'foreignKey' => 'ManufacturerId',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+}
diff --git a/web/api/app/View/Manufacturers/json/edit.ctp b/web/api/app/View/Manufacturers/json/edit.ctp
new file mode 100644
index 000000000..a32d9cfad
--- /dev/null
+++ b/web/api/app/View/Manufacturers/json/edit.ctp
@@ -0,0 +1,2 @@
+echo json_encode($message);
+echo json_encode($manufacturer);
diff --git a/web/api/app/View/Manufacturers/json/index.ctp b/web/api/app/View/Manufacturers/json/index.ctp
new file mode 100644
index 000000000..4c54bdf95
--- /dev/null
+++ b/web/api/app/View/Manufacturers/json/index.ctp
@@ -0,0 +1 @@
+echo json_encode($manufacturers);
diff --git a/web/api/app/View/Manufacturers/json/view.ctp b/web/api/app/View/Manufacturers/json/view.ctp
new file mode 100644
index 000000000..4e0a14ae6
--- /dev/null
+++ b/web/api/app/View/Manufacturers/json/view.ctp
@@ -0,0 +1 @@
+echo json_encode($manufacturer);
diff --git a/web/api/app/View/Manufacturers/xml/edit.ctp b/web/api/app/View/Manufacturers/xml/edit.ctp
new file mode 100644
index 000000000..09fb8979a
--- /dev/null
+++ b/web/api/app/View/Manufacturers/xml/edit.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $message));
+echo $xml->asXML();
diff --git a/web/api/app/View/Manufacturers/xml/index.ctp b/web/api/app/View/Manufacturers/xml/index.ctp
new file mode 100644
index 000000000..9bb514fff
--- /dev/null
+++ b/web/api/app/View/Manufacturers/xml/index.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $servers));
+echo $xml->asXML();
diff --git a/web/api/app/View/Manufacturers/xml/view.ctp b/web/api/app/View/Manufacturers/xml/view.ctp
new file mode 100644
index 000000000..3b2a3fdad
--- /dev/null
+++ b/web/api/app/View/Manufacturers/xml/view.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $server));
+echo $xml->asXML();

From 292b3c1d3767fb9c57ccc2778f20d9e269c31754 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 25 Sep 2021 20:49:53 -0400
Subject: [PATCH 022/501] add an ajax request for querying the available models

---
 web/ajax/models.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 web/ajax/models.php

diff --git a/web/ajax/models.php b/web/ajax/models.php
new file mode 100644
index 000000000..3a4f54c5b
--- /dev/null
+++ b/web/ajax/models.php
@@ -0,0 +1,24 @@
+<?php
+// At the moment this can only return the list of available models given the manufacturer id
+
+$message = '';
+
+//
+// INITIALIZE AND CHECK SANITY
+//
+
+if (!canView('Monitors')) {
+  $message = 'Insufficient permissions to view model entries for user '.$user['Username'];
+} else if (!isset($_REQUEST['ManufacturerId'])) {
+  $message = 'This request requires a ManufacturerId to be set';
+}
+
+if ($message) {
+  ajaxError($message);
+  return;
+}
+
+require_once('includes/Model.php');
+$models = ZM\Model::find(array('ManufacturerId'=>$_REQUEST['ManufacturerId']), array('order'=>'lower(Name)'));
+ajaxResponse(array('models'=>$models));
+?>

From 93c5ad0939df10685fe6042a7c8c13a0cf17213f Mon Sep 17 00:00:00 2001
From: Peter Keresztes Schmidt <carbenium@outlook.com>
Date: Sun, 12 Sep 2021 11:28:57 +0200
Subject: [PATCH 023/501] Image: Fix Wclobbered warnings

From C99 spec:
[...]  objects of automatic storage duration that are local to the function containing the invocation of the corresponding setjmp macro that do not have volatile-qualified type and have been changed between the setjmp invocation and longjmp call are indeterminate

Remove the variables in question or pass them as const refs.
---
 src/zm_image.cpp | 104 +++++++++++++++++++++++------------------------
 src/zm_image.h   |   2 +-
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index a837138bc..f0d94a542 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -935,14 +935,13 @@ bool Image::WriteRaw(const char *filename) const {
 
 bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsigned int p_subpixelorder) {
   unsigned int new_width, new_height, new_colours, new_subpixelorder;
-  struct jpeg_decompress_struct *cinfo = readjpg_dcinfo;
 
-  if ( !cinfo ) {
-    cinfo = readjpg_dcinfo = new jpeg_decompress_struct;
-    cinfo->err = jpeg_std_error(&jpg_err.pub);
+  if ( !readjpg_dcinfo ) {
+    readjpg_dcinfo = new jpeg_decompress_struct;
+    readjpg_dcinfo->err = jpeg_std_error(&jpg_err.pub);
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
     jpg_err.pub.emit_message = zm_jpeg_emit_message;
-    jpeg_create_decompress(cinfo);
+    jpeg_create_decompress(readjpg_dcinfo);
   }
 
   FILE *infile;
@@ -952,30 +951,30 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
   }
 
   if ( setjmp(jpg_err.setjmp_buffer) ) {
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
     return false;
   }
 
-  jpeg_stdio_src(cinfo, infile);
+  jpeg_stdio_src(readjpg_dcinfo, infile);
 
-  jpeg_read_header(cinfo, TRUE);
+  jpeg_read_header(readjpg_dcinfo, TRUE);
 
-  if ( (cinfo->num_components != 1) && (cinfo->num_components != 3) ) {
+  if ( (readjpg_dcinfo->num_components != 1) && (readjpg_dcinfo->num_components != 3) ) {
     Error("Unexpected colours when reading jpeg image: %d", colours);
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
     return false;
   }
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if ( cinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
-    zm_use_std_huff_tables(cinfo);
+  if ( readjpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
+    zm_use_std_huff_tables(readjpg_dcinfo);
   }
 
-  new_width = cinfo->image_width;
-  new_height = cinfo->image_height;
+  new_width = readjpg_dcinfo->image_width;
+  new_height = readjpg_dcinfo->image_height;
 
   if ( (width != new_width) || (height != new_height) ) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u", width, height, new_width, new_height);
@@ -983,7 +982,7 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
 
   switch ( p_colours ) {
     case ZM_COLOUR_GRAY8:
-        cinfo->out_color_space = JCS_GRAYSCALE;
+        readjpg_dcinfo->out_color_space = JCS_GRAYSCALE;
         new_colours = ZM_COLOUR_GRAY8;
         new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
         break;
@@ -991,17 +990,17 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
 #ifdef JCS_EXTENSIONS
         new_colours = ZM_COLOUR_RGB32;
         if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
-          cinfo->out_color_space = JCS_EXT_BGRX;
+          readjpg_dcinfo->out_color_space = JCS_EXT_BGRX;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
         } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
-          cinfo->out_color_space = JCS_EXT_XRGB;
+          readjpg_dcinfo->out_color_space = JCS_EXT_XRGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
         } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
-          cinfo->out_color_space = JCS_EXT_XBGR;
+          readjpg_dcinfo->out_color_space = JCS_EXT_XBGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
         } else {
           /* Assume RGBA */
-          cinfo->out_color_space = JCS_EXT_RGBX;
+          readjpg_dcinfo->out_color_space = JCS_EXT_RGBX;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
         }
         break;
@@ -1013,7 +1012,7 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
         new_colours = ZM_COLOUR_RGB24;
         if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
 #ifdef JCS_EXTENSIONS
-          cinfo->out_color_space = JCS_EXT_BGR;
+          readjpg_dcinfo->out_color_space = JCS_EXT_BGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
           Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
@@ -1029,7 +1028,7 @@ cinfo->out_color_space = JCS_EXT_RGB;
 cinfo->out_color_space = JCS_RGB;
 #endif
            */
-          cinfo->out_color_space = JCS_RGB;
+          readjpg_dcinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
         }
         break;
@@ -1037,20 +1036,20 @@ cinfo->out_color_space = JCS_RGB;
 
   if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
     return false;
   }
 
-  jpeg_start_decompress(cinfo);
+  jpeg_start_decompress(readjpg_dcinfo);
 
   JSAMPROW row_pointer = buffer;
-  while ( cinfo->output_scanline < cinfo->output_height ) {
-    jpeg_read_scanlines(cinfo, &row_pointer, 1);
+  while ( readjpg_dcinfo->output_scanline < readjpg_dcinfo->output_height ) {
+    jpeg_read_scanlines(readjpg_dcinfo, &row_pointer, 1);
     row_pointer += linesize;
   }
 
-  jpeg_finish_decompress(cinfo);
+  jpeg_finish_decompress(readjpg_dcinfo);
 
   fclose(infile);
 
@@ -1078,7 +1077,7 @@ bool Image::WriteJpeg(const std::string &filename, int quality_override, SystemT
 }
 
 bool Image::WriteJpeg(const std::string &filename,
-                      int quality_override,
+                      const int &quality_override,
                       SystemTimePoint timestamp,
                       bool on_blocking_abort) const {
   if ( config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8) ) {
@@ -1247,39 +1246,38 @@ bool Image::DecodeJpeg(
     unsigned int p_subpixelorder)
 {
   unsigned int new_width, new_height, new_colours, new_subpixelorder;
-  struct jpeg_decompress_struct *cinfo = decodejpg_dcinfo;
 
-  if ( !cinfo ) {
-    cinfo = decodejpg_dcinfo = new jpeg_decompress_struct;
-    cinfo->err = jpeg_std_error( &jpg_err.pub );
+  if ( !decodejpg_dcinfo ) {
+    decodejpg_dcinfo = new jpeg_decompress_struct;
+    decodejpg_dcinfo->err = jpeg_std_error( &jpg_err.pub );
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
     jpg_err.pub.emit_message = zm_jpeg_emit_message;
-    jpeg_create_decompress( cinfo );
+    jpeg_create_decompress( decodejpg_dcinfo );
   }
 
   if ( setjmp(jpg_err.setjmp_buffer) ) {
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
   }
 
-  zm_jpeg_mem_src(cinfo, inbuffer, inbuffer_size);
+  zm_jpeg_mem_src(decodejpg_dcinfo, inbuffer, inbuffer_size);
 
-  jpeg_read_header(cinfo, TRUE);
+  jpeg_read_header(decodejpg_dcinfo, TRUE);
 
-  if ( (cinfo->num_components != 1) && (cinfo->num_components != 3) ) {
+  if ( (decodejpg_dcinfo->num_components != 1) && (decodejpg_dcinfo->num_components != 3) ) {
     Error("Unexpected colours when reading jpeg image: %d", colours);
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
   }
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if ( cinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
-    zm_use_std_huff_tables(cinfo);
+  if ( decodejpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
+    zm_use_std_huff_tables(decodejpg_dcinfo);
   }
 
-  new_width = cinfo->image_width;
-  new_height = cinfo->image_height;
+  new_width = decodejpg_dcinfo->image_width;
+  new_height = decodejpg_dcinfo->image_height;
 
   if ( (width != new_width) || (height != new_height) ) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u",
@@ -1288,7 +1286,7 @@ bool Image::DecodeJpeg(
 
   switch (p_colours) {
     case ZM_COLOUR_GRAY8:
-        cinfo->out_color_space = JCS_GRAYSCALE;
+      decodejpg_dcinfo->out_color_space = JCS_GRAYSCALE;
         new_colours = ZM_COLOUR_GRAY8;
         new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
         break;
@@ -1296,17 +1294,17 @@ bool Image::DecodeJpeg(
 #ifdef JCS_EXTENSIONS
         new_colours = ZM_COLOUR_RGB32;
         if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
-          cinfo->out_color_space = JCS_EXT_BGRX;
+          decodejpg_dcinfo->out_color_space = JCS_EXT_BGRX;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
         } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
-          cinfo->out_color_space = JCS_EXT_XRGB;
+          decodejpg_dcinfo->out_color_space = JCS_EXT_XRGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
         } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
-          cinfo->out_color_space = JCS_EXT_XBGR;
+          decodejpg_dcinfo->out_color_space = JCS_EXT_XBGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
         } else {
           /* Assume RGBA */
-          cinfo->out_color_space = JCS_EXT_RGBX;
+          decodejpg_dcinfo->out_color_space = JCS_EXT_RGBX;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
         }
         break;
@@ -1318,7 +1316,7 @@ bool Image::DecodeJpeg(
         new_colours = ZM_COLOUR_RGB24;
         if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
 #ifdef JCS_EXTENSIONS
-          cinfo->out_color_space = JCS_EXT_BGR;
+          decodejpg_dcinfo->out_color_space = JCS_EXT_BGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
           Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
@@ -1334,7 +1332,7 @@ cinfo->out_color_space = JCS_EXT_RGB;
 cinfo->out_color_space = JCS_RGB;
 #endif
            */
-          cinfo->out_color_space = JCS_RGB;
+          decodejpg_dcinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
         }
         break;
@@ -1342,19 +1340,19 @@ cinfo->out_color_space = JCS_RGB;
 
   if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
-    jpeg_abort_decompress(cinfo);
+    jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
   }
 
-  jpeg_start_decompress(cinfo);
+  jpeg_start_decompress(decodejpg_dcinfo);
 
   JSAMPROW row_pointer = buffer;  /* pointer to a single row */
-  while ( cinfo->output_scanline < cinfo->output_height ) {
-    jpeg_read_scanlines(cinfo, &row_pointer, 1);
+  while ( decodejpg_dcinfo->output_scanline < decodejpg_dcinfo->output_height ) {
+    jpeg_read_scanlines(decodejpg_dcinfo, &row_pointer, 1);
     row_pointer += linesize;
   }
 
-  jpeg_finish_decompress(cinfo);
+  jpeg_finish_decompress(decodejpg_dcinfo);
 
   return true;
 }
diff --git a/src/zm_image.h b/src/zm_image.h
index 7778747e4..ccbae9f86 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -241,7 +241,7 @@ class Image {
   bool WriteJpeg(const std::string &filename, SystemTimePoint timestamp) const;
   bool WriteJpeg(const std::string &filename, int quality_override, SystemTimePoint timestamp) const;
   bool WriteJpeg(const std::string &filename,
-                 int quality_override,
+                 const int &quality_override,
                  SystemTimePoint timestamp,
                  bool on_blocking_abort) const;
 

From a4ebf533a93e8834b24455541a48735a6dcbf20e Mon Sep 17 00:00:00 2001
From: Peter Keresztes Schmidt <carbenium@outlook.com>
Date: Sun, 12 Sep 2021 11:38:44 +0200
Subject: [PATCH 024/501] Image: Codestyle changes

---
 src/zm_image.cpp | 304 +++++++++++++++++++++++------------------------
 1 file changed, 151 insertions(+), 153 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index f0d94a542..09c05550e 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -936,7 +936,7 @@ bool Image::WriteRaw(const char *filename) const {
 bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsigned int p_subpixelorder) {
   unsigned int new_width, new_height, new_colours, new_subpixelorder;
 
-  if ( !readjpg_dcinfo ) {
+  if (!readjpg_dcinfo) {
     readjpg_dcinfo = new jpeg_decompress_struct;
     readjpg_dcinfo->err = jpeg_std_error(&jpg_err.pub);
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
@@ -945,12 +945,12 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
   }
 
   FILE *infile;
-  if ( (infile = fopen(filename.c_str(), "rb")) == nullptr ) {
+  if ((infile = fopen(filename.c_str(), "rb")) == nullptr) {
     Error("Can't open %s: %s", filename.c_str(), strerror(errno));
     return false;
   }
 
-  if ( setjmp(jpg_err.setjmp_buffer) ) {
+  if (setjmp(jpg_err.setjmp_buffer)) {
     jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
     return false;
@@ -958,9 +958,9 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
 
   jpeg_stdio_src(readjpg_dcinfo, infile);
 
-  jpeg_read_header(readjpg_dcinfo, TRUE);
+  jpeg_read_header(readjpg_dcinfo, true);
 
-  if ( (readjpg_dcinfo->num_components != 1) && (readjpg_dcinfo->num_components != 3) ) {
+  if ((readjpg_dcinfo->num_components != 1) && (readjpg_dcinfo->num_components != 3)) {
     Error("Unexpected colours when reading jpeg image: %d", colours);
     jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
@@ -969,72 +969,72 @@ bool Image::ReadJpeg(const std::string &filename, unsigned int p_colours, unsign
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if ( readjpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
+  if (readjpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr) {
     zm_use_std_huff_tables(readjpg_dcinfo);
   }
 
   new_width = readjpg_dcinfo->image_width;
   new_height = readjpg_dcinfo->image_height;
 
-  if ( (width != new_width) || (height != new_height) ) {
+  if ((width != new_width) || (height != new_height)) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u", width, height, new_width, new_height);
   }
 
-  switch ( p_colours ) {
+  switch (p_colours) {
     case ZM_COLOUR_GRAY8:
-        readjpg_dcinfo->out_color_space = JCS_GRAYSCALE;
-        new_colours = ZM_COLOUR_GRAY8;
-        new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
-        break;
+      readjpg_dcinfo->out_color_space = JCS_GRAYSCALE;
+      new_colours = ZM_COLOUR_GRAY8;
+      new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
+      break;
     case ZM_COLOUR_RGB32:
 #ifdef JCS_EXTENSIONS
-        new_colours = ZM_COLOUR_RGB32;
-        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
-          readjpg_dcinfo->out_color_space = JCS_EXT_BGRX;
-          new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
-          readjpg_dcinfo->out_color_space = JCS_EXT_XRGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
-          readjpg_dcinfo->out_color_space = JCS_EXT_XBGR;
-          new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
-        } else {
-          /* Assume RGBA */
-          readjpg_dcinfo->out_color_space = JCS_EXT_RGBX;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-        }
-        break;
+      new_colours = ZM_COLOUR_RGB32;
+      if (p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        readjpg_dcinfo->out_color_space = JCS_EXT_BGRX;
+        new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+      } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        readjpg_dcinfo->out_color_space = JCS_EXT_XRGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+      } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        readjpg_dcinfo->out_color_space = JCS_EXT_XBGR;
+        new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
+      } else {
+        /* Assume RGBA */
+        readjpg_dcinfo->out_color_space = JCS_EXT_RGBX;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+      }
+      break;
 #else
-        Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
+      Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
     case ZM_COLOUR_RGB24:
     default:
-        new_colours = ZM_COLOUR_RGB24;
-        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+      new_colours = ZM_COLOUR_RGB24;
+      if (p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
 #ifdef JCS_EXTENSIONS
-          readjpg_dcinfo->out_color_space = JCS_EXT_BGR;
-          new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
+        readjpg_dcinfo->out_color_space = JCS_EXT_BGR;
+        new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
-          cinfo->out_color_space = JCS_RGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
+        cinfo->out_color_space = JCS_RGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
-        } else {
-          /* Assume RGB */
-          /*
+      } else {
+        /* Assume RGB */
+        /*
 #ifdef JCS_EXTENSIONS
 cinfo->out_color_space = JCS_EXT_RGB;
 #else
 cinfo->out_color_space = JCS_RGB;
 #endif
-           */
-          readjpg_dcinfo->out_color_space = JCS_RGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
-        }
-        break;
+         */
+        readjpg_dcinfo->out_color_space = JCS_RGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      }
+      break;
   }  // end switch p_colours
 
-  if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
+  if (WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
     jpeg_abort_decompress(readjpg_dcinfo);
     fclose(infile);
@@ -1044,13 +1044,12 @@ cinfo->out_color_space = JCS_RGB;
   jpeg_start_decompress(readjpg_dcinfo);
 
   JSAMPROW row_pointer = buffer;
-  while ( readjpg_dcinfo->output_scanline < readjpg_dcinfo->output_height ) {
+  while (readjpg_dcinfo->output_scanline < readjpg_dcinfo->output_height) {
     jpeg_read_scanlines(readjpg_dcinfo, &row_pointer, 1);
     row_pointer += linesize;
   }
 
   jpeg_finish_decompress(readjpg_dcinfo);
-
   fclose(infile);
 
   return true;
@@ -1080,34 +1079,37 @@ bool Image::WriteJpeg(const std::string &filename,
                       const int &quality_override,
                       SystemTimePoint timestamp,
                       bool on_blocking_abort) const {
-  if ( config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8) ) {
+  if (config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8)) {
     Image temp_image(*this);
     temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
     return temp_image.WriteJpeg(filename, quality_override, timestamp, on_blocking_abort);
   }
   int quality = quality_override ? quality_override : config.jpeg_file_quality;
 
-  struct jpeg_compress_struct *cinfo = writejpg_ccinfo[quality];
+  jpeg_compress_struct *cinfo = writejpg_ccinfo[quality];
   FILE *outfile = nullptr;
   int raw_fd = 0;
 
-  if ( !cinfo ) {
+  if (!cinfo) {
     cinfo = writejpg_ccinfo[quality] = new jpeg_compress_struct;
     cinfo->err = jpeg_std_error(&jpg_err.pub);
     jpeg_create_compress(cinfo);
   }
-  if ( !on_blocking_abort ) {
+  if (!on_blocking_abort) {
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
     jpg_err.pub.emit_message = zm_jpeg_emit_message;
   } else {
     jpg_err.pub.error_exit = zm_jpeg_error_silent;
     jpg_err.pub.emit_message = zm_jpeg_emit_silence;
-    if ( setjmp(jpg_err.setjmp_buffer) ) {
+    if (setjmp(jpg_err.setjmp_buffer)) {
       jpeg_abort_compress(cinfo);
-      Debug(1, "Aborted a write mid-stream and %s and %d", (outfile == nullptr) ? "closing file" : "file not opened", raw_fd);
-      if ( raw_fd )
+      Debug(1,
+            "Aborted a write mid-stream and %s and %d",
+            (outfile == nullptr) ? "closing file" : "file not opened",
+            raw_fd);
+      if (raw_fd)
         close(raw_fd);
-      if ( outfile )
+      if (outfile)
         fclose(outfile);
       return false;
     }
@@ -1134,58 +1136,58 @@ bool Image::WriteJpeg(const std::string &filename,
   cinfo->image_width = width;   /* image width and height, in pixels */
   cinfo->image_height = height;
 
-  switch ( colours ) {
+  switch (colours) {
     case ZM_COLOUR_GRAY8:
-        cinfo->input_components = 1;
-        cinfo->in_color_space = JCS_GRAYSCALE;
-        break;
+      cinfo->input_components = 1;
+      cinfo->in_color_space = JCS_GRAYSCALE;
+      break;
     case ZM_COLOUR_RGB32:
 #ifdef JCS_EXTENSIONS
-        cinfo->input_components = 4;
-        if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA ) {
-          cinfo->in_color_space = JCS_EXT_RGBX;
-        } else if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
-          cinfo->in_color_space = JCS_EXT_BGRX;
-        } else if ( subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
-          cinfo->in_color_space = JCS_EXT_XRGB;
-        } else if ( subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
-          cinfo->in_color_space = JCS_EXT_XBGR;
-        } else {
-          Warning("Unknwon subpixelorder %d", subpixelorder);
-          /* Assume RGBA */
-          cinfo->in_color_space = JCS_EXT_RGBX;
-        }
-        break;
+      cinfo->input_components = 4;
+      if (subpixelorder == ZM_SUBPIX_ORDER_RGBA) {
+        cinfo->in_color_space = JCS_EXT_RGBX;
+      } else if (subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        cinfo->in_color_space = JCS_EXT_BGRX;
+      } else if (subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        cinfo->in_color_space = JCS_EXT_XRGB;
+      } else if (subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        cinfo->in_color_space = JCS_EXT_XBGR;
+      } else {
+        Warning("Unknwon subpixelorder %d", subpixelorder);
+        /* Assume RGBA */
+        cinfo->in_color_space = JCS_EXT_RGBX;
+      }
+      break;
 #else
-        Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
+      Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
+      jpeg_abort_compress(cinfo);
+      fclose(outfile);
+      return false;
+#endif
+    case ZM_COLOUR_RGB24:
+    default:
+      cinfo->input_components = 3;
+      if (subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+#ifdef JCS_EXTENSIONS
+        cinfo->in_color_space = JCS_EXT_BGR;
+#else
+        Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
         jpeg_abort_compress(cinfo);
         fclose(outfile);
         return false;
 #endif
-    case ZM_COLOUR_RGB24:
-    default:
-        cinfo->input_components = 3;
-        if ( subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS
-          cinfo->in_color_space = JCS_EXT_BGR;
-#else
-          Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
-          jpeg_abort_compress(cinfo);
-          fclose(outfile);
-          return false;
-#endif
-        } else {
-          /* Assume RGB */
-          /*
+      } else {
+        /* Assume RGB */
+        /*
 #ifdef JCS_EXTENSIONS
 cinfo->out_color_space = JCS_EXT_RGB;
 #else
 cinfo->out_color_space = JCS_RGB;
 #endif
 */
-          cinfo->in_color_space = JCS_RGB;
-        }
-        break;
+        cinfo->in_color_space = JCS_RGB;
+      }
+      break;
   }  // end switch(colours)
 
   jpeg_set_defaults(cinfo);
@@ -1193,7 +1195,7 @@ cinfo->out_color_space = JCS_RGB;
   cinfo->dct_method = JDCT_FASTEST;
 
   jpeg_start_compress(cinfo, TRUE);
-  if ( config.add_jpeg_comments && !annotation_.empty() ) {
+  if (config.add_jpeg_comments && !annotation_.empty()) {
     jpeg_write_marker(cinfo, JPEG_COM, reinterpret_cast<const JOCTET *>(annotation_.c_str()), annotation_.size());
   }
   // If we have a non-zero time (meaning a parameter was passed in), then form a simple exif segment with that time as DateTimeOriginal and SubsecTimeOriginal
@@ -1217,19 +1219,19 @@ cinfo->out_color_space = JCS_RGB;
     snprintf(msbuf, sizeof msbuf, "%06d", static_cast<int32>(ts_usec.count()));
 
     unsigned char exiftimes[82] = {
-      0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
-      0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
-      0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-      0xff, 0x00 };
-    memcpy(&exiftimes[EXIFTIMES_OFFSET], timebuf,EXIFTIMES_LEN);
+        0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
+        0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
+        0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0x00};
+    memcpy(&exiftimes[EXIFTIMES_OFFSET], timebuf, EXIFTIMES_LEN);
     memcpy(&exiftimes[EXIFTIMES_MS_OFFSET], msbuf, EXIFTIMES_MS_LEN);
-    jpeg_write_marker(cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes));
+    jpeg_write_marker(cinfo, EXIF_CODE, (const JOCTET *) exiftimes, sizeof(exiftimes));
   }
 
   JSAMPROW row_pointer = buffer;  /* pointer to a single row */
-  while ( cinfo->next_scanline < cinfo->image_height ) {
+  while (cinfo->next_scanline < cinfo->image_height) {
     jpeg_write_scanlines(cinfo, &row_pointer, 1);
     row_pointer += linesize;
   }
@@ -1239,23 +1241,19 @@ cinfo->out_color_space = JCS_RGB;
   return true;
 }
 
-bool Image::DecodeJpeg(
-    const JOCTET *inbuffer,
-    int inbuffer_size,
-    unsigned int p_colours,
-    unsigned int p_subpixelorder)
+bool Image::DecodeJpeg(const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder)
 {
   unsigned int new_width, new_height, new_colours, new_subpixelorder;
 
-  if ( !decodejpg_dcinfo ) {
+  if (!decodejpg_dcinfo) {
     decodejpg_dcinfo = new jpeg_decompress_struct;
-    decodejpg_dcinfo->err = jpeg_std_error( &jpg_err.pub );
+    decodejpg_dcinfo->err = jpeg_std_error(&jpg_err.pub);
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
     jpg_err.pub.emit_message = zm_jpeg_emit_message;
-    jpeg_create_decompress( decodejpg_dcinfo );
+    jpeg_create_decompress(decodejpg_dcinfo);
   }
 
-  if ( setjmp(jpg_err.setjmp_buffer) ) {
+  if (setjmp(jpg_err.setjmp_buffer)) {
     jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
   }
@@ -1264,7 +1262,7 @@ bool Image::DecodeJpeg(
 
   jpeg_read_header(decodejpg_dcinfo, TRUE);
 
-  if ( (decodejpg_dcinfo->num_components != 1) && (decodejpg_dcinfo->num_components != 3) ) {
+  if ((decodejpg_dcinfo->num_components != 1) && (decodejpg_dcinfo->num_components != 3)) {
     Error("Unexpected colours when reading jpeg image: %d", colours);
     jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
@@ -1272,73 +1270,73 @@ bool Image::DecodeJpeg(
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if ( decodejpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
+  if (decodejpg_dcinfo->dc_huff_tbl_ptrs[0] == nullptr) {
     zm_use_std_huff_tables(decodejpg_dcinfo);
   }
 
   new_width = decodejpg_dcinfo->image_width;
   new_height = decodejpg_dcinfo->image_height;
 
-  if ( (width != new_width) || (height != new_height) ) {
+  if ((width != new_width) || (height != new_height)) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u",
-        width, height, new_width, new_height);
+          width, height, new_width, new_height);
   }
 
   switch (p_colours) {
     case ZM_COLOUR_GRAY8:
       decodejpg_dcinfo->out_color_space = JCS_GRAYSCALE;
-        new_colours = ZM_COLOUR_GRAY8;
-        new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
-        break;
+      new_colours = ZM_COLOUR_GRAY8;
+      new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
+      break;
     case ZM_COLOUR_RGB32:
 #ifdef JCS_EXTENSIONS
-        new_colours = ZM_COLOUR_RGB32;
-        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
-          decodejpg_dcinfo->out_color_space = JCS_EXT_BGRX;
-          new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
-          decodejpg_dcinfo->out_color_space = JCS_EXT_XRGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
-          decodejpg_dcinfo->out_color_space = JCS_EXT_XBGR;
-          new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
-        } else {
-          /* Assume RGBA */
-          decodejpg_dcinfo->out_color_space = JCS_EXT_RGBX;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-        }
-        break;
+      new_colours = ZM_COLOUR_RGB32;
+      if (p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        decodejpg_dcinfo->out_color_space = JCS_EXT_BGRX;
+        new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+      } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        decodejpg_dcinfo->out_color_space = JCS_EXT_XRGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+      } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        decodejpg_dcinfo->out_color_space = JCS_EXT_XBGR;
+        new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
+      } else {
+        /* Assume RGBA */
+        decodejpg_dcinfo->out_color_space = JCS_EXT_RGBX;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+      }
+      break;
 #else
-        Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
+      Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
     case ZM_COLOUR_RGB24:
     default:
-        new_colours = ZM_COLOUR_RGB24;
-        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+      new_colours = ZM_COLOUR_RGB24;
+      if (p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
 #ifdef JCS_EXTENSIONS
-          decodejpg_dcinfo->out_color_space = JCS_EXT_BGR;
-          new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
+        decodejpg_dcinfo->out_color_space = JCS_EXT_BGR;
+        new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
-          cinfo->out_color_space = JCS_RGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
+        cinfo->out_color_space = JCS_RGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
-        } else {
-          /* Assume RGB */
-          /*
+      } else {
+        /* Assume RGB */
+        /*
 #ifdef JCS_EXTENSIONS
 cinfo->out_color_space = JCS_EXT_RGB;
 #else
 cinfo->out_color_space = JCS_RGB;
 #endif
-           */
-          decodejpg_dcinfo->out_color_space = JCS_RGB;
-          new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
-        }
-        break;
+         */
+        decodejpg_dcinfo->out_color_space = JCS_RGB;
+        new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      }
+      break;
   } // end switch
 
-  if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
+  if (WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
     jpeg_abort_decompress(decodejpg_dcinfo);
     return false;
@@ -1347,7 +1345,7 @@ cinfo->out_color_space = JCS_RGB;
   jpeg_start_decompress(decodejpg_dcinfo);
 
   JSAMPROW row_pointer = buffer;  /* pointer to a single row */
-  while ( decodejpg_dcinfo->output_scanline < decodejpg_dcinfo->output_height ) {
+  while (decodejpg_dcinfo->output_scanline < decodejpg_dcinfo->output_height) {
     jpeg_read_scanlines(decodejpg_dcinfo, &row_pointer, 1);
     row_pointer += linesize;
   }

From 4b4152b837f07eba1bcb0ce0dfadc23546d6c6f2 Mon Sep 17 00:00:00 2001
From: Andrea Vezzali <vezza@inwind.it>
Date: Mon, 13 Sep 2021 13:28:48 +0200
Subject: [PATCH 025/501] Update it_it translation (#3350)

---
 web/lang/it_it.php | 274 ++++++++++++++++++++++-----------------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 62e881d45..b51b85300 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -98,8 +98,8 @@ $SLANG = array(
     'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Attenzione',
     'All'                  => 'Tutto',
-    'AnalysisFPS'          => 'Analysis FPS',           // Added - 2015-07-22
-    'AnalysisUpdateDelay'  => 'Analysis Update Delay',  // Added - 2015-07-23
+    'AnalysisFPS'          => 'Analisi FPS',           // Added - 2015-07-22
+    'AnalysisUpdateDelay'  => 'Intervallo aggiornamento analisi',  // Added - 2015-07-23
     'Apply'                => 'Applica',
     'ApplyingStateChange'  => 'Sto applicando le modifiche',
     'ArchArchived'         => 'Archiviato',
@@ -112,31 +112,31 @@ $SLANG = array(
     'AttrArchiveStatus'    => 'Stato Archivio',
     'AttrAvgScore'         => 'Punteggio medio',
     'AttrCause'            => 'Causa',
-    'AttrDiskBlocks'       => 'Blocchi del Disco',
-    'AttrDiskPercent'      => 'Percentuale del Disco',
-    'AttrDiskSpace'        => 'Disk Space',             // Added - 2018-08-30
+    'AttrDiskBlocks'       => 'Blocchi disco',
+    'AttrDiskPercent'      => 'Percentuale disco',
+    'AttrDiskSpace'        => 'Spazio disco',             // Added - 2018-08-30
     'AttrDuration'         => 'Durata',
     'AttrEndDate'          => 'End Date',               // Added - 2018-08-30
     'AttrEndDateTime'      => 'End Date/Time',          // Added - 2018-08-30
     'AttrEndTime'          => 'End Time',               // Added - 2018-08-30
     'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
-    'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
+    'AttrFilterServer'     => 'Filtro attivo su Server', // Added - 2018-08-30
     'AttrFrames'           => 'Immagini',
     'AttrId'               => 'Id',
     'AttrMaxScore'         => 'Punteggio massimo',
     'AttrMonitorId'        => 'Id Monitor',
     'AttrMonitorName'      => 'Nome Monitor',
-    'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
+    'AttrMonitorServer'    => 'Monitor attivo su Server', // Added - 2018-08-30
     'AttrName'             => 'Nome',
     'AttrNotes'            => 'Note',
-    'AttrStartDate'        => 'Start Date',             // Added - 2018-08-30
-    'AttrStartDateTime'    => 'Start Date/Time',        // Added - 2018-08-30
-    'AttrStartTime'        => 'Start Time',             // Added - 2018-08-30
-    'AttrStartWeekday'     => 'Start Weekday',          // Added - 2018-08-30
-    'AttrStateId'          => 'Run State',              // Added - 2018-08-30
-    'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
-    'AttrStorageServer'    => 'Server Hosting Storage', // Added - 2018-08-30
-    'AttrSystemLoad'       => 'System Load',
+    'AttrStartDate'        => 'Inizio - Data',             // Added - 2018-08-30
+    'AttrStartDateTime'    => 'Inizio - Data/orario',        // Added - 2018-08-30
+    'AttrStartTime'        => 'Inizio - Orario',             // Added - 2018-08-30
+    'AttrStartWeekday'     => 'Inizio - Giorno della settimana',          // Added - 2018-08-30
+    'AttrStateId'          => 'Stato esecuzione',              // Added - 2018-08-30
+    'AttrStorageArea'      => 'Area Salvataggio',           // Added - 2018-08-30
+    'AttrStorageServer'    => 'Server Salvataggio remoto', // Added - 2018-08-30
+    'AttrSystemLoad'       => 'Carico di sistema',
     'AttrTotalScore'       => 'Punteggio totale',
     'Auto'                 => 'Auto',
     'AutoStopTimeout'      => 'Auto Stop Timeout',
@@ -181,56 +181,56 @@ $SLANG = array(
     'BlobPx'               => 'Blob Px',
     'BlobSizes'            => 'Dimensioni Blob',
     'Blobs'                => 'Blobs',
-    'Brightness'           => 'Luminosit&agrave;',
+    'Brightness'           => 'Luminosità;',
     'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
     'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
-    'CanAutoFocus'         => 'Puo\' Auto Focus',
-    'CanAutoGain'          => 'Puo\' Auto Gains',
-    'CanAutoIris'          => 'Puo\' Auto Iris',
-    'CanAutoWhite'         => 'Puo\' Auto bil bianco',
-    'CanAutoZoom'          => 'Puo\' Auto Zoom',
-    'CanFocus'             => 'Puo\' Fuoco',
-    'CanFocusAbs'          => 'Puo\' Fuoco Assoluto',
-    'CanFocusCon'          => 'Puo\' Fuoco Continuo ',
-    'CanFocusRel'          => 'Puo\' Fuoco Relativo',
-    'CanGain'              => 'Puo\' Gain ',
-    'CanGainAbs'           => 'Puo\' Gain Assoluto',
-    'CanGainCon'           => 'Puo\' Gain Continuo  ',
-    'CanGainRel'           => 'Puo\' Gain Relativo',
-    'CanIris'              => 'Puo\' Iris',
-    'CanIrisAbs'           => 'Puo\' Iris Assoluto',
-    'CanIrisCon'           => 'Puo\' Iris Continuo  ',
-    'CanIrisRel'           => 'Puo\' Iris Relativo',
-    'CanMove'              => 'Puo\' Mov.',
-    'CanMoveAbs'           => 'Puo\' Mov. Assoluto',
-    'CanMoveCon'           => 'Puo\' Mov. Continuo  ',
-    'CanMoveDiag'          => 'Puo\' Mov. Diagonale ',
-    'CanMoveMap'           => 'Puo\' Mov Mappato',
-    'CanMoveRel'           => 'Puo\' Mov. Relativo',
-    'CanPan'               => 'Puo\' Pan' ,
-    'CanReset'             => 'Puo\' Reset',
-	'CanReboot'             => 'Can Reboot',
-    'CanSetPresets'        => 'Puo\' impostare preset',
-    'CanSleep'             => 'Puo\' andare in sleep',
-    'CanTilt'              => 'Puo\' Tilt',
-    'CanWake'              => 'Puo\' essere riattivato',
-    'CanWhite'             => 'Puo\' bilanciare il bianco',
-    'CanWhiteAbs'          => 'Puo\' bilanciare il bianco assoluto',
-    'CanWhiteBal'          => 'Puo\' bilanciare il bianco',
-    'CanWhiteCon'          => 'Puo\' bilanciare il bianco Continuo',
-    'CanWhiteRel'          => 'Puo\' bilanciare il bianco Relativo',
-    'CanZoom'              => 'Puo\' Zoom',
-    'CanZoomAbs'           => 'Puo\' Zoom Assoluto',
-    'CanZoomCon'           => 'Puo\' Zoom Continuo',
-    'CanZoomRel'           => 'Puo\' Zoom Relativo',
+    'CanAutoFocus'         => 'Può Auto Focus',
+    'CanAutoGain'          => 'Può Auto Gains',
+    'CanAutoIris'          => 'Può Auto Iris',
+    'CanAutoWhite'         => 'Può Auto bil bianco',
+    'CanAutoZoom'          => 'Può Auto Zoom',
+    'CanFocus'             => 'Può Fuoco',
+    'CanFocusAbs'          => 'Può Fuoco Assoluto',
+    'CanFocusCon'          => 'Può Fuoco Continuo ',
+    'CanFocusRel'          => 'Può Fuoco Relativo',
+    'CanGain'              => 'Può Gain ',
+    'CanGainAbs'           => 'Può Gain Assoluto',
+    'CanGainCon'           => 'Può Gain Continuo  ',
+    'CanGainRel'           => 'Può Gain Relativo',
+    'CanIris'              => 'Può Iris',
+    'CanIrisAbs'           => 'Può Iris Assoluto',
+    'CanIrisCon'           => 'Può Iris Continuo  ',
+    'CanIrisRel'           => 'Può Iris Relativo',
+    'CanMove'              => 'Può Mov.',
+    'CanMoveAbs'           => 'Può Mov. Assoluto',
+    'CanMoveCon'           => 'Può Mov. Continuo  ',
+    'CanMoveDiag'          => 'Può Mov. Diagonale ',
+    'CanMoveMap'           => 'Può Mov Mappato',
+    'CanMoveRel'           => 'Può Mov. Relativo',
+    'CanPan'               => 'Può Pan' ,
+    'CanReset'             => 'Può Reset',
+	'CanReboot'             => 'Può Riavviare',
+    'CanSetPresets'        => 'Può impostare preset',
+    'CanSleep'             => 'Può andare in sleep',
+    'CanTilt'              => 'Può Tilt',
+    'CanWake'              => 'Può essere riattivato',
+    'CanWhite'             => 'Può bilanciare il bianco',
+    'CanWhiteAbs'          => 'Può bilanciare il bianco assoluto',
+    'CanWhiteBal'          => 'Può bilanciare il bianco',
+    'CanWhiteCon'          => 'Può bilanciare il bianco Continuo',
+    'CanWhiteRel'          => 'Può bilanciare il bianco Relativo',
+    'CanZoom'              => 'Può Zoom',
+    'CanZoomAbs'           => 'Può Zoom Assoluto',
+    'CanZoomCon'           => 'Può Zoom Continuo',
+    'CanZoomRel'           => 'Può Zoom Relativo',
     'Cancel'               => 'Annulla',
     'CancelForcedAlarm'    => 'Annulla Allarme Forzato',
-    'CaptureHeight'        => 'Altezza img catturata',
-    'CaptureMethod'        => 'Metodo di cattura',         // Added - 2009-02-08
-    'CapturePalette'       => 'Paletta img catturata',
-    'CaptureResolution'    => 'Risoluzione di cattura',     // Added - 2015-04-18
-    'CaptureWidth'         => 'Larghezza img Catturata',
+    'CaptureHeight'        => 'Altezza Cattura Immagine',
+    'CaptureMethod'        => 'Metodo Cattura Immagine',         // Added - 2009-02-08
+    'CapturePalette'       => 'Tavolozza Cattura Immagine',
+    'CaptureResolution'    => 'Risoluzione Cattura Immagine',     // Added - 2015-04-18
+    'CaptureWidth'         => 'Larghezza Cattura Immagine',
     'Cause'                => 'Causa',
     'CheckMethod'          => 'Metodo di Controllo Allarme',
     'ChooseDetectedCamera' => 'Scegli telecamera rilevata', // Added - 2009-03-31
@@ -244,7 +244,7 @@ $SLANG = array(
     'Colour'               => 'Colori',
     'Command'              => 'Comando',
     'Component'            => 'Component',              // Added - 2011-06-16
-    'ConcurrentFilter'     => 'Run filter concurrently', // Added - 2018-08-30
+    'ConcurrentFilter'     => 'Esegui filtro contemporaneamente', // Added - 2018-08-30
     'Config'               => 'Configura',
     'ConfiguredFor'        => 'Configurato per',
     'ConfirmDeleteEvents'  => 'Sei sicuro di voler cancellare gli eventi selezionati',
@@ -279,7 +279,7 @@ $SLANG = array(
     'DeleteSavedFilter'    => 'Elimina il filtro salvato',
     'Description'          => 'Descrizione',
     'DetectedCameras'      => 'Telecamere Rilevate',       // Added - 2009-03-31
-    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
+    'DetectedProfiles'     => 'Profili Rilevati',      // Added - 2015-04-18
     'Device'               => 'Periferica',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Canale Periferica',
     'DeviceFormat'         => 'Formato',
@@ -287,14 +287,14 @@ $SLANG = array(
     'DevicePath'           => 'Percorso Dispositivo',
     'Devices'              => 'Dispositivi',
     'Dimensions'           => 'Dimensioni',
-    'DisableAlarms'        => 'Disabil Allarme',
+    'DisableAlarms'        => 'Disabilita Allarme',
     'Disk'                 => 'Utilizzo Disco',
-    'Display'              => 'Display',                // Added - 2011-01-30
-    'Displaying'           => 'Displaying',             // Added - 2011-06-16
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
+    'Display'              => 'Mostra',                // Added - 2011-01-30
+    'Displaying'           => 'Visualizzazione',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Attiva Motion Detection Nativo',
     'Donate'               => 'Donate,per favore',
     'DonateAlready'        => 'No, ho gia donato...    ',
-    'DonateEnticement'     => 'Stai usando ZoneMinder da un po\' di tempo e spero che tu lo stia trovando utile per la sicurezza di casa tua o del tuo posto di lavoro..Anche se ZoneMinder e\' distribuito liberamente come software libero,costa soldi sia svilupparlo che supportarlo. Se preferisci che questo software continui ad avere supporto e sviluppo in futuro allora considera l\idea di fare una piccola donazione. Donare e\' ovviamente opzionale, ma apprezzato e puoi donare quanto vuoi,quel poco o tanto che tu desideri.<br><br>Se hai voglia per cortesia seleziona l\'opzione sotto o punta il tuo browser a https://zoneminder.com/donate/ .<br><br>Grazie per usare ZoneMinder e non dimenticare di visitare il forum in ZoneMinder.com se cerchi supporto o hai suggerimenti riguardo a come rendere migliore Zoneminder.',
+    'DonateEnticement'     => 'Stai usando ZoneMinder da un pò di tempo e spero che tu lo stia trovando utile per la sicurezza di casa tua o del tuo posto di lavoro..Anche se ZoneMinder e\' distribuito liberamente come software libero,costa soldi sia svilupparlo che supportarlo. Se preferisci che questo software continui ad avere supporto e sviluppo in futuro allora considera l\idea di fare una piccola donazione. Donare e\' ovviamente opzionale, ma apprezzato e puoi donare quanto vuoi,quel poco o tanto che tu desideri.<br><br>Se hai voglia per cortesia seleziona l\'opzione sotto o punta il tuo browser a https://zoneminder.com/donate/ .<br><br>Grazie per usare ZoneMinder e non dimenticare di visitare il forum in ZoneMinder.com se cerchi supporto o hai suggerimenti riguardo a come rendere migliore Zoneminder.',
     'DonateRemindDay'      => 'Non ancora, ricordamelo ancora tra 1 giorno',
     'DonateRemindHour'     => 'Non ancora, ricordamelo ancora tra 1 ora',
     'DonateRemindMonth'    => 'Non ancora, ricordamelo ancora tra 1 mese',
@@ -325,24 +325,24 @@ $SLANG = array(
     'Execute'              => 'Esegui',
     'Exif'                 => 'Includi dati EXIF nell\'immagine', // Added - 2018-08-30
     'Export'               => 'Esporta',
-    'ExportDetails'        => 'Esp. dettagli eventi',
-    'ExportFailed'         => 'Esp. Fallita ',
-    'ExportFormat'         => 'Formato File Esp. ',
+    'ExportDetails'        => 'Esporta dettagli eventi',
+    'ExportFailed'         => 'Esportazione Fallita ',
+    'ExportFormat'         => 'Formato File Esportazione',
     'ExportFormatTar'      => 'Tar',
     'ExportFormatZip'      => 'Zip',
-    'ExportFrames'         => 'Dettagli frame espo.',
+    'ExportFrames'         => 'Esporta dettagli immagini',
     'ExportImageFiles'     => 'Esporta le immagini',
-    'ExportLog'            => 'Export Log',             // Added - 2011-06-17
-    'ExportMiscFiles'      => 'Esporto Altri file (se presenti)',
+    'ExportLog'            => 'Esporta Log',             // Added - 2011-06-17
+    'ExportMiscFiles'      => 'Esporta Altri file (se presenti)',
     'ExportOptions'        => 'Opzioni Esportazione',
-    'ExportSucceeded'      => 'Export completata con successo',       // Added - 2009-02-08
-    'ExportVideoFiles'     => 'Esporto File Video (se presenti)',
-    'Exporting'            => 'In corso.',
+    'ExportSucceeded'      => 'Esportazione completata con successo',       // Added - 2009-02-08
+    'ExportVideoFiles'     => 'Esporta File Video (se presenti)',
+    'Exporting'            => 'In corso',
     'FPS'                  => 'fps',
     'FPSReportInterval'    => 'Intervallo Report FPS',
     'FTP'                  => 'FTP',
     'Far'                  => 'Lontano',
-    'FastForward'          => 'Fast Forward',
+    'FastForward'          => 'Avanzamento veloce',
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
@@ -351,7 +351,7 @@ $SLANG = array(
     'FilterDeleteEvents'   => 'Elimina gli eventi',
     'FilterEmailEvents'    => 'Invia dettagli via email',
     'FilterExecuteEvents'  => 'Esegui un comando',
-    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
+    'FilterLog'            => 'Filtra log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Invia dettagli tramite messaggio',
     'FilterMoveEvents'     => 'Sposta tutti gli eventi',       // Added - 2018-08-30
     'FilterPx'             => 'Px Filtro',
@@ -388,19 +388,19 @@ $SLANG = array(
     'Grey'                 => 'Grigio',
     'Group'                => 'Gruppo',
     'Groups'               => 'Gruppi',
-    'HasFocusSpeed'        => 'Ha velocita\' di focus',
-    'HasGainSpeed'         => 'Ha velocita\' di guadagno',
+    'HasFocusSpeed'        => 'Ha velocità di focus',
+    'HasGainSpeed'         => 'Ha velocità di guadagno',
     'HasHomePreset'        => 'Ha posizioni di present',
-    'HasIrisSpeed'         => 'Ha velocota\' di iris',
-    'HasPanSpeed'          => 'Ha velocita\' di Pan',
+    'HasIrisSpeed'         => 'Ha velocotà di iris',
+    'HasPanSpeed'          => 'Ha velocità di Pan',
     'HasPresets'           => 'Ha preset',
-    'HasTiltSpeed'         => 'Ha velocita\' di Tilt',
+    'HasTiltSpeed'         => 'Ha velocità di Tilt',
     'HasTurboPan'          => 'Ha il Turbo Pan',
     'HasTurboTilt'         => 'Ha il Turbo Tilt',
-    'HasWhiteSpeed'        => 'Ha velocita\' di bilanciamento del bianco',
-    'HasZoomSpeed'         => 'Ha velocita\' di zoom',
+    'HasWhiteSpeed'        => 'Ha velocità di bilanciamento del bianco',
+    'HasZoomSpeed'         => 'Ha velocità di zoom',
     'High'                 => 'Alta',
-    'HighBW'               => 'Banda&nbsp;Alta',
+    'HighBW'               => 'Banda Alta',
     'Home'                 => 'Home',
     'Hostname'             => 'Nome Host',               // Added - 2018-08-30
     'Hour'                 => 'Ora',
@@ -445,31 +445,31 @@ $SLANG = array(
     'Mark'                 => 'Seleziona',
     'Max'                  => 'Massima',
     'MaxBandwidth'         => 'Banda Massima',
-    'MaxBrScore'           => 'Punteggio<br/>Massimo',
+    'MaxBrScore'           => 'Punteggio Massimo',
     'MaxFocusRange'        => 'Massimo range del focus',
-    'MaxFocusSpeed'        => 'Massima velocita\' del focus',
+    'MaxFocusSpeed'        => 'Massima velocità del focus',
     'MaxFocusStep'         => 'Massimo step del focus',
     'MaxGainRange'         => 'Massimo range del guadagno',
-    'MaxGainSpeed'         => 'Massima velocita\' del guadagno',
+    'MaxGainSpeed'         => 'Massima velocità del guadagno',
     'MaxGainStep'          => 'Massimo step del guadagno',
     'MaxIrisRange'         => 'Massima range dell\'Iris',
-    'MaxIrisSpeed'         => 'Massima velocita\' dell\'Iris',
+    'MaxIrisSpeed'         => 'Massima velocità dell\'Iris',
     'MaxIrisStep'          => 'Massimo step dell\'Iris',
     'MaxPanRange'          => 'Massimo range del pan',
-    'MaxPanSpeed'          => 'Massima velocita\' del tilt',
+    'MaxPanSpeed'          => 'Massima velocità del tilt',
     'MaxPanStep'           => 'Massimo step del pan',
     'MaxTiltRange'         => 'Massimo range del tilt',
-    'MaxTiltSpeed'         => 'Massima velocita\' del tilt',
+    'MaxTiltSpeed'         => 'Massima velocità del tilt',
     'MaxTiltStep'          => 'Massimo passo del tilt',
     'MaxWhiteRange'        => 'Massimo range del bilanciamento del bianco',
-    'MaxWhiteSpeed'        => 'Massima velocita\' del bilanciamento del bianco',
+    'MaxWhiteSpeed'        => 'Massima velocità del bilanciamento del bianco',
     'MaxWhiteStep'         => 'Massimo Step del bilanciamento del bianco',
     'MaxZoomRange'         => 'Massimo range dello zoom',
-    'MaxZoomSpeed'         => 'Massima velocita\' dello zoom',
+    'MaxZoomSpeed'         => 'Massima velocità dello zoom',
     'MaxZoomStep'          => 'Massimo step dello zoom',
     'MaximumFPS'           => 'Massimi FPS',
     'Medium'               => 'Media',
-    'MediumBW'             => 'Banda&nbsp;Media',
+    'MediumBW'             => 'Larghezza Banda Media',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'L\'area minima dell\'allarme deve essere minore di quella massima',
     'MinAlarmAreaUnset'    => 'Devi specificare il numero minimo di pixel per l\'allarme',
@@ -482,47 +482,47 @@ $SLANG = array(
     'MinFilterAreaUnset'   => 'Devi specificare il numero minimo di pixel per il filtro',
     'MinFilterLtMinAlarm'  => 'L\'area minima di filtro deve essere minore o uguale dell\area minima di allarme',
     'MinFocusRange'        => 'Range minimo del Focus',
-    'MinFocusSpeed'        => 'Velocita\' minima del Focus',
+    'MinFocusSpeed'        => 'Velocità minima del Focus',
     'MinFocusStep'         => 'Minimo step del Focus',
     'MinGainRange'         => 'Minimo range del Guadagno',
-    'MinGainSpeed'         => 'Velocita\' minima del Guadagno',
+    'MinGainSpeed'         => 'Velocità minima del Guadagno',
     'MinGainStep'          => 'Step minimo del guadagno',
     'MinIrisRange'         => 'Range minimo dell\'Iris',
-    'MinIrisSpeed'         => 'Velocita\' minima dell\'Iris',
+    'MinIrisSpeed'         => 'Velocità minima dell\'Iris',
     'MinIrisStep'          => 'Step minimo dell\'Iris',
     'MinPanRange'          => 'Range minimo del pan',
-    'MinPanSpeed'          => 'Velocita\' minima del Pan',
+    'MinPanSpeed'          => 'Velocità minima del Pan',
     'MinPanStep'           => 'Step minimo del Pan',
     'MinPixelThresLtMax'   => 'I pixel minimi della soglia devono essere minori dei pixel massimi della soglia',
     'MinPixelThresUnset'   => 'Devi specificare una soglia minima di pixel', // Added - 2009-02-08
     'MinTiltRange'         => 'Range minimo del Tilt',
-    'MinTiltSpeed'         => 'Velocita\' minima del Tilt',
+    'MinTiltSpeed'         => 'Velocità minima del Tilt',
     'MinTiltStep'          => 'Step minimo del Tilt',
     'MinWhiteRange'        => 'Range minimo del bilanciamento del bianco',
-    'MinWhiteSpeed'        => 'Velocita\' minima del bialnciamento del bianco',
+    'MinWhiteSpeed'        => 'Velocità minima del bialnciamento del bianco',
     'MinWhiteStep'         => 'Minimo step del bilanciamento del bianco',
     'MinZoomRange'         => 'Range minimo dello zoom',
-    'MinZoomSpeed'         => 'Velocita\' minima dello zoom',
+    'MinZoomSpeed'         => 'Velocità minima dello zoom',
     'MinZoomStep'          => 'Step minimo dello zoom',
     'Misc'                 => 'Altro',
     'Mode'                 => 'Modalità',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
-    'MonitorIds'           => 'Monitor&nbsp;Ids',
+    'MonitorIds'           => 'Monitor Ids',
     'MonitorPreset'        => 'Monitor Presenti',
     'MonitorPresetIntro'   => 'Selezionare un appropriato pre settaggio dalla lista riportata qui sotto.<br><br>Per favore notare che questo potrebbe sovrascrivere ogni valore che hai gi&agrave;  configurato su questo monitor.<br><br>',
     'MonitorProbe'         => 'Prova Monitor',          // Added - 2009-03-31
     'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
     'Monitors'             => 'Monitors',
     'Montage'              => 'Montaggio',
-    'MontageReview'        => 'Montage Review',         // Added - 2018-08-30
+    'MontageReview'        => 'Revisione del montaggio',         // Added - 2018-08-30
     'Month'                => 'Mese',
-    'More'                 => 'More',                   // Added - 2011-06-16
-    'MotionFrameSkip'      => 'Motion Frame Skip',
+    'More'                 => 'Più',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Salta/scarta fotogramma',
     'Move'                 => 'Sposta',
-    'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrx'           => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-wide grid',              // Added 2013.08.15.
+    'Mtg2widgrd'           => 'Griglia 2 colonne',              // Added 2013.08.15.
+    'Mtg3widgrd'           => 'Griglia 3 colonne',              // Added 2013.08.15.
+    'Mtg3widgrx'           => 'Griglia 3 colonne, scalata, ingrandita su allarme',              // Added 2013.08.15.
+    'Mtg4widgrd'           => 'Griglia 4 colonne',              // Added 2013.08.15.
     'MtgDefault'           => 'Predefinito',              // Added 2013.08.15.
     'MustBeGe'             => 'deve essere superiore a',
     'MustBeLe'             => 'deve essere inferiore o pari a',
@@ -609,7 +609,7 @@ $SLANG = array(
     'ProfileProbeIntro'    => 'L\'elenco seguente mostra i profili di streaming esistenti della telecamera selezionata.<br/><br/>Selezionare la voce desiderata dall\'elenco seguente.<br/><br/>Si noti che ZoneMinder non è in grado di configurare profili aggiuntivi e che la scelta di una telecamera qui può sovrascrivere qualsiasi valore già configurato per il monitor corrente.<br/><br/>', // Added - 2015-04-18
     'Progress'             => 'Progresso',               // Added - 2015-04-18
     'Protocol'             => 'Protocollo',
-    'RTSPDescribe'         => 'Use RTSP Response Media URL', // Added - 2018-08-30
+    'RTSPDescribe'         => 'Usa URL multimediale di risposta RTSP', // Added - 2018-08-30
     'RTSPTransport'        => 'RTSP Transport Protocol', // Added - 2018-08-30
     'Rate'                 => 'Velocità',
     'Real'                 => 'Reale',
@@ -622,15 +622,15 @@ $SLANG = array(
     'RemoteHostName'       => 'Nome dell\'Host Remoto',
     'RemoteHostPath'       => 'Percorso dell\'Host Remoto',
     'RemoteHostPort'       => 'Porta dell\'Host Remoto',
-    'RemoteHostSubPath'    => 'SubPath host remoto',    // Added - 2009-02-08
+    'RemoteHostSubPath'    => 'Percorso secondario dell\'Host remoto',    // Added - 2009-02-08
     'RemoteImageColours'   => 'Colori delle immagini Remote',
     'RemoteMethod'         => 'Metodo Remoto',          // Added - 2009-02-08
     'RemoteProtocol'       => 'Protocollo Remoto',        // Added - 2009-02-08
     'Rename'               => 'Rinomina',
-    'Replay'               => 'Replay',
-    'ReplayAll'            => 'All Events',
-    'ReplayGapless'        => 'Gapless Events',
-    'ReplaySingle'         => 'Single Event',
+    'Replay'               => 'Riproduci',
+    'ReplayAll'            => 'Tutti gli Eventi',
+    'ReplayGapless'        => 'Eventi continui',
+    'ReplaySingle'         => 'Evento singolo',
     'ReportEventAudit'     => 'Rapporto Eventi di controllo',    // Added - 2018-08-30
     'Reset'                => 'Resetta',
     'ResetEventCounts'     => 'Resetta Contatore Eventi',
@@ -644,7 +644,7 @@ $SLANG = array(
     'RotateLeft'           => 'Ruota a Sinista',
     'RotateRight'          => 'Ruota a Destra',
     'RunLocalUpdate'       => 'Eseguire zmupdate.pl per l\'aggiornamento', // Added - 2011-05-25
-    'RunMode'              => 'Modalita\' funzionamento',
+    'RunMode'              => 'Modalità funzionamento',
     'RunState'             => 'Stato di funzionamento',
     'Running'              => 'Attivo',
     'Save'                 => 'Salva',
@@ -679,25 +679,25 @@ $SLANG = array(
     'SourcePath'           => 'Percorso della Sorgente',            // Added - 2009-02-08
     'SourceType'           => 'Tipo Sorgente',
     'Speed'                => 'Velocita\'',
-    'SpeedHigh'            => 'Alta Velocita\'',
-    'SpeedLow'             => 'Bassa Velocita\'',
-    'SpeedMedium'          => 'Media Velocita\'',
-    'SpeedTurbo'           => 'Turbo Velocita\'',
+    'SpeedHigh'            => 'Alta Velocità',
+    'SpeedLow'             => 'Bassa Velocità',
+    'SpeedMedium'          => 'Media Velocità',
+    'SpeedTurbo'           => 'Turbo Velocità',
     'Start'                => 'Avvia',
     'State'                => 'Stato',
     'Stats'                => 'Statistiche',
     'Status'               => 'Stato',
-    'StatusConnected'      => 'Capturing',              // Added - 2018-08-30
-    'StatusNotRunning'     => 'Not Running',            // Added - 2018-08-30
-    'StatusRunning'        => 'Not Capturing',          // Added - 2018-08-30
-    'StatusUnknown'        => 'Unknown',                // Added - 2018-08-30
+    'StatusConnected'      => 'Registrazione in corso',              // Added - 2018-08-30
+    'StatusNotRunning'     => 'Non in esecuzione',            // Added - 2018-08-30
+    'StatusRunning'        => 'Registrazione in pausa',          // Added - 2018-08-30
+    'StatusUnknown'        => 'Sconosciuto',                // Added - 2018-08-30
     'Step'                 => 'Passo',
     'StepBack'             => 'Passo indietro',
     'StepForward'          => 'Passo avanti',
-    'StepLarge'            => 'Lungo passo',
-    'StepMedium'           => 'Medio passo',
-    'StepNone'             => 'No passo',
-    'StepSmall'            => 'Piccolo passo',
+    'StepLarge'            => 'Passo lungo',
+    'StepMedium'           => 'Passo medio',
+    'StepNone'             => 'Nessun passo',
+    'StepSmall'            => 'Passo piccolo',
     'Stills'               => 'Foto',
     'Stop'                 => 'Stop',
     'Stopped'              => 'Inattivo',
@@ -728,12 +728,12 @@ $SLANG = array(
     'Today'                => 'Oggi ',
     'Tools'                => 'Strumenti',
     'Total'                => 'Totale',                  // Added - 2011-06-16
-    'TotalBrScore'         => 'Punteggio<br/>Totale',
+    'TotalBrScore'         => 'Punteggio Totale',
     'TrackDelay'           => 'Track Delay',
     'TrackMotion'          => 'Track Motion',
     'Triggers'             => 'Triggers',
-    'TurboPanSpeed'        => 'Velocita\' Turbo Pan',
-    'TurboTiltSpeed'       => 'Velocita\' Turbo Tilt',
+    'TurboPanSpeed'        => 'Velocità Turbo Pan',
+    'TurboTiltSpeed'       => 'Velocità Turbo Tilt',
     'Type'                 => 'Tipo',
     'Unarchive'            => 'Togli dall\'archivio',
     'Undefined'            => 'Non specificato',              // Added - 2009-02-08
@@ -745,7 +745,7 @@ $SLANG = array(
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
     'UseFilter'            => 'Usa Filtro',
-    'UseFilterExprsPost'   => '&nbsp;espressioni&nbsp;filtri', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPost'   => ' espressioni filtri', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Usa&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
     'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Utente',
@@ -767,7 +767,7 @@ $SLANG = array(
     'VideoGenFiles'        => 'File Video Esistenti',
     'VideoGenNoFiles'      => 'Non ho trovato file ',
     'VideoGenParms'        => 'Parametri Generazione Video',
-    'VideoGenSucceeded'    => 'Successo: Generato Video  !',
+    'VideoGenSucceeded'    => 'Successo: Video Generato!',
     'VideoSize'            => 'Dimensioni Video',
     'VideoWriter'          => 'Scrittore video',           // Added - 2018-08-30
     'View'                 => 'Vedi',
@@ -782,7 +782,7 @@ $SLANG = array(
     'WebSiteUrl'           => 'Website URL',            // Added - 2018-08-30
     'Week'                 => 'Settimana',
     'White'                => 'Bianco',
-    'WhiteBalance'         => 'Bil. Bianco  ',
+    'WhiteBalance'         => 'Bilanciamento del Bianco',
     'Wide'                 => 'Larghezza',
     'X'                    => 'X',
     'X10'                  => 'X10',
@@ -795,7 +795,7 @@ $SLANG = array(
     'Zone'                 => 'Zona',
     'ZoneAlarmColour'      => 'Colore Allarme (RGB)',
     'ZoneArea'             => 'Zone Area',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
+    'ZoneExtendAlarmFrames' => 'Estendi conteggio immagini allarme',
     'ZoneFilterSize'       => 'Larghezza/Altezza Filtro (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Area Allarmata',
     'ZoneMinMaxBlobArea'   => 'Min/Max Area di Blob',
@@ -803,7 +803,7 @@ $SLANG = array(
     'ZoneMinMaxFiltArea'   => 'Min/Max Area Filtrata',
     'ZoneMinMaxPixelThres' => 'Min/Max Soglia Pixel (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
-    'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
+    'ZoneOverloadFrames'   => 'Sovraccarico - contatore immagini ignorate',
     'Zones'                => 'Zone',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Ingrandisci',

From 6dbfd2219076afb377381babb75ac6ec39ba5066 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Sep 2021 15:03:36 -0400
Subject: [PATCH 026/501] Add missing update_function_pointers so that we use
 SSE blend functions.  Significantly reduces cpu use in motion detection.

---
 src/zm_image.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 09c05550e..2b7bc69e2 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -313,6 +313,7 @@ bool Image::Assign(const AVFrame *frame, SwsContext *convert_context, AVFrame *t
     return false;
   }
   zm_dump_video_frame(temp_frame, "dest frame after convert");
+  update_function_pointers();
   return true;
 }  // end Image::Assign(const AVFrame *frame, SwsContext *convert_context, AVFrame *temp_frame)
 
@@ -687,6 +688,7 @@ void Image::AssignDirect(
   subpixelorder = p_subpixelorder;
   pixels = width * height;
   size = new_buffer_size;
+  update_function_pointers();
 }  // end void Image::AssignDirect
 
 void Image::Assign(
@@ -788,6 +790,7 @@ void Image::Assign(const Image &image) {
     linesize = image.linesize;
   }
 
+  update_function_pointers();
   if ( image.buffer != buffer )
     (*fptr_imgbufcpy)(buffer, image.buffer, size);
 }

From c4a49721d2f77128a3e3404a1a22fbabd55a08d1 Mon Sep 17 00:00:00 2001
From: Andrea Vezzali <vezza@inwind.it>
Date: Tue, 14 Sep 2021 15:16:25 +0200
Subject: [PATCH 027/501] Update it_it.php

---
 web/lang/it_it.php | 140 ++++++++++++++++++++++-----------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index b51b85300..f06b18cc4 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -84,7 +84,7 @@ $SLANG = array(
     'AddNewControl'        => 'Aggiungi nuovo Controllo',
     'AddNewMonitor'        => 'Aggiungi nuovo Monitor',
     'AddNewServer'         => 'Aggiungi nuovo Server',         // Added - 2018-08-30
-    'AddNewStorage'        => 'Aggiungi nuovo Storage',        // Added - 2018-08-30
+    'AddNewStorage'        => 'Aggiungi nuovo Archivio',        // Added - 2018-08-30
     'AddNewUser'           => 'Aggiungi nuovo Utente',
     'AddNewZone'           => 'Aggiungi nuova Zona',
     'Alarm'                => 'Allarme',
@@ -95,7 +95,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'FPS massimi durante l\'allarme',
     'AlarmPx'              => 'Pixel Allarme',
     'AlarmRGBUnset'        => 'Devi settare un colore RGB di allarme',
-    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
+    'AlarmRefImageBlendPct'=> 'Riferimento Allarme - Fusione Immagine %', // Added - 2015-04-18
     'Alert'                => 'Attenzione',
     'All'                  => 'Tutto',
     'AnalysisFPS'          => 'Analisi FPS',           // Added - 2015-07-22
@@ -103,14 +103,14 @@ $SLANG = array(
     'Apply'                => 'Applica',
     'ApplyingStateChange'  => 'Sto applicando le modifiche',
     'ArchArchived'         => 'Archiviato',
-    'ArchUnarchived'       => 'Non archiviato',
+    'ArchUnarchived'       => 'Non Archiviato',
     'Archive'              => 'Archivio',
     'Archived'             => 'Archiviato',
     'Area'                 => 'Area',
     'AreaUnits'            => 'Area (px/%)',
-    'AttrAlarmFrames'      => 'Immagini in Allarme',
+    'AttrAlarmFrames'      => 'Immagini Allarme',
     'AttrArchiveStatus'    => 'Stato Archivio',
-    'AttrAvgScore'         => 'Punteggio medio',
+    'AttrAvgScore'         => 'Punteggio Medio',
     'AttrCause'            => 'Causa',
     'AttrDiskBlocks'       => 'Blocchi disco',
     'AttrDiskPercent'      => 'Percentuale disco',
@@ -123,7 +123,7 @@ $SLANG = array(
     'AttrFilterServer'     => 'Filtro attivo su Server', // Added - 2018-08-30
     'AttrFrames'           => 'Immagini',
     'AttrId'               => 'Id',
-    'AttrMaxScore'         => 'Punteggio massimo',
+    'AttrMaxScore'         => 'Punteggio Massimo',
     'AttrMonitorId'        => 'Id Monitor',
     'AttrMonitorName'      => 'Nome Monitor',
     'AttrMonitorServer'    => 'Monitor attivo su Server', // Added - 2018-08-30
@@ -133,11 +133,11 @@ $SLANG = array(
     'AttrStartDateTime'    => 'Inizio - Data/orario',        // Added - 2018-08-30
     'AttrStartTime'        => 'Inizio - Orario',             // Added - 2018-08-30
     'AttrStartWeekday'     => 'Inizio - Giorno della settimana',          // Added - 2018-08-30
-    'AttrStateId'          => 'Stato esecuzione',              // Added - 2018-08-30
-    'AttrStorageArea'      => 'Area Salvataggio',           // Added - 2018-08-30
-    'AttrStorageServer'    => 'Server Salvataggio remoto', // Added - 2018-08-30
-    'AttrSystemLoad'       => 'Carico di sistema',
-    'AttrTotalScore'       => 'Punteggio totale',
+    'AttrStateId'          => 'Stato Esecuzione',              // Added - 2018-08-30
+    'AttrStorageArea'      => 'Area Archiviazione',           // Added - 2018-08-30
+    'AttrStorageServer'    => 'Server Archiviazione remota', // Added - 2018-08-30
+    'AttrSystemLoad'       => 'Carico Sistema',
+    'AttrTotalScore'       => 'Punteggio Totale',
     'Auto'                 => 'Auto',
     'AutoStopTimeout'      => 'Auto Stop Timeout',
     'Available'            => 'Disponibile',              // Added - 2009-03-31
@@ -181,7 +181,7 @@ $SLANG = array(
     'BlobPx'               => 'Blob Px',
     'BlobSizes'            => 'Dimensioni Blob',
     'Blobs'                => 'Blobs',
-    'Brightness'           => 'Luminosità;',
+    'Brightness'           => 'Luminosità',
     'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
     'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
@@ -213,7 +213,7 @@ $SLANG = array(
 	'CanReboot'             => 'Può Riavviare',
     'CanSetPresets'        => 'Può impostare preset',
     'CanSleep'             => 'Può andare in sleep',
-    'CanTilt'              => 'Può Tilt',
+    'CanTilt'              => 'Può inclinare',
     'CanWake'              => 'Può essere riattivato',
     'CanWhite'             => 'Può bilanciare il bianco',
     'CanWhiteAbs'          => 'Può bilanciare il bianco assoluto',
@@ -238,8 +238,8 @@ $SLANG = array(
     'ChooseLogFormat'      => 'Scegli un formato di registro',    // Added - 2011-06-17
     'ChooseLogSelection'   => 'Scegli una selezione del registro', // Added - 2011-06-17
     'ChoosePreset'         => 'Scegli Preset',
-    'Clear'                => 'Clear',                  // Added - 2011-06-16
-    'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
+    'Clear'                => 'Pulisci',                  // Added - 2011-06-16
+    'CloneMonitor'         => 'Clona',                  // Added - 2018-08-30
     'Close'                => 'Chiudi',
     'Colour'               => 'Colori',
     'Command'              => 'Comando',
@@ -257,25 +257,25 @@ $SLANG = array(
     'Contrast'             => 'Contrasto',
     'Control'              => 'Controllo',
     'ControlAddress'       => 'Indirizzo di controllo',
-    'ControlCap'           => 'Capacita\' di controllo',
-    'ControlCaps'          => 'Capacita\' di controllo',
+    'ControlCap'           => 'Capacità di controllo',
+    'ControlCaps'          => 'Capacità di controllo',
     'ControlDevice'        => 'Dispositivo di controllo',
     'ControlType'          => 'Tipo Controllo',
     'Controllable'         => 'Controllabile',
-    'Current'              => 'Current',                // Added - 2015-04-18
+    'Current'              => 'Corrente',                // Added - 2015-04-18
     'Cycle'                => 'Cicla',
     'CycleWatch'           => 'Vista Ciclica',
-    'DateTime'             => 'Date/Time',              // Added - 2011-06-16
+    'DateTime'             => 'Data/Orario',              // Added - 2011-06-16
     'Day'                  => 'Giorno',
     'Debug'                => 'Debug',
-    'DefaultRate'          => 'Default Rate',
+    'DefaultRate'          => 'Rateo predefinito',
     'DefaultScale'         => 'Scala di default',
-    'DefaultView'          => 'Visualizzazione di default',
-    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
-    'Delay'                => 'Delay',                  // Added - 2015-04-18
+    'DefaultView'          => 'Visualizzazione predefinita',
+    'Deinterlacing'        => 'Deinterlacciamento',          // Added - 2015-04-18
+    'Delay'                => 'Ritardo',                  // Added - 2015-04-18
     'Delete'               => 'Elimina',
-    'DeleteAndNext'        => 'Elimina &amp; Prossimo',
-    'DeleteAndPrev'        => 'Elimina &amp; Precedente',
+    'DeleteAndNext'        => 'Elimina e Prossimo',
+    'DeleteAndPrev'        => 'Elimina e Precedente',
     'DeleteSavedFilter'    => 'Elimina il filtro salvato',
     'Description'          => 'Descrizione',
     'DetectedCameras'      => 'Telecamere Rilevate',       // Added - 2009-03-31
@@ -298,7 +298,7 @@ $SLANG = array(
     'DonateRemindDay'      => 'Non ancora, ricordamelo ancora tra 1 giorno',
     'DonateRemindHour'     => 'Non ancora, ricordamelo ancora tra 1 ora',
     'DonateRemindMonth'    => 'Non ancora, ricordamelo ancora tra 1 mese',
-    'DonateRemindNever'    => 'No, io non voglio donare, non lo faro\' mai',
+    'DonateRemindNever'    => 'No, io non voglio donare, non lo farò mai',
     'DonateRemindWeek'     => 'Non ancora, ricordamelo ancora tra 1 settimana',
     'DonateYes'            => 'Si,mi piacerebbe donare qualcosa ora',
     'Download'             => 'Scarica',
@@ -363,12 +363,12 @@ $SLANG = array(
     'First'                => 'Primo',
     'FlippedHori'          => 'ribaltato orizzontale',
     'FlippedVert'          => 'ribaltato verticale',
-    'FnMocord'              => 'Mocord',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnNodect'              => 'Nodect',            // Added 2013.08.16.
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
+    'FnMocord'              => 'Mocord - Registrazione continua (con evidenziazione eventi)',            // Added 2013.08.16.
+    'FnModect'              => 'Modect - MOtion DEteCTtion (registrazione su rilevamento movimento)',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor - Visualizza Live',            // Added 2013.08.16.
+    'FnNodect'              => 'Nodect - No DEteCTtion (registrazione su evento esterno)',            // Added 2013.08.16.
+    'FnNone'                => 'None - Nessuno (Monitor disabilitato)',            // Added 2013.08.16.
+    'FnRecord'              => 'Record - Registrazione continua',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'Forza Allarme',
     'Format'               => 'Formato',
@@ -379,7 +379,7 @@ $SLANG = array(
     'Frames'               => 'Immagini',
     'Func'                 => 'Funz',
     'Function'             => 'Funzione',
-    'Gain'                 => 'Gain',
+    'Gain'                 => 'Guadagno',
     'General'              => 'Generale',
     'GenerateDownload'     => 'Genera download',      // Added - 2018-08-30
     'GenerateVideo'        => 'Genera video',
@@ -391,7 +391,7 @@ $SLANG = array(
     'HasFocusSpeed'        => 'Ha velocità di focus',
     'HasGainSpeed'         => 'Ha velocità di guadagno',
     'HasHomePreset'        => 'Ha posizioni di present',
-    'HasIrisSpeed'         => 'Ha velocotà di iris',
+    'HasIrisSpeed'         => 'Ha velocità di iris',
     'HasPanSpeed'          => 'Ha velocità di Pan',
     'HasPresets'           => 'Ha preset',
     'HasTiltSpeed'         => 'Ha velocità di Tilt',
@@ -414,7 +414,7 @@ $SLANG = array(
     'In'                   => 'In',
     'Include'              => 'Includi',
     'Inverted'             => 'Invertito',
-    'Iris'                 => 'Iris',
+    'Iris'                 => 'Iride',
     'KeyString'            => 'Stringa Chiave',
     'Label'                => 'Etichetta',
     'Language'             => 'Linguaggio',
@@ -438,7 +438,7 @@ $SLANG = array(
     'Logout'               => 'Logout',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => 'Bassa',
-    'LowBW'                => 'Banda&nbsp;Bassa',
+    'LowBW'                => 'Banda Bassa',
     'Main'                 => 'Principale',
     'Man'                  => 'Man',
     'Manual'               => 'Manuale',
@@ -452,9 +452,9 @@ $SLANG = array(
     'MaxGainRange'         => 'Massimo range del guadagno',
     'MaxGainSpeed'         => 'Massima velocità del guadagno',
     'MaxGainStep'          => 'Massimo step del guadagno',
-    'MaxIrisRange'         => 'Massima range dell\'Iris',
-    'MaxIrisSpeed'         => 'Massima velocità dell\'Iris',
-    'MaxIrisStep'          => 'Massimo step dell\'Iris',
+    'MaxIrisRange'         => 'Massima range dell\'Iride',
+    'MaxIrisSpeed'         => 'Massima velocità dell\'Iride',
+    'MaxIrisStep'          => 'Massimo step dell\'Iride',
     'MaxPanRange'          => 'Massimo range del pan',
     'MaxPanSpeed'          => 'Massima velocità del tilt',
     'MaxPanStep'           => 'Massimo step del pan',
@@ -470,7 +470,7 @@ $SLANG = array(
     'MaximumFPS'           => 'Massimi FPS',
     'Medium'               => 'Media',
     'MediumBW'             => 'Larghezza Banda Media',
-    'Message'              => 'Message',                // Added - 2011-06-16
+    'Message'              => 'Messaggio',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'L\'area minima dell\'allarme deve essere minore di quella massima',
     'MinAlarmAreaUnset'    => 'Devi specificare il numero minimo di pixel per l\'allarme',
     'MinBlobAreaLtMax'     => 'L\'area di blob minima deve essere minore dell\'area di blob massima',
@@ -487,10 +487,10 @@ $SLANG = array(
     'MinGainRange'         => 'Minimo range del Guadagno',
     'MinGainSpeed'         => 'Velocità minima del Guadagno',
     'MinGainStep'          => 'Step minimo del guadagno',
-    'MinIrisRange'         => 'Range minimo dell\'Iris',
-    'MinIrisSpeed'         => 'Velocità minima dell\'Iris',
-    'MinIrisStep'          => 'Step minimo dell\'Iris',
-    'MinPanRange'          => 'Range minimo del pan',
+    'MinIrisRange'         => 'Range minimo dell\'Iride',
+    'MinIrisSpeed'         => 'Velocità minima dell\'Iride',
+    'MinIrisStep'          => 'Step minimo dell\'Iride',
+    'MinPanRange'          => 'Range minimo del Pan',
     'MinPanSpeed'          => 'Velocità minima del Pan',
     'MinPanStep'           => 'Step minimo del Pan',
     'MinPixelThresLtMax'   => 'I pixel minimi della soglia devono essere minori dei pixel massimi della soglia',
@@ -550,7 +550,7 @@ $SLANG = array(
     'NoneAvailable'        => 'Nessuno disponibile',
     'Normal'               => 'Normale',
     'Notes'                => 'Note',
-    'NumPresets'           => 'Num Presets',
+    'NumPresets'           => 'Num redefiniti',
     'Off'                  => 'Off',
     'On'                   => 'On',
     'OnvifCredentialsIntro'=> 'Fornire nome utente e password per la telecamera selezionata.<br/>Se non è stato creato alcun utente per la videocamera, l\'utente qui indicato verrà creato con la password specificata.<br/><br/>', // Added - 2015-04-18
@@ -589,7 +589,7 @@ $SLANG = array(
     'Paths'                => 'Percorsi',
     'Pause'                => 'Pause',
     'Phone'                => 'Telefono',
-    'PhoneBW'              => 'Banda&nbsp;Tel',
+    'PhoneBW'              => 'Banda Tel',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
     'PixelDiff'            => 'Pixel Diff',
     'Pixels'               => 'pixels',
@@ -598,11 +598,11 @@ $SLANG = array(
     'PleaseWait'           => 'Attendere prego',
     'Plugins'              => 'Plugins',
     'Point'                => 'Punto',
-    'PostEventImageBuffer' => 'Buffer di immagini Dopo Evento',
-    'PreEventImageBuffer'  => 'Buffer di immagini Pre Evento',
+    'PostEventImageBuffer' => 'Buffer immagini Dopo Evento',
+    'PreEventImageBuffer'  => 'Buffer immagini Pre Evento',
     'PreserveAspect'       => 'Preserve Aspect Ratio',
     'Preset'               => 'Preset',
-    'Presets'              => 'Presets',
+    'Presets'              => 'Predefiniti',
     'Prev'                 => 'Prec',
     'Probe'                => 'Prova la telecamera',                  // Added - 2009-03-31
     'ProfileProbe'         => 'Prova lo stream',           // Added - 2015-04-18
@@ -632,8 +632,8 @@ $SLANG = array(
     'ReplayGapless'        => 'Eventi continui',
     'ReplaySingle'         => 'Evento singolo',
     'ReportEventAudit'     => 'Rapporto Eventi di controllo',    // Added - 2018-08-30
-    'Reset'                => 'Resetta',
-    'ResetEventCounts'     => 'Resetta Contatore Eventi',
+    'Reset'                => 'Reset',
+    'ResetEventCounts'     => 'Reset Contatore Eventi',
     'Restart'              => 'Riavvia',
     'Restarting'           => 'Sto riavviando',
     'RestrictedCameraIds'  => 'Camera Ids Riservati',
@@ -698,30 +698,30 @@ $SLANG = array(
     'StepMedium'           => 'Passo medio',
     'StepNone'             => 'Nessun passo',
     'StepSmall'            => 'Passo piccolo',
-    'Stills'               => 'Foto',
+    'Stills'               => 'Immagini fisse',
     'Stop'                 => 'Stop',
     'Stopped'              => 'Inattivo',
-    'StorageArea'          => 'Area di salvataggio',           // Added - 2018-08-30
-    'StorageScheme'        => 'Scheme',                 // Added - 2018-08-30
-    'Stream'               => 'Flusso',
-    'StreamReplayBuffer'   => 'Stream Replay Image Buffer',
+    'StorageArea'          => 'Area Archiviazione',           // Added - 2018-08-30
+    'StorageScheme'        => 'Schema Archiviazione',                 // Added - 2018-08-30
+    'Stream'               => 'Stream',
+    'StreamReplayBuffer'   => 'Buffer immagini riproduzione stream',
     'Submit'               => 'Accetta',
     'System'               => 'Sistema',
     'SystemLog'            => 'Log di sistema',             // Added - 2011-06-16
     'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Anteprima',
-    'Tilt'                 => 'Tilt',
+    'Tilt'                 => 'Tilt - Inclinazione',
     'Time'                 => 'Ora',
-    'TimeDelta'            => 'Tempo di Delta',
-    'TimeStamp'            => 'Time Stamp',
+    'TimeDelta'            => 'Differenza orario',
+    'TimeStamp'            => 'Sovraimpressione data/orario',
     'Timeline'             => 'Linea Temporale',
     'TimelineTip1'          => 'Passa il mouse sul grafico per visualizzare un\'immagine dell\'istantanea e i dettagli dell\'evento.',              // Added 2013.08.15.
     'TimelineTip2'          => 'Fai clic sulle sezioni colorate del grafico o sull\'immagine per visualizzare l\'evento.',              // Added 2013.08.15.
     'TimelineTip3'          => 'Fare clic sullo sfondo per ingrandire un periodo di tempo più piccolo basato sul clic.',              // Added 2013.08.15.
     'TimelineTip4'          => 'Utilizzare i controlli seguenti per ridurre o spostarsi avanti e indietro nell\'intervallo di tempo.',              // Added 2013.08.15.
-    'Timestamp'            => 'Timestamp',
-    'TimestampLabelFormat' => 'Formato etichetta timestamp',
+    'Timestamp'            => 'Sovraimpressione data/orario',
+    'TimestampLabelFormat' => 'Formato etichetta Sovraimpressione data/orario',
     'TimestampLabelSize'   => 'Dimensione carattere',              // Added - 2018-08-30
     'TimestampLabelX'      => 'coordinata X etichetta',
     'TimestampLabelY'      => 'coordinata Y etichetta',
@@ -729,9 +729,9 @@ $SLANG = array(
     'Tools'                => 'Strumenti',
     'Total'                => 'Totale',                  // Added - 2011-06-16
     'TotalBrScore'         => 'Punteggio Totale',
-    'TrackDelay'           => 'Track Delay',
-    'TrackMotion'          => 'Track Motion',
-    'Triggers'             => 'Triggers',
+    'TrackDelay'           => 'Ritardo traccia',
+    'TrackMotion'          => 'Segui movimento',
+    'Triggers'             => 'Inneschi/Interruttori',
     'TurboPanSpeed'        => 'Velocità Turbo Pan',
     'TurboTiltSpeed'       => 'Velocità Turbo Tilt',
     'Type'                 => 'Tipo',
@@ -742,17 +742,17 @@ $SLANG = array(
     'Update'               => 'Aggiorna',
     'UpdateAvailable'      => 'Un aggiornamento di ZoneMinder è disponibilie.',
     'UpdateNotNecessary'   => 'Nessun aggiornamento necessario.',
-    'Updated'              => 'Updated',                // Added - 2011-06-16
-    'Upload'               => 'Upload',                 // Added - 2011-08-23
+    'Updated'              => 'Aggiornato',                // Added - 2011-06-16
+    'Upload'               => 'Carica',                 // Added - 2011-08-23
     'UseFilter'            => 'Usa Filtro',
     'UseFilterExprsPost'   => ' espressioni filtri', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Usa&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
-    'UsedPlugins'	   => 'Used Plugins',
+    'UsedPlugins'	   => 'Plugins in uso',
     'User'                 => 'Utente',
     'Username'             => 'Nome Utente',
     'Users'                => 'Utenti',
     'V4L'                  => 'V4L',                    // Added - 2015-04-18
-    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Rilevamenti per immagine',     // Added - 2015-04-18
     'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Valore',
     'Version'              => 'Versione',
@@ -769,7 +769,7 @@ $SLANG = array(
     'VideoGenParms'        => 'Parametri Generazione Video',
     'VideoGenSucceeded'    => 'Successo: Video Generato!',
     'VideoSize'            => 'Dimensioni Video',
-    'VideoWriter'          => 'Scrittore video',           // Added - 2018-08-30
+    'VideoWriter'          => 'Scrittore Video',           // Added - 2018-08-30
     'View'                 => 'Vedi',
     'ViewAll'              => 'Vedi Tutto',
     'ViewEvent'            => 'Vedi Evento',
@@ -789,7 +789,7 @@ $SLANG = array(
     'X10ActivationString'  => 'Stringa attivazione X10',
     'X10InputAlarmString'  => 'Stringa allarme input X10',
     'X10OutputAlarmString' => 'Stringa allarme output X10',
-    'Y'                    => 'Y',
+    'Y'                    => 'S',
     'Yes'                  => 'Si',
     'YouNoPerms'           => 'Non hai i permessi per accedere a questa risorsa.',
     'Zone'                 => 'Zona',

From 787b7f1874141ca675081db0fe6b945d88fe078a Mon Sep 17 00:00:00 2001
From: Andrea Vezzali <vezza@inwind.it>
Date: Tue, 14 Sep 2021 15:39:53 +0200
Subject: [PATCH 028/501] Update it_it.php

---
 web/lang/it_it.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index f06b18cc4..4cdb24ee9 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -631,7 +631,7 @@ $SLANG = array(
     'ReplayAll'            => 'Tutti gli Eventi',
     'ReplayGapless'        => 'Eventi continui',
     'ReplaySingle'         => 'Evento singolo',
-    'ReportEventAudit'     => 'Rapporto Eventi di controllo',    // Added - 2018-08-30
+    'ReportEventAudit'     => 'Controllo Eventi',    // Added - 2018-08-30
     'Reset'                => 'Reset',
     'ResetEventCounts'     => 'Reset Contatore Eventi',
     'Restart'              => 'Riavvia',
@@ -671,14 +671,14 @@ $SLANG = array(
     'Size'                 => 'grandezza',
     'SkinDescription'      => 'Cambia la skin predefinita per questo computer', // Added - 2011-01-30
     'Sleep'                => 'Sleep',
-    'SortAsc'              => 'Cresc',
+    'SortAsc'              => 'Crescente',
     'SortBy'               => 'Ordina per',
-    'SortDesc'             => 'Decr',
+    'SortDesc'             => 'Decrescente',
     'Source'               => 'Sorgente',
     'SourceColours'        => 'Colori della Sorgente',         // Added - 2009-02-08
     'SourcePath'           => 'Percorso della Sorgente',            // Added - 2009-02-08
     'SourceType'           => 'Tipo Sorgente',
-    'Speed'                => 'Velocita\'',
+    'Speed'                => 'Velocità',
     'SpeedHigh'            => 'Alta Velocità',
     'SpeedLow'             => 'Bassa Velocità',
     'SpeedMedium'          => 'Media Velocità',
@@ -708,10 +708,10 @@ $SLANG = array(
     'Submit'               => 'Accetta',
     'System'               => 'Sistema',
     'SystemLog'            => 'Log di sistema',             // Added - 2011-06-16
-    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
+    'TargetColorspace'     => 'Spazio dei colori obiettivo',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Anteprima',
-    'Tilt'                 => 'Tilt - Inclinazione',
+    'Tilt'                 => 'Tilt (Inclinazione)',
     'Time'                 => 'Ora',
     'TimeDelta'            => 'Differenza orario',
     'TimeStamp'            => 'Sovraimpressione data/orario',

From c7aa41502aea2b6ab65fcaec5fb8c5ffa2981897 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Sep 2021 10:26:07 -0400
Subject: [PATCH 029/501] Fix js error in montage review when using scaled
 mode.  Fixes #3351

---
 web/skins/classic/views/js/montagereview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index 4650e7e21..787a910d0 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -498,8 +498,8 @@ function redrawScreen() {
     drawGraph();
   }
 
+  var monitors = $j('#monitors');
   if ( fitMode == 1 ) {
-    var monitors = $j('#monitors');
     var fps = $j('#fps');
     var vh = window.innerHeight;
     var mh = (vh - monitors.position().top - fps.outerHeight());

From 120d9764bce6796e6e0e5bd979ae2104603a63df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Sep 2021 13:38:55 -0400
Subject: [PATCH 030/501] notify anyone waiting in packetqueue before waiting
 on a packet in motion detection. Should fix decode lockup

---
 src/zm_monitor.cpp   | 1 +
 src/zm_packetqueue.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 44e032979..5a2c646ab 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1846,6 +1846,7 @@ bool Monitor::Analyse() {
           while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
             Debug(1, "Waiting for decode");
+            packetqueue.notify_all(); // decode might be waiting
             packet_lock->wait();
             if (!snap->image and snap->decoded) {
               Debug(1, "No image but was decoded, giving up");
diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h
index 7e2f367fc..2fc29ea33 100644
--- a/src/zm_packetqueue.h
+++ b/src/zm_packetqueue.h
@@ -81,6 +81,7 @@ class PacketQueue {
     );
     bool is_there_an_iterator_pointing_to_packet(const std::shared_ptr<ZMPacket> &zm_packet);
     void unlock(ZMLockedPacket *lp);
+    void notify_all() { condition.notify_all(); };
 };
 
 #endif /* ZM_PACKETQUEUE_H */

From 8272411bb2320233035fff04be01a3e9b0e96e48 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Sep 2021 15:47:35 -0400
Subject: [PATCH 031/501] Revert "use get_packet_and_increment_it instead of
 the two step to improve locking"

This reverts commit a44bbf8e345d3eefea92e2b05bb1034ae1bd46b7.
---
 src/zm_monitor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 5a2c646ab..eb65ac6f0 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1723,7 +1723,7 @@ bool Monitor::Analyse() {
   // if have event, send frames until we find a video packet, at which point do analysis. Adaptive skip should only affect which frames we do analysis on.
 
   // get_analysis_packet will lock the packet and may wait if analysis_it is at the end
-  ZMLockedPacket *packet_lock = packetqueue.get_packet_and_increment_it(analysis_it);
+  ZMLockedPacket *packet_lock = packetqueue.get_packet(analysis_it);
   if (!packet_lock) return false;
   std::shared_ptr<ZMPacket> snap = packet_lock->packet_;
 
@@ -1731,11 +1731,13 @@ bool Monitor::Analyse() {
   if (snap->score != -1) {
     Error("skipping because score was %d", snap->score);
     packetqueue.unlock(packet_lock);
+    packetqueue.increment_it(analysis_it);
     return false;
   }
 
   // Store the it that points to our snap we will need it later
-  packetqueue_iterator snap_it = std::prev(*analysis_it);
+  packetqueue_iterator snap_it = *analysis_it;
+  packetqueue.increment_it(analysis_it);
 
   // signal is set by capture
   bool signal = shared_data->signal;

From de299ab8829d28e8fbe0e1cca1419f439c1590ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Sep 2021 16:21:32 -0400
Subject: [PATCH 032/501] More properly fix the threading lock.  Instead of
 waiting on a packet, release it and wait on the packetqueue.

---
 src/zm_monitor.cpp     | 30 +++++++++++++++++-------------
 src/zm_packetqueue.cpp |  9 +++++++++
 src/zm_packetqueue.h   |  3 ++-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index eb65ac6f0..38160e354 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1735,10 +1735,6 @@ bool Monitor::Analyse() {
     return false;
   }
 
-  // Store the it that points to our snap we will need it later
-  packetqueue_iterator snap_it = *analysis_it;
-  packetqueue.increment_it(analysis_it);
-
   // signal is set by capture
   bool signal = shared_data->signal;
   bool signal_change = (signal != last_signal);
@@ -1848,8 +1844,15 @@ bool Monitor::Analyse() {
           while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
             Debug(1, "Waiting for decode");
+            packetqueue.unlock(packet_lock);
             packetqueue.notify_all(); // decode might be waiting
-            packet_lock->wait();
+            packetqueue.wait();
+
+            // Another thread may have moved our it. Unlikely but possible
+            packet_lock = packetqueue.get_packet(analysis_it);
+            if (!packet_lock) return false;
+            snap = packet_lock->packet_;
+
             if (!snap->image and snap->decoded) {
               Debug(1, "No image but was decoded, giving up");
               delete packet_lock;
@@ -1947,14 +1950,14 @@ bool Monitor::Analyse() {
               // Must start on a keyframe so rewind. Only for passthrough though I guess.
               // FIXME this iterator is not protected from invalidation
               packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
-                  snap_it, 0 /* pre_event_count */
+                  *analysis_it, 0 /* pre_event_count */
                   );
 
               // This gets a lock on the starting packet
 
               ZMLockedPacket *starting_packet_lock = nullptr;
               std::shared_ptr<ZMPacket> starting_packet = nullptr;
-              if (*start_it != snap_it) {
+              if (*start_it != *analysis_it) {
                 starting_packet_lock = packetqueue.get_packet(start_it);
                 if (!starting_packet_lock) {
                   Warning("Unable to get starting packet lock");
@@ -1968,12 +1971,12 @@ bool Monitor::Analyse() {
 
               event = new Event(this, starting_packet->timestamp, "Continuous", noteSetMap);
               // Write out starting packets, do not modify packetqueue it will garbage collect itself
-              while (starting_packet and ((*start_it) != snap_it)) {
+              while (starting_packet and ((*start_it) != *analysis_it)) {
                 event->AddPacket(starting_packet);
                 // Have added the packet, don't want to unlock it until we have locked the next
 
                 packetqueue.increment_it(start_it);
-                if ((*start_it) == snap_it) {
+                if ((*start_it) == *analysis_it) {
                   if (starting_packet_lock) delete starting_packet_lock;
                   break;
                 }
@@ -2051,12 +2054,12 @@ bool Monitor::Analyse() {
 
               if (!event) {
                 packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
-                    snap_it,
+                    *analysis_it,
                     (pre_event_count > alarm_frame_count ? pre_event_count : alarm_frame_count)
                     );
                 ZMLockedPacket *starting_packet_lock = nullptr;
                 std::shared_ptr<ZMPacket> starting_packet = nullptr;
-                if (*start_it != snap_it) {
+                if (*start_it != *analysis_it) {
                   starting_packet_lock = packetqueue.get_packet(start_it);
                   if (!starting_packet_lock) return false;
                   starting_packet = starting_packet_lock->packet_;
@@ -2071,11 +2074,11 @@ bool Monitor::Analyse() {
                 shared_data->state = state = ALARM;
 
                 // Write out starting packets, do not modify packetqueue it will garbage collect itself
-                while (*start_it != snap_it) {
+                while (*start_it != *analysis_it) {
                   event->AddPacket(starting_packet);
 
                   packetqueue.increment_it(start_it);
-                  if ( (*start_it) == snap_it ) {
+                  if ( (*start_it) == (*analysis_it) ) {
                     if (starting_packet_lock) delete starting_packet_lock;
                     break;
                   }
@@ -2262,6 +2265,7 @@ bool Monitor::Analyse() {
     if (function == MODECT or function == MOCORD)
       UpdateAnalysisFPS();
   }
+  packetqueue.increment_it(analysis_it);
   packetqueue.unlock(packet_lock);
   shared_data->last_read_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 67ba35c0f..43ab20d1e 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -663,3 +663,12 @@ void PacketQueue::setPreEventVideoPackets(int p) {
     pre_event_video_packet_count = 1;
   // We can simplify a lot of logic in queuePacket if we can assume at least 1 packet in queue
 }
+
+void PacketQueue::notify_all() {
+  condition.notify_all();
+};
+
+void PacketQueue::wait() {
+  std::unique_lock<std::mutex> lck(mutex);
+  condition.wait(lck);
+}
diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h
index 2fc29ea33..20cfdfe85 100644
--- a/src/zm_packetqueue.h
+++ b/src/zm_packetqueue.h
@@ -81,7 +81,8 @@ class PacketQueue {
     );
     bool is_there_an_iterator_pointing_to_packet(const std::shared_ptr<ZMPacket> &zm_packet);
     void unlock(ZMLockedPacket *lp);
-    void notify_all() { condition.notify_all(); };
+    void notify_all();
+    void wait();
 };
 
 #endif /* ZM_PACKETQUEUE_H */

From cddb9d88bf4eb59e70fb2e87ce18e093521f0457 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Sep 2021 18:08:50 -0400
Subject: [PATCH 033/501] Add support for package version

---
 utils/packpack/startpackpack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index e8a8a182d..2ea949078 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -223,7 +223,7 @@ setdebpkgname () {
     if [ "" == "$VERSION" ]; then
       export VERSION="${versionfile}~${thedate}.${numcommits}"
     fi
-    export RELEASE="${DIST}"
+    export RELEASE="${DIST}${PACKAGE_VERSION}"
 
     checkvars
 

From 38cda24b5383b79b92ed659455ee9f33a5c6ce9b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Sep 2021 12:53:41 -0400
Subject: [PATCH 034/501] wait won't wake up other threads, so notify first.
 Since we have the lock, this should be ok

---
 src/zm_packetqueue.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 43ab20d1e..cef7e8e2f 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -133,6 +133,7 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
       if (max_video_packet_count > 0) {
         while (packet_counts[video_stream_id] > max_video_packet_count) {
           Error("Unable to free up older packets.  Waiting.");
+          condition.notify_all();
           condition.wait(lck);
           if (deleting or zm_terminate)
             return false;

From c5f46231042195d25dad3c321bcb1a5579d77c39 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Sep 2021 12:55:49 -0400
Subject: [PATCH 035/501] Don't crash when unable to create source. erase will
 call the desctructor.  Fixes #3344

---
 src/zm_rtsp_server.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/zm_rtsp_server.cpp b/src/zm_rtsp_server.cpp
index 2276850cd..ea6f4e2b7 100644
--- a/src/zm_rtsp_server.cpp
+++ b/src/zm_rtsp_server.cpp
@@ -269,9 +269,8 @@ int main(int argc, char *argv[]) {
           Warning("Unknown format in %s", videoFifoPath.c_str());
         }
         if (videoSource == nullptr) {
-          Error("Unable to create source");
+          Error("Unable to create source for %s", videoFifoPath.c_str());
           rtspServer->RemoveSession(sessions[monitor->Id()]->GetMediaSessionId());
-          delete sessions[monitor->Id()];
           sessions.erase(monitor->Id());
           continue;
         }

From e63be2b18ed3b362b5db198d7da16204f00a6cd7 Mon Sep 17 00:00:00 2001
From: Mike Dussault <mike.dussault@gmail.com>
Date: Wed, 15 Sep 2021 10:13:02 -0700
Subject: [PATCH 036/501] Fixed a bug in Image::Buffer that would return the
 wrong location in the image if the image had > 1 channels (and if the request
 were for x > 0).

---
 src/zm_image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_image.h b/src/zm_image.h
index ccbae9f86..24626d789 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -181,7 +181,7 @@ class Image {
 
     /* Internal buffer should not be modified from functions outside of this class */
     inline const uint8_t* Buffer() const { return buffer; }
-    inline const uint8_t* Buffer(unsigned int x, unsigned int y=0) const { return &buffer[(y*linesize)+x]; }
+    inline const uint8_t* Buffer(unsigned int x, unsigned int y=0) const { return &buffer[(y*linesize) + x*colours]; }
     /* Request writeable buffer */
     uint8_t* WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder);
     // Is only acceptable on a pre-allocated buffer

From c233ec3b8c63f7c602395ccdb88bed0cc362b247 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Sep 2021 13:38:00 -0400
Subject: [PATCH 037/501] Remove redundant notify_all, spelling mistake

---
 src/zm_monitor.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 38160e354..9a5144623 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1844,8 +1844,7 @@ bool Monitor::Analyse() {
           while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
             Debug(1, "Waiting for decode");
-            packetqueue.unlock(packet_lock);
-            packetqueue.notify_all(); // decode might be waiting
+            packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
             packetqueue.wait();
 
             // Another thread may have moved our it. Unlikely but possible
@@ -3070,7 +3069,7 @@ int Monitor::PrimeCapture() {
       Debug(1, "Creating decoder thread");
       decoder = zm::make_unique<DecoderThread>(this);
     } else {
-      Debug(1, "Restartg decoder thread");
+      Debug(1, "Restarting decoder thread");
       decoder->Start();
     }
   }

From 874552c06b2de7b5fd329d09a88bbd96febc3475 Mon Sep 17 00:00:00 2001
From: ColorfullyZhang <36832299+ColorfullyZhang@users.noreply.github.com>
Date: Thu, 16 Sep 2021 14:41:24 +0800
Subject: [PATCH 038/501] Set mysql character set to utf8 explicitly to support
 chinese characters (or other special characters).

---
 src/zm_db.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index 0d499edbd..c6cc452b9 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -102,6 +102,7 @@ bool zmDbConnect() {
   if ( mysql_query(&dbconn, "SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED") ) {
     Error("Can't set isolation level: %s", mysql_error(&dbconn));
   }
+  mysql_set_character_set(&dbconn, "utf8");
   zmDbConnected = true;
   return zmDbConnected;
 }

From 9e4f203632bad8193f07bd9cc64834a00a9b684d Mon Sep 17 00:00:00 2001
From: ColorfullyZhang <36832299+ColorfullyZhang@users.noreply.github.com>
Date: Thu, 16 Sep 2021 18:24:37 +0800
Subject: [PATCH 039/501] Set character set as utf8 when connect to mysql to
 avoid mistakes when there are Chinese characters in storage path.

---
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 18df301f3..35d2dc6fa 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -107,6 +107,7 @@ sub zmDbConnect {
         .$socket . $sslOptions . ($options?join(';', '', map { $_.'='.$$options{$_} } keys %{$options} ) : '')
         , $ZoneMinder::Config::Config{ZM_DB_USER}
         , $ZoneMinder::Config::Config{ZM_DB_PASS}
+        , { mysql_enable_utf8 => 1, }
         );
     };
     if ( !$dbh or $@ ) {

From 0bf417bae0736673ce987d2924a8f610b89b0eaf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Sep 2021 10:03:21 -0400
Subject: [PATCH 040/501] Reduce logging level to debug dealing with index ==
 -1, which is used in zmu to mean the last captured image. Fixes #3354

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 9a5144623..723d4f7b5 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1153,7 +1153,7 @@ void Monitor::AddPrivacyBitmask() {
 
 int Monitor::GetImage(int32_t index, int scale) {
   if (index < 0 || index > image_buffer_count) {
-    Warning("Invalid index %d passed. image_buffer_count = %d", index, image_buffer_count);
+    Debug(1, "Invalid index %d passed. image_buffer_count = %d", index, image_buffer_count);
     index = shared_data->last_write_index;
   }
   if (!image_buffer.size() or static_cast<size_t>(index) >= image_buffer.size()) {

From e75d5a89e928c9f47a6e3ac17027498e5e0eedc8 Mon Sep 17 00:00:00 2001
From: Andrea Vezzali <vezza@inwind.it>
Date: Mon, 20 Sep 2021 14:02:35 +0200
Subject: [PATCH 041/501] Update italian (it_it) translation (#3357)

---
 web/lang/it_it.php | 105 +++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 4cdb24ee9..55fb3b34a 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -184,46 +184,46 @@ $SLANG = array(
     'Brightness'           => 'Luminosità',
     'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
-    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
-    'CanAutoFocus'         => 'Può Auto Focus',
-    'CanAutoGain'          => 'Può Auto Gains',
-    'CanAutoIris'          => 'Può Auto Iris',
-    'CanAutoWhite'         => 'Può Auto bil bianco',
-    'CanAutoZoom'          => 'Può Auto Zoom',
-    'CanFocus'             => 'Può Fuoco',
-    'CanFocusAbs'          => 'Può Fuoco Assoluto',
-    'CanFocusCon'          => 'Può Fuoco Continuo ',
-    'CanFocusRel'          => 'Può Fuoco Relativo',
-    'CanGain'              => 'Può Gain ',
-    'CanGainAbs'           => 'Può Gain Assoluto',
-    'CanGainCon'           => 'Può Gain Continuo  ',
-    'CanGainRel'           => 'Può Gain Relativo',
-    'CanIris'              => 'Può Iris',
-    'CanIrisAbs'           => 'Può Iris Assoluto',
-    'CanIrisCon'           => 'Può Iris Continuo  ',
-    'CanIrisRel'           => 'Può Iris Relativo',
-    'CanMove'              => 'Può Mov.',
-    'CanMoveAbs'           => 'Può Mov. Assoluto',
-    'CanMoveCon'           => 'Può Mov. Continuo  ',
-    'CanMoveDiag'          => 'Può Mov. Diagonale ',
-    'CanMoveMap'           => 'Può Mov Mappato',
-    'CanMoveRel'           => 'Può Mov. Relativo',
-    'CanPan'               => 'Può Pan' ,
-    'CanReset'             => 'Può Reset',
-	'CanReboot'             => 'Può Riavviare',
-    'CanSetPresets'        => 'Può impostare preset',
-    'CanSleep'             => 'Può andare in sleep',
+    'CSSDescription'       => 'Modificare il css predefinito per questo computer', // Added - 2015-04-18
+    'CanAutoFocus'         => 'Può impostare Auto Focus',
+    'CanAutoGain'          => 'Può impostare Auto Gains',
+    'CanAutoIris'          => 'Può impostare Auto Iris',
+    'CanAutoWhite'         => 'Può impostare Auto bil bianco',
+    'CanAutoZoom'          => 'Può impostare Auto Zoom',
+    'CanFocus'             => 'Può impostare Fuoco',
+    'CanFocusAbs'          => 'Può impostare Fuoco Assoluto',
+    'CanFocusCon'          => 'Può impostare Fuoco Continuo',
+    'CanFocusRel'          => 'Può impostare Fuoco Relativo',
+    'CanGain'              => 'Può impostare Guadagno',
+    'CanGainAbs'           => 'Può impostare Guadagno Assoluto',
+    'CanGainCon'           => 'Può impostare Guadagno Continuo  ',
+    'CanGainRel'           => 'Può impostare Guadagno Relativo',
+    'CanIris'              => 'Può impostare Iride',
+    'CanIrisAbs'           => 'Può impostare Iride Assoluto',
+    'CanIrisCon'           => 'Può impostare Iride Continuo',
+    'CanIrisRel'           => 'Può impostare Iride Relativo',
+    'CanMove'              => 'Può impostare Movimento',
+    'CanMoveAbs'           => 'Può impostare Movimento Assoluto',
+    'CanMoveCon'           => 'Può impostare Movimento Continuo',
+    'CanMoveDiag'          => 'Può impostare Movimento Diagonale',
+    'CanMoveMap'           => 'Può impostare Movimento Mappato',
+    'CanMoveRel'           => 'Può impostare Movimento Relativo',
+    'CanPan'               => 'Può impostare Panoramica' ,
+    'CanReset'             => 'Può effettuare Reset',
+    'CanReboot'            => 'Può Riavviare',
+    'CanSetPresets'        => 'Può impostare Preset',
+    'CanSleep'             => 'Può sospendere',
     'CanTilt'              => 'Può inclinare',
-    'CanWake'              => 'Può essere riattivato',
+    'CanWake'              => 'Può riattivare',
     'CanWhite'             => 'Può bilanciare il bianco',
     'CanWhiteAbs'          => 'Può bilanciare il bianco assoluto',
     'CanWhiteBal'          => 'Può bilanciare il bianco',
     'CanWhiteCon'          => 'Può bilanciare il bianco Continuo',
     'CanWhiteRel'          => 'Può bilanciare il bianco Relativo',
-    'CanZoom'              => 'Può Zoom',
-    'CanZoomAbs'           => 'Può Zoom Assoluto',
-    'CanZoomCon'           => 'Può Zoom Continuo',
-    'CanZoomRel'           => 'Può Zoom Relativo',
+    'CanZoom'              => 'Può impostare Zoom',
+    'CanZoomAbs'           => 'Può impostare Zoom Assoluto',
+    'CanZoomCon'           => 'Può impostare Zoom Continuo',
+    'CanZoomRel'           => 'Può impostare Zoom Relativo',
     'Cancel'               => 'Annulla',
     'CancelForcedAlarm'    => 'Annulla Allarme Forzato',
     'CaptureHeight'        => 'Altezza Cattura Immagine',
@@ -401,6 +401,7 @@ $SLANG = array(
     'HasZoomSpeed'         => 'Ha velocità di zoom',
     'High'                 => 'Alta',
     'HighBW'               => 'Banda Alta',
+    'Hight'                => 'Altezza',
     'Home'                 => 'Home',
     'Hostname'             => 'Nome Host',               // Added - 2018-08-30
     'Hour'                 => 'Ora',
@@ -508,10 +509,10 @@ $SLANG = array(
     'Mode'                 => 'Modalità',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Monitor Ids',
-    'MonitorPreset'        => 'Monitor Presenti',
-    'MonitorPresetIntro'   => 'Selezionare un appropriato pre settaggio dalla lista riportata qui sotto.<br><br>Per favore notare che questo potrebbe sovrascrivere ogni valore che hai gi&agrave;  configurato su questo monitor.<br><br>',
+    'MonitorPreset'        => 'Monitor Preset',
+    'MonitorPresetIntro'   => 'Selezionare un preset appropriato dalla lista riportata qui sotto.<br><br>Notare che questo potrebbe sovrascrivere ogni valore che hai già configurato su questo monitor.<br><br>',
     'MonitorProbe'         => 'Prova Monitor',          // Added - 2009-03-31
-    'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
+    'MonitorProbeIntro'    => 'L\'elenco seguente mostra le telecamere analogiche e di rete rilevate e se sono già in uso o disponibili per la selezione.<br/><br/>Selezionare la voce desiderata dall\'elenco seguente.<br/><br/>Si noti che non tutte le telecamere possono essere rilevate e che la scelta di una telecamera qui potrebbe sovrascrivere tutti i valori già configurati per il monitor corrente.<br/><br/>', // Added - 2009-03-31
     'Monitors'             => 'Monitors',
     'Montage'              => 'Montaggio',
     'MontageReview'        => 'Revisione del montaggio',         // Added - 2018-08-30
@@ -661,16 +662,17 @@ $SLANG = array(
     'SelectMonitors'       => 'Monitor Selezionati',
     'SelfIntersecting'     => 'I vertici del poligono non devono intersecarsi',
     'Set'                  => 'Imposta',
-    'SetNewBandwidth'      => 'Imposta nuova Banda',
-    'SetPreset'            => 'Imposta Preset',
+    'SetNewBandwidth'      => 'Imposta Nuova Banda',
+    'SetPreset'            => 'Imposta Predefiniti',
     'Settings'             => 'Impostazioni',
-    'ShowFilterWindow'     => 'MostraFinestraFiltri',
+    'ShowFilterWindow'     => 'Mostra Finestra Filtri',
     'ShowTimeline'         => 'Mostra linea temporale',
+	'Show Zones'           => 'Visualizza Zone',
     'SignalCheckColour'    => 'Colore controllo segnale',
     'SignalCheckPoints'    => 'Punti di controllo segnale',    // Added - 2018-08-30
     'Size'                 => 'grandezza',
     'SkinDescription'      => 'Cambia la skin predefinita per questo computer', // Added - 2011-01-30
-    'Sleep'                => 'Sleep',
+    'Sleep'                => 'Sospendi',
     'SortAsc'              => 'Crescente',
     'SortBy'               => 'Ordina per',
     'SortDesc'             => 'Decrescente',
@@ -747,7 +749,7 @@ $SLANG = array(
     'UseFilter'            => 'Usa Filtro',
     'UseFilterExprsPost'   => ' espressioni filtri', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Usa&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
-    'UsedPlugins'	   => 'Plugins in uso',
+    'UsedPlugins'		   => 'Plugins in uso',
     'User'                 => 'Utente',
     'Username'             => 'Nome Utente',
     'Users'                => 'Utenti',
@@ -784,6 +786,7 @@ $SLANG = array(
     'White'                => 'Bianco',
     'WhiteBalance'         => 'Bilanciamento del Bianco',
     'Wide'                 => 'Larghezza',
+    'Width'                => 'Larghezza',
     'X'                    => 'X',
     'X10'                  => 'X10',
     'X10ActivationString'  => 'Stringa attivazione X10',
@@ -937,17 +940,17 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
-		          "Examples (do not enter quotes)~~~~".
-		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
-		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		'Help' => "I parametri in questo campo vengono passati a FFmpeg. Più parametri possono essere separati da ,~~ ".
+		          "Esempi (non inserire virgolette)~~~~".
+		          "\"allowed_media_types=video\" Imposta il tipo di dati da richiedere dalla telecamera (audio, video, data)~~~~".
+		          "\"reorder_queue_size=nnn\" Imposta il numero di pacchetti nel buffer per la gestione dei pacchetti riordinati~~~~".
+		          "\"loglevel=debug\" Imposta la verbosità di FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
-		          "Examples (do not enter quotes)~~~~".
-		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
-		          "\"--verbose=2\" Set verbosity of libVLC"
+		'Help' => "I parametri in questo campo vengono passati a libVLC. Più parametri possono essere separati da ,~~ ".
+		          "Esempi (non inserire virgolette)~~~~".
+		          "\"--rtp-client-port=nnn\" Imposta la porta locale da utilizzare per i dati RTP~~~~". 
+		          "\"--verbose=2\" Imposta la verbosità di of libVLC"
 	),
 
 	

From d81be9701a64a61a603dc0be58ca60d080ad9584 Mon Sep 17 00:00:00 2001
From: 5472qaywsx <39193575+5472qaywsx@users.noreply.github.com>
Date: Mon, 20 Sep 2021 14:04:07 +0200
Subject: [PATCH 042/501] Docs: Fix a typo (#3358)

---
 docs/installationguide/packpack.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/packpack.rst b/docs/installationguide/packpack.rst
index fc1d6c077..64a6b4004 100644
--- a/docs/installationguide/packpack.rst
+++ b/docs/installationguide/packpack.rst
@@ -77,7 +77,7 @@ To start the build, simply execute the following command from the root folder of
 
 	OS=<distroname> DIST=<distrorel> utils/packpack/startpackpack.sh
 
-Where <distroname> is the name of the distro you wish to build on, such as fedora, and <distrorev> is release name or number of the distro you wish to build on. Redhat distros expect a number for <distrorev> while Debian and Ubuntu distros expect a name. For example:
+Where <distroname> is the name of the distro you wish to build on, such as fedora, and <distrorel> is the release name or number of the distro you wish to build on. Redhat distros expect a number for <distrorel> while Debian and Ubuntu distros expect a name. For example:
 
 ::
 

From 2a0ddc6337c4b46ac859a0ffa6179e20d5b34dfc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 20 Sep 2021 13:48:13 -0400
Subject: [PATCH 043/501] Add open collective username

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 8804e639c..5994f0e6b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,7 +2,7 @@
 
 github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: zoneminder # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
+open_collective: zoneminder # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

From 4bdf965dcb453273069dd0f4ce7a8233064f41f2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 20 Sep 2021 16:02:37 -0400
Subject: [PATCH 044/501] Set rows on email textarea

---
 web/skins/classic/views/filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index efb3eed15..60cc585d4 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -493,7 +493,7 @@ if ( ZM_OPT_EMAIL ) {
               </p>
               <p>
                 <label><?php echo translate('FilterEmailBody') ?></label>
-                <textarea name="filter[EmailBody]"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
+                <textarea name="filter[EmailBody]" rows="<?php echo count(explode("\n", $filter->EmailBody())) ?>"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
               </p>
             </div>
 <?php

From 6022dd59eb8933338910cad5d1cc06bad8f4a939 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 21 Sep 2021 12:59:42 -0400
Subject: [PATCH 045/501] Always include the download button so that we can
 assume that it exists in the js.   So avoid console errors when no mp4.

---
 web/skins/classic/views/event.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 81ff15075..a07c95042 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -149,13 +149,10 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
         <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
         <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>" disabled><i class="fa fa-pencil"></i></button>
         <button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>"><i class="fa fa-external-link"></i></button>
-<?php
-  if ( $Event->DefaultVideo() ) {
-?>
-        <a class="btn btn-normal" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'),'&amp;')?>" download><i class="fa fa-download"></i></a>
-<?php
-  } 
-?>
+        <a id="downloadBtn" class="btn btn-normal" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'),'&amp;')?>"
+          download
+          <?php echo $Event->DefaultVideo() ? '' : 'style="display:none;"' ?>
+><i class="fa fa-download"></i></a>
         <button id="statsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats') ?>" ><i class="fa fa-info"></i></button>
         <button id="framesBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Frames') ?>" ><i class="fa fa-picture-o"></i></button>
         <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>"><i class="fa fa-trash"></i></button>

From 92f6d3cbae0e41ffe4f093b593ce117b14720cab Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 21 Sep 2021 13:00:47 -0400
Subject: [PATCH 046/501] Restore the download button's behaviour.  It is a
 simple link to the mp4, not an export.  Also add a handler for the video.js
 rate control to sync up our non video.js rate dropdown and stored cookie.

---
 web/skins/classic/views/js/event.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index e2d3c9ce3..727976e76 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -891,6 +891,12 @@ function initPage() {
     vid.on('timeupdate', function() {
       $j('#progressValue').html(secsToTime(Math.floor(vid.currentTime())));
     });
+    vid.on('ratechange', function() {
+      rate = vid.playbackRate() * 100;
+      console.log("rate change " + rate);
+      $j('select[name="rate"]').val(rate);
+      setCookie('zmEventRate', rate, 3600);
+    });
 
     // rate is in % so 100 would be 1x
     if (rate > 0) {
@@ -1012,19 +1018,6 @@ function initPage() {
     window.location.assign('?view=export&eids[]='+eventData.Id);
   });
 
-  // Manage the DOWNLOAD VIDEO button
-  bindButton('#downloadBtn', 'click', null, function onDownloadClick(evt) {
-    evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=modal&modal=download&eids[]='+eventData.Id)
-        .done(function(data) {
-          insertModalHtml('downloadModal', data.html);
-          $j('#downloadModal').modal('show');
-          // Manage the GENERATE DOWNLOAD button
-          $j('#exportButton').click(exportEvent);
-        })
-        .fail(logAjaxFail);
-  });
-
   // Manage the Event STATISTICS Button
   bindButton('#statsBtn', 'click', null, function onStatsClick(evt) {
     evt.preventDefault();

From 568be3fc549f2e8d258077982494c82c560bc135 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 21 Sep 2021 14:29:05 -0400
Subject: [PATCH 047/501] initialize video_first_pts and when setting it need
 to specify microseconds otherwise we get nanoseconds. White space.

---
 src/zm_ffmpeg_camera.cpp | 4 ++--
 src/zm_packet.cpp        | 2 +-
 src/zm_packet.h          | 3 ++-
 src/zm_videostore.cpp    | 8 +++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 1484d5234..82471c3dc 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -231,8 +231,8 @@ int FfmpegCamera::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
   zm_packet->set_packet(&packet);
   zm_packet->stream = stream;
   zm_packet->pts = av_rescale_q(packet.pts, stream->time_base, AV_TIME_BASE_Q);
-  if ( packet.pts != AV_NOPTS_VALUE ) {
-    if ( stream == mVideoStream ) {
+  if (packet.pts != AV_NOPTS_VALUE) {
+    if (stream == mVideoStream) {
       if (mFirstVideoPTS == AV_NOPTS_VALUE)
         mFirstVideoPTS = packet.pts;
 
diff --git a/src/zm_packet.cpp b/src/zm_packet.cpp
index 3361667e0..55a78721e 100644
--- a/src/zm_packet.cpp
+++ b/src/zm_packet.cpp
@@ -83,7 +83,7 @@ ZMPacket::ZMPacket(ZMPacket &p) :
   av_init_packet(&packet);
   packet.size = 0;
   packet.data = nullptr;
-  if ( zm_av_packet_ref(&packet, &p.packet) < 0 ) {
+  if (zm_av_packet_ref(&packet, &p.packet) < 0) {
     Error("error refing packet");
   }
 }
diff --git a/src/zm_packet.h b/src/zm_packet.h
index 66a6250ca..9cce4dd03 100644
--- a/src/zm_packet.h
+++ b/src/zm_packet.h
@@ -66,7 +66,7 @@ class ZMPacket {
     Image *set_image(Image *);
 
     int is_keyframe() { return keyframe; };
-    int decode( AVCodecContext *ctx );
+    int decode(AVCodecContext *ctx);
     explicit ZMPacket(Image *image, SystemTimePoint tv);
     explicit ZMPacket(ZMPacket &packet);
     ZMPacket();
@@ -88,6 +88,7 @@ class ZMLockedPacket {
       lck_(packet_->mutex_, std::defer_lock),
       locked(false) {
     }
+
     ~ZMLockedPacket() {
       if (locked) unlock();
     }
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 67f31cabc..1bd0724d5 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -93,6 +93,7 @@ VideoStore::VideoStore(
   converted_in_samples(nullptr),
   filename(filename_in),
   format(format_in),
+  video_first_pts(0),
   video_first_dts(0),
   audio_first_pts(0),
   audio_first_dts(0),
@@ -990,23 +991,24 @@ int VideoStore::writeVideoFramePacket(const std::shared_ptr<ZMPacket> &zm_packet
     frame->pkt_duration = 0;
 
     if (!video_first_pts) {
-      video_first_pts = zm_packet->timestamp.time_since_epoch().count();
+      video_first_pts = static_cast<int64>(std::chrono::duration_cast<Microseconds>(zm_packet->timestamp.time_since_epoch()).count());
       Debug(2, "No video_first_pts, set to (%" PRId64 ") secs(%.2f)",
             video_first_pts,
             FPSeconds(zm_packet->timestamp.time_since_epoch()).count());
 
       frame->pts = 0;
     } else {
+
       Microseconds useconds = std::chrono::duration_cast<Microseconds>(
           zm_packet->timestamp - SystemTimePoint(Microseconds(video_first_pts)));
       frame->pts = av_rescale_q(useconds.count(), AV_TIME_BASE_Q, video_out_ctx->time_base);
       Debug(2,
-            "Setting pts for frame(%d) to (%" PRId64 ") from (start %" PRIu64 " - %" PRIu64 " - us(%" PRIi64 ") @ %d/%d",
+            "Setting pts for frame(%d) to (%" PRId64 ") from (zm_packet->timestamp(%" PRIi64 " - first %" PRId64 " us %" PRId64 " ) @ %d/%d",
             frame_count,
             frame->pts,
+            static_cast<int64>(std::chrono::duration_cast<Microseconds>(zm_packet->timestamp.time_since_epoch()).count()),
             video_first_pts,
             static_cast<int64>(std::chrono::duration_cast<Microseconds>(useconds).count()),
-            static_cast<int64>(std::chrono::duration_cast<Microseconds>(zm_packet->timestamp.time_since_epoch()).count()),
             video_out_ctx->time_base.num,
             video_out_ctx->time_base.den);
     }

From e98728c529a2f541b8fc59914c1b75ed7c8b1681 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 Sep 2021 16:04:36 -0400
Subject: [PATCH 048/501] Set new defaults for various settings

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 0c8aec4a2..31d92bf11 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -308,7 +308,7 @@ our @options = (
   },
   {
     name        => 'ZM_AUTH_HASH_IPS',
-    default     => 'yes',
+    default     => 'no',
     description => 'Include IP addresses in the authentication hash',
     help        => q`
       When ZoneMinder is running in hashed authenticated mode it can
@@ -346,7 +346,7 @@ our @options = (
   },
   {
     name        => 'ZM_AUTH_HASH_LOGINS',
-    default     => 'no',
+    default     => 'yes',
     description => 'Allow login by authentication hash',
     help        => q`
       The normal process for logging into ZoneMinder is via the login
@@ -508,7 +508,7 @@ our @options = (
   },
   {
     name        =>  'ZM_SYSTEM_SHUTDOWN',
-    default     =>  'yes',
+    default     =>  'no',
     description =>  'Allow Admin users to power off or restart the system from the ZoneMinder UI.',
     help        =>  'The system will need to have sudo installed and the following added to /etc/sudoers~~
     ~~
@@ -1096,7 +1096,7 @@ our @options = (
   },
   {
     name        => 'ZM_LOG_LEVEL_SYSLOG',
-    default     => '0',
+    default     => '-1',
     description => 'Save logging output to the system log',
     help        => q`
       ZoneMinder logging is now more integrated between
@@ -1604,7 +1604,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_EVENT_DISK_SPACE',
-    default     => 'no',
+    default     => 'yes',
     description => 'Whether to show disk space used by each event.',
     help        => q`
       Adds another column to the listing of events
@@ -1634,7 +1634,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_ID_ON_CONSOLE',
-    default     => 'no',
+    default     => 'yes',
     description => 'Should the console list the monitor id',
     help        => q`
       Some find it useful to have the id always visible
@@ -2270,7 +2270,7 @@ our @options = (
   },
   {
     name        => 'ZM_MAX_RESTART_DELAY',
-    default     => '600',
+    default     => '30',
     description => 'Maximum delay (in seconds) for daemon restart attempts.',
     help        => q`
       The zmdc (zm daemon control) process controls when processeses

From b8022cdda266817191e01d768080455f02829ddb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 Sep 2021 16:06:18 -0400
Subject: [PATCH 049/501] More new defaults.  The navbar refreshes every 60
 secs so make full page refresh be 240sec.  Ajax timeout needs to be 10
 seconds.  Large event listings can take longer than 3

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 31d92bf11..ff802dd15 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2855,7 +2855,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_H_REFRESH_MAIN',
-    default     => '60',
+    default     => '240',
     introduction => q`
       There are now a number of options that are grouped into
       bandwidth categories, this allows you to configure the
@@ -3113,7 +3113,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_H_AJAX_TIMEOUT',
-    default     => '3000',
+    default     => '10000',
     description => 'How long to wait for Ajax request responses (ms)',
     help        => q`
       The newer versions of the live feed and event views use Ajax to

From 655daf4fbeaac2821e23c0ca8b28073a77d1ab30 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 Sep 2021 16:39:28 -0400
Subject: [PATCH 050/501] Add mmal device/pix fmt type

---
 src/zm_ffmpeg_camera.cpp | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 82471c3dc..6415b2134 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -55,31 +55,24 @@ static enum AVPixelFormat get_hw_format(
 }
 #if !LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
 static enum AVPixelFormat find_fmt_by_hw_type(const enum AVHWDeviceType type) {
-  enum AVPixelFormat fmt;
   switch (type) {
     case AV_HWDEVICE_TYPE_VAAPI:
-      fmt = AV_PIX_FMT_VAAPI;
-      break;
+      return AV_PIX_FMT_VAAPI;
     case AV_HWDEVICE_TYPE_DXVA2:
-      fmt = AV_PIX_FMT_DXVA2_VLD;
-      break;
+      return AV_PIX_FMT_DXVA2_VLD;
     case AV_HWDEVICE_TYPE_D3D11VA:
-      fmt = AV_PIX_FMT_D3D11;
-      break;
+      return = AV_PIX_FMT_D3D11;
     case AV_HWDEVICE_TYPE_VDPAU:
-      fmt = AV_PIX_FMT_VDPAU;
-      break;
+      return AV_PIX_FMT_VDPAU;
     case AV_HWDEVICE_TYPE_CUDA:
-      fmt = AV_PIX_FMT_CUDA;
-      break;
+      return AV_PIX_FMT_CUDA;
+    case AV_HWDEVICE_TYPE_MMAL:
+      return AV_PIX_FMT_MMAL;
     case AV_HWDEVICE_TYPE_VIDEOTOOLBOX:
-      fmt = AV_PIX_FMT_VIDEOTOOLBOX;
-      break;
+      return AV_PIX_FMT_VIDEOTOOLBOX;
     default:
-      fmt = AV_PIX_FMT_NONE;
-      break;
+      return AV_PIX_FMT_NONE;
   }
-  return fmt;
 }
 #endif
 #endif

From 2e4bb73204b977123a72aef4784dfa890c1ea8a3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 25 Sep 2021 14:27:10 -0400
Subject: [PATCH 051/501] remove useless commit.

---
 scripts/zmfilter.pl.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 64a20b4d5..1e62cb229 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -399,7 +399,6 @@ sub checkFilter {
 					) {
         $Event->save();
       }
-      $ZoneMinder::Database::dbh->commit() if !$$filter{LockRows};
     } # end if UpdateDiskSpace
   } # end foreach event
   ZoneMinder::Database::end_transaction($dbh, $in_transaction) if $$filter{LockRows}; 

From cbc376bb5a9df2f3b1d6cf02d5452c73053d7c17 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 25 Sep 2021 16:08:58 -0400
Subject: [PATCH 052/501] Add zm_rtsp_server to ignores

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e617d937c..3d61b4f54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,6 +124,7 @@ src/zmc
 src/zmf
 src/zms
 src/zmu
+src/zm_rtsp_server
 src/zoneminder-zmc.8
 src/zoneminder-zmc.8.gz
 src/zoneminder-zmf.8

From 43dfeb5b847fa47fbe191de7e1a00b2fe16b6891 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 25 Sep 2021 16:10:50 -0400
Subject: [PATCH 053/501] whitespace

---
 web/skins/classic/views/monitor.php | 32 +++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 327de5def..e7afc8cf6 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -21,44 +21,50 @@
 require_once('includes/Server.php');
 require_once('includes/Storage.php');
 
-if ( !canEdit('Monitors', empty($_REQUEST['mid'])?0:$_REQUEST['mid']) ) {
+if (!canEdit('Monitors', empty($_REQUEST['mid'])?0:$_REQUEST['mid'])) {
   $view = 'error';
   return;
 }
 
 $Server = null;
-if ( defined('ZM_SERVER_ID') ) {
+if (defined('ZM_SERVER_ID')) {
   $Server = dbFetchOne('SELECT * FROM Servers WHERE Id=?', NULL, array(ZM_SERVER_ID));
 }
-if ( !$Server ) {
+if (!$Server) {
   $Server = array('Id' => '');
 }
 $mid = null;
 $monitor = null;
-if ( !empty($_REQUEST['mid']) ) {
+if (!empty($_REQUEST['mid'])) {
   $mid = validInt($_REQUEST['mid']);
   $monitor = new ZM\Monitor($mid);
-  if ( $monitor and ZM_OPT_X10 )
-    $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid));
+  if ($monitor->Id()) {
+    if (ZM_OPT_X10) {
+      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid));
+    }
+  } else {
+    $monitor->Name(translate('Monitor').'-'.$mid);
+    $monitor->WebColour(random_colour());
+  }
 }
 
-if ( !$monitor ) {
+if (!$monitor) {
   $monitor = new ZM\Monitor();
   $monitor->Name(translate('Monitor').'-'.getTableAutoInc('Monitors'));
   $monitor->WebColour(random_colour());
 } # end if $_REQUEST['mid']
 
-if ( isset($_REQUEST['dupId']) ) {
+if (isset($_REQUEST['dupId'])) {
   $monitor = new ZM\Monitor($_REQUEST['dupId']);
   $monitor->GroupIds(); // have to load before we change the Id
-  if ( ZM_OPT_X10 )
+  if (ZM_OPT_X10)
     $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
   $clonedName = $monitor->Name();
   $monitor->Name('Clone of '.$monitor->Name());
   $monitor->Id($mid);
 }
 
-if ( ZM_OPT_X10 && empty($x10Monitor) ) {
+if (ZM_OPT_X10 && empty($x10Monitor)) {
   $x10Monitor = array(
       'Activation' => '',
       'AlarmInput' => '',
@@ -69,14 +75,14 @@ if ( ZM_OPT_X10 && empty($x10Monitor) ) {
 function fourcc($a, $b, $c, $d) {
   return ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24);
 }
-if ( isset($_REQUEST['newMonitor']) ) {
+if (isset($_REQUEST['newMonitor'])) {
   # Update the monitor object with whatever has been set so far.
   $monitor->set($_REQUEST['newMonitor']);
 
-  if ( ZM_OPT_X10 )
+  if (ZM_OPT_X10)
     $newX10Monitor = $_REQUEST['newX10Monitor'];
 } else {
-  if ( ZM_OPT_X10 )
+  if (ZM_OPT_X10)
     $newX10Monitor = $x10Monitor;
 }
 

From f40e2be28a4238ce104c155a4fd71389233d9670 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 25 Sep 2021 20:54:35 -0400
Subject: [PATCH 054/501] Add an input for an Id to assign to the new monitor. 
 List 10 available Ids.

---
 web/skins/classic/views/monitor.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index e7afc8cf6..05462ace9 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -355,6 +355,7 @@ $codecs = array(
   'MJPEG' => translate('MJPEG'),
 );
 
+$monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Name,Sequence ASC');
 $controls = ZM\Control::find(null, array('order'=>'lower(Name)'));
 
 xhtmlHeaders(__FILE__, translate('Monitor').' - '.validHtmlStr($monitor->Name()));
@@ -452,6 +453,21 @@ foreach ( $tabs as $name=>$value ) {
 switch ( $name ) {
   case 'general' :
     {
+      if (!$monitor->Id()) {
+        $monitor_ids = array();
+        foreach ($monitors as $m) { $monitor_ids[] = $m['Id']; }
+        $available_monitor_ids = array_diff(range(min($monitor_ids),max($monitor_ids)), $monitor_ids);
+?>
+          <tr class="Id">
+            <td class="text-right pr-3"><?php echo translate('Id') ?></td>
+            <td><input type="number" step="1" min="1" name="newMonitor[Id]" placeholder="leave blank for auto"/><br/>
+10 Available Ids: 
+<?php echo implode(', ', array_slice($available_monitor_ids, 0, 10)); ?>
+</td>
+          </tr>
+<?php
+
+      } # end if ! $monitor->Id()
 ?>
           <tr class="Name">
             <td class="text-right pr-3"><?php echo translate('Name') ?></td>
@@ -559,7 +575,6 @@ switch ( $name ) {
           <td class="text-right pr-3"><?php echo translate('LinkedMonitors'); echo makeHelpLink('OPTIONS_LINKED_MONITORS') ?></td>
           <td>
 <?php
-      $monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Name,Sequence ASC');
       $monitor_options = array();
       foreach ( $monitors as $linked_monitor ) {
         if ( (!$monitor->Id() || ($monitor->Id()!= $linked_monitor['Id'])) && visibleMonitor($linked_monitor['Id']) ) {

From ee609ad28bdeeec89f27b3c3c7d40f2fdfc040b3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 26 Sep 2021 14:46:56 -0400
Subject: [PATCH 055/501] Further develop behavour when typing in text input
 for new manufacturer or model.  If it already exists, select it.

---
 web/skins/classic/views/js/monitor.js | 49 ++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 44bcddb5b..88fae0a67 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -346,7 +346,7 @@ function getLocation() {
 }
 
 function populate_models(ManufacturerId) {
-  let dropdown = $j('[name="newMonitor[ModelId]"]');
+  const dropdown = $j('[name="newMonitor[ModelId]"]');
   if (!dropdown.length) {
     console.log("No element found for ModelId");
     return;
@@ -356,18 +356,22 @@ function populate_models(ManufacturerId) {
   dropdown.append('<option value="0" selected="true">Unknown</option>');
   dropdown.prop('selectedIndex', 0);
 
-  // Populate dropdown with list of provinces
-  $j.getJSON(thisUrl+'?request=models&ManufacturerId='+ManufacturerId, function (data) {
+  if (ManufacturerId) {
+    // Populate dropdown with list of provinces
+    $j.getJSON(thisUrl+'?request=models&ManufacturerId='+ManufacturerId, function(data) {
       if (data.result == 'Ok') {
-        $j.each(data.models, function (key, entry) {
-            dropdown.append($j('<option></option>').attr('value', entry.Id).text(entry.Name));
-            });
+        $j.each(data.models, function(key, entry) {
+          dropdown.append($j('<option></option>').attr('value', entry.Id).text(entry.Name));
+        });
         dropdown.chosen("destroy");
         dropdown.chosen();
       } else {
         alert(data.result);
       }
-      });
+    });
+  }
+  dropdown.chosen("destroy");
+  dropdown.chosen();
 }
 
 function ManufacturerId_onchange(ManufacturerId_select) {
@@ -377,7 +381,7 @@ function ManufacturerId_onchange(ManufacturerId_select) {
   } else {
     ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = 'inline';
     // Set models dropdown to Unknown, text area visible
-    let ModelId_dropdown = $j('[name="newMonitor[ModelId]"]');
+    const ModelId_dropdown = $j('[name="newMonitor[ModelId]"]');
     ModelId_dropdown.empty();
     ModelId_dropdown.append('<option selected="true">Unknown</option>');
     ModelId_dropdown.prop('selectedIndex', 0);
@@ -385,6 +389,31 @@ function ManufacturerId_onchange(ManufacturerId_select) {
   }
 }
 
+function select_by_value_case_insensitive(dropdown, value) {
+  const test_value = value.toLowerCase();
+  for (i=1; i < dropdown.options.length; i++) {
+    if (dropdown.options[i].text.toLowerCase() == test_value) {
+      dropdown.selectedIndex = i;
+      dropdown.options[i].selected = true;
+      $j(dropdown).chosen("destroy").chosen();
+      return;
+    }
+  }
+  if (dropdown.selectedIndex != 0) {
+    dropdown.selectedIndex = 0;
+    $j(dropdown).chosen("destroy").chosen();
+  }
+}
+
+function Manufacturer_onchange(input) {
+  if (!input.value) {
+    return;
+  }
+  ManufacturerId_select = input.form.elements['newMonitor[ManufacturerId]'];
+  select_by_value_case_insensitive(ManufacturerId_select, input.value);
+  populate_models(ManufacturerId_select.value);
+}
+
 function ModelId_onchange(ModelId_select) {
   if (parseInt(ModelId_select.value)) {
     $j('[name="newMonitor[Model]"]').hide();
@@ -393,4 +422,8 @@ function ModelId_onchange(ModelId_select) {
   }
 }
 
+function Model_onchange(input) {
+  select_by_value_case_insensitive(input.form.elements['newMonitor[ModelId]'], input.value);
+}
+
 window.addEventListener('DOMContentLoaded', initPage);

From 1c01936f754b7cd4c72b9b01bb5ac9abef3f998d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 26 Sep 2021 14:47:29 -0400
Subject: [PATCH 056/501] add oninput methods to text inputs for new
 Manufacturer/Model

---
 web/skins/classic/views/monitor.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 05462ace9..f47e29912 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -482,7 +482,7 @@ switch ( $name ) {
             <td>
 <?php 
   require_once('includes/Manufacturer.php');
-  $manufacturers = array(''=>translate('unknown'));
+  $manufacturers = array(''=>translate('Unknown'));
   foreach ( ZM\Manufacturer::find( null, array('order'=>'lower(Name)')) as $Manufacturer ) {
     $manufacturers[$Manufacturer->Id()] = $Manufacturer->Name();
   }
@@ -492,6 +492,7 @@ switch ( $name ) {
               <input type="text" name="newMonitor[Manufacturer]"
                 placeholder="enter new manufacturer name"
                 value="<?php echo $monitor->Manufacturer()->Name() ?>"<?php echo $monitor->ManufacturerId() ? ' style="display:none"' : '' ?>
+                data-on-input-this="Manufacturer_onchange"
               />
             </td>
           </tr>
@@ -500,7 +501,7 @@ switch ( $name ) {
             <td>
 <?php 
   require_once('includes/Model.php');
-  $models = array(''=>translate('unknown'));
+  $models = array(''=>translate('Unknown'));
   foreach ( ZM\Model::find(array('ManufacturerId'=>$monitor->ManufacturerId()), array('order'=>'lower(Name)')) as $Model ) {
     $models[$Model->Id()] = $Model->Name();
   }
@@ -509,7 +510,9 @@ switch ( $name ) {
 ?>
               <input type="text" name="newMonitor[Model]"
                 placeholder="enter new model name"
-                value="<?php echo $monitor->Model()->Name() ?>"<?php echo $monitor->ModelId() ? ' style="display:none"':'' ?>/>
+                value="<?php echo $monitor->Model()->Name() ?>"<?php echo $monitor->ModelId() ? ' style="display:none"':'' ?>
+                data-on-input-this="Model_onchange"
+              />
             </td>
           </tr>
           <tr>

From fe734d4e1ec745aab4640de2f8f7ac3a413804de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 27 Sep 2021 10:56:50 -0400
Subject: [PATCH 057/501] Add Manufacturer and CameraModel hasOne relationships

---
 web/api/app/Model/Monitor.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/api/app/Model/Monitor.php b/web/api/app/Model/Monitor.php
index de9a7685a..7a7d03588 100644
--- a/web/api/app/Model/Monitor.php
+++ b/web/api/app/Model/Monitor.php
@@ -139,6 +139,16 @@ class Monitor extends AppModel {
       'className' => 'Event_Summary',
       'foreignKey' => 'MonitorId',
       'joinTable' =>  'Event_Summaries',
+    ),
+    'Manufacturer' => array(
+      'className' => 'Manufacturer',
+      'foreignKey' => 'Id',
+      'joinTable' => 'Manufacturers',
+    ),
+    'CameraModel' => array(
+      'className' => 'CameraModel',
+      'foreignKey' => 'Id',
+      'joinTable' => 'Models',
     )
   );
 

From ee65d3e3dcf6f6e1a2b8fe8810cc2b7fa9ebbad6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 27 Sep 2021 10:57:06 -0400
Subject: [PATCH 058/501] add cmaeramodels route

---
 web/api/app/Config/routes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/api/app/Config/routes.php b/web/api/app/Config/routes.php
index 6b3314d09..7c6352602 100644
--- a/web/api/app/Config/routes.php
+++ b/web/api/app/Config/routes.php
@@ -32,6 +32,7 @@
 	Router::mapResources('logs');
 	Router::mapResources('manufacturers');
 	Router::mapResources('models');
+	Router::mapResources('cameramodels');
 	Router::mapResources('monitors');
 	Router::mapResources('servers');
 	Router::mapResources('states');

From 9cf4e892545e1460f7e5b4bc37e802a5cdebd76f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 27 Sep 2021 11:03:16 -0400
Subject: [PATCH 059/501] add update to 1.37.3

---
 db/zm_update-1.37.3.sql | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 db/zm_update-1.37.3.sql

diff --git a/db/zm_update-1.37.3.sql b/db/zm_update-1.37.3.sql
new file mode 100644
index 000000000..341c5e162
--- /dev/null
+++ b/db/zm_update-1.37.3.sql
@@ -0,0 +1,47 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From 5f27c124c371f58ae09d12c2dc44219c05d57b37 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Nov 2021 18:00:18 -0400
Subject: [PATCH 060/501] Ignore bootstrap-4.5.0.js

---
 .eslintignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index 4682851df..91b0fd196 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@
 web/api/lib
 web/includes/csrf/
 web/js/videojs.zoomrotate.js
-web/skins/classic/js/bootstrap.js
+web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/chosen
 web/skins/classic/js/dateTimePicker
 web/skins/classic/js/jquery-*.js

From 9d71f1192a0dac30f273942bbd062b453349e478 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 29 Sep 2021 09:30:04 -0400
Subject: [PATCH 061/501] merge manufacturer update into existing
 zm_update-1.37.2 and then move it to .in

---
 db/manufacturers.sql    | 19 -----------------
 db/zm_update-1.37.3.sql | 47 -----------------------------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 db/zm_update-1.37.3.sql

diff --git a/db/manufacturers.sql b/db/manufacturers.sql
index eaee2630c..be15f9c01 100644
--- a/db/manufacturers.sql
+++ b/db/manufacturers.sql
@@ -1,23 +1,4 @@
 INSERT INTO Manufacturers VALUES (1, 'Acti');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
 INSERT INTO Manufacturers VALUES (2, 'Amcrest');
 INSERT INTO Manufacturers VALUES (3, 'Airlink101');
 INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
diff --git a/db/zm_update-1.37.3.sql b/db/zm_update-1.37.3.sql
deleted file mode 100644
index 341c5e162..000000000
--- a/db/zm_update-1.37.3.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ManufacturerId'
-    ) > 0,
-"SELECT 'Column ManufacturerId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ManufacturerId'
-    ) > 0,
-"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF( 
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ModelId'
-    ) > 0,
-"SELECT 'Column ModelId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ModelId'
-    ) > 0,
-"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

From dc756ad670373e7cbe6dd3201fabbb44f1c922a3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 19:20:39 -0500
Subject: [PATCH 062/501] add back update for Manufacturers and Models

---
 db/zm_update-1.37.3.sql | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 db/zm_update-1.37.3.sql

diff --git a/db/zm_update-1.37.3.sql b/db/zm_update-1.37.3.sql
new file mode 100644
index 000000000..341c5e162
--- /dev/null
+++ b/db/zm_update-1.37.3.sql
@@ -0,0 +1,47 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From 8868a0fc41735174b00380c338109ea5d11e1d69 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Oct 2021 14:34:17 -0400
Subject: [PATCH 063/501] enforce default action

---
 utils/do_debian_package.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 2a4dd6989..6c8c06c00 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -230,12 +230,11 @@ rm .gitignore
 cd ../
 
 
-if [ !-e "$DIRECTORY.orig.tar.gz" ]; then
-read -p "$DIRECTORY.orig.tar.gz does not exist, create it? [Y/n]"
-      if [[ $REPLY == [yY] ]]; then
-
-  tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
-fi;
+if [ ! -e "$DIRECTORY.orig.tar.gz" ]; then
+  read -p "$DIRECTORY.orig.tar.gz does not exist, create it? [Y/n]"
+  if [[ "$REPLY" == "" || "$REPLY" == [yY] ]]; then
+    tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
+  fi;
 fi;
 
 IFS=',' ;for DISTRO in `echo "$DISTROS"`; do 

From caeaf91cad332d37d641e05e86a9ce6ef6462e50 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 6 Nov 2021 09:58:31 -0400
Subject: [PATCH 064/501] Only list available ids if there are some

---
 web/skins/classic/views/monitor.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index f47e29912..7d599904a 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -461,9 +461,12 @@ switch ( $name ) {
           <tr class="Id">
             <td class="text-right pr-3"><?php echo translate('Id') ?></td>
             <td><input type="number" step="1" min="1" name="newMonitor[Id]" placeholder="leave blank for auto"/><br/>
-10 Available Ids: 
-<?php echo implode(', ', array_slice($available_monitor_ids, 0, 10)); ?>
-</td>
+<?php 
+if (count($available_monitor_ids)) {
+  echo 'Some available ids: '.implode(', ', array_slice($available_monitor_ids, 0, 10));
+}
+?>
+            </td>
           </tr>
 <?php
 

From 3ac5402699cd7244e0a0905016f28f21ff898140 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 7 Nov 2021 11:28:34 -0500
Subject: [PATCH 065/501] Pretty up the v4l field names

---
 web/ajax/modals/settings.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/ajax/modals/settings.php b/web/ajax/modals/settings.php
index de42d6c87..e0bdf679c 100644
--- a/web/ajax/modals/settings.php
+++ b/web/ajax/modals/settings.php
@@ -38,7 +38,7 @@ if ($zmuOutput) {
 $ctls = shell_exec('v4l2-ctl -d '.$monitor->Device().' --list-ctrls');
 
 if (!$ctls) {
-ZM\Warning("Guessing v4l ctrls.  We need v4l2-ctl please install it");
+ZM\Warning('Guessing v4l ctrls.  We need v4l2-ctl please install it');
 $ctls = '
                      brightness 0x00980900 (int)    : min=-10 max=10 step=1 default=0 value=8
                        contrast 0x00980901 (int)    : min=0 max=20 step=1 default=10 value=12
@@ -83,10 +83,15 @@ foreach ($ctls as $line) {
     }
   }
 
+  $label = translate($setting_uc);
+  if ($label == $setting_uc) {
+    $label = ucwords(str_replace('_', ' ', $label));
+  }
+
   if ($setting == 'brightness' or $setting == 'colour' or $setting == 'contrast' or $setting == 'hue') {
     echo '
             <tr>
-              <th scope="row">'.translate($setting_uc).'</th>
+              <th scope="row">'.$label.'</th>
               <td>'.$min.'</td><td><input type="range" title="'.$value.'" min="'.$min.'" max="'.$max.'" step="'.$step.'" default="'.$default.'" value="'.$value.'" id="new'.$setting_uc.'" name="new'.$setting_uc.'" '.(canEdit('Control') ? '' : 'disabled="disabled"') .'/></td><td>'.$max.'</td>
             </tr>
 ';
@@ -94,7 +99,7 @@ foreach ($ctls as $line) {
     if ($type == '(bool)') {
     echo '
             <tr>
-              <th scope="row">'.translate($setting_uc).'</th>
+              <th scope="row">'.$label.'</th>
               <td></td><td>'.html_radio('new'.$setting_uc, array('0'=>translate('True'), '1', translate('False')), $value, array('disabled'=>'disabled')).'
               </td><td></td>
             </tr>
@@ -102,14 +107,14 @@ foreach ($ctls as $line) {
     } else if ($type == '(int)') {
     echo '
             <tr>
-              <th scope="row">'.translate($setting_uc).'</th>
+              <th scope="row">'.$label.'</th>
               <td></td><td><input type="range" '.$ctl[1].' disabled="disabled"/></td><td></td>
             </tr>
 ';
     } else {
     echo '
             <tr>
-              <th scope="row">'.translate($setting_uc).'</th>
+              <th scope="row">'.$label.'</th>
               <td></td><td>'.$value.'</td><td></td>
             </tr>
 ';

From 01eac4a277f650057bcb0f54f46abc1c60738e8c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 09:48:57 -0500
Subject: [PATCH 066/501] Default to now instead of ... epoch? when endtime is
 null.  Fixes video playing when event is incomplete

---
 src/zm_eventstream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 5e1ad605d..af9dd8639 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -141,7 +141,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
   event_data->storage_id = dbrow[1] ? atoi(dbrow[1]) : 0;
   event_data->frame_count = dbrow[2] == nullptr ? 0 : atoi(dbrow[2]);
   event_data->start_time = SystemTimePoint(Seconds(atoi(dbrow[3])));
-  event_data->end_time = dbrow[4] ? SystemTimePoint(Seconds(atoi(dbrow[4]))) : SystemTimePoint();
+  event_data->end_time = dbrow[4] ? SystemTimePoint(Seconds(atoi(dbrow[4]))) : std::chrono::system_clock::now();
   event_data->duration = std::chrono::duration_cast<Microseconds>(event_data->end_time - event_data->start_time);
   event_data->frames_duration =
       std::chrono::duration_cast<Microseconds>(dbrow[5] ? FPSeconds(atof(dbrow[5])) : FPSeconds(0.0));

From 9036728bdc9b7ca8dddaa0638d2402f487034d5c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 10:48:50 -0500
Subject: [PATCH 067/501] Report error if sql fails.  Add check for access to
 specific event.

---
 web/ajax/events.php | 63 +++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index 4e364242a..090fe476e 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -67,20 +67,19 @@ if (isset($_REQUEST['sort'])) {
 
 // Offset specifies the starting row to return, used for pagination
 $offset = 0;
-if ( isset($_REQUEST['offset']) ) {
-  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+if (isset($_REQUEST['offset'])) {
+  if ((!is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']))) {
     ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
   } else {
     $offset = $_REQUEST['offset'];
   }
 }
 
-
 // Limit specifies the number of rows to return
 // Set the default to 0 for events view, to prevent an issue with ALL pagination
 $limit = 0;
-if ( isset($_REQUEST['limit']) ) {
-  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+if (isset($_REQUEST['limit'])) {
+  if ((!is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']))) {
     ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
   } else {
     $limit = $_REQUEST['limit'];
@@ -91,25 +90,24 @@ if ( isset($_REQUEST['limit']) ) {
 // MAIN LOOP
 //
 
-switch ( $task ) {
+switch ($task) {
   case 'archive' :
-    foreach ( $eids as $eid ) archiveRequest($task, $eid);
+    foreach ($eids as $eid) archiveRequest($task, $eid);
     break;
   case 'unarchive' :
 		# The idea is that anyone can archive, but only people with Event Edit permission can unarchive..
-		if ( !canEdit('Events') )  {
+		if (!canEdit('Events'))  {
 			ajaxError('Insufficient permissions for user '.$user['Username']);
 			return;
 		}
-    foreach ( $eids as $eid ) archiveRequest($task, $eid);
+    foreach ($eids as $eid) archiveRequest($task, $eid);
     break;
   case 'delete' :
-		if ( !canEdit('Events') )  {
+		if (!canEdit('Events'))  {
 			ajaxError('Insufficient permissions for user '.$user['Username']);
 			return;
 		}
-
-    foreach ( $eids as $eid ) $data[] = deleteRequest($eid);
+    foreach ($eids as $eid) $data[] = deleteRequest($eid);
     break;
   case 'query' :
     $data = queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $limit);
@@ -139,6 +137,8 @@ function deleteRequest($eid) {
     $message[] = array($eid=>'Event not found.');
   } else if ( $event->Archived() ) {
     $message[] = array($eid=>'Event is archived, cannot delete it.');
+  } else if (!$event->canEdit()) {
+    $message[] = array($eid=>'You do not have permission to delete event '.$event->Id());
   } else {
     $event->delete();
   }
@@ -147,7 +147,6 @@ function deleteRequest($eid) {
 }
 
 function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $limit) {
-
   $data = array(
     'total'   =>  0,
     'totalNotFiltered' => 0,
@@ -156,7 +155,7 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
   );
 
   $failed = !$filter->test_pre_sql_conditions();
-  if ( $failed ) {
+  if ($failed) {
     ZM\Debug('Pre conditions failed, not doing sql');
     return $data;
   }
@@ -171,7 +170,7 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
   // The names of columns shown in the event view that are NOT dB columns in the database
   $col_alt = array('Monitor', 'Storage');
 
-  if ( !in_array($sort, array_merge($columns, $col_alt)) ) {
+  if (!in_array($sort, array_merge($columns, $col_alt))) {
     ZM\Error('Invalid sort field: ' . $sort);
     $sort = 'Id';
   }
@@ -186,7 +185,7 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
 
   $storage_areas = ZM\Storage::find();
   $StorageById = array();
-  foreach ( $storage_areas as $S ) {
+  foreach ($storage_areas as $S) {
     $StorageById[$S->Id()] = $S;
   }
 
@@ -195,41 +194,43 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
 
   ZM\Debug('Calling the following sql query: ' .$sql);
   $query = dbQuery($sql, $values);
-  if ( $query ) {
-    while ( $row = dbFetchNext($query) ) {
-      $event = new ZM\Event($row);
-      $event->remove_from_cache();
-      if ( !$filter->test_post_sql_conditions($event) ) {
-        continue;
-      }
-      $event_ids[] = $event->Id();
-      $unfiltered_rows[] = $row;
-    } # end foreach row
+  if (!$query) {
+    ajaxError(dbError($sql));
+    return;
   }
+  while ($row = dbFetchNext($query)) {
+    $event = new ZM\Event($row);
+    $event->remove_from_cache();
+    if (!$filter->test_post_sql_conditions($event)) {
+      continue;
+    }
+    $event_ids[] = $event->Id();
+    $unfiltered_rows[] = $row;
+  } # end foreach row
 
   ZM\Debug('Have ' . count($unfiltered_rows) . ' events matching base filter.');
 
   $filtered_rows = null;
 
-  if ( count($advsearch) or $search != '' ) {
+  if (count($advsearch) or $search != '') {
     $search_filter = new ZM\Filter();
     $search_filter = $search_filter->addTerm(array('cnj'=>'and', 'attr'=>'Id', 'op'=>'IN', 'val'=>$event_ids));
 
     // There are two search bars in the log view, normal and advanced
     // Making an exuctive decision to ignore the normal search, when advanced search is in use
     // Alternatively we could try to do both
-    if ( count($advsearch) ) {
+    if (count($advsearch)) {
       $terms = array();
-      foreach ( $advsearch as $col=>$text ) {
+      foreach ($advsearch as $col=>$text) {
         $terms[] = array('cnj'=>'and', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$text);
       } # end foreach col in advsearch
       $terms[0]['obr'] = 1;
       $terms[count($terms)-1]['cbr'] = 1;
       $search_filter->addTerms($terms);
-    } else if ( $search != '' ) {
+    } else if ($search != '') {
       $search = '%' .$search. '%';
       $terms = array();
-      foreach ( $columns as $col ) {
+      foreach ($columns as $col) {
         $terms[] = array('cnj'=>'or', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$search);
       }
       $terms[0]['obr'] = 1;

From 944c04e5b46cfa2c7bf883f69df025b78c17f0d0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 10:49:01 -0500
Subject: [PATCH 068/501] Whitespace

---
 web/includes/database.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/includes/database.php b/web/includes/database.php
index 34ea384fa..01926a26e 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -112,7 +112,7 @@ function dbLog($sql, $update=false) {
 function dbError($sql) {
   global $dbConn;
   $error = $dbConn->errorInfo();
-  if ( !$error[0] )
+  if (!$error[0])
     return '';
 
   $message = "SQL-ERR '".implode("\n", $dbConn->errorInfo())."', statement was '".$sql."'";
@@ -130,17 +130,17 @@ function dbEscape( $string ) {
 
 function dbQuery($sql, $params=NULL, $debug = false) {
   global $dbConn;
-  if ( dbLog($sql, true) )
+  if (dbLog($sql, true))
     return;
   $result = NULL;
   try {
-    if ( isset($params) ) {
-      if ( ! $result = $dbConn->prepare($sql) ) {
+    if (isset($params)) {
+      if (!$result = $dbConn->prepare($sql)) {
         ZM\Error("SQL: Error preparing $sql: " . $pdo->errorInfo);
         return NULL;
       }
 
-      if ( ! $result->execute($params) ) {
+      if (!$result->execute($params)) {
         ZM\Error("SQL: Error executing $sql: " . print_r($result->errorInfo(), true));
         return NULL;
       }

From 71931f007a9a90f3ca66c9550939c0b8c691c656 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 10:50:39 -0500
Subject: [PATCH 069/501] alert error message is an error is returned instead
 of rows

---
 web/skins/classic/views/js/events.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 9f6d34f75..6139ba3e4 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -35,12 +35,16 @@ var params =
 
 // Called by bootstrap-table to retrieve zm event data
 function ajaxRequest(params) {
-  if ( params.data && params.data.filter ) {
+  if (params.data && params.data.filter) {
     params.data.advsearch = params.data.filter;
     delete params.data.filter;
   }
   $j.getJSON(thisUrl + '?view=request&request=events&task=query'+filterQuery, params.data)
       .done(function(data) {
+        if (data.result == 'Error') {
+          alert(data.message);
+          return;
+        }
         var rows = processRows(data.rows);
         // rearrange the result into what bootstrap-table expects
         params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: rows});

From 0573c09b5097ce18816b182eefd8bed9e1cf1923 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 13:51:32 -0500
Subject: [PATCH 070/501] Cleanup and spacing. Rework last_motion_score to be a
 bit more efficient and use fewer lines.  Fix case where MOCORD was not
 ending/starting event on alarm.

---
 src/zm_monitor.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 679ea27b7..cdf544682 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1862,8 +1862,6 @@ bool Monitor::Analyse() {
           Debug(3, "signal and active and modect");
           Event::StringSet zoneSet;
 
-          int motion_score = last_motion_score;
-
           if (analysis_fps_limit) {
             double capture_fps = get_capture_fps();
             motion_frame_skip = capture_fps / analysis_fps_limit;
@@ -1880,7 +1878,7 @@ bool Monitor::Analyse() {
               } else {
                 Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
                 // Get new score.
-                motion_score = DetectMotion(*(snap->image), zoneSet);
+                int motion_score = DetectMotion(*(snap->image), zoneSet);
 
                 snap->zone_stats.reserve(zones.size());
                 for (const Zone &zone : zones) {
@@ -1892,21 +1890,20 @@ bool Monitor::Analyse() {
                 Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
                     score, last_motion_score, motion_score);
                 motion_frame_count += 1;
-                // Why are we updating the last_motion_score too?
                 last_motion_score = motion_score;
+                if (motion_score) {
+                  if (cause.length()) cause += ", ";
+                  cause += MOTION_CAUSE;
+                  noteSetMap[MOTION_CAUSE] = zoneSet;
+                } // end if motion_score
               }
             } else {
               Debug(1, "no image so skipping motion detection");
             }  // end if has image
           } else {
-            Debug(1, "Skipped motion detection last motion score was %d", motion_score);
+            Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
           }
-          if (motion_score) {
-            score += motion_score;
-            if (cause.length()) cause += ", ";
-            cause += MOTION_CAUSE;
-            noteSetMap[MOTION_CAUSE] = zoneSet;
-          } // end if motion_score
+          score += last_motion_score;
         } else {
           Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
               Active(), enabled, shared_data->active,
@@ -2007,7 +2004,7 @@ bool Monitor::Analyse() {
           } // end if ! event
         } // end if RECORDING
 
-        if (score and (function == MODECT or function == NODECT)) {
+        if (score and (function == MODECT or function == NODECT or function == MOCORD)) {
           if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
             // If we should end then previous continuous event and start a new non-continuous event
             if (event && event->Frames()
@@ -2142,7 +2139,8 @@ bool Monitor::Analyse() {
             shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
           } else {
             Debug(1,
-                  "State %s because image_count(%d)-last_alarm_count(%d) > post_event_count(%d) and timestamp.tv_sec(%" PRIi64 ") - recording.tv_src(%" PRIi64 ") >= min_section_length(%" PRIi64 ")",
+                  "State %d %s because analysis_image_count(%d)-last_alarm_count(%d) > post_event_count(%d) and timestamp.tv_sec(%" PRIi64 ") - recording.tv_src(%" PRIi64 ") >= min_section_length(%" PRIi64 ")",
+                  state,
                   State_Strings[state].c_str(),
                   analysis_image_count,
                   last_alarm_count,
@@ -2161,12 +2159,10 @@ bool Monitor::Analyse() {
           // Generate analysis images if necessary
           if ((savejpegs > 1) and snap->image) {
             for (const Zone &zone : zones) {
-              if (zone.Alarmed()) {
-                if (zone.AlarmImage()) {
+              if (zone.Alarmed() and zone.AlarmImage()) {
                   if (!snap->analysis_image)
                     snap->analysis_image = new Image(*(snap->image));
                   snap->analysis_image->Overlay(*(zone.AlarmImage()));
-                }
               } // end if zone is alarmed
             } // end foreach zone
           } // end if savejpegs

From bdf55f105e0dc1a18d0de38ba742ec4ff816447b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 13:54:33 -0500
Subject: [PATCH 071/501] Spacing

---
 src/zm_event.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 442033c50..d52f606a6 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -323,32 +323,32 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
   bool update = false;
 
   //Info( "Checking notes, %d <> %d", noteSetMap.size(), newNoteSetMap.size() );
-  if ( newNoteSetMap.size() > 0 ) {
-    if ( noteSetMap.size() == 0 ) {
+  if (newNoteSetMap.size() > 0) {
+    if (noteSetMap.size() == 0) {
       noteSetMap = newNoteSetMap;
       update = true;
     } else {
-      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin();
+      for (StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin();
           newNoteSetMapIter != newNoteSetMap.end();
-          ++newNoteSetMapIter ) {
+          ++newNoteSetMapIter) {
         const std::string &newNoteGroup = newNoteSetMapIter->first;
         const StringSet &newNoteSet = newNoteSetMapIter->second;
         //Info( "Got %d new strings", newNoteSet.size() );
-        if ( newNoteSet.size() > 0 ) {
+        if (newNoteSet.size() > 0) {
           StringSetMap::iterator noteSetMapIter = noteSetMap.find(newNoteGroup);
-          if ( noteSetMapIter == noteSetMap.end() ) {
-            //Info( "Can't find note group %s, copying %d strings", newNoteGroup.c_str(), newNoteSet.size() );
+          if (noteSetMapIter == noteSetMap.end()) {
+            //Debug(3, "Can't find note group %s, copying %d strings", newNoteGroup.c_str(), newNoteSet.size());
             noteSetMap.insert(StringSetMap::value_type(newNoteGroup, newNoteSet));
             update = true;
           } else {
             StringSet &noteSet = noteSetMapIter->second;
-            //Info( "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size() );
-            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin();
+            //Debug(3, "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size());
+            for (StringSet::const_iterator newNoteSetIter = newNoteSet.begin();
                 newNoteSetIter != newNoteSet.end();
-                ++newNoteSetIter ) {
+                ++newNoteSetIter) {
               const std::string &newNote = *newNoteSetIter;
               StringSet::iterator noteSetIter = noteSet.find(newNote);
-              if ( noteSetIter == noteSet.end() ) {
+              if (noteSetIter == noteSet.end()) {
                 noteSet.insert(newNote);
                 update = true;
               }

From 82a26a1f83bd8c55b05e9fcf039d6d71e07f5299 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 13:59:05 -0500
Subject: [PATCH 072/501] use != Monitor instead of all the other cases

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index cdf544682..81eacc956 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2004,7 +2004,7 @@ bool Monitor::Analyse() {
           } // end if ! event
         } // end if RECORDING
 
-        if (score and (function == MODECT or function == NODECT or function == MOCORD)) {
+        if (score and (function != MONITOR)) {
           if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
             // If we should end then previous continuous event and start a new non-continuous event
             if (event && event->Frames()

From 53c57478b812f555289c20065ac4c2b19a1c597c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 14:00:04 -0500
Subject: [PATCH 073/501] Ignore versioned bootstrap

---
 .eslintignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index 4682851df..91b0fd196 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@
 web/api/lib
 web/includes/csrf/
 web/js/videojs.zoomrotate.js
-web/skins/classic/js/bootstrap.js
+web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/chosen
 web/skins/classic/js/dateTimePicker
 web/skins/classic/js/jquery-*.js

From c76e688f05a8c67914c18b44766dc6fd799437b6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 15:49:25 -0500
Subject: [PATCH 074/501] Don't exit(0) on QUIT. Instead set zm_terminate=true
 so that all the cleanup routines run.

---
 src/zm_monitorstream.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 5c32b8e05..9bc04a311 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -229,6 +229,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
       break;
     case CMD_QUIT :
       Info("User initiated exit - CMD_QUIT");
+      zm_terminate = true;
       break;
     case CMD_QUERY :
       Debug(1, "Got QUERY command, sending STATUS");
@@ -315,16 +316,6 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
     }
   }
   Debug(2, "Number of bytes sent to (%s): (%d)", rem_addr.sun_path, nbytes);
-
-  // quit after sending a status, if this was a quit request
-  if ( (MsgCommand)msg->msg_data[0] == CMD_QUIT ) {
-    zm_terminate = true;
-    Debug(2, "Quitting");
-    return;
-  }
-
-  //Debug(2,"Updating framerate");
-  //updateFrameRate(monitor->GetFPS());
 }  // end void MonitorStream::processCommand(const CmdMsg *msg)
 
 bool MonitorStream::sendFrame(const std::string &filepath, SystemTimePoint timestamp) {

From acff4fb9c0900fce29c14487a25384bec3e84b90 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 14:32:06 -0500
Subject: [PATCH 075/501] rough in fullscreen mode in watch view

---
 web/skins/classic/js/skin.js        | 26 ++++++++++++++++++++++++++
 web/skins/classic/views/js/watch.js |  5 +++++
 web/skins/classic/views/watch.php   |  3 +++
 3 files changed, 34 insertions(+)

diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index c7e2afedf..6ede08479 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -947,3 +947,29 @@ function initThumbAnimation() {
     });
   }
 }
+
+/* View in fullscreen */
+function openFullscreen(elem) {
+  if (elem.requestFullscreen) {
+    elem.requestFullscreen();
+  } else if (elem.webkitRequestFullscreen) {
+    /* Safari */
+    elem.webkitRequestFullscreen();
+  } else if (elem.msRequestFullscreen) {
+    /* IE11 */
+    elem.msRequestFullscreen();
+  }
+}
+
+/* Close fullscreen */
+function closeFullscreen() {
+  if (document.exitFullscreen) {
+    document.exitFullscreen();
+  } else if (document.webkitExitFullscreen) {
+    /* Safari */
+    document.webkitExitFullscreen();
+  } else if (document.msExitFullscreen) {
+    /* IE11 */
+    document.msExitFullscreen();
+  }
+}
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index aacad5126..5ba4b407c 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -970,5 +970,10 @@ function initPage() {
   });
 } // initPage
 
+function watchFullscreen() {
+  const content = document.getElementById('content');
+  openFullscreen(content);
+}
+
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index e1e54c3c7..beab28ac1 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -142,6 +142,9 @@ if ( $streamMode == 'jpeg' ) {
         <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut">
         <i class="material-icons md-18">zoom_out</i>
         </button>
+        <button type="button" id="fullscreenBtn" title="<?php echo translate('Fullscreen') ?>" class="avail" data-on-click="watchFullscreen">
+        <i class="material-icons md-18">fullscreen</i>
+        </button>
 <?php
 } // end if streamMode==jpeg
 ?>

From dc9f7b4d1d5960282f46c39c445b3a675753e240 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 16:12:39 -0500
Subject: [PATCH 076/501] Rough in fullscreen mode on montage

---
 web/skins/classic/views/js/montage.js | 5 +++++
 web/skins/classic/views/montage.php   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 5312928a6..75b3a74d2 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -317,5 +317,10 @@ function initPage() {
   }
   selectLayout('#zmMontageLayout');
 }
+
+function watchFullscreen() {
+  const content = document.getElementById('content');
+  openFullscreen(content);
+}
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 3256cfcc8..b0b10f190 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -206,6 +206,9 @@ if ( canView('System') ) {
             &nbsp;<?php echo translate('Snapshot') ?>
           </button>
 <?php } ?>
+        <button type="button" id="fullscreenBtn" title="<?php echo translate('Fullscreen') ?>" class="avail" data-on-click="watchFullscreen">
+        <i class="material-icons md-18">fullscreen</i>
+        </button>
         </form>
       </div>
     </div>

From 9d37fbcd8e7e66e76396200df8e757548aeed668 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Nov 2021 17:01:04 -0500
Subject: [PATCH 077/501] Fix some build warnings on arm

---
 src/zm_fifo.cpp        |  4 ++--
 src/zm_monitor.cpp     | 22 +++++++++++-----------
 src/zm_packetqueue.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/zm_fifo.cpp b/src/zm_fifo.cpp
index 319c35c31..a999adc23 100644
--- a/src/zm_fifo.cpp
+++ b/src/zm_fifo.cpp
@@ -143,8 +143,8 @@ bool Fifo::writePacket(std::string filename, const ZMPacket &packet) {
 bool Fifo::write(uint8_t *data, size_t bytes, int64_t pts) {
   if (!(outfile or open())) return false;
   // Going to write a brief header
-  Debug(1, "Writing header ZM %lu %" PRId64,  bytes, pts);
-  if ( fprintf(outfile, "ZM %lu %" PRId64 "\n", bytes, pts) < 0 ) {
+  Debug(1, "Writing header ZM %zu %" PRId64,  bytes, pts);
+  if (fprintf(outfile, "ZM %zu %" PRId64 "\n", bytes, pts) < 0) {
     if (errno != EAGAIN) {
       Error("Problem during writing: %s", strerror(errno));
     } else {
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 81eacc956..b6e69a19f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -155,7 +155,7 @@ bool Monitor::MonitorLink::connect() {
 
     mem_size = sizeof(SharedData) + sizeof(TriggerData);
 
-    Debug(1, "link.mem.size=%jd", mem_size);
+    Debug(1, "link.mem.size=%jd", static_cast<intmax_t>(mem_size));
 #if ZM_MEM_MAPPED
     map_fd = open(mem_file.c_str(), O_RDWR, (mode_t)0600);
     if (map_fd < 0) {
@@ -182,14 +182,14 @@ bool Monitor::MonitorLink::connect() {
       disconnect();
       return false;
     } else if (map_stat.st_size < mem_size) {
-      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, mem_size);
+      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, static_cast<intmax_t>(mem_size));
       disconnect();
       return false;
     }
 
     mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
     if (mem_ptr == MAP_FAILED) {
-      Error("Can't map file %s (%jd bytes) to memory: %s", mem_file.c_str(), mem_size, strerror(errno));
+      Error("Can't map file %s (%jd bytes) to memory: %s", mem_file.c_str(), static_cast<intmax_t>(mem_size), strerror(errno));
       disconnect();
       return false;
     }
@@ -947,7 +947,7 @@ bool Monitor::connect() {
       map_fd = -1;
       return false;
     } else {
-      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, mem_size);
+      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, static_cast<intmax_t>(mem_size));
       close(map_fd);
       map_fd = -1;
       return false;
@@ -959,18 +959,18 @@ bool Monitor::connect() {
   mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0);
   if (mem_ptr == MAP_FAILED) {
     if (errno == EAGAIN) {
-      Debug(1, "Unable to map file %s (%jd bytes) to locked memory, trying unlocked", mem_file.c_str(), mem_size);
+      Debug(1, "Unable to map file %s (%jd bytes) to locked memory, trying unlocked", mem_file.c_str(), static_cast<intmax_t>(mem_size));
 #endif
       mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
-      Debug(1, "Mapped file %s (%jd bytes) to unlocked memory", mem_file.c_str(), mem_size);
+      Debug(1, "Mapped file %s (%jd bytes) to unlocked memory", mem_file.c_str(), static_cast<intmax_t>(mem_size));
 #ifdef MAP_LOCKED
     } else {
-      Error("Unable to map file %s (%jd bytes) to locked memory (%s)", mem_file.c_str(), mem_size, strerror(errno));
+      Error("Unable to map file %s (%jd bytes) to locked memory (%s)", mem_file.c_str(), static_cast<intmax_t>(mem_size), strerror(errno));
     }
   }
 #endif
   if ((mem_ptr == MAP_FAILED) or (mem_ptr == nullptr)) {
-    Error("Can't map file %s (%jd bytes) to memory: %s(%d)", mem_file.c_str(), mem_size, strerror(errno), errno);
+    Error("Can't map file %s (%jd bytes) to memory: %s(%d)", mem_file.c_str(), static_cast<intmax_t>(mem_size), strerror(errno), errno);
     close(map_fd);
     map_fd = -1;
     mem_ptr = nullptr;
@@ -2310,7 +2310,7 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
     while ( 1 ) {
       dest_ptr = link_id_str;
       while ( *src_ptr >= '0' && *src_ptr <= '9' ) {
-        if ( (dest_ptr-link_id_str) < (unsigned int)(sizeof(link_id_str)-1) ) {
+        if ( (unsigned int)(dest_ptr-link_id_str) < (unsigned int)(sizeof(link_id_str)-1) ) {
           *dest_ptr++ = *src_ptr++;
         } else {
           break;
@@ -2741,7 +2741,7 @@ void Monitor::TimestampImage(Image *ts_image, SystemTimePoint ts_time) const {
   const char *s_ptr = label_time_text;
   char *d_ptr = label_text;
 
-  while (*s_ptr && ((d_ptr - label_text) < (unsigned int) sizeof(label_text))) {
+  while (*s_ptr && ((unsigned int)(d_ptr - label_text) < (unsigned int) sizeof(label_text))) {
     if ( *s_ptr == config.timestamp_code_char[0] ) {
       bool found_macro = false;
       switch ( *(s_ptr+1) ) {
@@ -2757,7 +2757,7 @@ void Monitor::TimestampImage(Image *ts_image, SystemTimePoint ts_time) const {
           typedef std::chrono::duration<int64, std::centi> Centiseconds;
           Centiseconds centi_sec = std::chrono::duration_cast<Centiseconds>(
               ts_time.time_since_epoch() - std::chrono::duration_cast<Seconds>(ts_time.time_since_epoch()));
-          d_ptr += snprintf(d_ptr, sizeof(label_text) - (d_ptr - label_text), "%02ld", centi_sec.count());
+          d_ptr += snprintf(d_ptr, sizeof(label_text) - (d_ptr - label_text), "%02lld", static_cast<long long int>(centi_sec.count()));
           found_macro = true;
           break;
       }
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index ceef421db..509a25ee6 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -209,7 +209,7 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
       --it;
     }
   }
-  Debug(1, "Tail count is %d, queue size is %lu", tail_count, pktQueue.size());
+  Debug(1, "Tail count is %d, queue size is %zu", tail_count, pktQueue.size());
 
   if (!keep_keyframes) {
     // If not doing passthrough, we don't care about starting with a keyframe so logic is simpler

From 98e29e7ef6d68b01ac2ac81ab04fd6869dcb39d6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:18:58 -0500
Subject: [PATCH 078/501] implement UrlToZMS in Monitor

---
 web/includes/Monitor.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index bd9987b2c..6423af11f 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -499,6 +499,10 @@ class Monitor extends ZM_Object {
     return $this->Server()->UrlToIndex($port);
   }
 
+  public function UrlToZMS($port=null) {
+    return $this->Server()->UrlToZMS($port).'?mid='.$this->Id();
+  }
+
   public function sendControlCommand($command) {
     // command is generally a command option list like --command=blah but might be just the word quit
 

From 8d0463bbff5e9cef3d954f30e40fab752d8a7020 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:20:19 -0500
Subject: [PATCH 079/501] Implement getElement, setScale in MonitorStream.js

---
 web/js/MonitorStream.js | 75 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index a10d90008..feb4b3611 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -3,8 +3,10 @@ function MonitorStream(monitorData) {
   this.id = monitorData.id;
   this.connKey = monitorData.connKey;
   this.url = monitorData.url;
+  this.url_to_zms = monitorData.url_to_zms;
   this.width = monitorData.width;
   this.height = monitorData.height;
+  this.scale = 100;
   this.status = null;
   this.alarmState = STATE_IDLE;
   this.lastAlarmState = STATE_IDLE;
@@ -15,19 +17,68 @@ function MonitorStream(monitorData) {
   };
   this.type = monitorData.type;
   this.refresh = monitorData.refresh;
+  this.element = null;
+  this.getElement = function() {
+    if (this.element) return this.element;
+    this.element = document.getElementById('liveStream'+this.id);
+    if (!this.element) {
+      console.error("No img for #liveStream"+this.id);
+    }
+    return this.element;
+  };
+
+  /* if the img element didn't have a src, this would fill it in, causing it to show. */
+  this.show = function() {
+    const stream = this.getElement();
+    if (!stream.src) {
+      stream.src = this.url_to_zms+"&mode=single&scale=100&connkey="+this.connKey;
+    }
+  };
+
+  this.setScale = function(newscale) {
+    const img = this.getElement();
+    if (!img) return;
+
+    this.scale = newscale;
+
+    const oldSrc = img.getAttribute('src');
+    let newSrc = '';
+
+    img.setAttribute('src', '');
+    console.log("Scaling to: " + newscale);
+
+    if (newscale == '0' || newscale == 'auto') {
+      let bottomElement = document.getElementById('replayStatus');
+      if (!bottomElement) {
+        bottomElement = document.getElementById('monitorState');
+      }
+      var newSize = scaleToFit(this.width, this.height, $j(img), $j(bottomElement));
+
+      console.log(newSize);
+      newWidth = newSize.width;
+      newHeight = newSize.height;
+      autoScale = parseInt(newSize.autoScale);
+      // This is so that we don't waste bandwidth and let the browser do all the scaling.
+      if (autoScale > 100) autoScale = 100;
+      if (autoScale) {
+        newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+autoScale);
+      }
+    } else {
+      newWidth = this.width * newscale / SCALE_BASE;
+      newHeight = this.height * newscale / SCALE_BASE;
+      img.width(newWidth);
+      img.height(newHeight);
+      if (newscale > 100) newscale = 100;
+      newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+newscale);
+    }
+    img.setAttribute('src', newSrc);
+  };
   this.start = function(delay) {
     // Step 1 make sure we are streaming instead of a static image
-    var stream = $j('#liveStream'+this.id);
-    if (!stream.length) {
-      console.log('No live stream');
-      return;
-    }
-    stream = stream[0];
-    if ( !stream ) {
-      console.log('No live stream');
-      return;
-    }
-    if ( !stream.src ) {
+    const stream = this.getElement();
+    if (!stream) return;
+
+    if (!stream.src) {
       // Website Monitors won't have an img tag
       console.log('No src for #liveStream'+this.id);
       console.log(stream);
@@ -38,7 +89,7 @@ function MonitorStream(monitorData) {
       src += '&connkey='+this.connKey;
     }
     if ( stream.src != src ) {
-      console.log("Setting to streaming");
+      console.log("Setting to streaming: " + src);
       stream.src = '';
       stream.src = src;
     }

From 6f3e22f2a0ed27140512d13d785bf7401d6729df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:21:12 -0500
Subject: [PATCH 080/501] If no bottom element is specified, take the last
 child of content in scaleToFit

---
 web/skins/classic/js/skin.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 6ede08479..a12005e76 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -584,10 +584,21 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
   $j(window).on('resize', endOfResize); //set delayed scaling when Scale to Fit is selected
   var ratio = baseWidth / baseHeight;
   var container = $j('#content');
+  if (!container) {
+    console.error("No container found");
+    return;
+  }
+
+  if (!bottomEl || !bottomEl.length) {
+    bottomEl = $j(container[0].lastElementChild);
+  }
+  //console.log(bottomEl);
   var viewPort = $j(window);
-  // jquery does not provide a bottom offet, and offset dows not include margins.  outerHeight true minus false gives total vertical margins.
+  // jquery does not provide a bottom offset, and offset does not include margins.  outerHeight true minus false gives total vertical margins.
   var bottomLoc = bottomEl.offset().top + (bottomEl.outerHeight(true) - bottomEl.outerHeight()) + bottomEl.outerHeight(true);
+  //console.log("bottomLoc: " + bottomEl.offset().top + " + (" + bottomEl.outerHeight(true) + ' - ' + bottomEl.outerHeight() +') + '+bottomEl.outerHeight(true));
   var newHeight = viewPort.height() - (bottomLoc - scaleEl.outerHeight(true));
+  //console.log("newHeight = " + viewPort.height() +" - " + bottomLoc + ' - ' + scaleEl.outerHeight(true));
   var newWidth = ratio * newHeight;
   if (newWidth > container.innerWidth()) {
     newWidth = container.innerWidth();
@@ -598,13 +609,15 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
     return parseInt($j(this).val());
   }).get();
   scales.shift();
-  var closest;
+  var closest = null;
   $j(scales).each(function() { //Set zms scale to nearest regular scale.  Zoom does not like arbitrary scale values.
     if (closest == null || Math.abs(this - autoScale) < Math.abs(closest - autoScale)) {
       closest = this.valueOf();
     }
   });
-  autoScale = closest;
+  if (closest) {
+    autoScale = closest;
+  }
   return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
 }
 

From a7fd65d844134b2be36dfa303b606763c6b54800 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:21:38 -0500
Subject: [PATCH 081/501] Put SCALE_BASE in skin.js.php as it is used in many
 places.

---
 web/skins/classic/js/skin.js.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 802a21095..87e08310e 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -54,6 +54,7 @@ foreach ( $perms as $perm ) {
 ?>
 
 var ANIMATE_THUMBS = <?php echo ZM_WEB_ANIMATE_THUMBS?'true':'false' ?>;
+var SCALE_BASE = <?php echo SCALE_BASE ?>;
 
 var refreshParent = <?php
 if ( ! empty($refreshParent) ) {

From 14e578cdb27b931e41d4e0e40887ffaa49a56530 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:22:05 -0500
Subject: [PATCH 082/501] Implement Exit Fullscreen using same button

---
 web/skins/classic/views/js/watch.js     | 14 ++++++++++++--
 web/skins/classic/views/js/watch.js.php |  6 +++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 5ba4b407c..324e7f7e0 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -971,8 +971,18 @@ function initPage() {
 } // initPage
 
 function watchFullscreen() {
-  const content = document.getElementById('content');
-  openFullscreen(content);
+  const btn = document.getElementById('fullscreenBtn');
+  console.log(btn);
+  if (btn.firstElementChild.innerHTML=='fullscreen') {
+    const content = document.getElementById('content');
+    openFullscreen(content);
+    btn.firstElementChild.innerHTML='fullscreen_exit';
+    btn.setAttribute('title', translate["Exit Fullscreen"]);
+  } else {
+    closeFullscreen();
+    btn.firstElementChild.innerHTML='fullscreen';
+    btn.setAttribute('title', translate["Fullscreen"]);
+  }
 }
 
 // Kick everything off
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 258a1da73..5b4568dfc 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -97,9 +97,13 @@ foreach( dbFetchAll( 'SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, a
   $labels[$row['Preset']] = $row['Label'];
 }
 
-foreach ( $labels as $index=>$label ) {
+foreach ($labels as $index=>$label) {
 ?>
 labels[<?php echo validInt($index) ?>] = '<?php echo validJsStr($label) ?>';
 <?php
 }
 ?>
+var translate = {
+  "Fullscreen": "<?php echo translate('Fullscreen') ?>",
+  "Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
+};

From 529e889d9912ca015277931e7988f32c39599061 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:23:36 -0500
Subject: [PATCH 083/501] remove extra ,

---
 web/ajax/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ajax/event.php b/web/ajax/event.php
index 906fe255a..a0b9cb57a 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -93,7 +93,7 @@ if ( canView('Events') or canView('Snapshots') ) {
       $exportFormat,
       $exportCompress,
       $exportStructure,
-      (!empty($_REQUEST['exportFile'])?$_REQUEST['exportFile']:'zmExport'),
+      (!empty($_REQUEST['exportFile'])?$_REQUEST['exportFile']:'zmExport')
     )) {
       ajaxResponse(array('exportFile'=>$exportFile));
     } else {

From ac03a88550357aa3ed56f2fa68bdda93f93ad2d7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:25:12 -0500
Subject: [PATCH 084/501] Include url_to_zms in monitorData

---
 web/skins/classic/views/js/zone.js.php  | 1 +
 web/skins/classic/views/js/zones.js.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index fc6616327..37eb6db82 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -66,6 +66,7 @@ monitorData[monitorData.length] = {
   'width': <?php echo $monitor->ViewWidth() ?>,
   'height':<?php echo $monitor->ViewHeight() ?>,
   'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'url_to_zms': '<?php echo $monitor->UrlToZMS( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
index 180a19d81..338095552 100644
--- a/web/skins/classic/views/js/zones.js.php
+++ b/web/skins/classic/views/js/zones.js.php
@@ -9,6 +9,7 @@ monitorData[monitorData.length] = {
   'width': <?php echo $monitor->ViewWidth() ?>,
   'height':<?php echo $monitor->ViewHeight() ?>,
   'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'url_to_zms': '<?php echo $monitor->UrlToZMS( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
@@ -24,7 +25,7 @@ var STATE_TAPE = <?php echo STATE_TAPE ?>;
 
 var stateStrings = new Array();
 stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_PREALARM] = "<?php echo translate('PreAlarm') ?>";
 stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
 stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
 stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";

From 795c5bb7d728dbe0f7ae68d346dd0f67827009ce Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:25:29 -0500
Subject: [PATCH 085/501] setScale to auto

---
 web/skins/classic/views/js/zone.js  | 1 +
 web/skins/classic/views/js/zones.js | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 6282cbf8a..58c286b43 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -661,6 +661,7 @@ function initPage() {
 
     // Start the fps and status updates. give a random delay so that we don't assault the server
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    monitors[i].setScale('auto');
     monitors[i].start(delay);
   }
 
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
index 0ad91942d..67dcb094a 100644
--- a/web/skins/classic/views/js/zones.js
+++ b/web/skins/classic/views/js/zones.js
@@ -12,6 +12,7 @@ function initPage() {
 
     // Start the fps and status updates. give a random delay so that we don't assault the server
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    monitors[i].setScale('auto');
     monitors[i].start(delay);
   }
 
@@ -31,5 +32,12 @@ function initPage() {
   });
 }
 
+function streamCmdQuit() {
+  for ( var i = 0, length = monitorData.length; i < length; i++ ) {
+    monitors[i] = new MonitorStream(monitorData[i]);
+    monitors[i].stop();
+  }
+}
+
 window.addEventListener('DOMContentLoaded', initPage);
 

From 8872b8be6325a0f90ec5de3c93770fb93f37ac39 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 14:25:45 -0500
Subject: [PATCH 086/501] spacing

---
 web/skins/classic/views/zones.php | 67 +++++++++++++++----------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index f457ad2fc..423326a98 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -80,15 +80,14 @@ xhtmlHeaders(__FILE__, translate('Zones'));
           <?php echo getStreamHTML($monitor, $options); ?>
           <svg class="zones" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>">
 <?php
-      foreach( array_reverse($zones) as $zone ) {
+    foreach (array_reverse($zones) as $zone) {
 ?>
             <polygon points="<?php echo $zone['AreaCoords'] ?>"
                      class="zmlink <?php echo $zone['Type']?>"
-                     data-on-click-true="streamCmdQuit"
                      data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
             />
 <?php
-      } // end foreach zone
+    } // end foreach zone
 ?>
           Sorry, your browser does not support inline SVG
         </svg>
@@ -96,37 +95,37 @@ xhtmlHeaders(__FILE__, translate('Zones'));
           <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
         </div>
         </div>
-				<div class="zones">
-					<table id="zonesTable" class="major">
-						<thead>
-							<tr>
-								<th class="colName"><?php echo translate('Name') ?></th>
-								<th class="colType"><?php echo translate('Type') ?></th>
-								<th class="colUnits"><?php echo translate('AreaUnits') ?></th>
-								<th class="colMark"><?php echo translate('Mark') ?></th>
-							</tr>
-						</thead>
-						<tbody>
-	<?php
-	foreach( $zones as $zone ) {
-	?>
-							<tr>
-								<td class="colName"><?php echo makeLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
-								<td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
-								<td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf('%.2f', ($zone['Area']*100)/($monitor->ViewWidth()*$monitor->ViewHeight()) ) ?></td>
-								<td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit('Monitors') ) { ?> disabled="disabled"<?php } ?>/></td>
-							</tr>
-	<?php
-	}
-	?>
-						</tbody>
-					</table>
-                                     <div id="contentButtons">
-                                       <?php echo makeButton('?view=zone&mid='.$mid.'&zid=0', 'AddNewZone', canEdit('Monitors')); ?>
-                                       <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
-                                     </div>
-				</div><!--zones-->
-<br class="clear"/>
+        <div class="zones">
+          <table id="zonesTable" class="major">
+            <thead>
+              <tr>
+                <th class="colName"><?php echo translate('Name') ?></th>
+                <th class="colType"><?php echo translate('Type') ?></th>
+                <th class="colUnits"><?php echo translate('AreaUnits') ?></th>
+                <th class="colMark"><?php echo translate('Mark') ?></th>
+              </tr>
+            </thead>
+            <tbody>
+  <?php
+  foreach( $zones as $zone ) {
+  ?>
+              <tr>
+                <td class="colName"><?php echo makeLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
+                <td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
+                <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf('%.2f', ($zone['Area']*100)/($monitor->ViewWidth()*$monitor->ViewHeight()) ) ?></td>
+                <td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit('Monitors') ) { ?> disabled="disabled"<?php } ?>/></td>
+              </tr>
+  <?php
+  }
+  ?>
+            </tbody>
+          </table>
+          <div id="contentButtons">
+            <?php echo makeButton('?view=zone&mid='.$mid.'&zid=0', 'AddNewZone', canEdit('Monitors')); ?>
+            <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+          </div>
+        </div><!--zones-->
+        <br class="clear"/>
       </div><!--Monitor-->
 <?php 
   } # end foreach monitor

From d94c100a72441202656060bcd594e9ca1e8c2202 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 16:53:07 -0500
Subject: [PATCH 087/501] Use event->StartTime instead of
 GetVideoWriterStartTime. Add some parenthesis to make logic clearer and add
 more info to debug statements

---
 src/zm_monitor.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index b6e69a19f..d808ddba0 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1916,7 +1916,7 @@ bool Monitor::Analyse() {
           if (event) {
             Debug(2, "Have event %" PRIu64 " in record", event->Id());
 
-            if (section_length != Seconds(0) && (timestamp - GetVideoWriterStartTime() >= section_length)
+            if (section_length != Seconds(0) && (timestamp - event->StartTime() >= section_length)
                 && ((function == MOCORD && event_close_mode != CLOSE_TIME)
                     || (function == RECORD && event_close_mode == CLOSE_TIME)
                     || std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()) % section_length == Seconds(0))) {
@@ -1925,8 +1925,8 @@ bool Monitor::Analyse() {
                    image_count,
                    event->Id(),
                    static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()).count()),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - GetVideoWriterStartTime()).count()),
+                   static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
+                   static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - event->StartTime()).count()),
                    static_cast<int64>(Seconds(section_length).count()));
               closeEvent();
             }  // end if section_length
@@ -2009,21 +2009,22 @@ bool Monitor::Analyse() {
             // If we should end then previous continuous event and start a new non-continuous event
             if (event && event->Frames()
                 && !event->AlarmFrames()
-                && event_close_mode == CLOSE_ALARM
-                && timestamp - GetVideoWriterStartTime() >= min_section_length
-                && (!pre_event_count || Event::PreAlarmCount() >= alarm_frame_count - 1)) {
+                && (event_close_mode == CLOSE_ALARM)
+                && ((timestamp - event->StartTime()) >= min_section_length)
+                && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
               Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
                   name.c_str(), image_count, event->Id());
               closeEvent();
             } else if (event) {
               // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
               Debug(3,
-                    "pre_alarm_count in event %d, event frames %d, alarm frames %d event length %" PRIi64 " >=? %" PRIi64 " min",
-                    Event::PreAlarmCount(),
+                    "pre_alarm_count in event %d of %d, event frames %d, alarm frames %d event length %" PRIi64 " >=? %" PRIi64 " min close mode is ALARM? %d",
+                    Event::PreAlarmCount(), pre_event_count,
                     event->Frames(),
                     event->AlarmFrames(),
-                    static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - GetVideoWriterStartTime()).count()),
-                    static_cast<int64>(Seconds(min_section_length).count()));
+                    static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - event->StartTime()).count()),
+                    static_cast<int64>(Seconds(min_section_length).count()),
+                    (event_close_mode == CLOSE_ALARM));
             }
             if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
               // lets construct alarm cause. It will contain cause + names of zones alarmed
@@ -2120,8 +2121,10 @@ bool Monitor::Analyse() {
             Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
             shared_data->state = state = ALERT;
           } else if (state == ALERT) {
-            if (analysis_image_count - last_alarm_count > post_event_count
-                && timestamp - GetVideoWriterStartTime() >= min_section_length) {
+            if (
+                ((analysis_image_count - last_alarm_count) > post_event_count)
+                &&
+               ((timestamp - event->StartTime()) >= min_section_length)) {
               Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                   name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
               //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
@@ -2168,7 +2171,6 @@ bool Monitor::Analyse() {
           } // end if savejpegs
 
           // incremement pre alarm image count
-          //have_pre_alarmed_frames ++;
           Event::AddPreAlarmFrame(snap->image, timestamp, score, nullptr);
         } else if (state == ALARM) {
           for (const Zone &zone : zones) {
@@ -2183,7 +2185,7 @@ bool Monitor::Analyse() {
           if (event) {
             if (noteSetMap.size() > 0)
               event->updateNotes(noteSetMap);
-            if (section_length != Seconds(0) && (timestamp - GetVideoWriterStartTime() >= section_length)) {
+            if (section_length != Seconds(0) && (timestamp - event->StartTime() >= section_length)) {
               Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
                       name.c_str(), analysis_image_count, event->Id(),
                       static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()).count()),

From e35dc3902ef5f10268603412f190fe3adeb6172c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 16:53:29 -0500
Subject: [PATCH 088/501] Make state enum start at 0 as we are indexing into an
 array for StateStrings

---
 src/zm_monitor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 56785405f..5b9a2ce46 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -100,7 +100,7 @@ public:
   } Deinterlace;
 
   typedef enum {
-    UNKNOWN=-1,
+    UNKNOWN,
     IDLE,
     PREALARM,
     ALARM,

From c84f42e2804519bc6e11a1bb58b579af9bc97f65 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Nov 2021 17:05:46 -0500
Subject: [PATCH 089/501] Set to never timeout while generating video

---
 web/skins/classic/views/js/video.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/skins/classic/views/js/video.js b/web/skins/classic/views/js/video.js
index 970119f4f..c764f33b5 100644
--- a/web/skins/classic/views/js/video.js
+++ b/web/skins/classic/views/js/video.js
@@ -16,6 +16,9 @@ function generateVideoResponse( data, responseText ) {
 }
 
 function generateVideo() {
+  $j.ajaxSetup({
+    timeout: 0
+  });
   var form = $j('#videoForm').serialize();
   $j.getJSON(thisUrl + '?view=request&request=event&action=video', form)
       .done(generateVideoResponse)

From d00430f799c450f7f213e9aff364b26c6a7ac6bb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Nov 2021 09:47:11 -0500
Subject: [PATCH 090/501] Add ModelId to MonitorPresets

---
 db/zm_create.sql.in     |  1 +
 db/zm_update-1.37.3.sql | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index ecc2d477d..9a048886d 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -412,6 +412,7 @@ CREATE TABLE `Models` (
 DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
+  `ModelId`  int unsigned, FOREIGN KEY (`ModelId`) REFERENCES `Models` (Id),
   `Name` varchar(64) NOT NULL default '',
   `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Device` tinytext,
diff --git a/db/zm_update-1.37.3.sql b/db/zm_update-1.37.3.sql
index 341c5e162..9002ce8e2 100644
--- a/db/zm_update-1.37.3.sql
+++ b/db/zm_update-1.37.3.sql
@@ -45,3 +45,26 @@ SET @s = (SELECT IF(
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'MonitorPresets'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in MonitorPresets'",
+"ALTER TABLE `MonitorPresets` ADD `ModelId`  int(10) unsigned AFTER `Id`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'MonitorPresets'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in MonitorPresets'",
+"ALTER TABLE `MonitorPresets` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From e63222d7337edfa8643e0e9064bbf83253e30266 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Nov 2021 16:30:03 -0500
Subject: [PATCH 091/501] Add IGNORE so it does UPSERT

---
 db/manufacturers.sql | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/db/manufacturers.sql b/db/manufacturers.sql
index be15f9c01..3761f5cbe 100644
--- a/db/manufacturers.sql
+++ b/db/manufacturers.sql
@@ -1,24 +1,24 @@
-INSERT INTO Manufacturers VALUES (1, 'Acti');
-INSERT INTO Manufacturers VALUES (2, 'Amcrest');
-INSERT INTO Manufacturers VALUES (3, 'Airlink101');
-INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
-INSERT INTO Manufacturers VALUES (5, 'Axis');
-INSERT INTO Manufacturers VALUES (6, 'Dahua');
-INSERT INTO Manufacturers VALUES (7, 'D-Link');
-INSERT INTO Manufacturers VALUES (8, 'Edimax');
-INSERT INTO Manufacturers VALUES (9, 'Foscam');
-INSERT INTO Manufacturers VALUES (10, 'Gadspot');
-INSERT INTO Manufacturers VALUES (11, 'GrandStream');
-INSERT INTO Manufacturers VALUES (12, 'HikVision');
-INSERT INTO Manufacturers VALUES (13, 'JVC');
-INSERT INTO Manufacturers VALUES (14, 'Maginon');
-INSERT INTO Manufacturers VALUES (15, 'Mobotix');
-INSERT INTO Manufacturers VALUES (16, 'Oncam Grandeye');
-INSERT INTO Manufacturers VALUES (17, 'Panasonic');
-INSERT INTO Manufacturers VALUES (18, 'Pelco');
-INSERT INTO Manufacturers VALUES (19, 'Sony');
-INSERT INTO Manufacturers VALUES (20, 'TP-Link');
-INSERT INTO Manufacturers VALUES (21, 'Trendnet');
-INSERT INTO Manufacturers VALUES (22, 'VisionTek');
-INSERT INTO Manufacturers VALUES (23, 'Vivotek');
-INSERT INTO Manufacturers VALUES (24, 'Wansview');
+INSERT IGNORE INTO Manufacturers VALUES (1, 'Acti');
+INSERT IGNORE INTO Manufacturers VALUES (2, 'Amcrest');
+INSERT IGNORE INTO Manufacturers VALUES (3, 'Airlink101');
+INSERT IGNORE INTO Manufacturers VALUES (4, 'Arecont Vision');
+INSERT IGNORE INTO Manufacturers VALUES (5, 'Axis');
+INSERT IGNORE INTO Manufacturers VALUES (6, 'Dahua');
+INSERT IGNORE INTO Manufacturers VALUES (7, 'D-Link');
+INSERT IGNORE INTO Manufacturers VALUES (8, 'Edimax');
+INSERT IGNORE INTO Manufacturers VALUES (9, 'Foscam');
+INSERT IGNORE INTO Manufacturers VALUES (10, 'Gadspot');
+INSERT IGNORE INTO Manufacturers VALUES (11, 'GrandStream');
+INSERT IGNORE INTO Manufacturers VALUES (12, 'HikVision');
+INSERT IGNORE INTO Manufacturers VALUES (13, 'JVC');
+INSERT IGNORE INTO Manufacturers VALUES (14, 'Maginon');
+INSERT IGNORE INTO Manufacturers VALUES (15, 'Mobotix');
+INSERT IGNORE INTO Manufacturers VALUES (16, 'Oncam Grandeye');
+INSERT IGNORE INTO Manufacturers VALUES (17, 'Panasonic');
+INSERT IGNORE INTO Manufacturers VALUES (18, 'Pelco');
+INSERT IGNORE INTO Manufacturers VALUES (19, 'Sony');
+INSERT IGNORE INTO Manufacturers VALUES (20, 'TP-Link');
+INSERT IGNORE INTO Manufacturers VALUES (21, 'Trendnet');
+INSERT IGNORE INTO Manufacturers VALUES (22, 'VisionTek');
+INSERT IGNORE INTO Manufacturers VALUES (23, 'Vivotek');
+INSERT IGNORE INTO Manufacturers VALUES (24, 'Wansview');

From 4e9a56624d8d7f86f3ad83059044f77599af42a1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Nov 2021 16:30:17 -0500
Subject: [PATCH 092/501] Use UPSERTS and add some more models

---
 db/models.sql | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/db/models.sql b/db/models.sql
index b7150d816..ffafb76a8 100644
--- a/db/models.sql
+++ b/db/models.sql
@@ -1,30 +1,41 @@
 /* INSERT INTO Manufacturers VALUES (1, 'Acti'); */
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
-INSERT INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A21');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A23');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A24');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A28');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A31');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A310');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A311');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A32');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A41');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A415');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A416');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A418');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A42');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A421');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A43');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A45');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A46');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A48');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (1, 'A74');
 /*
 INSERT INTO Manufacturers VALUES (2, 'Amcrest');
+*/
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'IP8M-T2499EW');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'ASH42-B');
+/*
 INSERT INTO Manufacturers VALUES (3, 'Airlink101');
 INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');
 INSERT INTO Manufacturers VALUES (5, 'Axis');
 INSERT INTO Manufacturers VALUES (6, 'Dahua');
 INSERT INTO Manufacturers VALUES (7, 'D-Link');
+*/
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-930L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-932L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-933L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-942L');
+INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (7, 'DCS-5020L');
+/*
 INSERT INTO Manufacturers VALUES (8, 'Edimax');
 INSERT INTO Manufacturers VALUES (9, 'Foscam');
 INSERT INTO Manufacturers VALUES (10, 'Gadspot');

From 6cbc4c0a7af6d1e977997283a4f7e214842966be Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Nov 2021 16:30:39 -0500
Subject: [PATCH 093/501] Update MonirorPresets to link to Amcrest cams

---
 db/zm_update-1.37.3.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/zm_update-1.37.3.sql b/db/zm_update-1.37.3.sql
index 9002ce8e2..5ae4aa1b1 100644
--- a/db/zm_update-1.37.3.sql
+++ b/db/zm_update-1.37.3.sql
@@ -68,3 +68,6 @@ SET @s = (SELECT IF(
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
+UPDATE `MonitorPresets` SET `ModelId`=(SELECT `Id` FROM `Models` WHERE `Name`='IP8M-T2499EW') WHERE `Name` like 'Amcrest, IP8M-T2499EW
+%';

From f48511acba1dd033feeab533d502dcc4aadbf45f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Nov 2021 09:19:42 -0500
Subject: [PATCH 094/501] Add NULL for ModelId column when adding
 MonitorPresets.

---
 db/zm_create.sql.in | 150 ++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 9a048886d..d9d4f96c3 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -974,81 +974,81 @@ INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0
 -- Add some monitor preset values
 --
 
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
 
 --
 -- Add some zone preset values

From 20629fdf5a77505708842f2f910822799102e641 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Nov 2021 09:20:14 -0500
Subject: [PATCH 095/501] Include Manufacturer and Model in telemetry

---
 scripts/zmtelemetry.pl.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index a3debabdb..c164df7e4 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -263,7 +263,10 @@ sub countQuery {
 sub getMonitorRef {
   my $dbh = shift;
 
-  my $sql = 'SELECT `Id`,`Name`,`Type`,`Function`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS` FROM `Monitors`';
+  my $sql = 'SELECT `Id`,`Name`,`Type`,`Function`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS`,
+  (SELECT Name FROM Manufacturers WHERE Manufacturers.Id = ManufacturerId),
+  (SELECT Name FROM Models WHERE Models.Id = ModelId)
+  FROM `Monitors`';
   my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
   my $arrayref = $sth->fetchall_arrayref({});

From 78a803abf87bd724dcaa69de4401b561a847b8a5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Nov 2021 09:47:34 -0500
Subject: [PATCH 096/501] Add Model and Manufacturer to telemetry listing

---
 web/lang/en_gb.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 8b412cd39..8c6ce9adb 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -663,8 +663,33 @@ $SLANG = array(
     'PrivacyCookiesText'    => 'Whether you use a web browser or a mobile app to communicate with the ZoneMinder server, a ZMSESSID cookie is created on the client to uniquely identify a session with the ZoneMinder server. ZmCSS and zmSkin cookies are created to remember your style and skin choices.',
     'PrivacyTelemetry'      => 'Telemetry',
     'PrivacyTelemetryText'  => 'Because ZoneMinder is open-source, anyone can install it without registering. This makes it difficult to  answer questions such as: how many systems are out there, what is the largest system out there, what kind of systems are out there, or where are these systems located? Knowing the answers to these questions, helps users who ask us these questions, and it helps us set priorities based on the majority user base.',
-    'PrivacyTelemetryList'  => 'The ZoneMinder Telemetry daemon collects the following data about your system:<ul><li>A unique identifier (UUID) <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!<li>Current time<li>Total number of monitors<li>Total number of events<li>System architecture<li>Operating system kernel, distro, and distro version<li>Version of ZoneMinder<li>Total amount of memory<li>Number of cpu cores</ul>',
-    'PrivacyMonitorList'    => 'The following configuration parameters from each monitor are collected:<ul><li>Id<li>Name<li>Type<li>Function<li>Width<li>Height<li>Colours<li>MaxFPS<li>AlarmMaxFPS</ul>',
+    'PrivacyTelemetryList'  => 'The ZoneMinder Telemetry daemon collects the following data about your system:
+    <ul>
+      <li>A unique identifier (UUID)</li>
+      <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!</li>
+      <li>Current time</li>
+      <li>Total number of monitors</li>
+      <li>Total number of events</li>
+      <li>System architecture</li>
+      <li>Operating system kernel, distro, and distro version</li>
+      <li>Version of ZoneMinder</li>
+      <li>Total amount of memory</li>
+      <li>Number of cpu cores</li>
+    </ul>',
+    'PrivacyMonitorList'    => 'The following configuration parameters from each monitor are collected:
+   <ul>
+    <li>Id</li>
+    <li>Name</li>
+    <li>Manufacturer</li>
+    <li>Model</li>
+    <li>Type</li>
+    <li>Function</li>
+    <li>Width</li>
+    <li>Height</li>
+    <li>Colours</li>
+    <li>MaxFPS</li>
+    <li>AlarmMaxFPS</li>
+   </ul>',
     'PrivacyConclusionText' => 'We are <u>NOT</u> collecting any image specific data from your cameras. We don’t know what your cameras are watching. This data will not be sold or used for any purpose not stated herein. By clicking accept, you agree to send us this data to help make ZoneMinder a better product. By clicking decline, you can still freely use ZoneMinder and all its features.',
     'Probe'                 => 'Probe',
     'ProfileProbe'          => 'Stream Probe',

From ab9c538c370e3d2817dd13448017bea788315c1a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Nov 2021 14:59:18 -0500
Subject: [PATCH 097/501] Allow NOW or CURRENT for PACKAGE_VERSION similar to
 snapshot

---
 utils/do_debian_package.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 6c8c06c00..a77702fca 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -146,6 +146,14 @@ else
   fi;
 fi
 
+if [ "$PACKAGE_VERSION" == "NOW" ]; then
+  PACKAGE_VERSION=`date +%Y%m%d%H%M%S`;
+else
+  if [ "$PACKAGE_VERSION" == "CURRENT" ]; then
+    PACKAGE_VERSION="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
+  fi;
+fi;
+
 IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
 if [ "$PPA" == "" ]; then
   if [ "$RELEASE" != "" ]; then

From 4945a016cf7383bdb51d8190247c083640b10615 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 11:04:28 -0500
Subject: [PATCH 098/501] Restore inclusion of video files in export when not
 including images. Fixes #3324

---
 web/skins/classic/includes/export_functions.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 0e348152f..f34d53546 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -786,7 +786,7 @@ function exportFileList(
     }
     closedir($dir);
   }
-  ZM\Debug(print_r($files, true));
+  ZM\Debug('All available files: '.print_r($files, true));
 
   $exportFileList = array();
 
@@ -843,6 +843,18 @@ function exportFileList(
     ZM\Debug('Not including frame images');
   } # end if exportImages
 
+  if ($exportVideo) {
+    $filesLeft = array();
+    foreach ($files as $file) {
+      if (preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file)) {
+        $exportFileList[$file] = $file;
+      } else {
+        $filesLeft[$file] = $file;
+      }
+    }
+    $files = $filesLeft;
+  }
+
   if ($exportMisc) {
     foreach ($files as $file) {
       $exportFileList[$file] = $file;

From 96b4af6255b0f1d9e5306c74bca4e808987d4659 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 14:43:13 -0500
Subject: [PATCH 099/501] Enable multi-threading on decode

---
 src/zm_ffmpeg_camera.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index b122e0f2b..728b51783 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -458,6 +458,17 @@ int FfmpegCamera::OpenFfmpeg() {
 #endif
   }  // end if hwaccel_name
 
+  // set codec to automatically determine how many threads suits best for the decoding job
+  mVideoCodecContext->thread_count = 0;
+
+  if (mVideoCodec->capabilities | AV_CODEC_CAP_FRAME_THREADS) {
+    mVideoCodecContext->thread_type = FF_THREAD_FRAME;
+  } else if (mVideoCodec->capabilities | AV_CODEC_CAP_SLICE_THREADS) {
+    mVideoCodecContext->thread_type = FF_THREAD_SLICE;
+  } else {
+    mVideoCodecContext->thread_count = 1; //don't use multithreading
+  }
+
   ret = avcodec_open2(mVideoCodecContext, mVideoCodec, &opts);
 
   e = nullptr;

From c37d8eeded5e5c7562537de64b76f59d9d318e1e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 17:45:38 -0500
Subject: [PATCH 100/501] spacing and report save errors

---
 web/includes/actions/monitors.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/web/includes/actions/monitors.php b/web/includes/actions/monitors.php
index 118af1533..c133ac83b 100644
--- a/web/includes/actions/monitors.php
+++ b/web/includes/actions/monitors.php
@@ -19,24 +19,27 @@
 //
 
 // Monitor edit actions, monitor id derived, require edit permissions for that monitor
-if ( ! canEdit('Monitors') ) {
+if (!canEdit('Monitors')) {
   ZM\Warning("Monitor actions require Monitors Permissions");
   return;
 }
 
-if ( $action == 'save' ) {
-  foreach ( $_REQUEST['mids'] as $mid ) {
+if ($action == 'save') {
+  foreach ($_REQUEST['mids'] as $mid) {
     $mid = ValidInt($mid);
-    if ( ! canEdit('Monitors', $mid) ) {
-      ZM\Warning("Cannot edit monitor $mid");
+    if (!canEdit('Monitors', $mid)) {
+      ZM\Warning('Cannot edit monitor '.$mid);
       continue;
     }
     $Monitor = new ZM\Monitor($mid);
-    if ( $Monitor->Type() != 'WebSite' ) {
+    if ($Monitor->Type() != 'WebSite') {
       $Monitor->zmcControl('stop');
     }
-    $Monitor->save($_REQUEST['newMonitor']);
-    if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
+    if (!$Monitor->save($_REQUEST['newMonitor'])) {
+      global $error_message;
+      $error_message .= 'Error saving monitor: ' . $Monitor->get_last_error().'<br/>';
+    }
+    if ($Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite') {
       $Monitor->zmcControl('start');
     }
   } // end foreach mid

From b1d881b11833e44485c0117ff4ddfa13506542ef Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 18:57:36 -0500
Subject: [PATCH 101/501] Report more saving errors to ui

---
 web/includes/actions/monitor.php | 69 ++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 50e354978..2d900433a 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -19,55 +19,62 @@
 //
 
 // Monitor edit actions, monitor id derived, require edit permissions for that monitor
-if ( !canEdit('Monitors') ) {
+if (!canEdit('Monitors')) {
   ZM\Warning('Monitor actions require Monitors Permissions');
   return;
 }
 
-if ( $action == 'save' ) {
+global $error_message;
+
+if ($action == 'save') {
   $mid = 0;
-  if ( !empty($_REQUEST['mid']) ) {
+  if (!empty($_REQUEST['mid'])) {
     $mid = validInt($_REQUEST['mid']);
-    if ( !canEdit('Monitors', $mid) ) {
+    if (!canEdit('Monitors', $mid)) {
       ZM\Warning('You do not have permission to edit this monitor');
       return;
     }
-    if ( ZM_OPT_X10 ) {
+    if (ZM_OPT_X10) {
       $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
-      if ( !$x10Monitor ) $x10Monitor = array();
+      if (!$x10Monitor) $x10Monitor = array();
     }
   } else {
-    if ( $user['MonitorIds'] ) {
+    if ($user['MonitorIds']) {
       ZM\Warning('You are restricted to certain monitors so cannot add a new one.');
       return;
     }
-    if ( ZM_OPT_X10 ) {
+    if (ZM_OPT_X10) {
       $x10Monitor = array();
     }
   }
 
   # For convenience
   $newMonitor = $_REQUEST['newMonitor'];
+  ZM\Debug("newMonitor: ". print_r($newMonitor, true));
 
-  if ( !$newMonitor['ManufacturerId'] and ($newMonitor['Manufacturer'] != '') ) {
+  if (!$newMonitor['ManufacturerId'] and ($newMonitor['Manufacturer'] != '')) {
     # Need to add a new Manufacturer entry
     $newManufacturer = ZM\Manufacturer::find_one(array('Name'=>$newMonitor['Manufacturer']));
     if (!$newManufacturer) {
       $newManufacturer = new ZM\Manufacturer();
-      $newManufacturer->save(array('Name'=>$newMonitor['Manufacturer']));
+      if (!$newManufacturer->save(array('Name'=>$newMonitor['Manufacturer']))) {
+        $error_message .= "Error saving new Manufacturer: " . $newManufacturer->get_last_error().'</br>';
+      }
     }
     $newMonitor['ManufacturerId'] = $newManufacturer->Id();
   }
 
-  if ( !$newMonitor['ModelId'] and ($newMonitor['Model'] != '') ) {
+  if (!$newMonitor['ModelId'] and ($newMonitor['Model'] != '')) {
     # Need to add a new Model entry
     $newModel = ZM\Model::find_one(array('Name'=>$newMonitor['Model']));
     if (!$newModel) {
       $newModel = new ZM\Model();
-      $newModel->save(array(
+      if (!$newModel->save(array(
             'Name'=>$newMonitor['Model'],
             'ManufacturerId'=>$newMonitor['ManufacturerId']
-            ));
+      ))) {
+        $error_message .= "Error saving new Model: " . $newModel->get_last_error().'</br>';
+      }
     }
     $newMonitor['ModelId'] = $newModel->Id();
   }
@@ -94,13 +101,13 @@ if ( $action == 'save' ) {
 
   # Checkboxes don't return an element in the POST data, so won't be present in newMonitor.
   # So force a value for these fields
-  foreach ( $types as $field => $value ) {
-    if ( ! isset($newMonitor[$field] ) ) {
+  foreach ($types as $field => $value) {
+    if (!isset($newMonitor[$field])) {
       $newMonitor[$field] = $value;
     }
   } # end foreach type
 
-  if ( $newMonitor['ServerId'] == 'auto' ) {
+  if ($newMonitor['ServerId'] == 'auto') {
     $newMonitor['ServerId'] = dbFetchOne(
       'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
     ZM\Debug('Auto selecting server: Got ' . $newMonitor['ServerId']);
@@ -110,17 +117,19 @@ if ( $action == 'save' ) {
     }
   }
 
+  ZM\Debug("newMonitor: ". print_r($newMonitor, true));
   $changes = $monitor->changes($newMonitor);
+  ZM\Debug("Changes: ". print_r($changes, true));
   $restart = false;
 
-  if ( count($changes) ) {
+  if (count($changes)) {
     // monitor->Id() has a value when the db record exists
-    if ( $monitor->Id() ) {
+    if ($monitor->Id()) {
 
       # If we change anything that changes the shared mem size, zma can complain.  So let's stop first.
-      if ( $monitor->Type() != 'WebSite' ) {
+      if ($monitor->Type() != 'WebSite') {
         $monitor->zmcControl('stop');
-        if ( $monitor->Controllable() ) {
+        if ($monitor->Controllable()) {
           $monitor->sendControlCommand('stop');
         }
       }
@@ -129,8 +138,7 @@ if ( $action == 'save' ) {
       $oldW = $monitor->Width();
       $oldH = $monitor->Height();
 
-      if ( $monitor->save($changes) ) {
-
+      if ($monitor->save($changes)) {
         // Groups will be added below
         if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
           // creating symlinks when symlink already exists reports errors, but is perfectly ok
@@ -138,26 +146,26 @@ if ( $action == 'save' ) {
 
           $OldStorage = $monitor->Storage();
           $saferOldName = basename($monitor->Name());
-          if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
+          if (file_exists($OldStorage->Path().'/'.$saferOldName))
             unlink($OldStorage->Path().'/'.$saferOldName);
 
           $NewStorage = new ZM\Storage($newMonitor['StorageId']);
-          if ( !file_exists($NewStorage->Path().'/'.$mid) ) {
-            if ( !mkdir($NewStorage->Path().'/'.$mid, 0755) ) {
-              ZM\Error('Unable to mkdir ' . $NewStorage->Path().'/'.$mid);
+          if (!file_exists($NewStorage->Path().'/'.$mid)) {
+            if (!mkdir($NewStorage->Path().'/'.$mid, 0755)) {
+              ZM\Error('Unable to mkdir '.$NewStorage->Path().'/'.$mid);
             }
           }
           $saferNewName = basename($newMonitor['Name']);
           $link_path = $NewStorage->Path().'/'.$saferNewName;
           // Use a relative path for the target so the link continues to work from backups or directory changes.
-          if ( !symlink($mid, $link_path) ) {
-            if ( ! ( file_exists($link_path) and is_link($link_path) ) ) {
+          if (!symlink($mid, $link_path)) {
+            if (!(file_exists($link_path) and is_link($link_path))) {
               ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
             }
           }
         } // end if Name or Storage Area Change
 
-        if ( isset($changes['Width']) || isset($changes['Height']) ) {
+        if (isset($changes['Width']) || isset($changes['Height'])) {
           $newW = $newMonitor['Width'];
           $newH = $newMonitor['Height'];
 
@@ -230,8 +238,7 @@ if ( $action == 'save' ) {
           } // end if rotation or just size change
         } // end if changes in width or height
       } else {
-        global $error_message;
-        $error_message = dbError('unknown');
+        $error_message .= $monitor->get_last_error();
       } // end if successful save
       $restart = true;
     } else { // new monitor

From 836fe8c2b1db41070f60df0a11ac51c7ad589fc3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 18:57:44 -0500
Subject: [PATCH 102/501] spacing

---
 web/includes/Object.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/includes/Object.php b/web/includes/Object.php
index 96a572c01..1a9011586 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -28,7 +28,7 @@ class ZM_Object {
           $this->{$k} = $v;
         }
         global $object_cache;
-        if ( ! isset($object_cache[$class]) ) {
+        if (!isset($object_cache[$class])) {
           $object_cache[$class] = array();
         }
         $cache = &$object_cache[$class];
@@ -103,13 +103,13 @@ class ZM_Object {
       }
       $sql .= implode(' AND ', $fields );
     }
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
+    if ($options) {
+      if (isset($options['order'])) {
+        $sql .= ' ORDER BY '.$options['order'];
       }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
+      if (isset($options['limit'])) {
+        if (is_integer($options['limit']) or ctype_digit($options['limit'])) {
+          $sql .= ' LIMIT '.$options['limit'];
         } else {
           $backTrace = debug_backtrace();
           Error('Invalid value for limit('.$options['limit'].') passed to '.get_class()."::find from ".print_r($backTrace,true));
@@ -119,8 +119,8 @@ class ZM_Object {
     }
     $rows = dbFetchAll($sql, NULL, $values);
     $results = array();
-    if ( $rows ) {
-      foreach ( $rows as $row ) {
+    if ($rows) {
+      foreach ($rows as $row) {
         array_push($results , new $class($row));
       }
     }
@@ -129,7 +129,7 @@ class ZM_Object {
 
   public static function _find_one($class, $parameters = array(), $options = array() ) {
     global $object_cache;
-    if ( ! isset($object_cache[$class]) ) {
+    if (!isset($object_cache[$class])) {
       $object_cache[$class] = array();
     }
     $cache = &$object_cache[$class];
@@ -179,11 +179,11 @@ class ZM_Object {
   }
 
   public function set($data) {
-    foreach ( $data as $field => $value ) {
-      if ( method_exists($this, $field) and is_callable(array($this, $field), false) ) {
+    foreach ($data as $field => $value) {
+      if (method_exists($this, $field) and is_callable(array($this, $field), false)) {
         $this->$field($value);
       } else {
-        if ( is_array($value) ) {
+        if (is_array($value)) {
           # perhaps should turn into a comma-separated string
           $this->{$field} = implode(',', $value);
         } else if (is_string($value)) {
@@ -212,11 +212,11 @@ class ZM_Object {
           } else {
             $this->{$field} = $value;
           }
-        } else if ( is_integer($value) ) {
+        } else if (is_integer($value)) {
           $this->{$field} = $value;
-        } else if ( is_bool($value) ) {
+        } else if (is_bool($value)) {
           $this->{$field} = $value;
-        } else if ( is_null($value) ) {
+        } else if (is_null($value)) {
           $this->{$field} = $value;
         } else {
           Error("Unknown type $field => $value of var " . gettype($value));
@@ -307,7 +307,7 @@ class ZM_Object {
     $class = get_class($this);
     $table = $class::$table;
 
-    if ( $new_values ) {
+    if ($new_values) {
       $this->set($new_values);
     }
 

From 9160ee932f37e9d848eade19c36c82b7e8d3555f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 18:57:53 -0500
Subject: [PATCH 103/501] remove debug

---
 web/skins/classic/views/_monitor_filters.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
index f80bd1f5b..6fdde8be1 100644
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@@ -178,7 +178,6 @@ $html .= '</span>
 ' .
   ( count($conditions) ? ' WHERE ' . implode(' AND ', $conditions) : '' ).' ORDER BY Sequence ASC';
   $monitors = dbFetchAll($sql, null, $values);
-  ZM\Debug(print_r($monitors, true));
   $displayMonitors = array();
   $monitors_dropdown = array();
 

From 7b18b22f82931db21ee51328710cf8e67b9b9ba7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 18:58:02 -0500
Subject: [PATCH 104/501] Fix value of unknown Model

---
 web/skins/classic/views/js/monitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 88fae0a67..38d685367 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -353,7 +353,7 @@ function populate_models(ManufacturerId) {
   }
 
   dropdown.empty();
-  dropdown.append('<option value="0" selected="true">Unknown</option>');
+  dropdown.append('<option value="" selected="true">Unknown</option>');
   dropdown.prop('selectedIndex', 0);
 
   if (ManufacturerId) {

From 805ef16e7345495ed04d1798d5b2df18a80edc2a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Nov 2021 18:59:37 -0500
Subject: [PATCH 105/501] bump version

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 69e7fbc03..0c38e7d30 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.1
+Version: 1.37.3
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index 9cf86ad0f..d2829d87d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.1
+1.37.3

From 18610fd601daddc1ce74dac606685d086a9d8259 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 18 Nov 2021 09:55:19 -0500
Subject: [PATCH 106/501] Add an update script that includes manufacturers and
 models

---
 db/CMakeLists.txt          | 3 +++
 db/zm_update-1.37.4.sql.in | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 db/zm_update-1.37.4.sql.in

diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
index 18f440fc8..eb9e690bd 100644
--- a/db/CMakeLists.txt
+++ b/db/CMakeLists.txt
@@ -4,6 +4,7 @@
 configure_file(zm_create.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" @ONLY)
 configure_file(zm_update-1.31.30.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" @ONLY)
 configure_file(zm_update-1.35.24.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" @ONLY)
+configure_file(zm_update-1.37.4.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.37.4.sql" @ONLY)
 
 # Glob all database upgrade scripts
 file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
@@ -15,6 +16,8 @@ install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 # install zm_update-1.35.24.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+# install zm_update-1.37.4.sql
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.37.4.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
 # install zm_create.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
diff --git a/db/zm_update-1.37.4.sql.in b/db/zm_update-1.37.4.sql.in
new file mode 100644
index 000000000..d0ab7b36c
--- /dev/null
+++ b/db/zm_update-1.37.4.sql.in
@@ -0,0 +1,2 @@
+source @PKGDATADIR@/db/manufacturers.sql
+source @PKGDATADIR@/db/models.sql

From f63c124988ceb565ce00deb5651d23bba6883ff7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 18 Nov 2021 09:55:39 -0500
Subject: [PATCH 107/501] include manufacturers and models

---
 db/zm_create.sql.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index d9d4f96c3..fe4d93dde 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -1118,6 +1118,9 @@ CREATE TABLE Snapshot_Events (
 
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
 source @PKGDATADIR@/db/triggers.sql
+
+source @PKGDATADIR@/db/manufacturers.sql
+source @PKGDATADIR@/db/models.sql
 --
 -- Apply the initial configuration
 --

From 0a30c55042982af42fefe73ccf5c91f51786b43f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 18 Nov 2021 11:09:49 -0500
Subject: [PATCH 108/501] install manufacturers.sql and models.sql

---
 db/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
index eb9e690bd..00cc7d8a4 100644
--- a/db/CMakeLists.txt
+++ b/db/CMakeLists.txt
@@ -25,3 +25,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_I
 # install triggers.sql
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/triggers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
+# install manufacturers.sql
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/manufacturers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+
+# install models.sql
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/models.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")

From 2c798069d3d9b5a9efc04e16bb5a9188bfdba0c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 18 Nov 2021 18:12:07 -0500
Subject: [PATCH 109/501] improve debug logging when loading Control in Monitor

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 26 ++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index c5e09c137..da3a56373 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -327,17 +327,23 @@ sub resumeMotionDetection {
 sub Control {
   my $self = shift;
   if ( ! exists $$self{Control}) {
-    require ZoneMinder::Control;
-    my $Control = ZoneMinder::Control->find_one(Id=>$$self{ControlId});
-    if ($Control) {
-      require Module::Load::Conditional;
-      if (!Module::Load::Conditional::can_load(modules => {'ZoneMinder::Control::'.$$Control{Protocol} => undef})) {
-        Error("Can't load ZoneMinder::Control::$$Control{Protocol}\n$Module::Load::Conditional::ERROR");
-        return undef;
+    if ($$self{ControlId}) {
+      require ZoneMinder::Control;
+      my $Control = ZoneMinder::Control->find_one(Id=>$$self{ControlId});
+      if ($Control) {
+        require Module::Load::Conditional;
+        if (!Module::Load::Conditional::can_load(modules => {'ZoneMinder::Control::'.$$Control{Protocol} => undef})) {
+          Error("Can't load ZoneMinder::Control::$$Control{Protocol}\n$Module::Load::Conditional::ERROR");
+          return undef;
+        }
+        bless $Control, 'ZoneMinder::Control::'.$$Control{Protocol};
+        $$Control{MonitorId} = $$self{Id};
+        $$self{Control} = $Control;
+      } else {
+        Error("Unable to load control for control $$self{ControlId} for monitor $$self{Id}");
       }
-      bless $Control, 'ZoneMinder::Control::'.$$Control{Protocol};
-      $$Control{MonitorId} = $$self{Id};
-      $$self{Control} = $Control;
+    } else {
+      Info("No ControlId set in monitor $$self{Id}")
     }
   }
   return $$self{Control};

From 2529765df3616af550ac55e86c93e4db810020a6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 19 Nov 2021 11:59:19 -0500
Subject: [PATCH 110/501] timestamp image before scaling. Fixes lack of scaling
 when TIMESTAMP_ON_CAPTURE is off

---
 src/zm_monitorstream.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 9bc04a311..7c2aeeaa2 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -377,10 +377,10 @@ bool MonitorStream::sendFrame(const std::string &filepath, SystemTimePoint times
 }
 
 bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
-  Image *send_image = prepareImage(image);
   if (!config.timestamp_on_capture) {
-    monitor->TimestampImage(send_image, timestamp);
+    monitor->TimestampImage(image, timestamp);
   }
+  Image *send_image = prepareImage(image);
 
   fputs("--" BOUNDARY "\r\n", stdout);
   if ( type == STREAM_MPEG ) {
@@ -854,16 +854,16 @@ void MonitorStream::SingleImage(int scale) {
   int index = monitor->shared_data->last_write_index % monitor->image_buffer_count;
   Debug(1, "write index: %d %d", monitor->shared_data->last_write_index, index);
   Image *snap_image = monitor->image_buffer[index];
+  if (!config.timestamp_on_capture) {
+    monitor->TimestampImage(snap_image,
+                            SystemTimePoint(zm::chrono::duration_cast<Microseconds>(monitor->shared_timestamps[index])));
+  }
 
   if ( scale != ZM_SCALE_BASE ) {
     scaled_image.Assign(*snap_image);
     scaled_image.Scale(scale);
     snap_image = &scaled_image;
   }
-  if (!config.timestamp_on_capture) {
-    monitor->TimestampImage(snap_image,
-                            SystemTimePoint(zm::chrono::duration_cast<Microseconds>(monitor->shared_timestamps[index])));
-  }
   snap_image->EncodeJpeg(img_buffer, &img_buffer_size);
 
   fprintf(stdout,

From 40e7f607f5d3dd73fcd714acc3cd7d73e06d9188 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Nov 2021 11:38:40 -0500
Subject: [PATCH 111/501] If no protocol defined, fall back to the name of the
 Control

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index da3a56373..5646fb897 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -326,17 +326,23 @@ sub resumeMotionDetection {
 
 sub Control {
   my $self = shift;
-  if ( ! exists $$self{Control}) {
+  if (!exists $$self{Control}) {
     if ($$self{ControlId}) {
       require ZoneMinder::Control;
       my $Control = ZoneMinder::Control->find_one(Id=>$$self{ControlId});
       if ($Control) {
+        my $Protocol = $$Control{Protocol};
+
+        if (!$Protocol) {
+          Error("No protocol set in control $$Control{Id}, trying Name $$Control{Name}");
+          $Protocol = $$Control{Name};
+        }
         require Module::Load::Conditional;
-        if (!Module::Load::Conditional::can_load(modules => {'ZoneMinder::Control::'.$$Control{Protocol} => undef})) {
-          Error("Can't load ZoneMinder::Control::$$Control{Protocol}\n$Module::Load::Conditional::ERROR");
+        if (!Module::Load::Conditional::can_load(modules => {'ZoneMinder::Control::'.$Protocol => undef})) {
+          Error("Can't load ZoneMinder::Control::$Protocol\n$Module::Load::Conditional::ERROR");
           return undef;
         }
-        bless $Control, 'ZoneMinder::Control::'.$$Control{Protocol};
+        bless $Control, 'ZoneMinder::Control::'.$Protocol;
         $$Control{MonitorId} = $$self{Id};
         $$self{Control} = $Control;
       } else {

From cc65c99791ee2ce5c9617dae41d9f7cae8f9a100 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Nov 2021 12:53:51 -0500
Subject: [PATCH 112/501] Move init of ctx up before we setup the monitors. I
 think in some cases we can calls functions that assume ctx has a value. 
 Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData')

---
 web/skins/classic/views/js/montagereview.js   | 25 ++++++++++---------
 .../classic/views/js/montagereview.js.php     |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index 787a910d0..da3301d4d 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -985,6 +985,19 @@ function initPage() {
     });
   });
 
+  if ( !liveMode ) {
+    canvas = document.getElementById('timeline');
+
+    canvas.addEventListener('mousemove', mmove, false);
+    canvas.addEventListener('touchmove', tmove, false);
+    canvas.addEventListener('mousedown', mdown, false);
+    canvas.addEventListener('mouseup', mup, false);
+    canvas.addEventListener('mouseout', mout, false);
+
+    ctx = canvas.getContext('2d');
+    drawGraph();
+  }
+
   for ( var i = 0, len = monitorPtr.length; i < len; i += 1 ) {
     var monId = monitorPtr[i];
     if ( !monId ) continue;
@@ -1006,18 +1019,6 @@ function initPage() {
     }
   } // end foreach monitor
 
-  if ( !liveMode ) {
-    canvas = document.getElementById('timeline');
-
-    canvas.addEventListener('mousemove', mmove, false);
-    canvas.addEventListener('touchmove', tmove, false);
-    canvas.addEventListener('mousedown', mdown, false);
-    canvas.addEventListener('mouseup', mup, false);
-    canvas.addEventListener('mouseout', mout, false);
-
-    ctx = canvas.getContext('2d');
-    drawGraph();
-  }
   setSpeed(speedIndex);
   //setFit(fitMode);  // will redraw
   //setLive(liveMode);  // will redraw
diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index d82f103ed..f4b6222f4 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -239,6 +239,6 @@ echo "];\n";
 var cWidth;   // save canvas width
 var cHeight;  // save canvas height
 var canvas;   // global canvas definition so we don't have to keep looking it up
-var ctx;
+var ctx = null;
 var underSlider;    // use this to hold what is hidden by the slider
 var underSliderX;   // Where the above was taken from (left side, Y is zero)

From 1f75b017ccb4688bfda4726c3ac4bdb3a64bd996 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Nov 2021 14:17:50 -0500
Subject: [PATCH 113/501] kill the background timer when switching to history
 so that we don't cause a javascript error. comment out debugging and use
 native javascript instead of jquery.

---
 web/skins/classic/views/js/montagereview.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index da3301d4d..60856f4ca 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -57,7 +57,7 @@ function getFrame(monId, time, last_Frame) {
 
   var events_for_monitor = events_by_monitor_id[monId];
   if ( !events_for_monitor ) {
-    console.log("No events for monitor " + monId);
+    //console.log("No events for monitor " + monId);
     return;
   }
 
@@ -648,8 +648,11 @@ function setSpeed(speed_index) {
 }
 
 function setLive(value) {
+  // When we submit the context etc goes away but we may still be trying to update
+  // So kill the timer.
+  clearInterval(timerObj);
   liveMode = value;
-  var form = $j('#montagereview_form')[0];
+  var form = document.getElementById('montagereview_form');
   form.elements['live'].value = value;
   form.submit();
   return false;

From 46a835b28ab80ec2128d5d4acc2f109f1fb29890 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Nov 2021 14:26:48 -0500
Subject: [PATCH 114/501] fix error when no monitors defined and we are adding
 one.Fixes #3385

---
 web/skins/classic/views/monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 7d599904a..3dc6937e8 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -453,7 +453,7 @@ foreach ( $tabs as $name=>$value ) {
 switch ( $name ) {
   case 'general' :
     {
-      if (!$monitor->Id()) {
+      if (!$monitor->Id() and count($monitors)) {
         $monitor_ids = array();
         foreach ($monitors as $m) { $monitor_ids[] = $m['Id']; }
         $available_monitor_ids = array_diff(range(min($monitor_ids),max($monitor_ids)), $monitor_ids);
@@ -470,7 +470,7 @@ if (count($available_monitor_ids)) {
           </tr>
 <?php
 
-      } # end if ! $monitor->Id()
+      } # end if ! $monitor->Id() and count($monitors)
 ?>
           <tr class="Name">
             <td class="text-right pr-3"><?php echo translate('Name') ?></td>

From ffdb0f98249819c5a75c123da4709e995deeee80 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 23 Nov 2021 11:05:39 -0500
Subject: [PATCH 115/501] If we are starting a process that is waiting to term,
 mark it to get started by the reaper.  Fixes case where zmdc thought the
 process was still running and so didn't start it.  We never noticed because
 zmwatch would eventually notice.  The result is instant restart.

---
 scripts/zmdc.pl.in | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 5cf866e56..793049479 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -429,10 +429,20 @@ sub start {
 # It's not running, or at least it's not been started by us
     $process = { daemon=>$daemon, args=>\@args, command=>$command, keepalive=>!undef };
   } elsif ( $process->{pid} && $pid_hash{$process->{pid}} ) {
-    dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' already running at "
+    if ($process->{term_sent_at}) {
+      dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' was told to term at "
+        .strftime('%y/%m/%d %H:%M:%S', localtime($process->{term_sent_at}))
+        .", pid = $process->{pid}\n"
+      );
+      $process->{keepalive} = !undef;
+      $process->{delay} = 0;
+      delete $terminating_processes{$command};
+    } else {
+      dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' already running at "
         .strftime('%y/%m/%d %H:%M:%S', localtime($process->{started}))
         .", pid = $process->{pid}\n"
-        );
+      );
+    }
     return;
   }
 
@@ -523,7 +533,7 @@ sub send_stop {
         ."\n"
         );
     sigprocmask(SIG_UNBLOCK, $blockset) or die "dying at unblock...\n";
-    return();
+    return ();
   }
 
   my $pid = $process->{pid};
@@ -586,7 +596,7 @@ sub check_for_processes_to_kill {
 
 sub stop {
   my ( $daemon, @args ) = @_;
-  my $command = join(' ', $daemon, @args );
+  my $command = join(' ', $daemon, @args);
   my $process = $cmd_hash{$command};
   if ( !$process ) {
     dPrint(ZoneMinder::Logger::WARNING, "Can't find process with command of '$command'");

From 81ffc6df4e763474035d56c098089c7ca6339f8d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 12:06:13 -0500
Subject: [PATCH 116/501] Remove text-nowrap from cause/notes column

---
 web/skins/classic/views/js/events.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 6139ba3e4..bafd16763 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -63,13 +63,13 @@ function processRows(rows) {
 
     row.Id = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + eid + '</a>';
     row.Name = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + row.Name + '</a>' +
-        '<br/><div class="small text-nowrap text-muted">' + archived + emailed + '</div>';
+        '<br/><div class="small text-muted">' + archived + emailed + '</div>';
     if ( canEdit.Monitors ) row.Monitor = '<a href="?view=event&amp;eid=' + eid + '">' + row.Monitor + '</a>';
     if ( canEdit.Events ) row.Cause = '<a href="#" title="' + row.Notes + '" class="eDetailLink" data-eid="' + eid + '">' + row.Cause + '</a>';
     if ( row.Notes.indexOf('detected:') >= 0 ) {
-      row.Cause = row.Cause + '<a href="#" class="objDetectLink" data-eid=' +eid+ '><div class="small text-nowrap text-muted"><u>' + row.Notes + '</u></div></div></a>';
+      row.Cause = row.Cause + '<a href="#" class="objDetectLink" data-eid=' +eid+ '><div class="small text-muted"><u>' + row.Notes + '</u></div></div></a>';
     } else if ( row.Notes != 'Forced Web: ' ) {
-      row.Cause = row.Cause + '<br/><div class="small text-nowrap text-muted">' + row.Notes + '</div>';
+      row.Cause = row.Cause + '<br/><div class="small text-muted">' + row.Notes + '</div>';
     }
     row.Frames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.Frames + '</a>';
     row.AlarmFrames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.AlarmFrames + '</a>';

From 4be9c6cdd28c87fdaecec89342b758a6876ee6d7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 12:42:31 -0500
Subject: [PATCH 117/501] Code comments and make warning when the first packet
 in queue is locked.

---
 src/zm_packetqueue.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 509a25ee6..8b831ec2d 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -116,14 +116,15 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
           , max_video_packet_count);
 
       for (
-      auto it = ++pktQueue.begin();
-      it != pktQueue.end() and *it != add_packet;
+          auto it = ++pktQueue.begin();
+          it != pktQueue.end() and *it != add_packet;
+          // iterator is incremented by erase
       ) {
         std::shared_ptr <ZMPacket>zm_packet = *it;
 
         ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
         if (!lp->trylock()) {
-          Debug(1, "Found locked packet when trying to free up video packets. Skipping to next one");
+          Warning("Found locked packet when trying to free up video packets. This basically means that decoding is not keeping up.");
           delete lp;
           ++it;
           continue;
@@ -312,7 +313,6 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
             pktQueue.size());
       pktQueue.pop_front();
       packet_counts[zm_packet->packet.stream_index] -= 1;
-      //delete zm_packet;
     }
   }  // end if have at least max_video_packet_count video packets remaining
   // We signal on every packet because someday we may analyze sound

From 67556430c661a4e801d306b819442ebc2588844d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 12:44:07 -0500
Subject: [PATCH 118/501] Add option ZM_NO_PCRE to disable testing for
 libpcre3. debian wants to remove it so this allows us to test building
 without it. Remove libpcre3 from depends and set ZM_NO_PCRE=ON in debian
 build config

---
 CMakeLists.txt             | 34 ++++++++++++++++++++--------------
 distros/ubuntu2004/control |  2 --
 distros/ubuntu2004/rules   |  1 +
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c34a9f808..3b789e4c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,6 +167,8 @@ set(ZM_NO_X10 "OFF" CACHE BOOL
 set(ZM_ONVIF "ON" CACHE BOOL
   "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not
     work with all cameras claiming to be ONVIF compliant. default: ON")
+set(ZM_NO_PCRE "OFF" CACHE BOOL
+  "Set to ON to skip libpcre3 checks and force building ZM without libpcre3. default: OFF")
 set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
   "Set to ON to skip building ZM with rtsp server support. default: OFF")
 set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING
@@ -407,21 +409,24 @@ else()
   message(FATAL_ERROR "ZoneMinder requires pthread but it was not found on your system")
 endif()
 
-# pcre (using find_library and find_path)
-find_library(PCRE_LIBRARIES pcre)
-if(PCRE_LIBRARIES)
-  set(HAVE_LIBPCRE 1)
-  list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
-  find_path(PCRE_INCLUDE_DIR pcre.h)
-  if(PCRE_INCLUDE_DIR)
-    include_directories("${PCRE_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
+# Do not check for cURL if ZM_NO_CURL is on
+if(NOT ZM_NO_PRCE)
+  # pcre (using find_library and find_path)
+  find_library(PCRE_LIBRARIES pcre)
+  if(PCRE_LIBRARIES)
+    set(HAVE_LIBPCRE 1)
+    list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
+    find_path(PCRE_INCLUDE_DIR pcre.h)
+    if(PCRE_INCLUDE_DIR)
+      include_directories("${PCRE_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
+    check_include_file("pcre.h" HAVE_PCRE_H)
+    set(optlibsfound "${optlibsfound} PCRE")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} PCRE")
   endif()
-  mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
-  check_include_file("pcre.h" HAVE_PCRE_H)
-  set(optlibsfound "${optlibsfound} PCRE")
-else()
-  set(optlibsnotfound "${optlibsnotfound} PCRE")
 endif()
 
 # mysqlclient (using find_library and find_path)
@@ -540,6 +545,7 @@ set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
   set(ZM_PCRE 1)
 endif()
+
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)
diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index a4683bfde..d14c3fb52 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev
               ,libturbojpeg0-dev
               ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
-              ,libpcre3-dev
               ,libpolkit-gobject-1-dev
               ,libv4l-dev [!hurd-any]
               ,libvlc-dev
@@ -70,7 +69,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
-        ,libpcre3
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
         ,libvncclient1|libvncclient0
diff --git a/distros/ubuntu2004/rules b/distros/ubuntu2004/rules
index c137a9da2..af75a409a 100755
--- a/distros/ubuntu2004/rules
+++ b/distros/ubuntu2004/rules
@@ -19,6 +19,7 @@ override_dh_auto_configure:
             -DCMAKE_VERBOSE_MAKEFILE=ON                \
             -DCMAKE_BUILD_TYPE=Release                 \
 						-DBUILD_MAN=0 \
+						-DZM_NO_PCRE=ON \
             -DZM_CONFIG_DIR="/etc/zm"                  \
             -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
             -DZM_RUNDIR="/run/zm"                  \

From 77d3109152ab6a238589ec82853d864403af4833 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 13:44:45 -0500
Subject: [PATCH 119/501] Increase to 20 before warning about db queue size.
 Put lock in it's own scope so that we unlock before notifying

---
 src/zm_db.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index e3b737c07..f0b13d538 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -251,11 +251,11 @@ void zmDbQueue::process() {
       mCondition.wait(lock);
     }
     while (!mQueue.empty()) {
-      if (mQueue.size() > 10) {
+      if (mQueue.size() > 20) {
         Logger *log = Logger::fetch();
         Logger::Level db_level = log->databaseLevel();
         log->databaseLevel(Logger::NOLOG);
-        Warning("db queue size has grown larger %zu than 10 entries", mQueue.size());
+        Warning("db queue size has grown larger %zu than 20 entries", mQueue.size());
         log->databaseLevel(db_level);
       }
       std::string sql = mQueue.front();
@@ -271,8 +271,10 @@ void zmDbQueue::process() {
 
 void zmDbQueue::push(std::string &&sql) {
   if (mTerminate) return;
-  std::unique_lock<std::mutex> lock(mMutex);
-  mQueue.push(std::move(sql));
+  {
+    std::unique_lock<std::mutex> lock(mMutex);
+    mQueue.push(std::move(sql));
+  }
   mCondition.notify_all();
 }
 

From e061f3b34a6e230850120c99bdecdafe7be4ac4b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 14:28:15 -0500
Subject: [PATCH 120/501] typo

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index d808ddba0..d9f932d75 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1873,7 +1873,7 @@ bool Monitor::Analyse() {
             if (snap->image) {
               // decoder may not have been able to provide an image
               if (!ref_image.Buffer()) {
-                Debug(1, "Assigning instead of Dectecting");
+                Debug(1, "Assigning instead of Detecting");
                 ref_image.Assign(*(snap->image));
               } else {
                 Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);

From e8bb095730a7ba7430ffe27703926c9cd71a7a43 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 14:28:31 -0500
Subject: [PATCH 121/501] include monitor dimensions when logging about zone
 mismatch

---
 src/zm_zone.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index f0c09ec78..4fc1bf61b 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -878,16 +878,23 @@ std::vector<Zone> Zone::Load(Monitor *monitor) {
       continue;
     }
 
-    if (polygon.Extent().Lo().x_ < 0 || polygon.Extent().Hi().x_ > static_cast<int32>(monitor->Width())
-        || polygon.Extent().Lo().y_ < 0 || polygon.Extent().Hi().y_ > static_cast<int32>(monitor->Height())) {
-      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), fixing",
+    if (polygon.Extent().Lo().x_ < 0
+        ||
+        polygon.Extent().Hi().x_ > static_cast<int32>(monitor->Width())
+        ||
+        polygon.Extent().Lo().y_ < 0
+        ||
+        polygon.Extent().Hi().y_ > static_cast<int32>(monitor->Height())) {
+      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d) != (%d,%d), fixing",
             Id,
             Name,
             monitor->Name(),
             polygon.Extent().Lo().x_,
             polygon.Extent().Lo().y_,
             polygon.Extent().Hi().x_,
-            polygon.Extent().Hi().y_);
+            polygon.Extent().Hi().y_,
+            monitor->Width(),
+            monitor->Height());
 
       polygon.Clip(Box(
           {0, 0},

From af5436d009732c4a2656eb32bbe3b6d3d12036a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 10:31:54 -0500
Subject: [PATCH 122/501] Handle bug where a value of '' will prevent special
 case handling.  Allow '' to mean NULL when specifying Storage Area

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 3a3308938..0db46ff0d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -230,8 +230,8 @@ sub Sql {
           # PostCondition, so no further SQL
         } else {
           ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
-          foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
-
+          # Empty value will result in () from split
+          foreach my $temp_value ( $stripped_value ? split( /["'\s]*?,["'\s]*?/, $stripped_value ) : $stripped_value ) {
             if ( $term->{attr} eq 'AlarmedZoneId' ) {
               $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND Score > 0 AND ZoneId='.$value.')';
             } elsif ( $term->{attr} =~ /^MonitorName/ ) {
@@ -250,7 +250,8 @@ sub Sql {
                 $$self{Server} = new ZoneMinder::Server($temp_value);
               }
             } elsif ( $term->{attr} eq 'StorageId' ) {
-              $value = "'$temp_value'";
+              # Empty means NULL, otherwise must be an integer
+              $value = $temp_value ne '' ? int($temp_value) : 'NULL';
               $$self{Storage} = new ZoneMinder::Storage($temp_value);
             } elsif ( $term->{attr} eq 'Name'
               || $term->{attr} eq 'Cause'

From a1bf8f7f5bf2b271ab7d1e598f572206a5bd54de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 10:35:15 -0500
Subject: [PATCH 123/501] Fix NULL and add special 0 case for Storage area
 specification in filter

---
 web/skins/classic/views/filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index b425f7896..b441db349 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -152,7 +152,7 @@ $booleanValues = array(
 
 $focusWindow = true;
 
-$storageareas = array('' => 'All') + ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Storage');
+$storageareas = array('' => array('Name'=>'NULL Unspecified'), '0' => array('Name'=>'Zero')) + ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Storage');
 
 $weekdays = array();
 for ( $i = 0; $i < 7; $i++ ) {

From f9f2615d485381dcacc04977860d9f6fa31d9b61 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 15:26:38 -0500
Subject: [PATCH 124/501] Return if unable to lock the event record. Improve
 code around CopyTo call.

---
 scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 0276af097..c5e3994a7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -733,19 +733,22 @@ sub MoveTo {
 
   my $was_in_transaction = !$ZoneMinder::Database::dbh->{AutoCommit};
   $ZoneMinder::Database::dbh->begin_work() if !$was_in_transaction;
-  $self->lock_and_load(); # The fact that we are in a transaction might not imply locking
+  if (!$self->lock_and_load()) {
+    Warning('Unable to lock event record '.$$self{Id}); # The fact that we are in a transaction might not imply locking
+    $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
+    return 'Unable to lock event record';
+  }
 
   my $OldStorage = $self->Storage(undef);
-
   my $error = $self->CopyTo($NewStorage);
-  return $error if $error;
+  if (!$error) {
+    # Succeeded in copying all files, so we may now update the Event.
+    $$self{StorageId} = $$NewStorage{Id};
+    $self->Storage($NewStorage);
+    $error .= $self->save();
 
-  # Succeeded in copying all files, so we may now update the Event.
-  $$self{StorageId} = $$NewStorage{Id};
-  $self->Storage($NewStorage);
-  $error .= $self->save();
-
-  # Going to leave it to upper layer as to whether we rollback or not
+    # Going to leave it to upper layer as to whether we rollback or not
+  }
   $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
   return $error if $error;
 

From d51eb63947d66619cae917663f6a0601f5b0f92b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 19:21:24 -0500
Subject: [PATCH 125/501] Add EventStartCommand and EventEndCommand to monitors
 table

---
 db/zm_create.sql.in     |  2 ++
 db/zm_update-1.37.5.sql | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 db/zm_update-1.37.5.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index fe4d93dde..bf598b646 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -456,6 +456,8 @@ CREATE TABLE `Monitors` (
   `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
+  `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '',
+  `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '',
   `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
   `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
   `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
diff --git a/db/zm_update-1.37.5.sql b/db/zm_update-1.37.5.sql
new file mode 100644
index 000000000..1f40eb923
--- /dev/null
+++ b/db/zm_update-1.37.5.sql
@@ -0,0 +1,31 @@
+--
+-- This update adds EventStartCommand and EventEndCommand
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'AlarmEndCommand'
+	) > 0,
+"SELECT 'Column EventEndCommand already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'AlarmStartCommand'
+	) > 0,
+"SELECT 'Column EventStartCommand already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From b626de50dca26a2d5e9ce28977d24aed9a91a5de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 19:21:51 -0500
Subject: [PATCH 126/501] Add code to fork and exec EventStartCommand and
 EventEndCommand

---
 src/zm_monitor.cpp | 32 +++++++++++++++++++++++++++++---
 src/zm_monitor.h   |  2 ++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index d9f932d75..d50e4e6eb 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -70,7 +70,7 @@
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
 "SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, "
-"`LinkedMonitors`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
+"`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
 "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
 "`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
 "`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, "
@@ -435,7 +435,7 @@ Monitor::Monitor()
 
 /*
   std::string load_monitor_sql =
- "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, LinkedMonitors, "
+ "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
  "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
  "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
  "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
@@ -489,6 +489,8 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   // See below after save_jpegs for a recalculation of decoding_enabled
 
   ReloadLinkedMonitors(dbrow[col]); col++;
+  event_start_command = dbrow[col] ? dbrow[col] : ""; col++;
+  event_end_command = dbrow[col] ? dbrow[col] : ""; col++;
 
   /* "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS," */
   analysis_fps_limit = dbrow[col] ? strtod(dbrow[col], nullptr) : 0.0; col++;
@@ -1994,6 +1996,12 @@ bool Monitor::Analyse() {
             alarm_cause = cause+" Continuous "+alarm_cause;
             strncpy(shared_data->alarm_cause, alarm_cause.c_str(), sizeof(shared_data->alarm_cause)-1);
             SetVideoWriterStartTime(event->StartTime());
+            if (!event_start_command.empty()) {
+              if (fork() == 0) {
+                execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
+                Error("Error execing %s", event_start_command.c_str());
+              }
+            }
 
             Info("%s: %03d - Opened new event %" PRIu64 ", section start",
                 name.c_str(), analysis_image_count, event->Id());
@@ -2084,6 +2092,13 @@ bool Monitor::Analyse() {
                 delete start_it;
                 start_it = nullptr;
 
+            if (!event_start_command.empty()) {
+              if (fork() == 0) {
+                execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
+                Error("Error execing %s", event_start_command.c_str());
+              }
+            }
+
                 Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
               } else {
                 shared_data->state = state = ALARM;
@@ -2786,7 +2801,18 @@ void Monitor::closeEvent() {
     Debug(1, "close event thread is not joinable");
   }
   Debug(1, "Starting thread to close event");
-  close_event_thread = std::thread([](Event *e){ delete e; }, event);
+  close_event_thread = std::thread([](Event *e, const std::string &command){
+        int64_t event_id = e->Id();
+        delete e;
+
+        if (!command.empty()) {
+          if (fork() == 0) {
+            execlp(command.c_str(), command.c_str(), std::to_string(event_id).c_str(), nullptr);
+            Error("Error execing %s", command.c_str());
+          }
+        }
+
+      }, event, event_end_command);
   Debug(1, "Nulling event");
   event = nullptr;
   if (shared_data) video_store_data->recording = {};
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 5b9a2ce46..d670911bb 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -404,6 +404,8 @@ protected:
 
   int      n_linked_monitors;
   MonitorLink    **linked_monitors;
+  std::string   event_start_command;
+  std::string   event_end_command;
 
   std::vector<Group *> groups;
 

From 21218491f7e1f94a5e7ff5bd520b79e57a4211a8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 19:22:07 -0500
Subject: [PATCH 127/501] Add EventStartCommand and EventEndCommand to monitors
 ui

---
 web/includes/Monitor.php            | 2 ++
 web/skins/classic/views/monitor.php | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 6423af11f..b5e2ef853 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -57,6 +57,8 @@ class Monitor extends ZM_Object {
     'DecodingEnabled'   => array('type'=>'boolean','default'=>1),
     'LinkedMonitors' => array('type'=>'set', 'default'=>null),
     'Triggers'  =>  array('type'=>'set','default'=>''),
+    'EventStartCommand' => '',
+    'EventEndCommand' => '',
     'ONVIF_URL' =>  '',
     'ONVIF_Username'  =>  '',
     'ONVIF_Password'  =>  '',
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 3dc6937e8..657c2ce8c 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -675,6 +675,14 @@ if (count($available_monitor_ids)) {
       }
 ?>
         </td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('Event Start Command') ?></td>
+            <td><input type="text" name="newMonitor[EventStartCommand]" value="<?php echo validHtmlStr($monitor->EventStartCommand()) ?>" /></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('Event End Command') ?></td>
+            <td><input type="text" name="newMonitor[EventEndCommand]" value="<?php echo validHtmlStr($monitor->EventEndCommand()) ?>" /></td>
+          </tr>
         <?php
         }
         break;

From 28d8b2237739fb9db2391fa7d86ba54f00c281df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 19:22:53 -0500
Subject: [PATCH 128/501] bump version 1.37.5

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 0c38e7d30..8d49c0d7f 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.3
+Version: 1.37.5
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index d2829d87d..e2ba07049 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.3
+1.37.5

From 74a227667122a8dbe6ed0a1eac69046575fac660 Mon Sep 17 00:00:00 2001
From: pkubaj <pkubaj@FreeBSD.org>
Date: Mon, 29 Nov 2021 00:03:45 +0000
Subject: [PATCH 129/501] Fix build on FreeBSD/armv7

1. FreeBSD uses elf_aux_info instead of getauxval.
2. FreeBSD uses HWCAP_NEON macro for Neon.
---
 src/zm_utils.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index 5da5509ff..409429667 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -252,8 +252,15 @@ void HwCapsDetect() {
 #elif defined(__arm__)
   // ARM processor in 32bit mode
   // To see if it supports NEON, we need to get that information from the kernel
+  #ifdef __linux__
   unsigned long auxval = getauxval(AT_HWCAP);
   if (auxval & HWCAP_ARM_NEON) {
+  #elif defined(__FreeBSD__)
+  unsigned long auxval = 0;
+  elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval));
+  if (auxval & HWCAP_NEON) {
+  #error Unsupported OS.
+  #endif
     Debug(1,"Detected ARM (AArch32) processor with Neon");
     neonversion = 1;
   } else {

From b47e96d7cfde58a0c84553d88116736e5fffa423 Mon Sep 17 00:00:00 2001
From: maddios <maddios@maddios.com>
Date: Mon, 29 Nov 2021 00:20:25 -0500
Subject: [PATCH 130/501] Fix Copy/Move to Default Storage

When moving from a 2nd storage to Default it fails with "New storage does not have an id.  Moving will not happen" because the default ID is 0.
---
 scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index c5e3994a7..026ff6cea 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -43,6 +43,7 @@ require Date::Parse;
 require POSIX;
 use Date::Format qw(time2str);
 use Time::HiRes qw(gettimeofday tv_interval stat);
+use Scalar::Util qw(looks_like_number);
 
 #our @ISA = qw(ZoneMinder::Object);
 use parent qw(ZoneMinder::Object);
@@ -601,7 +602,7 @@ sub CopyTo {
   # First determine if we can move it to the dest.
   # We do this before bothering to lock the event
   my ( $NewPath ) = ( $NewStorage->Path() =~ /^(.*)$/ ); # De-taint
-  if ( ! $$NewStorage{Id} ) {
+  if ( ! looks_like_number($$NewStorage{Id}) ) {
     return 'New storage does not have an id.  Moving will not happen.';
   } elsif ( $$NewStorage{Id} == $$self{StorageId} ) {
     return 'Event is already located at ' . $NewPath;

From 01f4aee45034cea6e027dc6be031e0277a794133 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 27 Nov 2021 19:10:09 -0500
Subject: [PATCH 131/501] Fix underline

---
 docs/installationguide/debian.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index f7325fe1f..e6a3404df 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -4,7 +4,7 @@ Debian
 .. contents::
 
 Easy Way: Debian 11 (Bullseye)
-------------------------
+------------------------------
 
 This procedure will guide you through the installation of ZoneMinder on Debian 11 (Bullseye).
 

From 1f19ad7c9d9b483a92679f225c4efbafd9f3e290 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 27 Nov 2021 19:16:32 -0500
Subject: [PATCH 132/501] fix by removing code block

---
 docs/installationguide/debian.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index e6a3404df..b92ff267a 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -104,7 +104,7 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file
 
 You can do this using:
 
-.. code-block::
+::
 
     echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list
 

From ea6a84ae66ea3a3d7ae72f6ba5047b815bb26db7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 12:53:44 -0500
Subject: [PATCH 133/501] Fix AlarmEndCommand => EventEndCommand

---
 db/zm_update-1.37.5.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.37.5.sql b/db/zm_update-1.37.5.sql
index 1f40eb923..0f205ff77 100644
--- a/db/zm_update-1.37.5.sql
+++ b/db/zm_update-1.37.5.sql
@@ -7,7 +7,7 @@ SET @s = (SELECT IF(
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'AlarmEndCommand'
+	AND column_name = 'EventEndCommand'
 	) > 0,
 "SELECT 'Column EventEndCommand already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"

From 072d181f79c41889ba44107ade0f48254157c2ae Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 12:54:46 -0500
Subject: [PATCH 134/501] Fix AlarmStartCommand => EventStartCommand

---
 db/zm_update-1.37.5.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.37.5.sql b/db/zm_update-1.37.5.sql
index 0f205ff77..035a73a1a 100644
--- a/db/zm_update-1.37.5.sql
+++ b/db/zm_update-1.37.5.sql
@@ -21,7 +21,7 @@ SET @s = (SELECT IF(
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'AlarmStartCommand'
+	AND column_name = 'EventStartCommand'
 	) > 0,
 "SELECT 'Column EventStartCommand already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"

From 82a4cbaec520cc46ad2e75aba5e433013da80f46 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 13:48:44 -0500
Subject: [PATCH 135/501] Fix task=>action so that deleting works.  Pause
 streaming before delete to prevent errors being logged due to missing files

---
 web/skins/classic/views/js/event.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 05914f911..94e132cc1 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -773,8 +773,9 @@ function manageDelConfirmModalBtns() {
       return;
     }
 
+    pauseClicked();
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=event&task=delete&id='+eventData.Id)
+    $j.getJSON(thisUrl + '?request=event&action=delete&id='+eventData.Id)
         .done(function(data) {
           $j('#deleteConfirm').modal('hide');
           streamNext(true);

From 089563d1cecb5d04c8b7876f585e050390af5d73 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 14:14:56 -0500
Subject: [PATCH 136/501] rework do_debian_package to properly support the
 CURRENT style of snapshots and make the code a little easier to read

---
 utils/do_debian_package.sh | 122 ++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 57 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 6c8c06c00..91ecf520b 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -116,52 +116,6 @@ else
     echo "Defaulting to ZoneMinder upstream git"
     GITHUB_FORK="ZoneMinder"
   fi;
-  if [ "$SNAPSHOT" == "stable" ]; then
-    if [ "$BRANCH" == "" ]; then
-      #REV=$(git rev-list --tags --max-count=1)
-      BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
-      if [ -z "$BRANCH" ]; then
-        # This should only happen in CI environments where tag info isn't available
-        BRANCH=`cat version`
-        echo "Building branch $BRANCH"
-      fi
-      if [ "$BRANCH" == "" ]; then
-        echo "Unable to determine latest stable branch!"
-        exit 0;
-      fi
-      echo "Latest stable branch is $BRANCH";
-    fi;
-  else
-    if [ "$BRANCH" == "" ]; then
-      echo "Defaulting to master branch";
-      BRANCH="master";
-    fi;
-    if [ "$SNAPSHOT" == "NOW" ]; then
-      SNAPSHOT=`date +%Y%m%d%H%M%S`;
-    else
-      if [ "$SNAPSHOT" == "CURRENT" ]; then
-        SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
-      fi;
-    fi;
-  fi;
-fi
-
-IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
-if [ "$PPA" == "" ]; then
-  if [ "$RELEASE" != "" ]; then
-    # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
-    if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
-      PPA="ppa:iconnor/zoneminder-stable"
-    else
-      PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
-    fi;
-  else
-    if [ "$BRANCH" == "" ]; then
-      PPA="ppa:iconnor/zoneminder-master";
-    else
-      PPA="ppa:iconnor/zoneminder-$BRANCH";
-    fi;
-  fi;
 fi;
 
 # Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead.
@@ -171,15 +125,8 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
     cd "${GITHUB_FORK}_ZoneMinder.git"
     echo "git fetch..."
     git fetch
-    echo "git checkout $BRANCH"
-    git checkout $BRANCH
-    if [ $? -ne 0 ]; then
-      echo "Failed to switch to branch."
-      exit 1;
-    fi;
-    echo "git pull..."
-    git pull
     cd ../
+
     echo "git clone ${GITHUB_FORK}_ZoneMinder.git ${GITHUB_FORK}_zoneminder_release"
     git clone "${GITHUB_FORK}_ZoneMinder.git" "${GITHUB_FORK}_zoneminder_release"
   else
@@ -192,14 +139,59 @@ else
 fi;
 
 cd "${GITHUB_FORK}_zoneminder_release"
-  git checkout $BRANCH
-cd ../
 
-VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version`
+if [ "$SNAPSHOT" == "stable" ]; then
+  if [ "$BRANCH" == "" ]; then
+    #REV=$(git rev-list --tags --max-count=1)
+    BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
+    if [ -z "$BRANCH" ]; then
+      # This should only happen in CI environments where tag info isn't available
+      BRANCH=`cat version`
+      echo "Building branch $BRANCH"
+    fi
+    if [ "$BRANCH" == "" ]; then
+      echo "Unable to determine latest stable branch!"
+      exit 0;
+    fi
+    echo "Latest stable branch is $BRANCH";
+  fi;
+else
+  if [ "$BRANCH" == "" ]; then
+    echo "Defaulting to master branch";
+    BRANCH="master";
+  fi;
+  if [ "$SNAPSHOT" == "NOW" ]; then
+    SNAPSHOT=`date +%Y%m%d%H%M%S`;
+  else
+    if [ "$SNAPSHOT" == "CURRENT" ]; then
+      # git the latest (short) commit hash of the version file
+      versionhash=$(git log -n1 --pretty=format:%h version)
 
+      # Number of commits since the version file was last changed
+      numcommits=$(git rev-list ${versionhash}..HEAD --count)
+      SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
+    fi;
+  fi;
+fi;
+
+
+echo "git checkout $BRANCH"
+git checkout $BRANCH
+if [ $? -ne 0 ]; then
+  echo "Failed to switch to branch."
+  exit 1;
+fi;
+echo "git pull..."
+git pull
+# Grab the ZoneMinder version from the contents of the version file
+VERSION=$(cat version)
 if [ -z "$VERSION" ]; then
   exit 1;
 fi;
+IFS='.' read -r -a VERSION_PARTS <<< "$VERSION"
+
+cd ../
+
 if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then
   VERSION="$VERSION~$SNAPSHOT";
 fi;
@@ -357,6 +349,22 @@ EOF
     fi;
   else
     SC="zoneminder_${VERSION}-${DISTRO}${PACKAGE_VERSION}_source.changes";
+    if [ "$PPA" == "" ]; then
+      if [ "$RELEASE" != "" ]; then
+        # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
+        if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
+          PPA="ppa:iconnor/zoneminder-stable"
+        else
+          PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
+        fi;
+      else
+        if [ "$BRANCH" == "" ]; then
+          PPA="ppa:iconnor/zoneminder-master";
+        else
+          PPA="ppa:iconnor/zoneminder-$BRANCH";
+        fi;
+      fi;
+    fi;
 
     dput="Y";
     if [ "$INTERACTIVE" != "no" ]; then

From 7b9c86111c094662e485a94417755a7e230de8b2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 16:21:34 -0500
Subject: [PATCH 137/501] Move Cleanup and framebuffer freeing into Close() so
 that we don't crash on Reload

---
 src/zm_libvnc_camera.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/zm_libvnc_camera.cpp b/src/zm_libvnc_camera.cpp
index 6fb414686..3ff7804b6 100644
--- a/src/zm_libvnc_camera.cpp
+++ b/src/zm_libvnc_camera.cpp
@@ -23,7 +23,7 @@ void bind_libvnc_symbols() {
   
   libvnc_lib = dlopen("libvncclient.so", RTLD_LAZY | RTLD_GLOBAL);
   if (!libvnc_lib) {
-    Error("Error loading libvncclient: %s", dlerror());
+    Error("Error loading libvncclient.so: %s", dlerror());
     return;
   }
 
@@ -135,11 +135,6 @@ VncCamera::VncCamera(
 }
 
 VncCamera::~VncCamera() {
-  if (capture and mRfb) {
-    if (mRfb->frameBuffer)
-      free(mRfb->frameBuffer);
-    (*rfbClientCleanup_f)(mRfb);
-  }
   if (libvnc_lib) {
     dlclose(libvnc_lib);
     libvnc_lib = nullptr;
@@ -253,6 +248,12 @@ int VncCamera::PostCapture() {
 }
 
 int VncCamera::Close() {
+  if (capture and mRfb) {
+    if (mRfb->frameBuffer)
+      free(mRfb->frameBuffer);
+    (*rfbClientCleanup_f)(mRfb);
+    mRfb = nullptr;
+  }
   return 1;
 }
 #endif

From b5098a1ab90a9cbefa2a9942254421ca36a03f6a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 16:26:23 -0500
Subject: [PATCH 138/501] Do not guess multiple distros.  release building will
 have automated distro specification.

---
 utils/do_debian_package.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 91ecf520b..29ebdc0ef 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -87,11 +87,7 @@ else
 fi;
 
 if [ "$DISTROS" == "" ]; then
-  if [ "$RELEASE" != "" ]; then
-    DISTROS="bionic,focal,hirsute,impish"
-  else
-    DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
-  fi;
+  DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
   echo "Defaulting to $DISTROS for distribution";
 else
   echo "Building for $DISTROS";

From c927ef4b52b3ede8835e65f1e0c9aa7d62ca59df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 18:32:48 -0500
Subject: [PATCH 139/501] Aim to do db updates every 5 seconds instead of 1
 second

---
 src/zm_event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 9f1124e7b..2d95ec23a 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -546,7 +546,7 @@ void Event::AddFrame(Image *image,
         or
             (frame_type == BULK)
         or
-            (fps and (frame_data.size() > fps))) {
+            (fps and (frame_data.size() > 5*fps))) {
       Debug(1, "Adding %zu frames to DB because write_to_db:%d or frames > analysis fps %f or BULK(%d)",
             frame_data.size(), write_to_db, fps, (frame_type == BULK));
       WriteDbFrames();

From 1cddac4efd45cd6ea965d8d7e90c3815060332d8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 18:34:06 -0500
Subject: [PATCH 140/501] remove remaining signal blocking cruft, add ignoring
 sigchld so that anything we spawn doesn't become a zombie.

---
 src/zmc.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/zmc.cpp b/src/zmc.cpp
index 68c6227af..c2f14e254 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -220,12 +220,13 @@ int main(int argc, char *argv[]) {
   zmSetDefaultTermHandler();
   zmSetDefaultDieHandler();
 
-  sigset_t block_set;
-  sigemptyset(&block_set);
-
-  sigaddset(&block_set, SIGHUP);
-  sigaddset(&block_set, SIGUSR1);
-  sigaddset(&block_set, SIGUSR2);
+  struct sigaction sa;
+  sa.sa_handler = SIG_IGN; //handle signal by ignoring
+  sigemptyset(&sa.sa_mask);
+  sa.sa_flags = 0;
+  if (sigaction(SIGCHLD, &sa, 0) == -1) {
+    Error("Unable to set SIGCHLD to ignore. There may be zombies.");
+  }
 
   int result = 0;
   int prime_capture_log_count = 0;
@@ -286,7 +287,6 @@ int main(int argc, char *argv[]) {
     Microseconds sleep_time = Microseconds(0);
 
     while (!zm_terminate) {
-      //sigprocmask(SIG_BLOCK, &block_set, 0);
       for (size_t i = 0; i < monitors.size(); i++) {
         monitors[i]->CheckAction();
 

From 37069cb6fc4cc2650ebaa8c0e5ed547a66a8443d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Nov 2021 18:59:44 -0500
Subject: [PATCH 141/501] add cmake module to find libFmt

---
 cmake/Modules/FindFmt.cmake | 100 ++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 cmake/Modules/FindFmt.cmake

diff --git a/cmake/Modules/FindFmt.cmake b/cmake/Modules/FindFmt.cmake
new file mode 100644
index 000000000..b426d8c77
--- /dev/null
+++ b/cmake/Modules/FindFmt.cmake
@@ -0,0 +1,100 @@
+# FindFmt
+# -------
+# Finds the Fmt library
+#
+# This will define the following variables::
+#
+# FMT_FOUND - system has Fmt
+# FMT_INCLUDE_DIRS - the Fmt include directory
+# FMT_LIBRARIES - the Fmt libraries
+#
+# and the following imported targets::
+#
+#   Fmt::Fmt   - The Fmt library
+
+if(ENABLE_INTERNAL_FMT)
+  include(ExternalProject)
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/libfmt/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
+  string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" FMT_VERSION "${VER}")
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(FMT_URL)
+      get_filename_component(FMT_URL "${FMT_URL}" ABSOLUTE)
+  else()
+      set(FMT_URL http://mirrors.kodi.tv/build-deps/sources/fmt-${FMT_VERSION}.tar.gz)
+  endif()
+  if(VERBOSE)
+      message(STATUS "FMT_URL: ${FMT_URL}")
+  endif()
+
+  if(APPLE)
+    set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
+  endif()
+
+  set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
+  set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+  externalproject_add(fmt
+                      URL ${FMT_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/fmt
+                      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+                                 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+                                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                                 -DCMAKE_INSTALL_LIBDIR=lib
+                                 -DFMT_DOC=OFF
+                                 -DFMT_TEST=OFF
+                                 "${EXTRA_ARGS}"
+                      BUILD_BYPRODUCTS ${FMT_LIBRARY})
+  set_target_properties(fmt PROPERTIES FOLDER "External Projects")
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Fmt
+                                    REQUIRED_VARS FMT_LIBRARY FMT_INCLUDE_DIR
+                                    VERSION_VAR FMT_VERSION)
+
+  set(FMT_LIBRARIES ${FMT_LIBRARY})
+  set(FMT_INCLUDE_DIRS ${FMT_INCLUDE_DIR})
+
+else()
+
+find_package(FMT 6.1.2 CONFIG REQUIRED QUIET)
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_FMT libfmt QUIET)
+  if(PC_FMT_VERSION AND NOT FMT_VERSION)
+    set(FMT_VERSION ${PC_FMT_VERSION})
+  endif()
+endif()
+
+find_path(FMT_INCLUDE_DIR NAMES fmt/format.h
+                          PATHS ${PC_FMT_INCLUDEDIR})
+
+find_library(FMT_LIBRARY_RELEASE NAMES fmt
+                                PATHS ${PC_FMT_LIBDIR})
+find_library(FMT_LIBRARY_DEBUG NAMES fmtd
+                               PATHS ${PC_FMT_LIBDIR})
+
+include(SelectLibraryConfigurations)
+select_library_configurations(FMT)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fmt
+                                  REQUIRED_VARS FMT_LIBRARY FMT_INCLUDE_DIR FMT_VERSION
+                                  VERSION_VAR FMT_VERSION)
+
+if(FMT_FOUND)
+  set(FMT_LIBRARIES ${FMT_LIBRARY})
+  set(FMT_INCLUDE_DIRS ${FMT_INCLUDE_DIR})
+
+  if(NOT TARGET fmt)
+    add_library(fmt UNKNOWN IMPORTED)
+    set_target_properties(fmt PROPERTIES
+                               IMPORTED_LOCATION "${FMT_LIBRARY}"
+                               INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIR}")
+  endif()
+endif()
+
+endif()
+mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)

From 5647c224d1d6407b6a44288c91a8c9384c9f2f08 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Thu, 2 Dec 2021 15:18:04 +0100
Subject: [PATCH 142/501] Make config file comment on unix socket option a bit
 clearer

Initially I took the comment for granted, and the 'unix_socket' string
as a magic string to tell zoneminder to use the mysql default socket.  Alas,
this do not work, as the setting really need to point to the path of the socket.
Rewrite the comment to make this more clear, and less confusing for the
future users.
---
 zm.conf.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zm.conf.in b/zm.conf.in
index 312c9aeae..d48dfce56 100644
--- a/zm.conf.in
+++ b/zm.conf.in
@@ -37,7 +37,8 @@ ZM_WEB_GROUP=@WEB_GROUP@
 ZM_DB_TYPE=@ZM_DB_TYPE@
 
 # ZoneMinder database hostname or ip address and optionally port or unix socket
-# Acceptable formats include hostname[:port], ip_address[:port], or localhost:unix_socket
+# Acceptable formats include hostname[:port], ip_address[:port], or
+# localhost:/path/to/unix_socket
 ZM_DB_HOST=@ZM_DB_HOST@
 
 # ZoneMinder database name

From 1277e752783ed8d2dc061e1ae633a3670cc4b617 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 3 Dec 2021 12:03:23 -0500
Subject: [PATCH 143/501] Detect group hierarchy loops and break them.

---
 web/includes/Group.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/web/includes/Group.php b/web/includes/Group.php
index 026d1f7f4..34db0e869 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -167,9 +167,15 @@ class Group extends ZM_Object {
 	public function Parents() {
 		$Parents = array();
 		$Parent = $this->Parent();
-		while( $Parent ) {
+    $seen_parents = array();
+		while ($Parent) {
+      $seen_parents[$Parent->Id()] = $Parent;
 			array_unshift($Parents, $Parent);
 			$Parent = $Parent->Parent();
+      if ($Parent and isset($seen_parents[$Parent->Id()])) {
+        Warning("Detected hierarchy loop in group {$Parent->Name()}");
+        break;
+      }
 		}
 		return $Parents;
 	}
@@ -189,6 +195,9 @@ class Group extends ZM_Object {
 	public function canView($u=null) {
 		global $user;
 		if (!$u) $u = $user;
+    if (!count($this->Monitors()) and !count($this->Children())) {
+      return true;
+    }
 		# Can view if we can view any of the monitors in it.
 		foreach ($this->Monitors() as $monitor) {
 			if ($monitor->canView($u)) return true;

From eef172379c11c60a68236d3768495e962bef398f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 3 Dec 2021 13:25:21 -0500
Subject: [PATCH 144/501] Move all the opening of events code into one function
 called openEvent.

---
 src/zm_monitor.cpp | 208 ++++++++++++++++-----------------------------
 1 file changed, 75 insertions(+), 133 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index d50e4e6eb..0410d39bc 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1882,12 +1882,20 @@ bool Monitor::Analyse() {
                 // Get new score.
                 int motion_score = DetectMotion(*(snap->image), zoneSet);
 
+                // lets construct alarm cause. It will contain cause + names of zones alarmed
+                std::string alarm_cause;
                 snap->zone_stats.reserve(zones.size());
                 for (const Zone &zone : zones) {
                   const ZoneStats &stats = zone.GetStats();
                   stats.DumpToLog("After detect motion");
                   snap->zone_stats.push_back(stats);
+                  if (zone.Alarmed()) {
+                    if (!alarm_cause.empty()) alarm_cause += ",";
+                    alarm_cause += std::string(zone.Label());
+                  }
                 }
+                if (!alarm_cause.empty())
+                  cause = cause+" "+alarm_cause;
 
                 Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
                     score, last_motion_score, motion_score);
@@ -1913,6 +1921,7 @@ bool Monitor::Analyse() {
               );
         } // end if active and doing motion detection
 
+
         if (function == RECORD or function == MOCORD) {
           // If doing record, check to see if we need to close the event or not.
           if (event) {
@@ -1935,75 +1944,9 @@ bool Monitor::Analyse() {
           }  // end if event
 
           if (!event) {
-            Debug(2, "Creating continuous event");
-            if (!snap->keyframe and (videowriter == PASSTHROUGH)) {
-              // Must start on a keyframe so rewind. Only for passthrough though I guess.
-              // FIXME this iterator is not protected from invalidation
-              packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
-                  *analysis_it, 0 /* pre_event_count */
-                  );
+            event = openEvent(snap, cause.empty() ? "Continuous" : cause, noteSetMap);
 
-              // This gets a lock on the starting packet
-
-              ZMLockedPacket *starting_packet_lock = nullptr;
-              std::shared_ptr<ZMPacket> starting_packet = nullptr;
-              if (*start_it != *analysis_it) {
-                starting_packet_lock = packetqueue.get_packet(start_it);
-                if (!starting_packet_lock) {
-                  Warning("Unable to get starting packet lock");
-                  delete packet_lock;
-                  return false;
-                }
-                starting_packet = starting_packet_lock->packet_;
-              } else {
-                starting_packet = snap;
-              }
-
-              event = new Event(this, starting_packet->timestamp, "Continuous", noteSetMap);
-              // Write out starting packets, do not modify packetqueue it will garbage collect itself
-              while (starting_packet and ((*start_it) != *analysis_it)) {
-                event->AddPacket(starting_packet);
-                // Have added the packet, don't want to unlock it until we have locked the next
-
-                packetqueue.increment_it(start_it);
-                if ((*start_it) == *analysis_it) {
-                  if (starting_packet_lock) delete starting_packet_lock;
-                  break;
-                }
-                ZMLockedPacket *lp = packetqueue.get_packet(start_it);
-                delete starting_packet_lock;
-                if (!lp) return false;
-                starting_packet_lock = lp;
-                starting_packet = lp->packet_;
-              }
-              packetqueue.free_it(start_it);
-              delete start_it;
-              start_it = nullptr;
-            } else {
-              // Create event from current snap
-              event = new Event(this, timestamp, "Continuous", noteSetMap);
-            }
-            shared_data->last_event_id = event->Id();
-
-            // lets construct alarm cause. It will contain cause + names of zones alarmed
-            std::string alarm_cause;
-            for (const Zone &zone : zones) {
-              if (zone.Alarmed()) {
-                if (!alarm_cause.empty()) alarm_cause += ",";
-                alarm_cause += std::string(zone.Label());
-              }
-            }
-            alarm_cause = cause+" Continuous "+alarm_cause;
-            strncpy(shared_data->alarm_cause, alarm_cause.c_str(), sizeof(shared_data->alarm_cause)-1);
-            SetVideoWriterStartTime(event->StartTime());
-            if (!event_start_command.empty()) {
-              if (fork() == 0) {
-                execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
-                Error("Error execing %s", event_start_command.c_str());
-              }
-            }
-
-            Info("%s: %03d - Opened new event %" PRIu64 ", section start",
+            Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
                 name.c_str(), analysis_image_count, event->Id());
             /* To prevent cancelling out an existing alert\prealarm\alarm state */
             if (state == IDLE) {
@@ -2035,70 +1978,12 @@ bool Monitor::Analyse() {
                     (event_close_mode == CLOSE_ALARM));
             }
             if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
-              // lets construct alarm cause. It will contain cause + names of zones alarmed
-              std::string alarm_cause = "";
-              for (const Zone &zone : zones) {
-                if (zone.Alarmed()) {
-                  alarm_cause = alarm_cause + "," + std::string(zone.Label());
-                }
-              }
-              if (!alarm_cause.empty()) alarm_cause[0] = ' ';
-              alarm_cause = cause + alarm_cause;
-              strncpy(shared_data->alarm_cause, alarm_cause.c_str(), sizeof(shared_data->alarm_cause)-1);
               Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
-                  name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, shared_data->alarm_cause);
+                  name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
 
               if (!event) {
-                packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
-                    *analysis_it,
-                    (pre_event_count > alarm_frame_count ? pre_event_count : alarm_frame_count)
-                    );
-                ZMLockedPacket *starting_packet_lock = nullptr;
-                std::shared_ptr<ZMPacket> starting_packet = nullptr;
-                if (*start_it != *analysis_it) {
-                  starting_packet_lock = packetqueue.get_packet(start_it);
-                  if (!starting_packet_lock) return false;
-                  starting_packet = starting_packet_lock->packet_;
-                } else {
-                  starting_packet = snap;
-                }
-
-                event = new Event(this, starting_packet->timestamp, cause, noteSetMap);
-                shared_data->last_event_id = event->Id();
-                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                SetVideoWriterStartTime(event->StartTime());
+                event = openEvent(snap, cause, noteSetMap);
                 shared_data->state = state = ALARM;
-
-                // Write out starting packets, do not modify packetqueue it will garbage collect itself
-                while (*start_it != *analysis_it) {
-                  event->AddPacket(starting_packet);
-
-                  packetqueue.increment_it(start_it);
-                  if ( (*start_it) == (*analysis_it) ) {
-                    if (starting_packet_lock) delete starting_packet_lock;
-                    break;
-                  }
-                  ZMLockedPacket *lp = packetqueue.get_packet(start_it);
-                  delete starting_packet_lock;
-                  if (!lp) {
-                    // Shutting down event will be closed by ~Monitor()
-                    // Perhaps we shouldn't do this.
-                    return false;
-                  }
-                  starting_packet_lock = lp;
-                  starting_packet = lp->packet_;
-                }
-                packetqueue.free_it(start_it);
-                delete start_it;
-                start_it = nullptr;
-
-            if (!event_start_command.empty()) {
-              if (fork() == 0) {
-                execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
-                Error("Error execing %s", event_start_command.c_str());
-              }
-            }
-
                 Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
               } else {
                 shared_data->state = state = ALARM;
@@ -2208,11 +2093,7 @@ bool Monitor::Analyse() {
                       static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - GetVideoWriterStartTime()).count()),
                       static_cast<int64>(Seconds(section_length).count()));
               closeEvent();
-              event = new Event(this, timestamp, cause, noteSetMap);
-              shared_data->last_event_id = event->Id();
-              //set up video store data
-              snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-              SetVideoWriterStartTime(event->StartTime());
+              event = openEvent(snap, cause, noteSetMap);
             }
           } else {
             Error("ALARM but no event");
@@ -2791,6 +2672,67 @@ void Monitor::TimestampImage(Image *ts_image, SystemTimePoint ts_time) const {
   Debug(2, "done annotating %s", label_text);
 } // end void Monitor::TimestampImage
 
+Event * Monitor::openEvent(
+    const std::shared_ptr<ZMPacket> &snap,
+    const std::string &cause,
+    const Event::StringSetMap noteSetMap) {
+
+  // FIXME this iterator is not protected from invalidation
+  packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
+      *analysis_it,
+      (cause == "Continuous" ? 0 : (pre_event_count > alarm_frame_count ? pre_event_count : alarm_frame_count))
+      );
+
+  // This gets a lock on the starting packet
+
+  ZMLockedPacket *starting_packet_lock = nullptr;
+  std::shared_ptr<ZMPacket> starting_packet = nullptr;
+  if (*start_it != *analysis_it) {
+    starting_packet_lock = packetqueue.get_packet(start_it);
+    if (!starting_packet_lock) {
+      Warning("Unable to get starting packet lock");
+      return nullptr;
+    }
+    starting_packet = starting_packet_lock->packet_;
+  } else {
+    starting_packet = snap;
+  }
+
+  event = new Event(this, starting_packet->timestamp, cause, noteSetMap);
+
+  shared_data->last_event_id = event->Id();
+  strncpy(shared_data->alarm_cause, cause.c_str(), sizeof(shared_data->alarm_cause)-1);
+
+  if (!event_start_command.empty()) {
+    if (fork() == 0) {
+      execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
+      Error("Error execing %s", event_start_command.c_str());
+    }
+  }
+
+  // Write out starting packets, do not modify packetqueue it will garbage collect itself
+  while (starting_packet and ((*start_it) != *analysis_it)) {
+    event->AddPacket(starting_packet);
+    // Have added the packet, don't want to unlock it until we have locked the next
+
+    packetqueue.increment_it(start_it);
+    if ((*start_it) == *analysis_it) {
+      if (starting_packet_lock) delete starting_packet_lock;
+      break;
+    }
+    ZMLockedPacket *lp = packetqueue.get_packet(start_it);
+    delete starting_packet_lock;
+    if (!lp) return nullptr; // only on terminate FIXME
+    starting_packet_lock = lp;
+    starting_packet = lp->packet_;
+  }
+  packetqueue.free_it(start_it);
+  delete start_it;
+  start_it = nullptr;
+
+  return event;
+}
+
 void Monitor::closeEvent() {
   if (!event) return;
 

From 27e87fc21ff305a062416dd508d6d208146b0809 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 3 Dec 2021 13:25:36 -0500
Subject: [PATCH 145/501] Move all the opening of events code into one function
 called openEvent.

---
 src/zm_monitor.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index d670911bb..8d6bbd95e 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -593,6 +593,10 @@ public:
   bool Decode();
   void DumpImage( Image *dump_image ) const;
   void TimestampImage(Image *ts_image, SystemTimePoint ts_time) const;
+  Event *openEvent(
+      const std::shared_ptr<ZMPacket> &snap,
+      const std::string &cause,
+      const Event::StringSetMap noteSetMap);
   void closeEvent();
 
   void Reload();

From 45559123afc511218f38736ea8356e67b6d50909 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Dec 2021 17:45:26 -0500
Subject: [PATCH 146/501] Add numCoords, Coords, Area, AlarmRGB to Zone object.
 Also add Points(), AreaCoords, svg_polygon utility functions to it.

---
 web/includes/Zone.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/web/includes/Zone.php b/web/includes/Zone.php
index 9f3850bb1..eb216565a 100644
--- a/web/includes/Zone.php
+++ b/web/includes/Zone.php
@@ -13,6 +13,10 @@ class Zone extends ZM_Object {
 			'Name'                => '',
 			'Type' => 'Active',
 			'Units' => 'Pixels',
+      'NumCoords' => '0',
+      'Coords' => 0,
+      'Area' => '0',
+      'AlarmRGB' => '0',
 			'CheckMethod' => 'Blobs',
 			'MinPixelThreshold' => null,
 			'MaxPixelThreshold' => null,
@@ -46,5 +50,17 @@ class Zone extends ZM_Object {
     return new Monitor();
   }
 
+  public function Points() {
+    return coordsToPoints($this->Coords());
+  }
+
+  public function AreaCoords() {
+    return preg_replace('/\s+/', ',', $this->Coords());
+  }
+
+  public function svg_polygon() {
+    return '<polygon points="'.$this->AreaCoords().'" class="'.$this->Type().'" />';
+  }
+
 } # end class Zone
 ?>

From e6a12d20c6ad8279d0a02ce6727b41a4c37eb6a4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Dec 2021 17:45:54 -0500
Subject: [PATCH 147/501] Add svg syles and rename imageFeed to videoFeed

---
 web/skins/classic/css/base/views/event.css | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/css/base/views/event.css b/web/skins/classic/css/base/views/event.css
index f392cb99c..da59db6aa 100644
--- a/web/skins/classic/css/base/views/event.css
+++ b/web/skins/classic/css/base/views/event.css
@@ -77,7 +77,7 @@ height: 100%;
     position: relative;
 }
 
-#imageFeed {
+#videoFeed {
     display: inline-block;
     position: relative;
     text-align: center;
@@ -263,3 +263,17 @@ height: 100%;
     height: 100%;
     background-color: #999999;
 }
+svg.zones {
+  position:absolute;
+  top: 0;
+  left: 0;
+  background: none;
+  width: 100%;
+  /*
+  height: 100%;
+  */
+}
+#videoobj {
+  width: 100%;
+  height: 100%;
+}

From 76c4560c25e5d21aee2c17f12ceee2ee84a3a93c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Dec 2021 17:46:25 -0500
Subject: [PATCH 148/501] put svg zone styles in one files that can be included
 where needed

---
 web/skins/classic/css/base/zones.css | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 web/skins/classic/css/base/zones.css

diff --git a/web/skins/classic/css/base/zones.css b/web/skins/classic/css/base/zones.css
new file mode 100644
index 000000000..82c96e6b2
--- /dev/null
+++ b/web/skins/classic/css/base/zones.css
@@ -0,0 +1,19 @@
+.zones polygon {
+  fill-opacity: 0.25;
+}
+.Active {
+  stroke: #ff0000;
+  fill: #ff0000;
+}
+.Inclusive {
+  stroke: #FFA500;
+  fill: #FFA500;
+}
+.Exclusive {
+  stroke: #800080;
+  fill: #800080;
+}
+.Preclusive {
+  stroke: #0000FF;
+  fill: #0000FF;
+}

From 089c6044f1e3f42382f115bc04b55135489ee50d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Dec 2021 17:48:49 -0500
Subject: [PATCH 149/501] Add layers toggle button, cleanup code by using
 ->canView, rename Monitor to monitor, add svg zones layer

---
 web/skins/classic/views/event.php       | 107 ++++++++++++++----------
 web/skins/classic/views/js/event.js     |  32 +++++--
 web/skins/classic/views/js/event.js.php |  10 ++-
 3 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index e352f305b..b096fda97 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -25,47 +25,57 @@ if ( !canView('Events') ) {
 
 require_once('includes/Event.php');
 require_once('includes/Filter.php');
+require_once('includes/Zone.php');
 
 $eid = validInt($_REQUEST['eid']);
 $fid = !empty($_REQUEST['fid']) ? validInt($_REQUEST['fid']) : 1;
 
 $Event = new ZM\Event($eid);
-if ( $user['MonitorIds'] ) {
-  $monitor_ids = explode(',', $user['MonitorIds']);
-  if ( count($monitor_ids) and ! in_array($Event->MonitorId(), $monitor_ids) ) {
-    $view = 'error';
-    return;
-  }
-}
-$Monitor = $Event->Monitor();
+$monitor = $Event->Monitor();
 
-if ( isset($_REQUEST['rate']) ) {
+if (!$monitor->canView()) {
+  $view = 'error';
+  return;
+}
+
+zm_session_start();
+if (isset($_REQUEST['rate']) ) {
   $rate = validInt($_REQUEST['rate']);
-} else if ( isset($_COOKIE['zmEventRate']) ) {
+} else if (isset($_COOKIE['zmEventRate'])) {
   $rate = $_COOKIE['zmEventRate'];
 } else {
-  $rate = reScale(RATE_BASE, $Monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
+  $rate = reScale(RATE_BASE, $monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
 }
 
-if ( isset($_REQUEST['scale']) ) {
+if (isset($_REQUEST['scale'])) {
   $scale = validInt($_REQUEST['scale']);
-} else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) {
+} else if (isset($_COOKIE['zmEventScale'.$Event->MonitorId()])) {
   $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];
 } else {
-  $scale = $Monitor->DefaultScale();
+  $scale = $monitor->DefaultScale();
+}
+
+$showZones = false;
+if (isset($_REQUEST['showZones'])) {
+  $showZones = $_REQUEST['showZones'] == 1;
+  $_SESSION['zmEventShowZones'.$monitor->Id()] = $showZones;
+} else if (isset($_COOKIE['zmEventShowZones'.$monitor->Id()])) {
+  $showZones = $_COOKIE['zmEventShowZones'.$monitor->Id()] == 1;
+} else if (isset($_SESSION['zmEventShowZones'.$monitor->Id()]) ) {
+  $showZones = $_SESSION['zmEventShowZones'.$monitor->Id()];
 }
 
 $codec = 'auto';
-if ( isset($_REQUEST['codec']) ) {
+if (isset($_REQUEST['codec'])) {
   $codec = $_REQUEST['codec'];
-  zm_session_start();
   $_SESSION['zmEventCodec'.$Event->MonitorId()] = $codec;
-  session_write_close();
 } else if ( isset($_SESSION['zmEventCodec'.$Event->MonitorId()]) ) {
   $codec = $_SESSION['zmEventCodec'.$Event->MonitorId()];
 } else {
-  $codec = $Monitor->DefaultCodec();
+  $codec = $monitor->DefaultCodec();
 }
+session_write_close();
+
 $codecs = array(
   'auto'  => translate('Auto'),
   'MP4'   => translate('MP4'),
@@ -79,32 +89,30 @@ $replayModes = array(
   'gapless' => translate('ReplayGapless'),
 );
 
-if ( isset($_REQUEST['streamMode']) )
+if (isset($_REQUEST['streamMode']))
   $streamMode = validHtmlStr($_REQUEST['streamMode']);
 else
   $streamMode = 'video';
 
 $replayMode = '';
-if ( isset($_REQUEST['replayMode']) )
+if (isset($_REQUEST['replayMode']))
   $replayMode = validHtmlStr($_REQUEST['replayMode']);
-if ( isset($_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
+if (isset($_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']))
   $replayMode = validHtmlStr($_COOKIE['replayMode']);
 
-if ( ( !$replayMode ) or ( !$replayModes[$replayMode] ) ) {
+if ((!$replayMode) or !$replayModes[$replayMode]) {
   $replayMode = 'none';
 }
 
-$video_tag = false;
-if ( $Event->DefaultVideo() and ( $codec == 'MP4' or $codec == 'auto' ) ) {
-  $video_tag = true;
-}
+$video_tag = ($Event->DefaultVideo() and ($codec == 'MP4' or $codec == 'auto'));
+
 // videojs zoomrotate only when direct recording
 $Zoom = 1;
 $Rotation = 0;
-if ( $Monitor->VideoWriter() == '2' ) {
+if ($monitor->VideoWriter() == '2') {
 # Passthrough
   $Rotation = $Event->Orientation();
-  if ( in_array($Event->Orientation(),array('90','270')) )
+  if (in_array($Event->Orientation(),array('90','270')))
     $Zoom = $Event->Height()/$Event->Width();
 }
 
@@ -143,7 +151,7 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
       <div id="toolbar" >
         <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
         <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
-<?php if ( $Event->Id() ) { ?>
+<?php if ($Event->Id()) { ?>
         <button id="renameBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Rename') ?>" disabled><i class="fa fa-font"></i></button>
         <button id="archiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Archive') ?>" disabled><i class="fa fa-archive"></i></button>
         <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
@@ -158,7 +166,13 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
         <button id="statsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats') ?>" ><i class="fa fa-info"></i></button>
         <button id="framesBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Frames') ?>" ><i class="fa fa-picture-o"></i></button>
         <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>"><i class="fa fa-trash"></i></button>
-<?php } // end if Event->Id ?>
+<?php
+  if (canView('System')) { ?>
+    <button id="toggleZonesButton" class="btn btn-<?php echo $showZones?'normal':'secondary'?>" title="<?php echo translate(($showZones?'Hide':'Show').' Zones')?>" ><span class="material-icons"><?php echo $showZones?'layers_clear':'layers'?></span</button>
+<?php
+  }
+  } // end if Event->Id
+?>
       </div>
       
       <h2><?php echo translate('Event').' '.$Event->Id() ?></h2>
@@ -190,10 +204,10 @@ if ( $Event->Id() and !file_exists($Event->Path()) )
       <div class="">
       <div id="eventVideo">
       <!-- VIDEO CONTENT -->
-<?php
-if ( $video_tag ) {
-?>
         <div id="videoFeed">
+<?php
+if ($video_tag) {
+?>
           <video autoplay id="videoobj" class="video-js vjs-default-skin"
             style="transform: matrix(1, 0, 0, 1, 0, 0);"
            <?php echo $scale ? 'width="'.reScale($Event->Width(), $scale).'"' : '' ?>
@@ -209,21 +223,17 @@ if ( $video_tag ) {
           <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default/>
           Your browser does not support the video tag.
           </video>
-        </div><!--videoFeed-->
 <?php
 } else {
-?>
-      <div id="imageFeed">
-<?php
 if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
   $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode),'&amp;');
   outputVideoStream('evtStream', $streamSrc, reScale( $Event->Width(), $scale ).'px', reScale( $Event->Height(), $scale ).'px', ZM_MPEG_LIVE_FORMAT );
 } else {
   $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode),'&amp;');
   if ( canStreamNative() ) {
-    outputImageStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px', validHtmlStr($Event->Name()));
+    outputImageStream('evtStream', $streamSrc, '100%', '100%', validHtmlStr($Event->Name()));
   } else {
-    outputHelperStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px' );
+    outputHelperStream('evtStream', $streamSrc, '100%', '100%');
   }
 } // end if stream method
 ?>
@@ -231,10 +241,18 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
         <div id="progressBar" style="width: <?php echo reScale($Event->Width(), $scale);?>px;">
           <div class="progressBox" id="progressBox" title="" style="width: 0%;"></div>
         </div><!--progressBar-->
-      </div><!--imageFeed-->
 <?php
 } /*end if !DefaultVideo*/
 ?>
+<svg class="zones" id="zones<?php echo $monitor->Id() ?>" style="display:<?php echo $showZones ? 'block' : 'none'; ?>" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>" preserveAspectRatio="none">
+<?php
+    foreach (ZM\Zone::find(array('MonitorId'=>$monitor->Id()), array('order'=>'Area DESC')) as $zone) {
+      echo $zone->svg_polygon();
+    } // end foreach zone
+?>
+  Sorry, your browser does not support inline SVG
+</svg>
+        </div><!--videoFeed-->
         <p id="dvrControls">
           <button type="button" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" data-on-click-true="streamPrev">
           <i class="material-icons md-18">skip_previous</i>
@@ -268,8 +286,8 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
           <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">Replay</span></span>
           <span id="rate"><?php echo translate('Rate') ?>: 
 <?php 
-#rates are defined in skins/classic/includes/config.php
-echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
+  #rates are defined in skins/classic/includes/config.php
+  echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
 ?>
 <!--<span id="rateValue"><?php echo $rate/100 ?></span>x</span>-->
           <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue">0</span>s</span>
@@ -283,4 +301,7 @@ echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
     </div><!--content-->
     
   </div><!--page-->
-<?php xhtmlFooter() ?>
+<?php
+  echo output_link_if_exists(array('css/base/zones.css'));
+  xhtmlFooter();
+?>
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 94e132cc1..b252c292c 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -177,7 +177,7 @@ function changeScale() {
   var newWidth;
   var newHeight;
   var autoScale;
-  var eventViewer= $j(vid ? '#videoobj' : '#evtStream');
+  var eventViewer= $j(vid ? '#videoobj' : '#videoFeed');
   var alarmCue = $j('div.alarmCue');
   var bottomEl = $j('#replayStatus');
 
@@ -910,12 +910,12 @@ function initPage() {
     progressBarNav();
     streamCmdTimer = setTimeout(streamQuery, 500);
     if (canStreamNative) {
-      if (!$j('#imageFeed')) {
-        console.log('No element with id tag imageFeed found.');
+      if (!$j('#videoFeed')) {
+        console.log('No element with id tag videoFeed found.');
       } else {
-        var streamImg = $j('#imageFeed img');
+        var streamImg = $j('#videoFeed img');
         if (!streamImg) {
-          streamImg = $j('#imageFeed object');
+          streamImg = $j('#videoFeed object');
         }
         $j(streamImg).click(function(event) {
           handleClick(event);
@@ -1071,5 +1071,27 @@ function initPage() {
   });
 } // end initPage
 
+document.getElementById('toggleZonesButton').addEventListener('click', toggleZones);
+
+function toggleZones(e) {
+  const zones = $j('#zones'+eventData.MonitorId);
+  const button = document.getElementById('toggleZonesButton');
+  if (zones.length) {
+    if (zones.is(":visible")) {
+      zones.hide();
+      button.setAttribute('title', showZonesString);
+      button.innerHTML = '<span class="material-icons">layers</span>';
+      setCookie('zmEventShowZones'+eventData.MonitorId, '0', 3600);
+    } else {
+      zones.show();
+      button.setAttribute('title', hideZonesString);
+      button.innerHTML = '<span class="material-icons">layers_clear</span>';
+      setCookie('zmEventShowZones'+eventData.MonitorId, '1', 3600);
+    }
+  } else {
+    console.error("Zones svg not found");
+  }
+}
+
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index cdd4e9041..5d4d57f7c 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -1,7 +1,7 @@
 <?php
   global $connkey;
   global $Event;
-  global $Monitor;
+  global $monitor;
   global $filterQuery;
   global $sortQuery;
   global $rates;
@@ -43,8 +43,9 @@ var eventData = {
     Id: '<?php echo $Event->Id() ?>',
     Name: '<?php echo $Event->Name() ?>',
     MonitorId: '<?php echo $Event->MonitorId() ?>',
-    MonitorName: '<?php echo validJsStr($Monitor->Name()) ?>',
+    MonitorName: '<?php echo validJsStr($monitor->Name()) ?>',
     Cause: '<?php echo validHtmlStr($Event->Cause()) ?>',
+    Notes: '<?php echo $Event->Notes()?>',
     Width: '<?php echo $Event->Width() ?>',
     Height: '<?php echo $Event->Height() ?>',
     Length: '<?php echo $Event->Length() ?>',
@@ -72,6 +73,7 @@ var eventDataStrings = {
     MonitorId: '<?php echo translate('AttrMonitorId') ?>',
     MonitorName: '<?php echo translate('AttrMonitorName') ?>',
     Cause: '<?php echo translate('Cause') ?>',
+    Notes: '<?php echo translate('Notes') ?>',
     StartDateTimeShort: '<?php echo translate('AttrStartTime') ?>',
     Length: '<?php echo translate('Duration') ?>',
     Frames: '<?php echo translate('AttrFrames') ?>',
@@ -93,7 +95,7 @@ var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode
 var rates = <?php echo json_encode(array_keys($rates)) ?>;
 var rate = '<?php echo $rate ?>'; // really only used when setting up initial playback rate.
 var scale = "<?php echo $scale ?>";
-var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
+var LabelFormat = "<?php echo validJsStr($monitor->LabelFormat())?>";
 
 var streamTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 
@@ -105,6 +107,8 @@ var streamMode = '<?php echo $streamMode ?>';
 //
 var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
 var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
+var showZonesString = "<?php echo validJsStr(translate('Show Zones'))?>";
+var hideZonesString = "<?php echo validJsStr(translate('Hide Zones'))?>";
 var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
 var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
 var popup = '<?php echo $popup ?>';

From 7b66d751d80a9f0722ded2154b1514f72ab24105 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Dec 2021 17:49:24 -0500
Subject: [PATCH 150/501] cleanup, spacing, use zone object methods to clean up
 svg zone layers

---
 web/skins/classic/views/montage.php | 43 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index b0b10f190..deaddcaf3 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -24,6 +24,7 @@ if ( !canView('Stream') ) {
 }
 
 require_once('includes/MontageLayout.php');
+require_once('includes/Zone.php');
 
 $showControl = false;
 $showZones = false;
@@ -49,7 +50,6 @@ $heights = array(
   '1080' => '1080px',
 );
 
-
 $layouts = ZM\MontageLayout::find(NULL, array('order'=>"lower('Name')"));
 $layoutsById = array();
 foreach ( $layouts as $l ) {
@@ -149,7 +149,7 @@ echo getNavBarHTML();
     $html .= '<div class="container-fluid" id="mfbpanel"'.( ( $flip == 'down' ) ? ' style="display:none;"' : '' ) .'>'.PHP_EOL;
     echo $html;
 ?>
-        <div id="headerButtons">
+      <div id="headerButtons">
 <?php
 if ( $showControl ) {
   echo makeLink('?view=control', translate('Control'));
@@ -237,10 +237,10 @@ foreach ( $monitors as $monitor ) {
   $monitor_options['width'] = '100%';
 
   if ( 0 ) {
-  if ($monitor_options['width'] > 0)
-    $monitor_options['width'] = $monitor_options['width'].'px';
-  if ($monitor_options['height'] > 0)
-  $monitor_options['height'] = $monitor_options['height']?$monitor_options['height'].'px' : null;
+    if ($monitor_options['width'] > 0)
+      $monitor_options['width'] = $monitor_options['width'].'px';
+    if ($monitor_options['height'] > 0)
+      $monitor_options['height'] = $monitor_options['height']?$monitor_options['height'].'px' : null;
   } # end if
   $monitor_options['connkey'] = $monitor->connKey();
 
@@ -275,30 +275,28 @@ foreach ( $monitors as $monitor ) {
     } else if ( $scale ) {
       $width = reScale($monitor->Width(), $scale);
       $height = reScale($monitor->Height(), $scale);
-    } 
+    }
 
     $zones = array();
-    foreach( dbFetchAll('SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($monitor->Id()) ) as $row ) {
-      $row['Points'] = coordsToPoints($row['Coords']);
-
-      if ( $scale ) {
-        limitPoints($row['Points'], 0, 0, $monitor->Width(), $monitor->Height());
+    foreach ( ZM\Zone::find(array('MonitorId'=>$monitor->Id()), array('order'=>'Area DESC')) as $row ) {
+      $points = $row->Points();
+      if ($scale) {
+        limitPoints($points, 0, 0, $monitor->Width(), $monitor->Height());
       } else {
-        limitPoints($row['Points'], 0, 0, 
+        limitPoints($points, 0, 0, 
             ( $width ? $width-1 : $monitor->ViewWidth()-1 ),
             ( $height ? $height-1 : $monitor->ViewHeight()-1 )
             );
       }
-      $row['Coords'] = pointsToCoords($row['Points']);
-      $row['AreaCoords'] = preg_replace('/\s+/', ',', $row['Coords']);
+      $row->Coords(pointsToCoords($points));
       $zones[] = $row;
     } // end foreach Zone
 ?>
 
-<svg class="zones" id="zones<?php echo $monitor->Id() ?>" style="position:absolute; top: 0; left: 0; background: none; width: 100%; height: 100%;" viewBox="0 0 <?php echo $monitor->ViewWidth() ?> <?php echo $monitor->ViewHeight() ?>" preserveAspectRatio="none">
+<svg class="zones" id="zones<?php echo $monitor->Id() ?>" style="position:absolute; top: 0; left: 0; background: none; width: 100%; height: 100%;" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>" preserveAspectRatio="none">
 <?php
-foreach ( array_reverse($zones) as $zone ) {
-  echo '<polygon points="'. $zone['AreaCoords'] .'" class="'. $zone['Type'].'" />';
+foreach (array_reverse($zones) as $zone) {
+  echo $zone->svg_polygon();
 } // end foreach zone
 ?>
   Sorry, your browser does not support inline SVG
@@ -308,9 +306,14 @@ foreach ( array_reverse($zones) as $zone ) {
 ?>
             </div>
 <?php
-  if ( (!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite') ) {
+  if ((!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite')) {
 ?>
-            <div id="monitorState<?php echo $monitor->Id() ?>" class="monitorState idle"><?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps</div>
+            <div id="monitorState<?php echo $monitor->Id() ?>" class="monitorState idle">
+              <?php echo translate('State') ?>:
+              <span id="stateValue<?php echo $monitor->Id() ?>"></span>
+              &nbsp;-&nbsp;
+              <span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
+            </div>
 <?php
   }
 ?>

From 1f78776093f89b4f23d27968ab2df6b9514b6898 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 6 Dec 2021 09:48:44 -0500
Subject: [PATCH 151/501] Don't change colour of dot to warning when not
 Enabled and not doing analysis. Add reason to the dot

---
 web/skins/classic/views/console.php | 32 +++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index f0f654f56..e49b2c467 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -260,31 +260,37 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 ?>
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">
 <?php
+  $source_class = 'infoText';
+  $source_class_reason = '';
   if ( (!$monitor['Status'] || $monitor['Status'] == 'NotRunning') && $monitor['Type']!='WebSite' ) {
     $source_class = 'errorText';
+    $source_class_reason = translate('Not Running');
   } else {
     if ( $monitor['CaptureFPS'] == '0.00' ) {
       $source_class = 'errorText';
+      $source_class_reason = translate('No capture FPS');
     } else if ( (!$monitor['AnalysisFPS']) && ($monitor['Function']!='Monitor') && ($monitor['Function'] != 'Nodect') ) {
       $source_class = 'warnText';
-    } else {
-      $source_class = 'infoText';
+      $source_class_reason = translate('No analysis FPS');
     }
   }
-  if ( $monitor['Function'] == 'None' )
-    $function_class = 'errorText';
-  else
-    $function_class = 'infoText';
 
+  $function_class = 'infoText';
+  if ($monitor['Function'] == 'None') {
+    $function_class = 'errorText';
+  }
+
+  $dot_class = $source_class;
+  $dot_class_reason = $source_class_reason;
+  if ( $function_class != 'infoText' ) {
+    $dot_class = $function_class;
+  } else if (($monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord') and !$monitor['Enabled']) {
+    $dot_class .= ' warnText';
+    $dot_class_reason .= ' '.translate('Analysis is disabled');
+  }
 
   $scale = max(reScale(SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
   $stream_available = canView('Stream') and $monitor['Type']=='WebSite' or ($monitor['CaptureFPS'] && $monitor['Function'] != 'None');
-  $dot_class = $source_class;
-  if ( $function_class != 'infoText' ) {
-    $dot_class = $function_class;
-  } else if ( !$monitor['Enabled'] ) {
-    $dot_class .= ' warnText';
-  }
 
   if ( ZM_WEB_ID_ON_CONSOLE ) {
 ?>
@@ -317,7 +323,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   }
 ?>
             <td class="colName">
-            <i class="material-icons md-18 <?php echo $dot_class ?>">lens</i>
+            <i class="material-icons md-18 <?php echo $dot_class ?>" title="<?php echo $dot_class_reason ?>">lens</i>
               <a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . validHtmlStr($monitor['Name']) ?></a><br/>
               <?php echo $imgHTML ?>
               <div class="small text-nowrap text-muted">

From 3b84d7d82a2da112e5fbbcfdd8518455b3665fd7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 6 Dec 2021 10:28:02 -0500
Subject: [PATCH 152/501] Add --daemon to command line documentation so it ends
 up in man page.  Fixes #3393.  Improve the description and move the pod
 documentation to the bottom after __END__. Improve executeCommand a bit

---
 scripts/zmfilter.pl.in | 62 ++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 61922771b..535b411b4 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -21,28 +21,6 @@
 #
 # ==========================================================================
 
-=head1 NAME
-
-zmfilter.pl - ZoneMinder tool to filter events
-
-=head1 SYNOPSIS
-
-zmfilter.pl [-f <filter name>,--filter=<filter name>] [--filter_id=<filter id>] | -v, --version
-
-=head1 DESCRIPTION
-
-This script continuously monitors the recorded events for the given
-monitor and applies any filters which would delete and/or upload
-matching events.
-
-=head1 OPTIONS
-
-
--f{filter name}, --filter={filter name}  - The name of a specific filter to run
---filter_id={filter id}                  - The id of a specific filter to run
--v, --version                            - Print ZoneMinder version
-
-=cut
 use strict;
 use bytes;
 
@@ -1051,9 +1029,7 @@ sub executeCommand {
   my $filter = shift;
   my $Event = shift;
 
-  my $event_path = $Event->Path();
-
-  my $command = $filter->{AutoExecuteCmd}.' '.$event_path;
+  my $command = $filter->{AutoExecuteCmd}.' '.$Event->Path();
   $command = substituteTags($command, $filter, $Event);
 
   Info("Executing '$command'");
@@ -1063,15 +1039,37 @@ sub executeCommand {
     chomp($output);
     Debug("Output: $output");
   }
-  if ( $status ) {
+  if ($status) {
     Error("Command '$command' exited with status: $status");
     return 0;
   } else {
-    my $sql = 'UPDATE `Events` SET `Executed` = 1 WHERE `Id` = ?';
-    my $sth = $dbh->prepare_cached($sql)
-      or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
-    my $res = $sth->execute( $Event->{Id} )
-      or Fatal("Unable to execute '$sql': ".$dbh->errstr());
+    zmSQLExecute('UPDATE `Events` SET `Executed` = 1 WHERE `Id` = ?', $Event->{Id});
   }
-  return( 1 );
+  return 1;
 }
+
+1;
+__END__
+
+=head1 NAME
+
+zmfilter.pl - ZoneMinder tool to select events and perform actions on them
+
+=head1 SYNOPSIS
+
+zmfilter.pl [-f <filter name>,--filter=<filter name>] [--filter_id=<filter id>] [--daemon] | -v, --version
+
+=head1 DESCRIPTION
+
+This script performs a specified database query to select recorded events and performs specified actions on them
+such as email reporting, deleting, moving, etc.  If the --daemon option is given it will remain resident, repeating
+the query and applying actions.  This is normally managed by zmdc.pl however it can be used manually as well.
+
+=head1 OPTIONS
+
+  -f{filter name}, --filter={filter name}  - The name of a specific filter to run
+  --filter_id={filter id}                  - The id of a specific filter to run
+  --daemon                                 - Causes zmfilter.pl to stay running endlessly repeating the filter(s).
+  -v, --version                            - Print ZoneMinder version
+
+=cut

From 35bca1d89bb9e28e9004f545a469cd697c6f7260 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 6 Dec 2021 10:32:17 -0500
Subject: [PATCH 153/501] When launching concurrent zmfilter, use the id
 instead of Name because Name isn't necessarily unique

---
 scripts/zmfilter.pl.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 535b411b4..08ae4abf2 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -141,7 +141,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
 my $event_id = 0;
 
-if ( !EVENT_PATH ) {
+if (!EVENT_PATH) {
   Error('No event path defined. Config was '.$Config{ZM_DIR_EVENTS});
   die;
 }
@@ -173,22 +173,22 @@ if ( ! ( $filter_name or $filter_id ) ) {
 my @filters;
 my $last_action = 0;
 
-while( !$zm_terminate ) {
+while (!$zm_terminate) {
   my $now = time;
-  if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} ) {
+  if (($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY}) {
     Debug('Reloading filters');
     $last_action = $now;
     @filters = getFilters({ Name=>$filter_name, Id=>$filter_id });
   }
 
-  foreach my $filter ( @filters ) {
+  foreach my $filter (@filters) {
     last if $zm_terminate;
-    if ( $$filter{Concurrent} and ! ( $filter_id or $filter_name ) ) {
+    if ($$filter{Concurrent} and !($filter_id or $filter_name)) {
       my ( $proc ) = $0 =~ /(\S+)/;
       my ( $id ) = $$filter{Id} =~ /(\d+)/;
       Debug("Running concurrent filter process $proc --filter_id $$filter{Id} => $id for $$filter{Name}");
 
-      system(qq`$proc --filter "$$filter{Name}" &`);
+      system(qq`$proc --filter_id $id &`);
     } else {
       checkFilter($filter);
     }

From 090c803b9814bfdde92a4a4d8d02e52bcfb1da99 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 9 Dec 2021 12:33:59 -0500
Subject: [PATCH 154/501] Wait for closeEvent thread to finish. Fixes
 unfinished event when zmc told to restart

---
 src/zm_monitor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 0410d39bc..fff655177 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3047,9 +3047,6 @@ int Monitor::PrimeCapture() {
 int Monitor::PreCapture() const { return camera->PreCapture(); }
 int Monitor::PostCapture() const { return camera->PostCapture(); }
 int Monitor::Close() {
-  if (close_event_thread.joinable()) {
-    close_event_thread.join();
-  }
   // Because the stream indexes may change we have to clear out the packetqueue
   if (decoder) {
     decoder->Stop();
@@ -3067,10 +3064,14 @@ int Monitor::Close() {
     video_fifo = nullptr;
   }
 
+  if (close_event_thread.joinable()) {
+    close_event_thread.join();
+  }
   std::lock_guard<std::mutex> lck(event_mutex);
   if (event) {
     Info("%s: image_count:%d - Closing event %" PRIu64 ", shutting down", name.c_str(), image_count, event->Id());
     closeEvent();
+    close_event_thread.join();
   }
   if (camera) camera->Close();
   return 1;

From 31a1ef6cb4dc742935a4c6926beb658fabd17a9f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 9 Dec 2021 12:35:42 -0500
Subject: [PATCH 155/501] Move state definitions into skin.js.php because they
 are used in several different views. Add STATE_UNKNOWN to match of with c++
 side actual values.

---
 web/skins/classic/js/skin.js.php          | 15 +++++++++++++++
 web/skins/classic/views/js/montage.js.php | 12 ------------
 web/skins/classic/views/js/watch.js.php   | 12 ------------
 web/skins/classic/views/js/zone.js.php    | 14 --------------
 web/skins/classic/views/js/zones.js.php   | 15 ---------------
 5 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 87e08310e..2b7980c3a 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -90,3 +90,18 @@ unset($user_without_password['Password']);
 echo json_encode($user_without_password);
 ?>;
 var running = <?php echo daemonCheck()?'true':'false' ?>;
+
+var STATE_UNKNOWN = <?php echo STATE_UNKNOWN ?>;
+var STATE_IDLE = <?php echo STATE_IDLE ?>;
+var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
+var STATE_ALARM = <?php echo STATE_ALARM ?>;
+var STATE_ALERT = <?php echo STATE_ALERT ?>;
+var STATE_TAPE = <?php echo STATE_TAPE ?>;
+
+var stateStrings = new Array();
+stateStrings[STATE_UNKNOWN] = "<?php echo translate('Unknown') ?>";
+stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_PREALARM] = "<?php echo translate('Prealarm') ?>";
+stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
+stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
+stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 9b6962119..1c1c4130e 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -1,18 +1,6 @@
 //
 // Import constants
 //
-var STATE_IDLE = <?php echo STATE_IDLE ?>;
-var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
-var STATE_ALARM = <?php echo STATE_ALARM ?>;
-var STATE_ALERT = <?php echo STATE_ALERT ?>;
-var STATE_TAPE = <?php echo STATE_TAPE ?>;
-
-var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
-stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
-stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 
 var CMD_QUERY = <?php echo CMD_QUERY ?>;
 
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 5b4568dfc..74a86100c 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -9,18 +9,6 @@
 //
 // Import constants
 //
-var STATE_IDLE = <?php echo STATE_IDLE ?>;
-var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
-var STATE_ALARM = <?php echo STATE_ALARM ?>;
-var STATE_ALERT = <?php echo STATE_ALERT ?>;
-var STATE_TAPE = <?php echo STATE_TAPE ?>;
-
-var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
-stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
-stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 
 var deleteString = "<?php echo translate('Delete') ?>";
 
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 37eb6db82..2ba286d55 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -94,20 +94,6 @@ var deleteString = "<?php echo translate('Delete') ?>";
 // Imported from watch.js.php and modified for new zone edit view
 //
 
-var STATE_IDLE = <?php echo STATE_IDLE ?>;
-var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
-var STATE_ALARM = <?php echo STATE_ALARM ?>;
-var STATE_ALERT = <?php echo STATE_ALERT ?>;
-var STATE_TAPE = <?php echo STATE_TAPE ?>;
-
-var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
-stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
-stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
-
-
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
 var CMD_STOP = <?php echo CMD_STOP ?>;
diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
index 338095552..414231d12 100644
--- a/web/skins/classic/views/js/zones.js.php
+++ b/web/skins/classic/views/js/zones.js.php
@@ -17,25 +17,10 @@ monitorData[monitorData.length] = {
   }
 ?>
 
-var STATE_IDLE = <?php echo STATE_IDLE ?>;
-var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
-var STATE_ALARM = <?php echo STATE_ALARM ?>;
-var STATE_ALERT = <?php echo STATE_ALERT ?>;
-var STATE_TAPE = <?php echo STATE_TAPE ?>;
-
-var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
-stateStrings[STATE_PREALARM] = "<?php echo translate('PreAlarm') ?>";
-stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
-stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
-stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
-
-
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
 var CMD_STOP = <?php echo CMD_STOP ?>;
 var CMD_QUERY = <?php echo CMD_QUERY ?>;
 var CMD_QUIT = <?php echo CMD_QUIT ?>;
 
-
 var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;

From a9ef5bf731a80af243e53c9a186ac0ddd6e90aa3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 9 Dec 2021 12:36:03 -0500
Subject: [PATCH 156/501] Add STATE_UNKNOWN and correct values of other states

---
 web/includes/config.php.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index e044df58f..d285d8616 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -87,11 +87,12 @@ define('ZM_PCRE', '@ZM_PCRE@');                       // PCRE support enabled
 //
 // Alarm states
 //
-define('STATE_IDLE', 0);
-define('STATE_PREALARM', 1);
-define('STATE_ALARM', 2);
-define('STATE_ALERT', 3);
-define('STATE_TAPE', 4);
+define('STATE_UNKNOWN', 0);
+define('STATE_IDLE', 1);
+define('STATE_PREALARM', 2);
+define('STATE_ALARM', 3);
+define('STATE_ALERT', 4);
+define('STATE_TAPE', 5);
 
 //
 // DVR Control Commands

From 7bc46ba7a8a829c2ad6b6661fc5323d1154b897f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 9 Dec 2021 15:19:49 -0500
Subject: [PATCH 157/501] Create the .tar.gz by default if it doesn't exist. 
 Only warn if it already exists.

---
 utils/do_debian_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 91ecf520b..9806c3306 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -222,8 +222,8 @@ rm .gitignore
 cd ../
 
 
-if [ ! -e "$DIRECTORY.orig.tar.gz" ]; then
-  read -p "$DIRECTORY.orig.tar.gz does not exist, create it? [Y/n]"
+if [ -e "$DIRECTORY.orig.tar.gz" ]; then
+  read -p "$DIRECTORY.orig.tar.gz exists, overwrite it? [Y/n]"
   if [[ "$REPLY" == "" || "$REPLY" == [yY] ]]; then
     tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
   fi;

From 5d8db0a320a1cdca40160d1e25218233fd9f1a9c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 15:34:35 -0500
Subject: [PATCH 158/501] Merge cycle functionality into watch view. Add period
 dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and
 don't use status ajax unless we are in still mode.  Apply some min-width to
 fps so they don't jump around.  Only update their content if it has changed
 (fewer browser renders).

---
 web/skins/classic/css/base/views/watch.css |  53 ++--
 web/skins/classic/views/js/watch.js        | 242 +++++++++++-----
 web/skins/classic/views/js/watch.js.php    |  74 +++--
 web/skins/classic/views/watch.php          | 308 +++++++++++++++------
 4 files changed, 482 insertions(+), 195 deletions(-)

diff --git a/web/skins/classic/css/base/views/watch.css b/web/skins/classic/css/base/views/watch.css
index 17bf1593d..64fb81b16 100644
--- a/web/skins/classic/css/base/views/watch.css
+++ b/web/skins/classic/css/base/views/watch.css
@@ -1,6 +1,8 @@
 #header {
-    display: flex;
-    justify-content: space-between;
+}
+
+#sidebar {
+  min-width: 140px;
 }
 
 #menuControls {
@@ -19,19 +21,22 @@
 #monitorStatus {
     margin: 4px auto;
     text-align: center;
-}
-
-#monitorStatus #enableDisableAlarms {
-    float: left;
-}
-
-#monitorStatus #forceCancelAlarm {
-    float: right;
+  display: inline-block;
 }
 
 #monitorStatus #monitorState {
 }
 
+#replayStatus {
+    margin: 3px 0 2px;
+    text-align: center;
+  display: inline-block;
+}
+
+#replayStatus > span {
+    padding: 0 4px;
+}
+
 #dvrControls {
     margin-top: 3px;
     margin-bottom: 2px;
@@ -67,15 +72,6 @@
     cursor: default;
 }
 
-#replayStatus {
-    margin: 3px 0 2px;
-    text-align: center;
-    clear: both;
-}
-
-#replayStatus > span {
-    padding: 0 4px;
-}
 
 #events {
     margin: 0 auto;
@@ -116,3 +112,22 @@ span.alert {
     background-color: #DCDCDC;
 }
 
+.controlHeader {
+  width: 100%;
+}
+
+#viewingFPS,
+#captureFPS,
+#analysisFPS
+{
+  display: inline-block;
+}
+#stateValue,
+#viewingFPSValue,
+#captureFPSValue,
+#analysisFPSValue
+{
+  display: inline-block;
+  min-width: 40px;
+  text-align: right;
+}
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 324e7f7e0..8a0f527c9 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -44,7 +44,7 @@ function ajaxRequest(params) {
   data.view = 'request';
   data.request = 'watch';
   data.mid = monitorId;
-  if ( auth_hash ) data.auth = auth_hash;
+  if (auth_hash) data.auth = auth_hash;
 
   $j.getJSON(thisUrl, data)
       .done(function(data) {
@@ -94,8 +94,48 @@ function showPtzControls() {
   showMode = 'control';
 }
 
+function changeSize() {
+  var width = $j('#width').val();
+  var height = $j('#height').val();
+
+  // Scale the frame
+  monitor_frame = $j('#imageFeed');
+  if (!monitor_frame) {
+    console.log('Error finding frame');
+    return;
+  }
+  if (width) monitor_frame.css('width', width);
+  if (height) monitor_frame.css('height', height);
+
+  var streamImg = document.getElementById('liveStream'+monitorData[monIdx].id);
+  if (streamImg) {
+    if (streamImg.nodeName == 'IMG') {
+      let src = streamImg.src;
+      streamImg.src = '';
+      src = src.replace(/width=[\.\d]+/i, 'width='+parseInt(width));
+      src = src.replace(/height=[\.\d]+/i, 'height='+parseInt(height));
+      src = src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+      streamImg.src = src;
+    }
+    streamImg.style.width = width ? width : null;
+    streamImg.style.height = height ? height : null;
+  } else {
+    console.log('Did not find liveStream'+monitorData[monIdx].id);
+  }
+  $j('#scale').val('');
+  setCookie('zmCycleScale', '', 3600);
+  setCookie('zmCycleWidth', width, 3600);
+  setCookie('zmCycleHeight', height, 3600);
+} // end function changeSize()
+
 function changeScale() {
   var scale = $j('#scale').val();
+  $j('#width').val('auto');
+  $j('#height').val('auto');
+  setCookie('zmCycleScale', scale, 3600);
+  setCookie('zmCycleWidth', 'auto', 3600);
+  setCookie('zmCycleHeight', 'auto', 3600);
+
   var newWidth;
   var newHeight;
   var autoScale;
@@ -104,7 +144,7 @@ function changeScale() {
   // times and what the consequences would be
   $j(window).off('resize', endOfResize); //remove resize handler when Scale to Fit is not active
   if (scale == '0' || scale == 'auto') {
-    var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
+    const newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
     newWidth = newSize.width;
     newHeight = newSize.height;
     autoScale = newSize.autoScale;
@@ -118,16 +158,18 @@ function changeScale() {
 
   var streamImg = $j('#liveStream'+monitorId);
   if (streamImg) {
-    var oldSrc = streamImg.attr('src');
-    streamImg.attr('src', '');
-    // This is so that we don't waste bandwidth and let the browser do all the scaling.
-    if (autoScale > 100) autoScale = 100;
-    if (scale > 100) scale = 100;
-    var newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale));
+    if (streamImg.nodeName == 'IMG') {
+      const oldSrc = streamImg.attr('src');
+      streamImg.attr('src', '');
+      // This is so that we don't waste bandwidth and let the browser do all the scaling.
+      if (autoScale > 100) autoScale = 100;
+      if (scale > 100) scale = 100;
+      const newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale));
 
-    streamImg.width(newWidth);
-    streamImg.height(newHeight);
-    streamImg.attr('src', newSrc);
+      streamImg.width(newWidth);
+      streamImg.height(newHeight);
+      streamImg.attr('src', newSrc);
+    }
   } else {
     console.error('No element found for liveStream'+monitorId);
   }
@@ -200,9 +242,15 @@ function getStreamCmdResponse(respObj, respText) {
     // The get status command can get backed up, in which case we won't be able to get the semaphore and will exit.
     if (respObj.status) {
       streamStatus = respObj.status;
-      $j('#fpsValue').text(streamStatus.fps);
-      $j('#capturefpsValue').text(streamStatus.capturefps);
-      $j('#analysisfpsValue').text(streamStatus.analysisfps);
+      if ($j('#viewingFPSValue').text() != streamStatus.fps) {
+        $j('#viewingFPSValue').text(streamStatus.fps);
+      }
+      if ($j('#captureFPSValue').text() != streamStatus.capturefps) {
+        $j('#captureFPSValue').text(streamStatus.capturefps);
+      }
+      if ($j('#analysisFPSValue').text() != streamStatus.analysisfps) {
+        $j('#analysisFPSValue').text(streamStatus.analysisfps);
+      }
 
       setAlarmState(streamStatus.state);
 
@@ -287,31 +335,19 @@ function getStreamCmdResponse(respObj, respText) {
         // Try to reload the image stream.
         var streamImg = $j('#liveStream'+monitorId);
         if (streamImg) {
-          var oldSrc = streamImg.attr('src');
-          var newSrc = oldSrc.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
-          if (oldSrc != newSrc) {
-            streamImg.attr('src', newSrc);
-            table.bootstrapTable('refresh');
+          const oldSrc = streamImg.attr('src');
+          if (oldSrc) {
+            const newSrc = oldSrc.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+            if (oldSrc != newSrc) {
+              streamImg.attr('src', newSrc);
+              table.bootstrapTable('refresh');
+            }
           }
         }
       } // end if have a new auth hash
     } // end if respObj.status
   } else {
     checkStreamForErrors('getStreamCmdResponse', respObj);//log them
-    // Try to reload the image stream.
-    // If it's an auth error, we should reload the whole page.
-    console.log("have error");
-    //window.location.reload();
-    var streamImg = $j('#liveStream'+monitorId);
-    if (streamImg) {
-      var oldSrc = streamImg.attr('src');
-      var newSrc = oldSrc.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-
-      streamImg.attr('src', newSrc);
-      console.log('Changing livestream src to ' + newSrc);
-    } else {
-      console.log('Unable to find streamImg liveStream');
-    }
   }
 
   var streamCmdTimeout = statusRefreshTimeout;
@@ -368,6 +404,7 @@ function streamCmdPlay(action) {
 }
 
 function streamCmdReq(data) {
+  if (auth_hash) data.auth = auth_hash;
   $j.getJSON(monitorUrl + '?view=request&request=stream&connkey='+connKey, data)
       .done(getStreamCmdResponse)
       .fail(getStreamCmdError);
@@ -386,10 +423,7 @@ function streamCmdStop(action) {
     setButtonState('fastRevBtn', 'unavail');
   }
   if (action) {
-    var data = {};
-    if (auth_hash) data.auth = auth_hash;
-    data.command = CMD_STOP;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_STOP});
   }
   setButtonState('stopBtn', 'unavail');
   setButtonState('playBtn', 'active');
@@ -407,7 +441,6 @@ function streamCmdFastFwd(action) {
   }
   if (action) {
     var data = {};
-    if (auth_hash) data.auth = auth_hash;
     data.command = CMD_FASTFWD;
     streamCmdReq(data);
   }
@@ -425,7 +458,6 @@ function streamCmdSlowFwd(action) {
   }
   if (action) {
     var data = {};
-    if (auth_hash) data.auth = auth_hash;
     data.command = CMD_SLOWFWD;
     streamCmdReq(data);
   }
@@ -447,7 +479,6 @@ function streamCmdSlowRev(action) {
   }
   if (action) {
     var data = {};
-    if (auth_hash) data.auth = auth_hash;
     data.command = CMD_SLOWREV;
     streamCmdReq(data);
   }
@@ -469,7 +500,6 @@ function streamCmdFastRev(action) {
   }
   if (action) {
     var data = {};
-    if (auth_hash) data.auth = auth_hash;
     data.command = CMD_FASTREV;
     streamCmdReq(data);
   }
@@ -477,7 +507,6 @@ function streamCmdFastRev(action) {
 
 function streamCmdZoomIn(x, y) {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.x = x;
   data.y = y;
   data.command = CMD_ZOOMIN;
@@ -486,14 +515,12 @@ function streamCmdZoomIn(x, y) {
 
 function streamCmdZoomOut() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = CMD_ZOOMOUT;
   streamCmdReq(data);
 }
 
 function streamCmdScale(scale) {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = CMD_SCALE;
   data.scale = scale;
   streamCmdReq(data);
@@ -501,7 +528,6 @@ function streamCmdScale(scale) {
 
 function streamCmdPan(x, y) {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.x = x;
   data.y = y;
   data.command = CMD_PAN;
@@ -510,11 +536,11 @@ function streamCmdPan(x, y) {
 
 function streamCmdQuery() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = CMD_QUERY;
   streamCmdReq(data);
 }
 
+/* getStatusCmd is used when not streaming, since there is no persistent zms */
 function getStatusCmdResponse(respObj, respText) {
   watchdogOk('status');
   if (statusCmdTimer) {
@@ -522,32 +548,33 @@ function getStatusCmdResponse(respObj, respText) {
   }
 
   if (respObj.result == 'Ok') {
-    $j('#fpsValue').text(respObj.monitor.FrameRate);
+    $j('#captureFPSValue').text(respObj.monitor.FrameRate);
     setAlarmState(respObj.monitor.Status);
   } else {
     checkStreamForErrors('getStatusCmdResponse', respObj);
   }
 
   var statusCmdTimeout = statusRefreshTimeout;
-  if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
+  if (alarmState == STATE_ALARM || alarmState == STATE_ALERT) {
     statusCmdTimeout = statusCmdTimeout/5;
   }
   statusCmdTimer = setTimeout(statusCmdQuery, statusCmdTimeout);
 }
 
 function statusCmdQuery() {
-  $j.getJSON(monitorUrl + '?view=request&request=status&entity=monitor&element[]=Status&element[]=FrameRate&id='+monitorId)
+  $j.getJSON(monitorUrl + '?view=request&request=status&entity=monitor&element[]=Status&element[]=FrameRate&id='+monitorId+'&'+auth_relay)
       .done(getStatusCmdResponse)
       .fail(logAjaxFail);
 
-  streamCmdTimer = null;
+  statusCmdTimer = null;
 }
 
 function alarmCmdReq(data) {
+  if (auth_hash) data.auth = auth_hash;
   $j.getJSON(monitorUrl + '?view=request&request=alarm&id='+monitorId, data)
       .done(getAlarmCmdResponse)
       .fail(function(jqxhr, textStatus, error) {
-        if ( textStatus === "timeout" ) {
+        if (textStatus === 'timeout') {
           streamCmdQuery();
         } else {
           logAjaxFail(jqxhr, textStatus, error);
@@ -561,14 +588,12 @@ function getAlarmCmdResponse(respObj, respText) {
 
 function cmdDisableAlarms() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = 'disableAlarms';
   alarmCmdReq(data);
 }
 
 function cmdEnableAlarms() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = 'enableAlarms';
   alarmCmdReq(data);
 }
@@ -583,7 +608,6 @@ function cmdAlarm() {
 
 function cmdForceAlarm() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = 'forceAlarm';
   alarmCmdReq(data);
   if (window.event) window.event.preventDefault();
@@ -591,7 +615,6 @@ function cmdForceAlarm() {
 
 function cmdCancelForcedAlarm() {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.command = 'cancelForcedAlarm';
   alarmCmdReq(data);
   if (window.event) window.event.preventDefault();
@@ -607,6 +630,7 @@ function cmdForce() {
 }
 
 function controlReq(data) {
+  if (auth_hash) data.auth = auth_hash;
   $j.getJSON(monitorUrl + '?view=request&request=control&id='+monitorId, data)
       .done(getControlResponse)
       .fail(logAjaxFail);
@@ -639,16 +663,16 @@ function controlCmd(event) {
   var data = {};
 
   if (event && (xtell || ytell)) {
-    var target = event.target;
-    var offset = $j(target).offset();
-    var width = $j(target).width();
-    var height = $j(target).height();
+    const target = event.target;
+    const offset = $j(target).offset();
+    const width = $j(target).width();
+    const height = $j(target).height();
 
-    var x = event.pageX - offset.left;
-    var y = event.pageY - offset.top;
+    const x = event.pageX - offset.left;
+    const y = event.pageY - offset.top;
 
     if (xtell) {
-      var xge = parseInt((x*100)/width);
+      let xge = parseInt((x*100)/width);
       if (xtell == -1) {
         xge = 100 - xge;
       } else if (xtell == 2) {
@@ -657,7 +681,7 @@ function controlCmd(event) {
       data.xge = xge;
     }
     if (ytell) {
-      var yge = parseInt((y*100)/height);
+      let yge = parseInt((y*100)/height);
       if (ytell == -1) {
         yge = 100 - yge;
       } else if (ytell == 2) {
@@ -667,7 +691,6 @@ function controlCmd(event) {
     }
   }
 
-  if (auth_hash) data.auth = auth_hash;
   data.control = control;
   controlReq(data);
 
@@ -678,7 +701,6 @@ function controlCmd(event) {
 
 function controlCmdImage(x, y) {
   var data = {};
-  if (auth_hash) data.auth = auth_hash;
   data.scale = scale;
   data.control = imageControlMode;
   data.x = x;
@@ -768,7 +790,6 @@ function reloadWebSite() {
 
 function updatePresetLabels() {
   var lblNdx = $j('#ctrlPresetForm option:selected').val();
-
   $j('#newLabel').val(labels[lblNdx]);
 }
 
@@ -878,7 +899,7 @@ function initPage() {
     // Load the PTZ Preset modal into the DOM
     if (monitorControllable) getCtrlPresetModal();
     // Load the settings modal into the DOM
-    if (monitorType == "Local") getSettingsModal();
+    if (monitorType == 'Local') getSettingsModal();
   }
 
   if (monitorType != 'WebSite') {
@@ -886,15 +907,12 @@ function initPage() {
       statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
     } else {
-      streamCmdTimer = setTimeout(streamCmdQuery, (Math.random()+0.1)*statusRefreshTimeout);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
     }
 
     if (canStreamNative || (streamMode == 'single')) {
       var streamImg = $j('#imageFeed img');
-      if (!streamImg) {
-        streamImg = $j('#imageFeed object');
-      }
+      if (!streamImg) streamImg = $j('#imageFeed object');
       if (!streamImg) {
         console.error('No streamImg found for imageFeed');
       } else {
@@ -905,6 +923,10 @@ function initPage() {
           streamImg.click(function(event) {
             handleClick(event);
           });
+          streamImg.on("error", function(thing) {
+            console.log("Error loading image");
+            console.log(thing);
+          });
         }
       } // end if have streamImg
     } // streamMode native or single
@@ -944,6 +966,18 @@ function initPage() {
     $j('#settingsModal').modal('show');
   });
 
+  bindButton('#cyclePlayBtn', 'click', null, cycleStart);
+  bindButton('#cyclePauseBtn', 'click', null, cyclePause);
+  bindButton('#cycleNextBtn', 'click', null, cycleNext);
+  bindButton('#cyclePrevBtn', 'click', null, cyclePrev);
+  bindButton('#cycleToggle', 'click', null, cycleToggle);
+  bindButton('#cyclePeriod', 'change', null, cyclePeriodChange);
+  if (cycle) {
+    cycleStart();
+  } else {
+    cyclePause();
+  }
+
   // Only enable the settings button for local cameras
   settingsBtn.prop('disabled', !(canView.Control && (monitorType == 'Local')));
 
@@ -972,7 +1006,6 @@ function initPage() {
 
 function watchFullscreen() {
   const btn = document.getElementById('fullscreenBtn');
-  console.log(btn);
   if (btn.firstElementChild.innerHTML=='fullscreen') {
     const content = document.getElementById('content');
     openFullscreen(content);
@@ -985,5 +1018,70 @@ function watchFullscreen() {
   }
 }
 
+var intervalId;
+var secondsToCycle = 0;
+
+function nextCycleView() {
+  secondsToCycle --;
+  if (secondsToCycle<=0) {
+    window.location.replace('?view=watch&mid='+nextMid+'&mode='+mode+'&cycle=true');
+  }
+  $j('#secondsToCycle').text(secondsToCycle);
+}
+
+function cyclePause() {
+  clearInterval(intervalId);
+  $j('#cyclePauseBtn').hide();
+  $j('#cyclePlayBtn').show();
+}
+
+function cycleStart() {
+  secondsToCycle = $j('#cyclePeriod').val();
+  intervalId = setInterval(nextCycleView, 1000);
+  $j('#cyclePauseBtn').show();
+  $j('#cyclePlayBtn').hide();
+}
+
+function cycleNext() {
+  monIdx ++;
+  if (monIdx >= monitorData.length) {
+    monIdx = 0;
+  }
+  if (!monitorData[monIdx]) {
+    console.log('No monitorData for ' + monIdx);
+  }
+  window.location.replace('?view=watch&cycle=true&mid='+monitorData[monIdx].id+'&mode='+mode);
+}
+
+function cyclePrev() {
+  monIdx --;
+  if (monIdx < 0) {
+    monIdx = monitorData.length - 1;
+  }
+  if (!monitorData[monIdx]) {
+    console.log('No monitorData for ' + monIdx);
+  }
+  window.location.replace('?view=watch&cycle=true&mid='+monitorData[monIdx].id+'&mode='+mode);
+}
+
+function cyclePeriodChange() {
+  const cyclePeriodSelect = $j('#cyclePeriod');
+  secondsToCycle = cyclePeriodSelect.val();
+  setCookie('zmCyclePeriod', secondsToCycle, 3600);
+}
+function cycleToggle(e) {
+  sidebar = $j('#sidebar');
+  button = $j('#cycleToggle');
+  if (sidebar.is(":visible")) {
+    sidebar.hide();
+    setCookie('zmCycleShow', false, 3600);
+  } else {
+    sidebar.show();
+    setCookie('zmCycleShow', true, 3600);
+  }
+  button.toggleClass('btn-secondary');
+  button.toggleClass('btn-primary');
+}
+
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 74a86100c..ab09d6ca5 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -1,21 +1,20 @@
 <?php 
+  global $monIdx;
+  global $nextMid;
+  global $options;
+  global $monitors;
   global $streamMode;
   global $showPtzControls;
   global $connkey;
   global $monitor;
   global $scale;
   global $labels;
+  global $cycle;
 ?>
 //
 // Import constants
 //
 
-var deleteString = "<?php echo translate('Delete') ?>";
-
-var enableAlarmsStr = "<?php echo translate('EnableAlarms') ?>";
-var disableAlarmsStr = "<?php echo translate('DisableAlarms') ?>";
-var forceAlarmStr = "<?php echo translate('ForceAlarm') ?>";
-var cancelForcedAlarmStr = "<?php echo translate('CancelForcedAlarm') ?>";
 
 var CMD_NONE = <?php echo CMD_NONE ?>;
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
@@ -34,14 +33,13 @@ var CMD_NEXT = <?php echo CMD_NEXT ?>;
 var CMD_SEEK = <?php echo CMD_SEEK ?>;
 var CMD_QUERY = <?php echo CMD_QUERY ?>;
 
-var SCALE_BASE = <?php echo SCALE_BASE ?>;
-
 var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
 var POPUP_ON_ALARM = <?php echo ZM_WEB_POPUP_ON_ALARM ?>;
 var LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
 
 var streamMode = "<?php echo $streamMode ?>";
 var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"events" ?>";
+var cycle = <?php echo $cycle ? 'true' : 'false' ?>;
 
 var connKey = '<?php echo $connkey ?>';
 var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
@@ -55,6 +53,28 @@ var monitorRefresh = '<?php echo $monitor->Refresh() ?>';
 var monitorStreamReplayBuffer = <?php echo $monitor->StreamReplayBuffer() ?>;
 var monitorControllable = <?php echo $monitor->Controllable()?'true':'false' ?>;
 
+var monIdx = '<?php echo $monIdx; ?>';
+var nextMid = "<?php echo isset($nextMid)?$nextMid:'' ?>";
+var mode = "<?php echo $options['mode'] ?>";
+
+var monitorData = new Array();
+<?php
+foreach ($monitors as $monitor) {
+?>
+monitorData[monitorData.length] = {
+  'id': <?php echo $monitor->Id() ?>,
+  'width': <?php echo $monitor->ViewWidth() ?>,
+  'height':<?php echo $monitor->ViewHeight() ?>,
+  'url': '<?php echo $monitor->UrlToIndex() ?>',
+  'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
+  'type': '<?php echo $monitor->Type() ?>',
+  'refresh': '<?php echo $monitor->Refresh() ?>'
+};
+<?php
+} // end foreach monitor
+?>
+
+var SCALE_BASE = <?php echo SCALE_BASE ?>;
 var scale = '<?php echo $scale ?>';
 
 var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
@@ -63,17 +83,16 @@ var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
 
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
-<?php 
-  $control = $monitor->Control();
-  if ( $control->CanMoveMap() ) { ?>
-var imageControlMode = "moveMap";
-<?php } elseif ( $control->CanMoveRel() ) { ?>
-var imageControlMode = "movePseudoMap";
-<?php } elseif ( $control->CanMoveCon() ) { ?>
-var imageControlMode = "moveConMap";
-<?php } else { ?>
-var imageControlMode = null;
-<?php } ?>
+var imageControlMode = '<?php 
+$control = $monitor->Control();
+if ($control->CanMoveMap()) {
+  echo 'moveMap';
+} else if ($control->CanMoveRel()) {
+  echo 'movePseudoMap';
+} else if ($control->CanMoveCon()) {
+  echo 'moveConMap';
+}
+?>';
 
 var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
 var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
@@ -81,17 +100,18 @@ var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
 var labels = new Array();
 <?php
 $labels = array();
-foreach( dbFetchAll( 'SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array( $monitor->Id() ) ) as $row ) {
-  $labels[$row['Preset']] = $row['Label'];
-}
-
-foreach ($labels as $index=>$label) {
-?>
-labels[<?php echo validInt($index) ?>] = '<?php echo validJsStr($label) ?>';
-<?php
+foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor->Id())) as $row) {
+  $label = $labels[$row['Preset']] = $row['Label'];
+  echo 'labels['. validInt($index) .'] = '.validJsStr($label).'\'';
 }
 ?>
+var deleteString = "<?php echo translate('Delete') ?>";
+var enableAlarmsStr = "<?php echo translate('EnableAlarms') ?>";
+var disableAlarmsStr = "<?php echo translate('DisableAlarms') ?>";
+var forceAlarmStr = "<?php echo translate('ForceAlarm') ?>";
+var cancelForcedAlarmStr = "<?php echo translate('CancelForcedAlarm') ?>";
 var translate = {
+  "seconds": "<?php echo translate('seconds') ?>",
   "Fullscreen": "<?php echo translate('Fullscreen') ?>",
   "Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
 };
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index beab28ac1..58d24ac85 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -18,143 +18,296 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView('Stream') ) {
+if (!canView('Stream')) {
   $view = 'error';
   return;
 }
+require_once('includes/Monitor.php');
+
+ob_start();
+include('_monitor_filters.php');
+$filterbar = ob_get_contents();
+ob_end_clean();
 
-if ( !isset($_REQUEST['mid']) ) {
-  $view = 'error';
-  return;
-}
 
 // This is for input sanitation
-$mid = intval($_REQUEST['mid']); 
-if ( !visibleMonitor($mid) ) {
+$mid = isset($_REQUEST['mid']) ? intval($_REQUEST['mid']) : 0;
+
+$widths = array(
+  'auto'  => translate('auto'),
+  '100%'  => '100%',
+  '160px' => '160px',
+  '320px' => '320px',
+  '352px' => '352px',
+  '640px' => '640px',
+  '1280px' => '1280px',
+  '1920px'  =>  '1920px'
+);
+
+$heights = array(
+  'auto'  => translate('auto'),
+  '240px' => '240px',
+  '480px' => '480px',
+  '720px' => '720px',
+  '1080px'  =>  '1080px',
+);
+
+$monitors = array();
+$monitor_index = 0;
+foreach ($displayMonitors as &$row) {
+  if ($row['Function'] == 'None') continue;
+  if ($mid and ($row['Id'] == $mid)) $monitor_index = count($monitors);
+  $monitors[] = new ZM\Monitor($row);
+  if (!isset($widths[$row['Width'].'px'])) {
+    $widths[$row['Width'].'px'] = $row['Width'].'px';
+  }
+  if (!isset($heights[$row['Height'].'px'])) {
+    $heights[$row['Height'].'px'] = $row['Height'].'px';
+  }
+  unset($row);
+} # end foreach Monitor
+
+if (!$mid) {
+  $mid = $monitors[0]->Id();
+  $monitor_index = 0;
+}
+
+if (!visibleMonitor($mid)) {
   $view = 'error';
   return;
 }
 
-require_once('includes/Monitor.php');
 $monitor = new ZM\Monitor($mid);
-
+$nextMid = ($monitor_index == count($monitors)-1) ? $monitors[0]->Id() : $monitors[$monitor_index+1]->Id();
+$cycle = isset($_REQUEST['cycle']) and ($_REQUEST['cycle'] == 'true');
+$showCycle = $cycle;
+ZM\Error("Show cycle: $showCycle");
+if (isset($_COOKIE['zmCycleShow'])) {
+  $showCycle = $_COOKIE['zmCycleShow'] == 'true';
+  ZM\Error("Show cycle: $showCycle");
+} else {
+  ZM\Error("Show cycle: not set");
+}
 #Whether to show the controls button
 $showPtzControls = ( ZM_OPT_CONTROL && $monitor->Controllable() && canView('Control') && $monitor->Type() != 'WebSite' );
 
-if ( isset($_REQUEST['scale']) ) {
+$options = array();
+if (empty($_REQUEST['mode'])) {
+  $options['mode'] = canStream() ? 'stream' : 'still';
+} else {
+  $options['mode'] = validHtmlStr($_REQUEST['mode']);
+}
+zm_session_start();
+
+$period = ZM_WEB_REFRESH_CYCLE;
+if (isset($_REQUEST['period'])) {
+  $period = validInt($_REQUEST['period']);
+} else if (isset($_COOKIE['zmCyclePeriod'])) {
+  $period = validInt($_COOKIE['zmCyclePeriod']);
+}
+
+if (isset($_REQUEST['scale'])) {
   $scale = validInt($_REQUEST['scale']);
 } else if ( isset($_COOKIE['zmWatchScale'.$mid]) ) {
   $scale = $_COOKIE['zmWatchScale'.$mid];
 } else {
   $scale = $monitor->DefaultScale();
 }
+$options['scale'] = $scale;
+
+if (isset($_REQUEST['width'])) {
+  $options['width'] = validInt($_REQUEST['width']); 
+} else if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
+  $_SESSION['zmCycleWidth'] = $options['width'] = $_COOKIE['zmCycleWidth'];
+#} elseif ( isset($_SESSION['zmCycleWidth']) and $_SESSION['zmCycleWidth'] ) {
+  #$options['width'] = $_SESSION['zmCycleWidth'];
+} else {
+  $options['width'] = '';
+}
+if (isset($_REQUEST['height'])) {
+  $options['height'] =validInt($_REQUEST['height']);
+} else if (isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight']) {
+  $_SESSION['zmCycleHeight'] = $options['height'] = $_COOKIE['zmCycleHeight'];
+#else if ( isset($_SESSION['zmCycleHeight']) and $_SESSION['zmCycleHeight'] )
+  #$options['height'] = $_SESSION['zmCycleHeight'];
+} else {
+  $options['height'] = '';
+}
+session_write_close();
 
 $connkey = generateConnKey();
-
 $streamMode = getStreamMode();
 
-$popup = ((isset($_REQUEST['popup'])) && ($_REQUEST['popup'] == 1));
-
 noCacheHeaders();
 xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
 ?>
 <body>
   <?php echo getNavBarHTML() ?>
+  <div id="header">
+    <div class="controlHeader">
+      <form method="get">
+        <input type="hidden" name="view" value="watch"/>
+        <?php echo $filterbar ?>
+      </form>
+    </div>
+
     <div class="d-flex flex-row justify-content-between px-3 py-1">
-      <div>
+      <div id="navButtons">
         <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
         <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
         <button type="button" id="settingsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Settings') ?>" disabled><i class="fa fa-sliders"></i></button>
         <button type="button" id="enableAlmBtn" class="btn btn-normal" data-on-click="cmdAlarm" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
         <button type="button" id="forceAlmBtn" class="btn btn-danger" data-on-click="cmdForce" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
       </div>
-
-      <div>
-        <h2><?php echo makeLink('?view=monitor&amp;mid='.$monitor->Id(), validHtmlStr($monitor->Name()), canEdit('Monitors')) ?></h2>
+      <div id="headerButtons">
+<!--
+<?php if ( $options['mode'] == 'stream' ) { ?>
+        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
+<?php } else { ?>
+        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
+<?php } ?>
+-->
+        <button type="button" id="cycleToggle" class="btn <?php echo $showCycle ? 'btn-primary':'btn-secondary'?>" title="<?php echo translate('Toggle cycle sidebar')?>">
+            <span class="material-icons md-18">view_carousel</span>
+        </button>
       </div>
-
-      <div>
-        <?php echo translate('Scale').': '.htmlSelect('scale', $scales, $scale, array('id'=>'scale')); ?>
-      </div>
-    </div>
+      <div id="sizeControl">
+        <span id="widthControl">
+          <label><?php echo translate('Width') ?>:</label>
+          <?php echo htmlSelect('width', $widths, $options['width'], array('id'=>'width', 'data-on-change-this'=>'changeSize') ); ?>
+        </span>
+        <span id="heightControl">
+          <label><?php echo translate('Height') ?>:</label>
+          <?php echo htmlSelect('height', $heights, $options['height'], array('id'=>'height', 'data-on-change-this'=>'changeSize') ); ?>
+        </span>
+        <span id="scaleControl">
+          <label><?php echo translate('Scale') ?>:</label>
+          <?php echo htmlSelect('scale', $scales, $options['scale'], array('id'=>'scale', 'data-on-change-this'=>'changeScale') ); ?>
+        </span>
+      </div><!--sizeControl-->
+    </div><!--control header-->
+  </div><!--header-->
 <?php
 if ( $monitor->Status() != 'Connected' and $monitor->Type() != 'WebSite' ) {
   echo '<div class="warning">Monitor is not capturing. We will be unable to provide an image</div>';
 }
 ?>
-    <div id="content">
-      <div id="imageFeed"
+    <div class="container-fluid h-100">
+      <div class="row flex-nowrap h-100" id="content">
+        <nav id="sidebar" class="h-100"<?php echo $showCycle?'':' style="display:none;"'?>>
+          <div id="cycleButtons" class="buttons">
 <?php
-if ( $streamMode == 'jpeg' ) {
+$seconds = translate('seconds');
+$minute = translate('minute');
+$minutes = translate('minutes');
+$cyclePeriodOptions = array(
+  10 => '10 '.$seconds,
+  30 => '30 '.$seconds,
+  60 => '1 '.$minute,
+  120 => '2 '.$minutes,
+  300 => '5 '.$minutes,
+);
+if (!isset($cyclePeriodOptions[ZM_WEB_REFRESH_CYCLE])) {
+  $cyclePeriodOptions[ZM_WEB_REFRESH_CYCLE] = ZM_WEB_REFRESH_CYCLE.' '.$seconds;
+}
+echo htmlSelect('cyclePeriod', $cyclePeriodOptions, $period, array('id'=>'cyclePeriod'));
+?>
+            <span id="secondsToCycle"></span><br/>
+            <button type="button" id="cyclePrevBtn" title="<?php echo translate('PreviousMonitor') ?>">
+            <i class="material-icons md-18">skip_previous</i>
+            </button>
+            <button type="button" id="cyclePauseBtn" title="<?php echo translate('PauseCycle') ?>">
+            <i class="material-icons md-18">pause</i>
+            </button>
+            <button type="button" id="cyclePlayBtn" title="<?php echo translate('PlayCycle') ?>">
+            <i class="material-icons md-18">play_arrow</i>
+            </button>
+            <button type="button" id="cycleNextBtn" title="<?php echo translate('NextMonitor') ?>">
+            <i class="material-icons md-18">skip_next</i>
+            </button>
+          </div>
+          <ul class="nav nav-pills flex-column h-100">
+<?php
+  foreach ($monitors as $m) {
+    echo '<li class="nav-item"><a class="nav-link'.( $m->Id() == $monitor->Id() ? ' active' : '' ).'" href="?view=watch&amp;mid='.$m->Id().'">'.$m->Name().'</a></li>';
+  }
+ ?>
+          </ul>
+        </nav>
+      <div class="container-fluid col-sm-offset-2 h-100 pr-0">
+        <div id="imageFeed"
+<?php
+if ($streamMode == 'jpeg') {
   echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
 }
 ?>
-><?php echo getStreamHTML($monitor, array('scale'=>$scale)); ?></div>
-
-
-<?php if ( $monitor->Type() != 'WebSite' ) { ?>
-      <div id="monitorStatus">
-        <div id="monitorState">
-          <?php echo translate('State') ?>:
-          <span id="stateValue"></span> -
-          <span title="<?php echo translate('Viewing FPS')?>"><span id="fpsValue"></span> fps</span>
-          <span title="<?php echo translate('Capturing FPS')?>"><span id="capturefpsValue"></span> fps</span>
-          <?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
-          <span title="<?php echo translate('Analysis FPS')?>"><span id="analysisfpsValue"></span> fps</span>
-          <?php } ?>
+><?php echo getStreamHTML($monitor, array('scale'=>$scale)); ?>
         </div>
-      </div>
-      <div id="dvrControls">
+
+<?php if ($monitor->Type() != 'WebSite') { ?>
+        <div id="monitorStatus">
+          <div id="monitorState">
+            <span><?php echo translate('State') ?>:<span id="stateValue"></span></span>
+            <span id="viewingFPS" title="<?php echo translate('Viewing FPS')?>"><span id="viewingFPSValue"></span> fps</span>
+            <span id="captureFPS" title="<?php echo translate('Capturing FPS')?>"><span id="captureFPSValue"></span> fps</span>
+            <?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
+            <span id="analysisFPS" title="<?php echo translate('Analysis FPS')?>"><span id="analysisFPSValue"></span> fps</span>
+            <?php } ?>
+          </div>
+        </div>
+        <div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
+          <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
+          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
+          <span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
+          <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
+          <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
+        </div>
+        <div class="buttons">
+          <div id="dvrControls">
 <?php
-if ( $streamMode == 'jpeg' ) {
-  if ( $monitor->StreamReplayBuffer() != 0 ) {
+if ($streamMode == 'jpeg') {
+  if ($monitor->StreamReplayBuffer() != 0) {
 ?>
-        <button type="button" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastRev">
-<i class="material-icons md-18">fast_rewind</i>
-        </button>
-        <button type="button" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowRev">
-        <i class="material-icons md-18">chevron_right</i>
-        </button>
+            <button type="button" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastRev">
+            <i class="material-icons md-18">fast_rewind</i>
+            </button>
+            <button type="button" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowRev">
+            <i class="material-icons md-18">chevron_right</i>
+            </button>
 <?php 
   }
 ?>
-        <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click-true="streamCmdPause">
-<i class="material-icons md-18">pause</i>
-        </button>
-        <button type="button" id="stopBtn" title="<?php echo translate('Stop') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdStop" style="display:none;">
-<i class="material-icons md-18">stop</i>
-        </button>
-        <button type="button" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click-true="streamCmdPlay">
-<i class="material-icons md-18">play_arrow</i>
-        </button>
+            <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click-true="streamCmdPause">
+            <i class="material-icons md-18">pause</i>
+            </button>
+            <button type="button" id="stopBtn" title="<?php echo translate('Stop') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdStop" style="display:none;">
+            <i class="material-icons md-18">stop</i>
+            </button>
+            <button type="button" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click-true="streamCmdPlay">
+            <i class="material-icons md-18">play_arrow</i>
+            </button>
 <?php
-  if ( $monitor->StreamReplayBuffer() != 0 ) {
+  if ($monitor->StreamReplayBuffer() != 0) {
 ?>
-        <button type="button" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowFwd">
-        <i class="material-icons md-18">chevron_right</i>
-        </button>
-        <button type="button" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastFwd">
-<i class="material-icons md-18">fast_forward</i>
-        </button>
+            <button type="button" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowFwd">
+            <i class="material-icons md-18">chevron_right</i>
+            </button>
+            <button type="button" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastFwd">
+            <i class="material-icons md-18">fast_forward</i>
+            </button>
 <?php
   }
 ?>
-        <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut">
-        <i class="material-icons md-18">zoom_out</i>
-        </button>
-        <button type="button" id="fullscreenBtn" title="<?php echo translate('Fullscreen') ?>" class="avail" data-on-click="watchFullscreen">
-        <i class="material-icons md-18">fullscreen</i>
-        </button>
+            <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut">
+            <i class="material-icons md-18">zoom_out</i>
+            </button>
+            <button type="button" id="fullscreenBtn" title="<?php echo translate('Fullscreen') ?>" class="avail" data-on-click="watchFullscreen">
+            <i class="material-icons md-18">fullscreen</i>
+            </button>
 <?php
 } // end if streamMode==jpeg
 ?>
-      </div>
-      <div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
-        <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
-        <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
-        <span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
-        <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
-        <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
+      </div><!--dvrButtons-->
       </div>
 <?php } // end if $monitor->Type() != 'WebSite' ?>
 <?php
@@ -208,6 +361,7 @@ if ( canView('Events') && ($monitor->Type() != 'WebSite') ) {
 
         </table>
       </div>
+    </div>
 <?php
 }
 if ( ZM_WEB_SOUND_ON_ALARM ) {

From aa320cb28fda67ae8a2fe1a676cbe51781d023cf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 15:35:53 -0500
Subject: [PATCH 159/501] Fix missing STATE_UNKNOWN

---
 scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index e7fdcd35f..e0c9bf971 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -42,6 +42,7 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # will save memory.
 our %EXPORT_TAGS = (
     constants => [ qw(
+      STATE_UNKNOWN
       STATE_IDLE
       STATE_PREALARM
       STATE_ALARM
@@ -98,11 +99,12 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 
-use constant STATE_IDLE     => 0;
-use constant STATE_PREALARM => 1;
-use constant STATE_ALARM    => 2;
-use constant STATE_ALERT    => 3;
-use constant STATE_TAPE     => 4;
+use constant STATE_UNKNOWN  => 0;
+use constant STATE_IDLE     => 1;
+use constant STATE_PREALARM => 2;
+use constant STATE_ALARM    => 3;
+use constant STATE_ALERT    => 4;
+use constant STATE_TAPE     => 5;
 
 use constant ACTION_GET     => 1;
 use constant ACTION_SET     => 2;

From ed360348efc51c4c2cb659c1e75e0790194040ee Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 15:36:47 -0500
Subject: [PATCH 160/501] spacing, remove dead code. If Monitor Function
 becomes None, skip it

---
 scripts/zmtrigger.pl.in | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 041d1c449..49287942a 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -166,13 +166,9 @@ while (!$zm_terminate) {
     foreach my $connection ( values(%spawned_connections) ) {
       if ( vec($rout, $connection->fileno(), 1) ) {
         Debug('Got input from spawned connection '
-            .$connection->name()
-            .' ('
-            .$connection->fileno()
-            .')'
-            );
+            .$connection->name().' ('.$connection->fileno().')');
         my $messages = $connection->getMessages();
-        if ( defined($messages) ) {
+        if (defined($messages)) {
           foreach my $message ( @$messages ) {
             handleMessage($connection, $message);
           }
@@ -199,34 +195,32 @@ while (!$zm_terminate) {
 # Check polled connections
   foreach my $connection ( @in_poll_connections ) {
     my $messages = $connection->getMessages();
-    if ( defined($messages) ) {
-      foreach my $message ( @$messages ) {
-        handleMessage($connection, $message);
-      }
+    if (defined($messages)) {
+      foreach my $message (@$messages) handleMessage($connection, $message);
     }
   }
 
   # Check for alarms that might have happened
   my @out_messages;
   foreach my $monitor ( values %monitors ) {
+    if ($$monitor{Function} eq 'None') {
+      $monitor_reload_time = 0;
+      next;
+    }
 
-    if ( ! zmMemVerify($monitor) ) {
+    if (!zmMemVerify($monitor)) {
       # Our attempt to verify the memory handle failed. We should reload the monitors.
       # Don't need to zmMemInvalidate because the monitor reload will do it.
       push @needsReload, $monitor;
       next;
     }
 
-    my ( $state, $last_event ) = zmMemRead( $monitor,
-        [
+    my ($state, $last_event) = zmMemRead($monitor, [
         'shared_data:state',
         'shared_data:last_event'
-        ]
-        );
+        ]);
 
-#print( "$monitor->{Id}: S:$state, LE:$last_event" );
-#print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}" );
-    if ( $state == STATE_ALARM or $state == STATE_ALERT ) {
+    if ($state == STATE_ALARM or $state == STATE_ALERT) {
 # In alarm state
       if ( !defined($monitor->{LastEvent})
           or ($last_event != $monitor->{LastEvent})

From 5312d11e786a8df9d1b7537c506b1775188d2a96 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 16:08:43 -0500
Subject: [PATCH 161/501] Don't both running zmu if monitor Function is set to
 None

---
 web/api/app/Controller/MonitorsController.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 07098623e..193e8a61a 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -321,12 +321,20 @@ class MonitorsController extends AppController {
     }
 
     $monitor = $this->Monitor->find('first', array(
-      'fields' => array('Id', 'Type', 'Device'),
+      'fields' => array('Id', 'Type', 'Device', 'Function'),
       'conditions' => array('Id' => $id)
     ));
 
     // Clean up the returned array
     $monitor = Set::extract('/Monitor/.', $monitor);
+    if ($monitor[0]['Function'] == 'None') {
+      $this->set(array(
+        'status' => false,
+        'statustext' => 'Monitor function is set to None',
+        '_serialize' => array('status','statustext'),
+      ));
+      return;
+    }
 
     // Pass -d for local, otherwise -m
     if ( $monitor[0]['Type'] == 'Local' ) {

From 5a571228919657c86d347b62459a90a1dd3fbb9c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 16:17:54 -0500
Subject: [PATCH 162/501] fix typpo

---
 src/zm_buffer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_buffer.cpp b/src/zm_buffer.cpp
index 4cb580aa4..c65d8b24a 100644
--- a/src/zm_buffer.cpp
+++ b/src/zm_buffer.cpp
@@ -65,7 +65,7 @@ unsigned int Buffer::expand(unsigned int count) {
 int Buffer::read_into(int sd, unsigned int bytes) {
   // Make sure there is enough space
   this->expand(bytes);
-  Debug(3, "Reading %u btes", bytes);
+  Debug(3, "Reading %u bytes", bytes);
   int bytes_read = ::read(sd, mTail, bytes);
   if (bytes_read > 0) {
     mTail += bytes_read;

From 4cbc55d16053b55e398b895f4dd57abe8a878544 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 16:19:41 -0500
Subject: [PATCH 163/501] spacing

---
 src/zm_rgb.h | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/zm_rgb.h b/src/zm_rgb.h
index 58ad9bfae..ef1d46ce3 100644
--- a/src/zm_rgb.h
+++ b/src/zm_rgb.h
@@ -118,41 +118,34 @@ constexpr Rgb kRGBTransparent = 0x01000000;
 
 /* Convert RGB colour value into BGR\ARGB\ABGR */
 inline Rgb rgb_convert(Rgb p_col, int p_subpixorder) {
-  Rgb result;
+  Rgb result = 0;
   
-  switch(p_subpixorder) {
-    
+  switch (p_subpixorder) {
     case ZM_SUBPIX_ORDER_BGR:
     case ZM_SUBPIX_ORDER_BGRA:
-    {
-    BLUE_PTR_BGRA(&result) = BLUE_VAL_RGBA(p_col);
-    GREEN_PTR_BGRA(&result) = GREEN_VAL_RGBA(p_col);
-    RED_PTR_BGRA(&result) = RED_VAL_RGBA(p_col);
-    }
-    break;
+      BLUE_PTR_BGRA(&result) = BLUE_VAL_RGBA(p_col);
+      GREEN_PTR_BGRA(&result) = GREEN_VAL_RGBA(p_col);
+      RED_PTR_BGRA(&result) = RED_VAL_RGBA(p_col);
+      break;
     case ZM_SUBPIX_ORDER_ARGB:
-    {
-    BLUE_PTR_ARGB(&result) = BLUE_VAL_RGBA(p_col);
-    GREEN_PTR_ARGB(&result) = GREEN_VAL_RGBA(p_col);
-    RED_PTR_ARGB(&result) = RED_VAL_RGBA(p_col);
-    }
-    break;
+      BLUE_PTR_ARGB(&result) = BLUE_VAL_RGBA(p_col);
+      GREEN_PTR_ARGB(&result) = GREEN_VAL_RGBA(p_col);
+      RED_PTR_ARGB(&result) = RED_VAL_RGBA(p_col);
+      break;
     case ZM_SUBPIX_ORDER_ABGR:
-    {
-    BLUE_PTR_ABGR(&result) = BLUE_VAL_RGBA(p_col);
-    GREEN_PTR_ABGR(&result) = GREEN_VAL_RGBA(p_col);
-    RED_PTR_ABGR(&result) = RED_VAL_RGBA(p_col);
-    }
-    break;
-    /* Grayscale */
+      BLUE_PTR_ABGR(&result) = BLUE_VAL_RGBA(p_col);
+      GREEN_PTR_ABGR(&result) = GREEN_VAL_RGBA(p_col);
+      RED_PTR_ABGR(&result) = RED_VAL_RGBA(p_col);
+      break;
+      /* Grayscale */
     case ZM_SUBPIX_ORDER_NONE:
-    result = p_col & 0xff;
-    break;
+      result = p_col & 0xff;
+      break;
     default:
-    return p_col;
-    break;
+      result = p_col;
+      break;
   }
-  
+
   return result;
 }
 

From c42b75a252cdbb7024ce31aa186a4236a8132a29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Dec 2021 16:20:44 -0500
Subject: [PATCH 164/501] must clear the monitors array before terminating log.

---
 src/zmc.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zmc.cpp b/src/zmc.cpp
index 68c6227af..6577b5b58 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -365,6 +365,7 @@ int main(int argc, char *argv[]) {
         monitor->Id());
     zmDbDo(sql);
   }
+  monitors.clear();
 
   Image::Deinitialise();
   Debug(1, "terminating");

From ef13c84d8b0770c7e48b30cc5e599b41a5b8586b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 12 Dec 2021 17:01:12 -0500
Subject: [PATCH 165/501] fix zmtrigger. Need {}

---
 scripts/zmtrigger.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 49287942a..83fcf29f5 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -196,7 +196,7 @@ while (!$zm_terminate) {
   foreach my $connection ( @in_poll_connections ) {
     my $messages = $connection->getMessages();
     if (defined($messages)) {
-      foreach my $message (@$messages) handleMessage($connection, $message);
+      foreach my $message (@$messages) { handleMessage($connection, $message) };
     }
   }
 

From 0382a677df24a9d8b9178ca08e0e7ba10b94c3ce Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 14:58:32 -0500
Subject: [PATCH 166/501] Add ExecuteInterval to Filter Object. Allow empty
 sort_field to have the effort of not sorting. Always add FOR SHARE which adds
 a read-only lock the returned records.  Add SKIP LOCKED functionality so that
 filters can simply skip locked records. This should reduce contention. Also
 specify FOR UPDATE of the events table, otherwise we also lock Monitors and
 Storage.

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 26 +++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 0db46ff0d..7b3efad46 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -56,6 +56,7 @@ $primary_key = 'Id';
 %fields = map { $_ => $_ } qw(
 Id
 Name
+ExecuteInterval
 Query_json
 AutoArchive
 AutoUnarchive
@@ -106,7 +107,6 @@ sub Execute {
     $sql =~ s/zmSystemLoad/$load/g;
   }
 
-  $sql .= ' FOR UPDATE' if $$self{LockRows};
 
   Debug("Filter::Execute SQL ($sql)");
   my $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
@@ -371,10 +371,7 @@ sub Sql {
     if ( @auto_terms ) {
       $sql .= ' AND ( '.join(' or ', @auto_terms).' )';
     }
-    if ( !$filter_expr->{sort_field} ) {
-      $filter_expr->{sort_field} = 'StartDateTime';
-      $filter_expr->{sort_asc} = 0;
-    }
+
     my $sort_column = '';
     if ( $filter_expr->{sort_field} eq 'Id' ) {
       $sort_column = 'E.Id';
@@ -406,14 +403,23 @@ sub Sql {
       $sort_column = 'E.MaxScore';
     } elsif ( $filter_expr->{sort_field} eq 'DiskSpace' ) {
       $sort_column = 'E.DiskSpace';
-    } else {
-      $sort_column = 'E.StartDateTime';
+    } elsif ( $filter_expr->{sort_field} ne '' ) {
+      $sort_column = 'E.'.$filter_expr->{sort_field};
     }
-    my $sort_order = $filter_expr->{sort_asc} ? 'ASC' : 'DESC';
-    $sql .= ' ORDER BY '.$sort_column.' '.$sort_order;
-    if ( $filter_expr->{limit} ) {
+    if ( $sort_column ne '' ) {
+      $sql .= ' ORDER BY '.$sort_column.' '.($filter_expr->{sort_asc} ? 'ASC' : 'DESC');
+    }
+    if ($filter_expr->{limit}) {
       $sql .= ' LIMIT 0,'.$filter_expr->{limit};
     }
+    if ($$self{LockRows}) {
+      $sql .= ' FOR UPDATE OF E'
+    } else {
+      $sql .= ' FOR SHARE OF E'
+    }
+    if ($filter_expr->{skip_locked}) {
+      $sql .= ' SKIP LOCKED';
+    }
     $self->{Sql} = $sql;
   } # end if has Sql
   return $self->{Sql};

From a65f2b42ce5a98054ae9823b669d3a1979a68c94 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 14:59:38 -0500
Subject: [PATCH 167/501] Implement per-filter delays using the ExecuteInterval
 member of Filters. Remove uneded lockandload when doing row locks.  We will
 have already locked when executing the filter sql.

---
 scripts/zmfilter.pl.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 08ae4abf2..fd927020f 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -138,7 +138,6 @@ $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
 my $event_id = 0;
 
 if (!EVENT_PATH) {
@@ -174,6 +173,7 @@ my @filters;
 my $last_action = 0;
 
 while (!$zm_terminate) {
+  my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
   my $now = time;
   if (($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY}) {
     Debug('Reloading filters');
@@ -183,6 +183,15 @@ while (!$zm_terminate) {
 
   foreach my $filter (@filters) {
     last if $zm_terminate;
+
+    my $elapsed = ($now - $$filter{last_ran});
+    if ($$filter{last_ran} and ($elapsed < $$filter{ExecuteInterval})) {
+      my $filter_delay = $$filter{ExecuteInterval} - ($now - $$filter{last_ran});
+      $delay = $filter_delay if $filter_delay < $delay;
+      Debug("Setting delay to $delay because ExecuteInterval=$$filter{ExecuteInterval} and $elapsed have elapsed");
+      next;
+    }
+
     if ($$filter{Concurrent} and !($filter_id or $filter_name)) {
       my ( $proc ) = $0 =~ /(\S+)/;
       my ( $id ) = $$filter{Id} =~ /(\d+)/;
@@ -191,8 +200,9 @@ while (!$zm_terminate) {
       system(qq`$proc --filter_id $id &`);
     } else {
       checkFilter($filter);
+      $$filter{last_ran} = $now;
     }
-  }
+  } # end foreach filter
 
   last if (!$daemon and ($filter_name or $filter_id)) or $zm_terminate;
 
@@ -362,11 +372,6 @@ sub checkFilter {
     } # end if AutoCopy
 
     if ( $filter->{UpdateDiskSpace} ) {
-      if ( $$filter{LockRows} ) {
-        $ZoneMinder::Database::dbh->begin_work();
-        $Event->lock_and_load();
-      }
-
       my $old_diskspace = $$Event{DiskSpace};
 			my $new_diskspace = $Event->DiskSpace(undef);
 

From e2df6e507437ffa7b9a9b13299b2fc4403462f8e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:00:03 -0500
Subject: [PATCH 168/501] Add ExecuteInterval to Filters

---
 db/zm_create.sql.in     |  1 +
 db/zm_update-1.37.6.sql | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 db/zm_update-1.37.6.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index bf598b646..fbc7cad3c 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -283,6 +283,7 @@ CREATE TABLE `Filters` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `UserId`  int(10) unsigned,
+  `ExecuteInterval` int(10) unsigned NOT NULL default '60',
   `Query_json` text NOT NULL,
   `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
   `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0',
diff --git a/db/zm_update-1.37.6.sql b/db/zm_update-1.37.6.sql
new file mode 100644
index 000000000..7c79886ad
--- /dev/null
+++ b/db/zm_update-1.37.6.sql
@@ -0,0 +1,18 @@
+--
+-- Update Filters table to have a ExecuteInterval Column
+--
+
+SELECT 'Checking for ExecuteInterval in Filters';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Filters'
+  AND table_schema = DATABASE()
+  AND column_name = 'ExecuteInterval'
+  ) > 0,
+"SELECT 'Column ExecuteInterval already exists in Filters'",
+"ALTER TABLE Filters ADD COLUMN `ExecuteInterval` int(10) unsigned NOT NULL default '60' AFTER `UserId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From 6511dc8a4fe4007edaebcc505a978740af88d82d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:00:35 -0500
Subject: [PATCH 169/501] Allow empty sort field.

---
 web/ajax/events.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index 090fe476e..4db6b99cc 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -48,7 +48,7 @@ if (isset($_REQUEST['order'])) {
   } else if (strtolower($_REQUEST['order']) == 'desc') {
     $order = 'DESC';
   } else {
-    Warning("Invalid value for order " . $_REQUEST['order']);
+    Warning('Invalid value for order ' . $_REQUEST['order']);
   }
 }
 
@@ -170,18 +170,23 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
   // The names of columns shown in the event view that are NOT dB columns in the database
   $col_alt = array('Monitor', 'Storage');
 
-  if (!in_array($sort, array_merge($columns, $col_alt))) {
-    ZM\Error('Invalid sort field: ' . $sort);
-    $sort = 'Id';
+  if ( $sort != '' ) {
+    if (!in_array($sort, array_merge($columns, $col_alt))) {
+      ZM\Error('Invalid sort field: ' . $sort);
+      $sort = '';
+    } else if ( $sort == 'Monitor' ) {
+      $sort = 'M.Name';
+    } else {
+      $sort = 'E.'.$sort;
+    }
   }
 
   $values = array();
   $likes = array();
   $where = $filter->sql()?' WHERE ('.$filter->sql().')' : '';
 
-  $sort = $sort == 'Monitor' ? 'M.Name' : 'E.'.$sort;
   $col_str = 'E.*, M.Name AS Monitor';
-  $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id'.$where.' ORDER BY '.$sort.' '.$order;
+  $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id'.$where.($sort?' ORDER BY '.$sort.' '.$order:'');
 
   $storage_areas = ZM\Storage::find();
   $StorageById = array();

From 69faa42ca7351e5f1529a02a5eb22633613bdbf6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:00:55 -0500
Subject: [PATCH 170/501] Add more of the resulting SQL to the filter debug
 modal

---
 web/ajax/modals/filterdebug.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/ajax/modals/filterdebug.php b/web/ajax/modals/filterdebug.php
index 725539a99..f3a961874 100644
--- a/web/ajax/modals/filterdebug.php
+++ b/web/ajax/modals/filterdebug.php
@@ -9,13 +9,13 @@
      </div>
      <div class="modal-body">
 <?php
-  //require_once('includes/Filter.php');
+  require_once('includes/Filter.php');
   $fid = validInt($_REQUEST['fid']);
-  if ( !$fid ) {
+  if (!$fid) {
     echo '<div class="error">No filter id specified.</div>';
   } else {
     $filter = new ZM\Filter($_REQUEST['fid']);
-    if ( ! $filter->Id() ) {
+    if (!$filter->Id()) {
       echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>';
     }
   }
@@ -25,7 +25,16 @@
             // We have to manually insert the csrf key into the form when using a modal generated via ajax call
             echo getCSRFinputHTML();
 ?>
-          <p><label>SQL</label><?php echo $filter->sql() ?></p>
+          <p><label>SQL</label>
+<?php
+  $sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale<br/>FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId)<br/>WHERE<br/>';
+  $sql .= $filter->sql();
+  $sql .= $filter->sort_field() ? ' ORDER BY '.$filter->sort_field(). ' ' .($filter->sort_asc() ? 'ASC' : 'DESC') : '';
+  $sql .= $filter->limit() ? ' LIMIT '.$filter->limit() : '';
+  $sql .= $filter->skip_locked() ? ' SKIP LOCKED' : '';
+
+  echo $sql;
+?></p>
          <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel')?> </button>
         </div>

From 6b18b2889d492fe849b1cf45e6d3563d4227ec54 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:01:17 -0500
Subject: [PATCH 171/501] Add skip_locked and ExecuteInterval

---
 web/includes/Filter.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index a155d97a8..4fdd8e43f 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -9,6 +9,8 @@ class Filter extends ZM_Object {
   protected $defaults = array(
     'Id'              =>  null,
     'Name'            =>  '',
+    'UserId'          =>  0,
+    'ExecuteInterval' =>  60,
     'AutoExecute'     =>  0,
     'AutoExecuteCmd'  =>  '',
     'AutoEmail'       =>  0,
@@ -26,7 +28,6 @@ class Filter extends ZM_Object {
     'AutoCopy'        =>  0,
     'AutoCopyTo'      =>  0,
     'UpdateDiskSpace' =>  0,
-    'UserId'          =>  0,
     'Background'      =>  0,
     'Concurrent'      =>  0,
     'Query_json'      =>  '',
@@ -62,6 +63,7 @@ class Filter extends ZM_Object {
       } # end foreach term
       $this->_querystring .= $separator.urlencode($objectname.'[Query][sort_asc]').'='.$this->sort_asc();
       $this->_querystring .= $separator.urlencode($objectname.'[Query][sort_field]').'='.$this->sort_field();
+      $this->_querystring .= $separator.urlencode($objectname.'[Query][skip_locked]').'='.$this->skip_locked();
       $this->_querystring .= $separator.urlencode($objectname.'[Query][limit]').'='.$this->limit();
       if ( $this->Id() ) {
         $this->_querystring .= $separator.$objectname.urlencode('[Id]').'='.$this->Id();
@@ -207,18 +209,29 @@ class Filter extends ZM_Object {
   }
 
   public function sort_asc( ) {
-    if ( func_num_args( ) ) {
+    if (func_num_args()) {
       $Query = $this->Query();
       $Query['sort_asc'] = func_get_arg(0);
       $this->Query($Query);
     }
-    if ( isset( $this->Query()['sort_asc'] ) ) {
+    if (isset($this->Query()['sort_asc'])) {
       return $this->{'Query'}['sort_asc'];
     }
     return ZM_WEB_EVENT_SORT_ORDER == 'asc' ? 1 : 0;
     #return $this->defaults{'sort_asc'};
   }
 
+  public function skip_locked() {
+    if (func_num_args()) {
+      $Query = $this->Query();
+      $Query['skip_locked'] = func_get_arg(0);
+      $this->Query($Query);
+    }
+    if (isset($this->Query()['skip_locked']))
+      return $this->{'Query'}['skip_locked'];
+    return false;
+  }
+
   public function limit( ) {
     if ( func_num_args( ) ) {
       $Query = $this->Query();

From ea671a57f897ab66abb07d2938e64c09f64e3462 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:01:23 -0500
Subject: [PATCH 172/501] Add skip_locked and ExecuteInterval

---
 web/skins/classic/views/filter.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index b441db349..8445d2c12 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -367,6 +367,7 @@ for ( $i=0; $i < count($terms); $i++ ) {
                 <?php
 # Note: The keys need to be actual column names
 $sort_fields = array(
+    ''              => translate('None'),
     'Id'            => translate('AttrId'),
     'Name'          => translate('AttrName'),
     'Cause'         => translate('AttrCause'),
@@ -383,10 +384,18 @@ $sort_fields = array(
     );
 echo htmlSelect('filter[Query][sort_field]', $sort_fields, $filter->sort_field());
 $sort_dirns = array(
-    '1' => translate('SortAsc'),
-    '0'  => translate('SortDesc')
-    );
-echo htmlSelect( 'filter[Query][sort_asc]', $sort_dirns, $filter->sort_asc() );
+  '1' => translate('SortAsc'),
+  '0'  => translate('SortDesc')
+);
+echo htmlSelect('filter[Query][sort_asc]', $sort_dirns, $filter->sort_asc());
+?>
+              </td>
+              <td>
+                <label for="filter[Query][skip_locked]"><?php echo translate('Skip Locked') ?></label>
+<?php
+echo htmlSelect('filter[Query][skip_locked]',
+  array('0'=>translate('No'), '1'=>translate('Yes')),
+  $filter->skip_locked());
 ?>
               </td>
               <td>  
@@ -468,9 +477,13 @@ if ( ZM_OPT_MESSAGE ) {
         <div id="optionsTable" class="filterTable">
           <fieldset><legend><?php echo translate('Options') ?></legend>
             <p>
-              <label for="background"><?php echo translate('BackgroundFilter') ?></label>
+              <label for="filter[Background]"><?php echo translate('BackgroundFilter') ?></label>
               <input type="checkbox" id="filter[Background]" name="filter[Background]" value="1"<?php if ( $filter->Background() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
+            <p>
+              <label for="ExecuteInterval"><?php echo translate('Execute Interval') ?></label>
+              <input type="number" id="filter[ExecuteInterval]" name="filter[ExecuteInterval]" min="0" step="1" value="<?php echo $filter->ExecuteInterval() ?>" />
+            </p>
             <p>
               <label for="Concurrent"><?php echo translate('ConcurrentFilter') ?></label>
               <input type="checkbox" id="filter[Concurrent]" name="filter[Concurrent]" value="1"<?php if ( $filter->Concurrent() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>

From 3fad178528e78d6d4741c5e94f4ee486d843664e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 13 Dec 2021 15:02:54 -0500
Subject: [PATCH 173/501] Bump version for ExecuteInterval in filters

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 8d49c0d7f..f5aeebf2d 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.5
+Version: 1.37.6
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index e2ba07049..e22b12fd6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.5
+1.37.6

From 9733cdb576d8e84e9f5dcfed313f4c0e2627a439 Mon Sep 17 00:00:00 2001
From: makers-mark <fornecker.joseph@gmail.com>
Date: Mon, 13 Dec 2021 21:07:35 -0500
Subject: [PATCH 174/501] Update zm_update-1.35.25.sql

---
 db/zm_update-1.35.25.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.35.25.sql b/db/zm_update-1.35.25.sql
index 387ef09b0..16df91d74 100644
--- a/db/zm_update-1.35.25.sql
+++ b/db/zm_update-1.35.25.sql
@@ -56,7 +56,7 @@ EXECUTE stmt;
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEvents'
+     AND column_name = 'DayEventDiskSpace'
     ) > 0,
 "ALTER TABLE `Monitor_Status` DROP `DayEventDiskSpace`",
 "SELECT 'Column DayEventDiskSpace already removed from Monitor_Status'"

From 4c351a6c540373425f084f275726aee5072ab4a2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 09:39:29 -0500
Subject: [PATCH 175/501] When orig.tar.bz2 doesn't exist, just create it
 without asking

---
 utils/do_debian_package.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 00dcd44e9..efe16401b 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -223,6 +223,8 @@ if [ -e "$DIRECTORY.orig.tar.gz" ]; then
   if [[ "$REPLY" == "" || "$REPLY" == [yY] ]]; then
     tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
   fi;
+else
+  tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
 fi;
 
 IFS=',' ;for DISTRO in `echo "$DISTROS"`; do 

From fe72fd83f89cbe8425bcbf062c65d242ab86f10f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 10:04:35 -0500
Subject: [PATCH 176/501] Fix auth not getting realm from auth headers due to
 them being an array now.  Get auth and ip from Path if not set in
 ControlAddress.

---
 .../lib/ZoneMinder/Control/AxisV2.pm          | 68 ++++++++++++-------
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
index 64e284278..e50449927 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
@@ -51,11 +51,21 @@ sub open {
   my $self = shift;
 
   $self->loadMonitor();
-	if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
-		# Has no scheme at the beginning, so won't parse as a URI
-		$self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
-	}
-  $uri = URI->new($self->{Monitor}->{ControlAddress});
+
+  if ($self->{Monitor}->{ControlAddress} and ($self->{Monitor}->{ControlAddress} ne 'user:pass@ip')) {
+    Debug("Getting connection details from Control Address " . $self->{Monitor}->{ControlAddress});
+    if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
+      # Has no scheme at the beginning, so won't parse as a URI
+      $self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
+    }
+    $uri = URI->new($self->{Monitor}->{ControlAddress});
+  } elsif ($self->{Monitor}->{Path}) {
+    Debug("Getting connection details from Path " . $self->{Monitor}->{Path});
+    $uri = URI->new($self->{Monitor}->{Path});
+    $uri->scheme('http');
+    $uri->port(80);
+    $uri->path('');
+  }
 
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;
@@ -64,6 +74,7 @@ sub open {
   $self->{state} = 'closed';
 
   my ( $username, $password, $host ) = ( $uri->authority() =~ /^([^:]+):([^@]*)@(.+)$/ );
+  Debug("Have username: $username password: $password host: $host from authority:" . $uri->authority());
   
   $uri->userinfo(undef);
 
@@ -75,40 +86,47 @@ sub open {
   # test auth
   my $res = $self->{ua}->get($uri->canonical().$url);
 
-  if ( $res->is_success ) {
-    if ( $res->content() ne "Properties.PTZ.PTZ=yes\n" ) {
+  if ($res->is_success) {
+    if ($res->content() ne "Properties.PTZ.PTZ=yes\n") {
       Warning('Response suggests that camera doesn\'t support PTZ. Content:('.$res->content().')');
     }
     $self->{state} = 'open';
     return;
   }
+  if ($res->status_line() eq '404 Not Found') {
+    #older style
+    $url = 'axis-cgi/com/ptz.cgi';
+    $res = $self->{ua}->get($uri->canonical().$url);
+    Debug("Result from getting ".$uri->canonical().$url . ':' . $res->status_line());
+  }
 
-  if ( $res->status_line() eq '401 Unauthorized' ) {
-
+  if ($res->status_line() eq '401 Unauthorized') {
     my $headers = $res->headers();
     foreach my $k ( keys %$headers ) {
       Debug("Initial Header $k => $$headers{$k}");
     }
 
     if ( $$headers{'www-authenticate'} ) {
-      my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/;
-      if ( $tokens =~ /\w+="([^"]+)"/i ) {
-        if ( $realm ne $1 ) {
-          $realm = $1;
-          $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
-          $res = $self->{ua}->get($uri->canonical().$url);
-          if ( $res->is_success() ) {
-            Info("Auth succeeded after setting realm to $realm.  You can set this value in the Control Device field to speed up connections and remove these log entries.");
-            $self->{state} = 'open';
-            return;
+      foreach my $auth_header ( ref $$headers{'www-authenticate'} eq 'ARRAY' ? @{$$headers{'www-authenticate'}} : ($$headers{'www-authenticate'})) {
+        my ( $auth, $tokens ) = $auth_header =~ /^(\w+)\s+(.*)$/;
+        if ( $tokens =~ /\w+="([^"]+)"/i ) {
+          if ( $realm ne $1 ) {
+            $realm = $1;
+            $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+            $res = $self->{ua}->get($uri->canonical().$url);
+            if ( $res->is_success() ) {
+              Info("Auth succeeded after setting realm to $realm.  You can set this value in the Control Device field to speed up connections and remove these log entries.");
+              $self->{state} = 'open';
+              return;
+            }
+            Error('Authentication still failed after updating REALM status: '.$res->status_line);
+          } else {
+            Error('Authentication failed, not a REALM problem');
           }
-          Error('Authentication still failed after updating REALM status: '.$res->status_line);
         } else {
-          Error('Authentication failed, not a REALM problem');
-        }
-      } else {
-        Error('Failed to match realm in tokens');
-      } # end if
+          Error('Failed to match realm in tokens');
+        } # end if
+      } # end foreach auth header
     } else {
       Debug('No headers line');
     } # end if headers

From cca79538564ace7753bd3bdc2e0cf6de9f3d148f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 12:26:26 -0500
Subject: [PATCH 177/501] include user and function error message about
 insufficient permissions. Will make it easier to figure out who tried what.

---
 src/zmu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zmu.cpp b/src/zmu.cpp
index ec4ae7b86..ba96d71be 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -482,7 +482,7 @@ int main(int argc, char *argv[]) {
       exit_zmu(-1);
     }
 		if ( !ValidateAccess(user, mon_id, function) ) {
-			Error("Insufficient privileges for requested action");
+			Error("Insufficient privileges for user %s for requested function %x", username, function);
 			exit_zmu(-1);
 		}
   } // end if auth

From 4fa804e9a28f95e534d2e076547a35d053f375d7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 13:33:00 -0500
Subject: [PATCH 178/501] Can only SKIP LOCKED if locking rows. Remove FOR
 SHARE as it isn't supported on < mysql 8

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 7b3efad46..f483e545c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -413,12 +413,10 @@ sub Sql {
       $sql .= ' LIMIT 0,'.$filter_expr->{limit};
     }
     if ($$self{LockRows}) {
-      $sql .= ' FOR UPDATE OF E'
-    } else {
-      $sql .= ' FOR SHARE OF E'
-    }
-    if ($filter_expr->{skip_locked}) {
-      $sql .= ' SKIP LOCKED';
+      $sql .= ' FOR UPDATE'
+      if ($filter_expr->{skip_locked}) {
+        $sql .= ' SKIP LOCKED';
+      }
     }
     $self->{Sql} = $sql;
   } # end if has Sql

From f6d0274f745f87214a7348adda813ad9796a7d34 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 17:05:56 -0500
Subject: [PATCH 179/501] Fix PrevCycle because monIdx was empty.

---
 web/skins/classic/views/js/watch.js     | 5 ++++-
 web/skins/classic/views/js/watch.js.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 8a0f527c9..90c73dd9f 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -904,9 +904,10 @@ function initPage() {
 
   if (monitorType != 'WebSite') {
     if (streamMode == 'single') {
-      statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout);
+      statusCmdTimer = setTimeout(statusCmdQuery, 100);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
     } else {
+      streamCmdTimer = setTimeout(streamCmdQuery, 100);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
     }
 
@@ -1054,9 +1055,11 @@ function cycleNext() {
 }
 
 function cyclePrev() {
+  console.log(monIdx);
   monIdx --;
   if (monIdx < 0) {
     monIdx = monitorData.length - 1;
+  console.log(monIdx);
   }
   if (!monitorData[monIdx]) {
     console.log('No monitorData for ' + monIdx);
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index ab09d6ca5..d7b108b6d 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -1,5 +1,5 @@
 <?php 
-  global $monIdx;
+  global $monitor_index;
   global $nextMid;
   global $options;
   global $monitors;
@@ -53,7 +53,7 @@ var monitorRefresh = '<?php echo $monitor->Refresh() ?>';
 var monitorStreamReplayBuffer = <?php echo $monitor->StreamReplayBuffer() ?>;
 var monitorControllable = <?php echo $monitor->Controllable()?'true':'false' ?>;
 
-var monIdx = '<?php echo $monIdx; ?>';
+var monIdx = <?php echo $monitor_index; ?>;
 var nextMid = "<?php echo isset($nextMid)?$nextMid:'' ?>";
 var mode = "<?php echo $options['mode'] ?>";
 

From 61fe35a32a0df63673cda7932f48794c5eedeeef Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 14:06:48 -0500
Subject: [PATCH 180/501] Don't log errors when querying a monitor in NONE
 Function.  Just report a 0 status.Fixes  #3397

---
 src/zmu.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/zmu.cpp b/src/zmu.cpp
index ba96d71be..b85227fc4 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -497,6 +497,16 @@ int main(int argc, char *argv[]) {
     if ( verbose ) {
       printf("Monitor %u(%s)\n", monitor->Id(), monitor->Name());
     }
+
+    if (monitor->GetFunction() == Monitor::NONE) {
+      if (verbose) {
+        printf("Current state: None\n");
+      } else {
+        printf("%d", Monitor::UNKNOWN);
+      }
+      exit_zmu(-1);
+    }
+
     if ( !monitor->connect() ) {
       Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
       exit_zmu(-1);

From e8edeab641e97d213b95526183d1b61edd0dab69 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 14:22:11 -0500
Subject: [PATCH 181/501] parseInt prevEventId and nextEventID to be sure that
 our tests for != 0 work.  Also don't go to previous event if prevEventId
 ==0.Maybe Fixes #3390

---
 web/skins/classic/views/js/event.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index b252c292c..04bf66b7e 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -446,8 +446,10 @@ function streamFastRev(action) {
 function streamPrev(action) {
   if (action) {
     $j(".vjsMessage").remove();
-    location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
-    return;
+    if (prevEventId != 0) {
+      location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
+      return;
+    }
 
     /* Ideally I'd like to get back to this style
     if ( vid && PrevEventDefVideoPath.indexOf("view_video") > 0 ) {
@@ -619,8 +621,8 @@ function getNearEventsResponse(respObj, respText) {
   if (checkStreamForErrors('getNearEventsResponse', respObj)) {
     return;
   }
-  prevEventId = respObj.nearevents.PrevEventId;
-  nextEventId = respObj.nearevents.NextEventId;
+  prevEventId = parseInt(respObj.nearevents.PrevEventId);
+  nextEventId = parseInt(respObj.nearevents.NextEventId);
   prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime);
   nextEventStartTime = Date.parse(respObj.nearevents.NextEventStartTime);
   PrevEventDefVideoPath = respObj.nearevents.PrevEventDefVideoPath;

From f683557b0eb54eefb4bdf278d07a4c29d46a660b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 14 Dec 2021 15:05:21 -0500
Subject: [PATCH 182/501] Fix Monitor::Control to handle local cameras

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 5646fb897..87b75ad02 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -241,20 +241,26 @@ sub control {
   my $command = shift;
   my $process = shift;
 
-  if ( $command eq 'stop' or $command eq 'restart' ) {
-    if ( $process ) {
-      `/usr/bin/zmdc.pl stop $process -m $$monitor{Id}`;
+  if ($command eq 'stop' or $command eq 'restart') {
+    if ($process) {
+      runCommand("zmdc.pl stop $process -m $$monitor{Id}");
     } else {
-      `/usr/bin/zmdc.pl stop zma -m $$monitor{Id}`;
-      `/usr/bin/zmdc.pl stop zmc -m $$monitor{Id}`;
+      if ($monitor->{Type} eq 'Local') {
+        runCommand('zmdc.pl stop zmc -d '.$monitor->{Device});
+      } else {
+        runCommand('zmdc.pl stop zmc -m '.$monitor->{Id});
+      }
     }
   }
   if ( $command eq 'start' or $command eq 'restart' ) {
     if ( $process ) {
-      `/usr/bin/zmdc.pl start $process -m $$monitor{Id}`;
+      runCommand("zmdc.pl start $process -m $$monitor{Id}");
     } else {
-      `/usr/bin/zmdc.pl start zmc -m $$monitor{Id}`;
-      `/usr/bin/zmdc.pl start zma -m $$monitor{Id}`;
+      if ($monitor->{Type} eq 'Local') {
+        runCommand('zmdc.pl stop zmc -d '.$monitor->{Device});
+      } else {
+        runCommand('zmdc.pl stop zmc -m '.$monitor->{Id});
+      }
     } # end if
   }
 } # end sub control

From 28d5614da0aa8b83b8e2a1d2c4839c249c8da94c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:08:25 -0500
Subject: [PATCH 183/501] Fix missing ;

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index f483e545c..726685a7e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -413,7 +413,7 @@ sub Sql {
       $sql .= ' LIMIT 0,'.$filter_expr->{limit};
     }
     if ($$self{LockRows}) {
-      $sql .= ' FOR UPDATE'
+      $sql .= ' FOR UPDATE';
       if ($filter_expr->{skip_locked}) {
         $sql .= ' SKIP LOCKED';
       }

From fe0e4627efc4175d4f16c53d4d668ba740e85483 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:08:54 -0500
Subject: [PATCH 184/501] Specify ZoneMinder::General for runCommand

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 87b75ad02..d179534d4 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -243,23 +243,23 @@ sub control {
 
   if ($command eq 'stop' or $command eq 'restart') {
     if ($process) {
-      runCommand("zmdc.pl stop $process -m $$monitor{Id}");
+      ZoneMinder::General::runCommand("zmdc.pl stop $process -m $$monitor{Id}");
     } else {
       if ($monitor->{Type} eq 'Local') {
-        runCommand('zmdc.pl stop zmc -d '.$monitor->{Device});
+        ZoneMinder::General::runCommand('zmdc.pl stop zmc -d '.$monitor->{Device});
       } else {
-        runCommand('zmdc.pl stop zmc -m '.$monitor->{Id});
+        ZoneMinder::General::runCommand('zmdc.pl stop zmc -m '.$monitor->{Id});
       }
     }
   }
   if ( $command eq 'start' or $command eq 'restart' ) {
     if ( $process ) {
-      runCommand("zmdc.pl start $process -m $$monitor{Id}");
+      ZoneMinder::General::runCommand("zmdc.pl start $process -m $$monitor{Id}");
     } else {
       if ($monitor->{Type} eq 'Local') {
-        runCommand('zmdc.pl stop zmc -d '.$monitor->{Device});
+        ZoneMinder::General::runCommand('zmdc.pl start zmc -d '.$monitor->{Device});
       } else {
-        runCommand('zmdc.pl stop zmc -m '.$monitor->{Id});
+        ZoneMinder::General::runCommand('zmdc.pl start zmc -m '.$monitor->{Id});
       }
     } # end if
   }

From 12ebdacf543d506d687b9b779c94ea2e19381dce Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:09:14 -0500
Subject: [PATCH 185/501] specify ZoneMinder::Database for zmSQLExecute

---
 scripts/zmfilter.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index fd927020f..c0cdf7235 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -1048,7 +1048,7 @@ sub executeCommand {
     Error("Command '$command' exited with status: $status");
     return 0;
   } else {
-    zmSQLExecute('UPDATE `Events` SET `Executed` = 1 WHERE `Id` = ?', $Event->{Id});
+    ZoneMinder::Database::zmSQLExecute('UPDATE `Events` SET `Executed` = 1 WHERE `Id` = ?', $Event->{Id});
   }
   return 1;
 }

From d86456b6f2e13a64b2dbc6cb045f41904451addd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:11:08 -0500
Subject: [PATCH 186/501] revamp, using ZoneMinder::Monitor methods to reduce
 code. Reduce last analysze time was zero to a debug. Fixes #3389

---
 scripts/zmwatch.pl.in | 136 +++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 81 deletions(-)

diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 96235ccd3..1b4790bce 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -56,6 +56,7 @@ use constant START_DELAY => 30; # To give everything else time to start
 @EXTRA_PERL_LIB@
 use ZoneMinder;
 use ZoneMinder::Storage;
+use ZoneMinder::Monitor;
 use POSIX;
 use DBI;
 use autouse 'Data::Dumper'=>qw(Dumper);
@@ -80,91 +81,75 @@ Info('Watchdog starting, pausing for '.START_DELAY.' seconds');
 sleep(START_DELAY);
 
 my $dbh = zmDbConnect();
-my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
-my $sth = $dbh->prepare_cached($sql)
-    or Fatal("Can't prepare '$sql': ".$dbh->errstr());
 
 while (!$zm_terminate) {
-  while ( ! ( $dbh and $dbh->ping() ) ) {
-    if ( ! ( $dbh = zmDbConnect() ) ) {
+  while (!($dbh and $dbh->ping())) {
+    if (!($dbh = zmDbConnect())) {
       sleep($Config{ZM_WATCH_CHECK_INTERVAL});
     }
   }
 
-  my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
-    or Fatal('Can\'t execute: '.$sth->errstr());
-  while( my $monitor = $sth->fetchrow_hashref() ) {
+  foreach my $monitor (ZoneMinder::Monitor->find($Config{ZM_SERVER_ID} ? (ServerId=>$Config{ZM_SERVER_ID}) : ())) {
     next if $monitor->{Function} eq 'None';
     next if $monitor->{Type} eq 'WebSite';
     my $now = time(); 
     my $restart = 0;
-    if (zmMemVerify($monitor)) {
-# Check we have got an image recently
-      my $capture_time = zmGetLastWriteTime($monitor);
-      if (!defined($capture_time)) {
-# Can't read from shared data
-        Debug('LastWriteTime is not defined.');
-        zmMemInvalidate($monitor);
-        next;
-      }
-      Debug("Monitor $$monitor{Id} LastWriteTime is $capture_time.");
-      if (!$capture_time) {
-        my $startup_time = zmGetStartupTime($monitor);
-        if (($now - $startup_time) > $Config{ZM_WATCH_MAX_DELAY}) {
-          Warning(
-            "Restarting capture daemon for $$monitor{Name}, no image since startup. ".
-            "Startup time was $startup_time - now $now > $Config{ZM_WATCH_MAX_DELAY}"
-          );
-          $restart = 1;
-        } else {
-          # We can't get the last capture time so can't be sure it's died, it might just be starting up.
-          zmMemInvalidate($monitor);
-          next;
-        }
-      }
-      if (!$restart) {
-        my $max_image_delay = (
-          $monitor->{MaxFPS}
-          &&($monitor->{MaxFPS}>0)
-          &&($monitor->{MaxFPS}<1)
-        ) ? (3/$monitor->{MaxFPS})
-        : $Config{ZM_WATCH_MAX_DELAY}
-        ;
-        my $image_delay = $now - $capture_time;
-        Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
-        if ( $image_delay > $max_image_delay ) {
-          Warning("Restarting capture daemon for "
-              .$monitor->{Name}.", time since last capture $image_delay seconds ($now-$capture_time)"
-              );
-          $restart = 1;
-        }
-      } # end if ! restart 
-    } else {
+
+    zmMemInvalidate($monitor);
+    if (!zmMemVerify($monitor)) {
       Info("Restarting capture daemon for $monitor->{Name}, shared data not valid");
-      $restart = 1;
+      $monitor->control('restart');
+      next;
     }
 
-    if ($restart) {
-      my $command;
-      if ($monitor->{Type} eq 'Local') {
-        $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
-      } else {
-        $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
+    # Check we have got an image recently
+    my $capture_time = zmGetLastWriteTime($monitor);
+    if (!defined($capture_time)) {
+      # Can't read from shared data
+      Warning('LastWriteTime is not defined.');
+      next;
+    }
+    Debug("Monitor $$monitor{Id} LastWriteTime is $capture_time.");
+    if (!$capture_time) {
+      # We can't get the last capture time so can't be sure it's died, it might just be starting up.
+      my $startup_time = zmGetStartupTime($monitor);
+      if (($now - $startup_time) > $Config{ZM_WATCH_MAX_DELAY}) {
+        Warning(
+          "Restarting capture daemon for $$monitor{Name}, no image since startup. ".
+          "Startup time was $startup_time - now $now > $Config{ZM_WATCH_MAX_DELAY}"
+        );
+        $monitor->control('restart');
       }
-      runCommand($command);
-    } elsif ($monitor->{Function} ne 'Monitor') {
-# Now check analysis daemon
-      $restart = 0;
+      next;
+    }
+
+    my $max_image_delay = (
+      $monitor->{MaxFPS}
+      &&($monitor->{MaxFPS}>0)
+      &&($monitor->{MaxFPS}<1)
+    ) ? (3/$monitor->{MaxFPS})
+    : $Config{ZM_WATCH_MAX_DELAY}
+    ;
+    my $image_delay = $now - $capture_time;
+    Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
+    if ($image_delay > $max_image_delay) {
+      Warning('Restarting capture daemon for '.$monitor->{Name}.
+        ", time since last capture $image_delay seconds ($now-$capture_time)");
+      $monitor->control('restart');
+      next;
+    }
+
+    if ($monitor->{Function} ne 'Monitor') {
+      # Now check analysis thread
 # Check we have got an image recently
       my $image_time = zmGetLastReadTime($monitor);
       if (!defined($image_time)) {
-# Can't read from shared data
-        $restart = 1;
+        # Can't read from shared data
         Error("Error reading shared data for $$monitor{Id} $$monitor{Name}");
+        $monitor->control('restart');
+        next;
       } elsif (!$image_time) {
-# We can't get the last capture time so can't be sure it's died.
-        #$restart = 1;
-        Error("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
+        Debug("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
       } else {
         my $max_image_delay = ( $monitor->{MaxFPS}
             &&($monitor->{MaxFPS}>0)
@@ -176,25 +161,14 @@ while (!$zm_terminate) {
         Debug("Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay");
         if ($image_delay > $max_image_delay) {
           Warning("Analysis daemon for $$monitor{Id} $$monitor{Name} needs restarting,"
-              ." time since last analysis $image_delay seconds ($now-$image_time)"
-              );
-          $restart = 1;
+              ." time since last analysis $image_delay seconds ($now-$image_time)");
+            $monitor->control('restart');
+            next;
         }
       }
 
-      if ($restart) {
-        Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}");
-        my $command;
-        if ( $monitor->{Type} eq 'Local' ) {
-          $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
-        } else {
-          $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
-        }
-        runCommand($command);
-      } # end if restart
     } # end if check analysis daemon
-    # Prevent open handles building up if we have connect to shared memory
-    zmMemInvalidate($monitor); # Close our file handle to the zmc process we are about to end
+
   } # end foreach monitor
 
   sleep($Config{ZM_WATCH_CHECK_INTERVAL});

From 854d11ce9d44fb6752a5ded12976cec8e3b706d6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:11:46 -0500
Subject: [PATCH 187/501] List the connkey that isn't open, differentiate logs
 a bit to help debug.

---
 src/zm_stream.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 5255d3ab2..88ccd11d1 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -128,10 +128,10 @@ bool StreamBase::checkCommandQueue() {
       return true;
     }
   } else if ( connkey ) {
-    Warning("No sd in checkCommandQueue, comms not open?");
+    Warning("No sd in checkCommandQueue, comms not open for connkey %06d?", connkey);
   } else {
     // Perfectly valid if only getting a snapshot
-    Debug(1, "No sd in checkCommandQueue, comms not open?");
+    Debug(1, "No sd in checkCommandQueue, comms not open.");
   }
   return false;
 }  // end bool StreamBase::checkCommandQueue()
@@ -387,8 +387,8 @@ void StreamBase::openComms() {
     rem_addr.sun_family = AF_UNIX;
 
     last_comm_update = std::chrono::system_clock::now();
+    Debug(3, "comms open at %s", loc_sock_path);
   } // end if connKey > 0
-  Debug(3, "comms open at %s", loc_sock_path);
 } // end void StreamBase::openComms()
 
 void StreamBase::closeComms() {

From f1db88510eab5a6cd0213c87531d2fadaf4b6ef0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 09:23:21 -0500
Subject: [PATCH 188/501] remove debug, fix eslint

---
 web/skins/classic/views/js/watch.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 90c73dd9f..f290e1998 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -1055,11 +1055,9 @@ function cycleNext() {
 }
 
 function cyclePrev() {
-  console.log(monIdx);
   monIdx --;
   if (monIdx < 0) {
     monIdx = monitorData.length - 1;
-  console.log(monIdx);
   }
   if (!monitorData[monIdx]) {
     console.log('No monitorData for ' + monIdx);

From 8215b04fb02aeb46d45b4895e768303adb689cbb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 14:49:40 -0500
Subject: [PATCH 189/501] remove padding from container in watch view so that
 image can go right to edge.  Add 1px padding to sidebar for better visual
 separation.

---
 web/skins/classic/css/base/views/watch.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/skins/classic/css/base/views/watch.css b/web/skins/classic/css/base/views/watch.css
index 64fb81b16..77a4a4e96 100644
--- a/web/skins/classic/css/base/views/watch.css
+++ b/web/skins/classic/css/base/views/watch.css
@@ -1,8 +1,14 @@
 #header {
 }
 
+.container-fluid {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 #sidebar {
   min-width: 140px;
+  padding-right: 1px;
 }
 
 #menuControls {

From 4edd5c1bf5babb68b2365a993af3bd3ab74cd3df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 16:57:17 -0500
Subject: [PATCH 190/501] Don't alter maxfps.  Just report that we are too
 slow.  Don't use ZM_RATE_BASE in sleep time calculations it amplifies the
 sleep seconds by 100 times.  Removing allows us to view a full framerate.

---
 src/zm_monitorstream.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 7c2aeeaa2..d7b306fe0 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -290,7 +290,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   status_data.rate = replay_rate;
   status_data.delay = FPSeconds(now - last_frame_timestamp).count();
   status_data.zoom = zoom;
-  Debug(2, "fps: %.2f capture_fps: %.2f analysis_fps: %.2f Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
+  Debug(2, "viewing fps: %.2f capture_fps: %.2f analysis_fps: %.2f Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
       status_data.fps,
       status_data.capture_fps,
       status_data.analysis_fps,
@@ -363,7 +363,6 @@ bool MonitorStream::sendFrame(const std::string &filepath, SystemTimePoint times
     TimePoint::duration frame_send_time = send_end_time - send_start_time;
 
     if (frame_send_time > Milliseconds(lround(Milliseconds::period::den / maxfps))) {
-      maxfps /= 2;
       Info("Frame send time %" PRIi64 " ms too slow, throttling maxfps to %.2f",
            static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
            maxfps);
@@ -448,11 +447,13 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
 
     TimePoint send_end_time = std::chrono::steady_clock::now();
     TimePoint::duration frame_send_time = send_end_time - send_start_time;
+    TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
 
-    if (frame_send_time > Milliseconds(lround(Milliseconds::period::den / maxfps))) {
-      maxfps /= 1.5;
-      Warning("Frame send time %" PRIi64 " msec too slow, throttling maxfps to %.2f",
+    if (frame_send_time > maxfps_milliseconds) {
+      //maxfps /= 1.5;
+      Warning("Frame send time %" PRIi64 " msec too slow (> %" PRIi64 ", throttling maxfps to %.3f",
               static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
+              static_cast<int64>(std::chrono::duration_cast<Milliseconds>(maxfps_milliseconds).count()),
               maxfps);
     }
   }  // Not mpeg
@@ -779,13 +780,18 @@ void MonitorStream::runStream() {
     } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
 
     FPSeconds sleep_time =
-        FPSeconds(ZM_RATE_BASE / ((base_fps ? base_fps : 1) * (replay_rate ? abs(replay_rate * 2) : 2)));
+        FPSeconds(1 / ((base_fps ? base_fps : 1) * (replay_rate ? abs(replay_rate) : 1)));
+    if (last_frame_sent.time_since_epoch() != Seconds(0)) {
+      sleep_time -= (now - last_frame_sent);
+      if (sleep_time < Seconds(0)) 
+        sleep_time = Seconds(0);
+    }
 
     if (sleep_time > MonitorStream::MAX_SLEEP) {
+      Debug(3, "Sleeping for MAX_SLEEP_USEC instead of %" PRIi64 " us",
+            static_cast<int64>(std::chrono::duration_cast<Microseconds>(sleep_time).count()));
       // Shouldn't sleep for long because we need to check command queue, etc.
       sleep_time = MonitorStream::MAX_SLEEP;
-      Debug(3, "Sleeping for MAX_SLEEP_USEC %" PRIi64 " us",
-            static_cast<int64>(std::chrono::duration_cast<Microseconds>(sleep_time).count()));
     } else {
       Debug(3, "Sleeping for %" PRIi64 " us",
             static_cast<int64>(std::chrono::duration_cast<Microseconds>(sleep_time).count()));
@@ -797,13 +803,6 @@ void MonitorStream::runStream() {
             static_cast<int64>(std::chrono::duration_cast<Microseconds>(ttl).count()));
       break;
     }
-
-    if (last_frame_sent.time_since_epoch() == Seconds(0)) {
-      // If we didn't capture above, because frame_mod was bad? Then last_frame_sent will not have a value.
-      last_frame_sent = now;
-      Warning("no last_frame_sent.  Shouldn't happen. frame_mod was (%d) frame_count (%d)",
-          frame_mod, frame_count);
-    }
   } // end while ! zm_terminate
 
   if (buffered_playback) {

From d10d5201acce360b9aa9d1522bb0fe568e85f08f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 15 Dec 2021 16:57:27 -0500
Subject: [PATCH 191/501] log max fps

---
 src/zm_stream.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_stream.h b/src/zm_stream.h
index 8650801ea..d33127332 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -207,10 +207,11 @@ public:
       scale = DEFAULT_SCALE;
   }
   void setStreamReplayRate(int p_rate) {
-    Debug(2, "Setting replay_rate %d", p_rate);
+    Debug(1, "Setting replay_rate %d", p_rate);
     replay_rate = p_rate;
   }
   void setStreamMaxFPS(double p_maxfps) {
+    Debug(1, "Setting max fps to %f", p_maxfps);
     maxfps = p_maxfps;
   }
   void setStreamBitrate(int p_bitrate) {

From 7c3ab46408ecbe2524d02624325d6e89b85a3cac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 09:35:21 -0500
Subject: [PATCH 192/501] fix missing quote

---
 web/skins/classic/views/js/watch.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index d7b108b6d..36a0417de 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -102,7 +102,7 @@ var labels = new Array();
 $labels = array();
 foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor->Id())) as $row) {
   $label = $labels[$row['Preset']] = $row['Label'];
-  echo 'labels['. validInt($index) .'] = '.validJsStr($label).'\'';
+  echo 'labels['. validInt($index) .'] = \''.validJsStr($label).'\'';
 }
 ?>
 var deleteString = "<?php echo translate('Delete') ?>";

From 7b7ac8fc7e29542d665e11dda3ab6a2b6c987b08 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:30:26 -0500
Subject: [PATCH 193/501] Add utility functions TimePointToString and
 SystemTimePointToString

---
 src/CMakeLists.txt |  1 +
 src/zm_time.cpp    | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 src/zm_time.h      |  4 ++++
 3 files changed, 57 insertions(+)
 create mode 100644 src/zm_time.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80e09e9c3..8852391a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,6 +60,7 @@ set(ZM_BIN_SRC_FILES
   zm_signal.cpp
   zm_stream.cpp
   zm_swscale.cpp
+  zm_time.cpp
   zm_user.cpp
   zm_utils.cpp
   zm_videostore.cpp
diff --git a/src/zm_time.cpp b/src/zm_time.cpp
new file mode 100644
index 000000000..9d4c281c4
--- /dev/null
+++ b/src/zm_time.cpp
@@ -0,0 +1,52 @@
+//
+// ZoneMinder Time Functions & Definitions, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+// 
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+// 
+
+#include "zm_time.h"
+
+#include <cinttypes>
+
+std::string SystemTimePointToString(SystemTimePoint tp) {
+  time_t tp_sec = std::chrono::system_clock::to_time_t(tp);
+  Microseconds now_frac = std::chrono::duration_cast<Microseconds>(
+      tp.time_since_epoch() - std::chrono::duration_cast<Seconds>(tp.time_since_epoch()));
+
+  std::string timeString;
+  timeString.reserve(64);
+  char *timePtr = timeString.data();
+  tm tp_tm = {};
+  timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
+  snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));
+  return timeString;
+}
+
+std::string TimePointToString(TimePoint tp) {
+  time_t tp_sec = std::chrono::system_clock::to_time_t(
+      std::chrono::system_clock::now() + (tp - std::chrono::steady_clock::now()));
+
+  Microseconds now_frac = std::chrono::duration_cast<Microseconds>(
+      tp.time_since_epoch() - std::chrono::duration_cast<Seconds>(tp.time_since_epoch()));
+
+  std::string timeString;
+  timeString.reserve(64);
+  char *timePtr = timeString.data();
+  tm tp_tm = {};
+  timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
+  snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));
+  return timeString;
+}
diff --git a/src/zm_time.h b/src/zm_time.h
index d3d5b95c5..7aaea7316 100644
--- a/src/zm_time.h
+++ b/src/zm_time.h
@@ -21,6 +21,7 @@
 #define ZM_TIME_H
 
 #include <chrono>
+#include <string>
 #include <sys/time.h>
 
 typedef std::chrono::microseconds Microseconds;
@@ -120,4 +121,7 @@ class TimeSegmentAdder {
   bool finished_;
 };
 
+std::string SystemTimePointToString(SystemTimePoint tp);
+std::string TimePointToString(TimePoint tp);
+
 #endif // ZM_TIME_H

From 60d2186ff4ddea373340dc61d56154205a2db785 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:35:20 -0500
Subject: [PATCH 194/501] Move from SystemTimePoint to SteadyTimePoint where
 possible.  Implement MAXFPS command.  Change the logic of calculating sleep
 time to make more sense. Get rid of frame_mod use in favour of calculating
 when then next frame should get sent and just waiting till then.

---
 src/zm_eventstream.cpp   | 10 ++--
 src/zm_eventstream.h     |  2 +-
 src/zm_monitorstream.cpp | 98 +++++++++++++++++++++++++++-------------
 src/zm_stream.cpp        |  2 +-
 src/zm_stream.h          | 10 ++--
 5 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index af9dd8639..0c104ffd0 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -663,7 +663,7 @@ bool EventStream::checkEventLoaded() {
       else
         curr_frame_id = 1;
       Debug(2, "New frame id = %ld", curr_frame_id);
-      start = std::chrono::system_clock::now();
+      start = std::chrono::steady_clock::now();
       return true;
     } else {
       Debug(2, "No next event loaded using %s. Pausing", sql.c_str());
@@ -851,13 +851,13 @@ void EventStream::runStream() {
   }
   updateFrameRate(fps);
 
-  start = std::chrono::system_clock::now();
+  start = std::chrono::steady_clock::now();
 
   SystemTimePoint::duration last_frame_offset = Seconds(0);
   SystemTimePoint::duration time_to_event = Seconds(0);
 
   while ( !zm_terminate ) {
-    now = std::chrono::system_clock::now();
+    now = std::chrono::steady_clock::now();
 
     Microseconds delta = Microseconds(0);
     send_frame = false;
@@ -904,7 +904,7 @@ void EventStream::runStream() {
 
     // time_to_event > 0 means that we are not in the event
     if (time_to_event > Seconds(0) and mode == MODE_ALL) {
-      SystemTimePoint::duration time_since_last_send = now - last_frame_sent;
+      TimePoint::duration time_since_last_send = now - last_frame_sent;
       Debug(1, "Time since last send = %.2f s", FPSeconds(time_since_last_send).count());
       if (time_since_last_send > Seconds(1)) {
         char frame_text[64];
@@ -976,7 +976,7 @@ void EventStream::runStream() {
       // +/- 1? What if we are skipping frames?
       curr_frame_id += (replay_rate>0) ? frame_mod : -1*frame_mod;
       // sending the frame may have taken some time, so reload now
-      now = std::chrono::system_clock::now();
+      now = std::chrono::steady_clock::now();
 
       // we incremented by replay_rate, so might have jumped past frame_count
       if ( (mode == MODE_SINGLE) && (
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 387748b08..969e6725d 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -76,7 +76,7 @@ class EventStream : public StreamBase {
     long curr_frame_id;
     SystemTimePoint curr_stream_time;
     bool  send_frame;
-    SystemTimePoint start;     // clock time when started the event
+    TimePoint start;     // clock time when started the event
 
     EventData *event_data;
 
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index d7b306fe0..4ce0eebeb 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -134,6 +134,18 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
           break;
       }
       break;
+    case CMD_MAXFPS :
+      {
+        double int_part = ((unsigned char) msg->msg_data[1] << 24) | ((unsigned char) msg->msg_data[2] << 16)
+          | ((unsigned char) msg->msg_data[3] << 8) | (unsigned char) msg->msg_data[4];
+        double dec_part = ((unsigned char) msg->msg_data[5] << 24) | ((unsigned char) msg->msg_data[6] << 16)
+          | ((unsigned char) msg->msg_data[7] << 8) | (unsigned char) msg->msg_data[8];
+
+        maxfps = (int_part + dec_part / 1000000.0);
+
+        Debug(1, "Got MAXFPS %f", maxfps);
+        break;
+      }
     case CMD_SLOWFWD :
       Debug(1, "Got SLOW FWD command");
       paused = true;
@@ -268,7 +280,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   } else {
     FPSeconds elapsed = now - last_fps_update;
     if (elapsed.count()) { 
-      actual_fps = (frame_count - last_frame_count) / elapsed.count();
+      actual_fps = (actual_fps + (frame_count - last_frame_count) / elapsed.count())/2;
       last_frame_count = frame_count;
       last_fps_update = now;
     }
@@ -288,7 +300,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   status_data.delayed = delayed;
   status_data.paused = paused;
   status_data.rate = replay_rate;
-  status_data.delay = FPSeconds(now - last_frame_timestamp).count();
+  status_data.delay = FPSeconds(now - last_frame_sent).count();
   status_data.zoom = zoom;
   Debug(2, "viewing fps: %.2f capture_fps: %.2f analysis_fps: %.2f Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
       status_data.fps,
@@ -382,6 +394,9 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
   Image *send_image = prepareImage(image);
 
   fputs("--" BOUNDARY "\r\n", stdout);
+  // Calculate how long it takes to actually send the frame
+  TimePoint send_start_time = std::chrono::steady_clock::now();
+
   if ( type == STREAM_MPEG ) {
     if ( !vid_stream ) {
       vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height());
@@ -402,8 +417,6 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
     int img_buffer_size = 0;
     unsigned char *img_buffer = temp_img_buffer;
 
-    // Calculate how long it takes to actually send the frame
-    TimePoint send_start_time = std::chrono::steady_clock::now();
 
     switch ( type ) {
       case STREAM_JPEG :
@@ -445,21 +458,22 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
     fputs("\r\n", stdout);
     fflush(stdout);
 
-    TimePoint send_end_time = std::chrono::steady_clock::now();
-    TimePoint::duration frame_send_time = send_end_time - send_start_time;
-    TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
-
-    if (frame_send_time > maxfps_milliseconds) {
-      //maxfps /= 1.5;
-      Warning("Frame send time %" PRIi64 " msec too slow (> %" PRIi64 ", throttling maxfps to %.3f",
-              static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
-              static_cast<int64>(std::chrono::duration_cast<Milliseconds>(maxfps_milliseconds).count()),
-              maxfps);
-    }
   }  // Not mpeg
-  last_frame_sent = now;
+
+  TimePoint send_end_time = std::chrono::steady_clock::now();
+  TimePoint::duration frame_send_time = send_end_time - send_start_time;
+  TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
+
+  if (frame_send_time > maxfps_milliseconds) {
+    //maxfps /= 1.5;
+    Warning("Frame send time %" PRIi64 " msec too slow (> %" PRIi64 ", throttling maxfps to %.3f",
+        static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
+        static_cast<int64>(std::chrono::duration_cast<Milliseconds>(maxfps_milliseconds).count()),
+        maxfps);
+  }
+  last_frame_sent = send_end_time;
   return true;
-}
+}  // end bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp)
 
 void MonitorStream::runStream() {
   if (type == STREAM_SINGLE) {
@@ -502,7 +516,8 @@ void MonitorStream::runStream() {
   // point to end which is theoretically not a valid value because all indexes are % image_buffer_count
   int32_t last_read_index = monitor->image_buffer_count;
 
-  SystemTimePoint stream_start_time = std::chrono::system_clock::now();
+  TimePoint stream_start_time = std::chrono::steady_clock::now();
+  when_to_send_next_frame = stream_start_time; // initialize it to now so that we spit out a frame immediately
 
   frame_count = 0;
 
@@ -571,7 +586,7 @@ void MonitorStream::runStream() {
       break;
     }
 
-    now = std::chrono::system_clock::now();
+    now = std::chrono::steady_clock::now();
 
     bool was_paused = paused;
     bool got_command = false; // commands like zoom should output a frame even if paused
@@ -618,7 +633,7 @@ void MonitorStream::runStream() {
             temp_read_index = MOD_ADD(temp_read_index, (replay_rate>=0?-1:1), temp_image_buffer_count);
           } else {
             FPSeconds expected_delta_time = ((FPSeconds(swap_image->timestamp - last_frame_timestamp)) * ZM_RATE_BASE) / replay_rate;
-            SystemTimePoint::duration actual_delta_time = now - last_frame_sent;
+            TimePoint::duration actual_delta_time = now - last_frame_sent;
 
             // If the next frame is due
             if (actual_delta_time > expected_delta_time) {
@@ -684,7 +699,8 @@ void MonitorStream::runStream() {
     if (last_read_index != monitor->shared_data->last_write_index) {
       // have a new image to send
       int index = monitor->shared_data->last_write_index % monitor->image_buffer_count;
-      if ((frame_mod == 1) || ((frame_count%frame_mod) == 0)) {
+      //if ((frame_mod == 1) || ((frame_count%frame_mod) == 0)) {
+      if ( now >= when_to_send_next_frame ) {
         if (!paused && !delayed) {
           last_read_index = monitor->shared_data->last_write_index;
           Debug(2, "Sending frame index: %d: frame_mod: %d frame count: %d paused(%d) delayed(%d)",
@@ -743,9 +759,9 @@ void MonitorStream::runStream() {
             }  // end if actual_delta_time > 5
           }  // end if change in zoom
         }  // end if paused or not
-      } else {
-        frame_count++;
-      }  // end if should send frame
+      //} else {
+        //frame_count++;
+      }  // end if should send frame now > when_to_send_next_frame
 
       if (buffered_playback && !paused) {
         if (monitor->shared_data->valid) {
@@ -776,15 +792,35 @@ void MonitorStream::runStream() {
         }
       } // end if buffered playback
     } else {
-      Debug(3, "Waiting for capture last_write_index=%u", monitor->shared_data->last_write_index);
+      Debug(3, "Waiting for capture last_write_index=%u == last_read_index=%u",
+          monitor->shared_data->last_write_index,
+          last_read_index);
     } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
 
-    FPSeconds sleep_time =
-        FPSeconds(1 / ((base_fps ? base_fps : 1) * (replay_rate ? abs(replay_rate) : 1)));
-    if (last_frame_sent.time_since_epoch() != Seconds(0)) {
-      sleep_time -= (now - last_frame_sent);
-      if (sleep_time < Seconds(0)) 
-        sleep_time = Seconds(0);
+    FPSeconds sleep_time;
+    if (now >= when_to_send_next_frame) {
+      // sent a frame, so update
+
+      double capture_fps = monitor->GetFPS();
+      double fps = (maxfps && (capture_fps > maxfps)) ? maxfps : capture_fps;
+      double sleep_time_seconds = (1 / ((fps ? fps : 1)))    // 1 second / fps
+        * (replay_rate ? abs(replay_rate)/ZM_RATE_BASE : 1); // replay_rate is 100 for 1x
+      Debug(3, "Using %f for maxfps.  capture_fps: %f maxfps %f * replay_rate: %d = %f", fps, capture_fps, maxfps, replay_rate, sleep_time_seconds);
+
+      sleep_time = FPSeconds(sleep_time_seconds);
+      if (when_to_send_next_frame > now)
+        sleep_time -= when_to_send_next_frame - now;
+
+      when_to_send_next_frame = now + std::chrono::duration_cast<Microseconds>(sleep_time);
+
+      if (last_frame_sent > now) {
+        FPSeconds elapsed = last_frame_sent - now;
+        if (sleep_time > elapsed) {
+          sleep_time -= elapsed;
+        }
+      }
+    } else {
+      sleep_time = when_to_send_next_frame - now;
     }
 
     if (sleep_time > MonitorStream::MAX_SLEEP) {
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 88ccd11d1..aba98e0c3 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -386,7 +386,7 @@ void StreamBase::openComms() {
     strncpy(rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path));
     rem_addr.sun_family = AF_UNIX;
 
-    last_comm_update = std::chrono::system_clock::now();
+    last_comm_update = std::chrono::steady_clock::now();
     Debug(3, "comms open at %s", loc_sock_path);
   } // end if connKey > 0
 } // end void StreamBase::openComms()
diff --git a/src/zm_stream.h b/src/zm_stream.h
index d33127332..09bd5bd80 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -88,6 +88,7 @@ protected:
     CMD_VARPLAY,
     CMD_GET_IMAGE,
     CMD_QUIT,
+    CMD_MAXFPS,
     CMD_QUERY=99
   } MsgCommand;
 
@@ -118,21 +119,22 @@ protected:
   bool paused;
   int step;
 
-  SystemTimePoint now;
-  SystemTimePoint last_comm_update;
+  TimePoint now;
+  TimePoint last_comm_update;
 
   double maxfps;
   double base_fps;        // Should be capturing fps, hence a rough target
   double effective_fps;   // Target fps after taking max_fps into account
   double actual_fps;      // sliding calculated actual streaming fps achieved
-  SystemTimePoint last_fps_update;
+  TimePoint last_fps_update;
   int frame_count;      // Count of frames sent
   int last_frame_count; // Used in calculating actual_fps from frame_count - last_frame_count
 
   int frame_mod;
 
-  SystemTimePoint last_frame_sent;
+  TimePoint last_frame_sent;
   SystemTimePoint last_frame_timestamp;
+  TimePoint when_to_send_next_frame;  // When to send next frame so if now < send_next_frame, skip
 
   VideoStream *vid_stream;
 

From 7101a70774dd88d8624b8cdda35129dd09d4dba2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:35:42 -0500
Subject: [PATCH 195/501] Switch to steady_clock

---
 src/zm_fifo_stream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_fifo_stream.cpp b/src/zm_fifo_stream.cpp
index 51d88b663..0acb720d2 100644
--- a/src/zm_fifo_stream.cpp
+++ b/src/zm_fifo_stream.cpp
@@ -155,7 +155,7 @@ void FifoStream::runStream() {
   }
 
   while (!zm_terminate) {
-    now = std::chrono::system_clock::now();
+    now = std::chrono::steady_clock::now();
     checkCommandQueue();
 
     if (stream_type == MJPEG) {

From 30e4d72c1de685e10469fc887be8c8a106e0fc47 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:36:12 -0500
Subject: [PATCH 196/501] Implement CMD_MAXFPS

---
 web/ajax/stream.php        | 7 +++++++
 web/includes/config.php.in | 1 +
 2 files changed, 8 insertions(+)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 5c8c07312..2557977ca 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -52,6 +52,13 @@ if ( sem_acquire($semaphore,1) !== false ) {
       intval($_REQUEST['offset']),
       1000000*( $_REQUEST['offset']-intval($_REQUEST['offset'])));
     break;
+  case CMD_MAXFPS :
+    ZM\Debug('Maxfps to '.$_REQUEST['maxfps']);
+    # Pack int two 32 bit integers instead of trying to deal with floats
+    $msg = pack('lcNN', MSG_CMD, $_REQUEST['command'],
+      intval($_REQUEST['maxfps']),
+      1000000*( $_REQUEST['maxfps']-intval($_REQUEST['maxfps'])));
+    break;
   default :
     ZM\Debug('Sending command ' . $_REQUEST['command']);
     $msg = pack('lc', MSG_CMD, $_REQUEST['command']);
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index d285d8616..fcd3a936d 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -119,6 +119,7 @@ define('CMD_NEXT', 13);
 define('CMD_SEEK', 14 );
 define('CMD_VARPLAY', 15);
 define('CMD_QUIT', 17);
+define('CMD_MAXFPS', 18);
 define('CMD_QUERY', 99);
 
 //

From 4dd454325c020c51c824e932915d20c657395834 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:36:38 -0500
Subject: [PATCH 197/501] use options[maxfps] instead of always specifying
 30fps.

---
 web/includes/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 89d2cc8ad..6f292357e 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2070,7 +2070,9 @@ function getStreamHTML($monitor, $options = array()) {
   if ( ! isset($options['height'] ) )
     $options['height'] = 0;
 
-  $options['maxfps'] = ZM_WEB_VIDEO_MAXFPS;
+  if (!isset($options['maxfps'])) {
+    $options['maxfps'] = ZM_WEB_VIDEO_MAXFPS;
+  }
   if ( $monitor->StreamReplayBuffer() )
     $options['buffer'] = $monitor->StreamReplayBuffer();
   //Warning("width: " . $options['width'] . ' height: ' . $options['height']. ' scale: ' . $options['scale'] );

From c08163703608aa83d7aec82a7b198cc241435d2f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 16:38:15 -0500
Subject: [PATCH 198/501] Fixes to specifying width and height of image due to
 us jquery. Implement changeRate/MaxFPS.  Cleanup use of auth_hash in JSON.

---
 web/skins/classic/views/js/watch.js     | 124 ++++++++++++++----------
 web/skins/classic/views/js/watch.js.php |   1 +
 web/skins/classic/views/watch.php       |  55 ++++++-----
 3 files changed, 103 insertions(+), 77 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index f290e1998..89f774ed1 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -130,6 +130,7 @@ function changeSize() {
 
 function changeScale() {
   var scale = $j('#scale').val();
+  setCookie('zmWatchScale'+monitorId, scale, 3600);
   $j('#width').val('auto');
   $j('#height').val('auto');
   setCookie('zmCycleScale', scale, 3600);
@@ -140,11 +141,16 @@ function changeScale() {
   var newHeight;
   var autoScale;
 
+  var streamImg = $j('#liveStream'+monitorId);
+  if (!streamImg.length) {
+    console.error('No element found for liveStream'+monitorId);
+  }
+
   // Always turn it off, we will re-add it below. I don't know if you can add a callback multiple
   // times and what the consequences would be
   $j(window).off('resize', endOfResize); //remove resize handler when Scale to Fit is not active
   if (scale == '0' || scale == 'auto') {
-    const newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
+    const newSize = scaleToFit(monitorWidth, monitorHeight, streamImg, $j('#dvrControls'));
     newWidth = newSize.width;
     newHeight = newSize.height;
     autoScale = newSize.autoScale;
@@ -154,24 +160,21 @@ function changeScale() {
     newHeight = monitorHeight * scale / SCALE_BASE;
   }
 
-  setCookie('zmWatchScale'+monitorId, scale, 3600);
+  if (streamImg.prop('nodeName') == 'IMG') {
+    const oldSrc = streamImg.attr('src');
+    streamImg.attr('src', '');
+    // This is so that we don't waste bandwidth and let the browser do all the scaling.
+    if (autoScale > 100) autoScale = 100;
+    if (scale > 100) scale = 100;
+    const newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale));
 
-  var streamImg = $j('#liveStream'+monitorId);
-  if (streamImg) {
-    if (streamImg.nodeName == 'IMG') {
-      const oldSrc = streamImg.attr('src');
-      streamImg.attr('src', '');
-      // This is so that we don't waste bandwidth and let the browser do all the scaling.
-      if (autoScale > 100) autoScale = 100;
-      if (scale > 100) scale = 100;
-      const newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale));
-
-      streamImg.width(newWidth);
-      streamImg.height(newHeight);
-      streamImg.attr('src', newSrc);
-    }
+    streamImg.css('width', newWidth+'px');
+    streamImg.width(newWidth);
+    streamImg.css('height', newHeight+'px');
+    streamImg.height(newHeight);
+    streamImg.attr('src', newSrc);
   } else {
-    console.error('No element found for liveStream'+monitorId);
+    console.log("Not an IMG, can't set size");
   }
 } // end function changeScale
 
@@ -226,6 +229,15 @@ function setAlarmState(currentAlarmState) {
   lastAlarmState = alarmState;
 } // end function setAlarmState( currentAlarmState )
 
+function streamCmdReq(data) {
+  if (auth_hash) data.auth = auth_hash;
+  $j.getJSON(monitorUrl + '?view=request&request=stream&connkey='+connKey, data)
+      .done(getStreamCmdResponse)
+      .fail(getStreamCmdError);
+
+  streamCmdTimer = null;
+}
+
 function getStreamCmdError(text, error) {
   console.log(error);
   // Error are normally due to failed auth. reload the page.
@@ -347,7 +359,9 @@ function getStreamCmdResponse(respObj, respText) {
       } // end if have a new auth hash
     } // end if respObj.status
   } else {
+    console.log("Not ok");
     checkStreamForErrors('getStreamCmdResponse', respObj);//log them
+    fetchImage($j('#imageFeed img'));
   }
 
   var streamCmdTimeout = statusRefreshTimeout;
@@ -357,6 +371,10 @@ function getStreamCmdResponse(respObj, respText) {
   streamCmdTimer = setTimeout(streamCmdQuery, streamCmdTimeout);
 }
 
+function streamCmdQuery() {
+  streamCmdReq({command: CMD_QUERY});
+}
+
 function streamCmdPause(action) {
   setButtonState('pauseBtn', 'active');
   setButtonState('playBtn', 'inactive');
@@ -396,21 +414,10 @@ function streamCmdPlay(action) {
     }
   }
   if (action) {
-    var data = {};
-    if (auth_hash) data.auth = auth_hash;
-    data.command = CMD_PLAY;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_PLAY});
   }
 }
 
-function streamCmdReq(data) {
-  if (auth_hash) data.auth = auth_hash;
-  $j.getJSON(monitorUrl + '?view=request&request=stream&connkey='+connKey, data)
-      .done(getStreamCmdResponse)
-      .fail(getStreamCmdError);
-
-  streamCmdTimer = null;
-}
 
 function streamCmdStop(action) {
   setButtonState('pauseBtn', 'inactive');
@@ -440,9 +447,7 @@ function streamCmdFastFwd(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    var data = {};
-    data.command = CMD_FASTFWD;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_FASTFWD});
   }
 }
 
@@ -457,9 +462,7 @@ function streamCmdSlowFwd(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    var data = {};
-    data.command = CMD_SLOWFWD;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_SLOWFWD});
   }
   setButtonState('pauseBtn', 'active');
   if (monitorStreamReplayBuffer) {
@@ -478,9 +481,7 @@ function streamCmdSlowRev(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    var data = {};
-    data.command = CMD_SLOWREV;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_SLOWREV});
   }
   setButtonState('pauseBtn', 'active');
   if (monitorStreamReplayBuffer) {
@@ -499,9 +500,7 @@ function streamCmdFastRev(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    var data = {};
-    data.command = CMD_FASTREV;
-    streamCmdReq(data);
+    streamCmdReq({command: CMD_FASTREV});
   }
 }
 
@@ -514,9 +513,7 @@ function streamCmdZoomIn(x, y) {
 }
 
 function streamCmdZoomOut() {
-  var data = {};
-  data.command = CMD_ZOOMOUT;
-  streamCmdReq(data);
+  streamCmdReq({command: CMD_ZOOMOUT});
 }
 
 function streamCmdScale(scale) {
@@ -534,11 +531,6 @@ function streamCmdPan(x, y) {
   streamCmdReq(data);
 }
 
-function streamCmdQuery() {
-  var data = {};
-  data.command = CMD_QUERY;
-  streamCmdReq(data);
-}
 
 /* getStatusCmd is used when not streaming, since there is no persistent zms */
 function getStatusCmdResponse(respObj, respText) {
@@ -713,7 +705,9 @@ function controlCmdImage(x, y) {
 }
 
 function fetchImage(streamImage) {
-  streamImage.attr('src', streamImage.attr('src').replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )));
+  const oldsrc = streamImage.attr('src');
+  streamImage.attr('src', '');
+  streamImage.attr('src', oldsrc.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )));
 }
 
 function handleClick(event) {
@@ -904,10 +898,10 @@ function initPage() {
 
   if (monitorType != 'WebSite') {
     if (streamMode == 'single') {
-      statusCmdTimer = setTimeout(statusCmdQuery, 100);
+      statusCmdTimer = setTimeout(statusCmdQuery, 200);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
     } else {
-      streamCmdTimer = setTimeout(streamCmdQuery, 100);
+      streamCmdTimer = setTimeout(streamCmdQuery, 200);
       setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
     }
 
@@ -927,6 +921,7 @@ function initPage() {
           streamImg.on("error", function(thing) {
             console.log("Error loading image");
             console.log(thing);
+            setInterval(fetchImage, 100, $j('#imageFeed img'));
           });
         }
       } // end if have streamImg
@@ -942,6 +937,9 @@ function initPage() {
       el.onchange = window['changeScale'];
     });
     changeScale();
+    document.querySelectorAll('select[name="changeRate"]').forEach(function(el) {
+      el.onchange = window['changeRate'].bind(el, el);
+    });
   } else if (monitorRefresh > 0) {
     setInterval(reloadWebSite, monitorRefresh*1000);
   }
@@ -1084,5 +1082,27 @@ function cycleToggle(e) {
   button.toggleClass('btn-primary');
 }
 
+function changeRate(e) {
+  const newvalue = $j(e).val();
+  if (1) {
+    var data = {};
+    data.command = CMD_MAXFPS;
+    data.maxfps = newvalue;
+    streamCmdReq(data);
+  } else {
+    streamImage = $j('#liveStream'+monitorData[monIdx].id);
+    const oldsrc = streamImage.attr('src');
+    streamImage.attr('src', ''); // stop streaming
+    console.log(newvalue);
+    if (newvalue == '0') {
+      // Unlimited
+      streamImage.attr('src', oldsrc.replace(/maxfps=\d+/i, 'maxfps=0.00100'));
+    } else {
+      streamImage.attr('src', oldsrc.replace(/maxfps=\d+/i, 'maxfps='+newvalue));
+    }
+  }
+  setCookie('zmWatchRate', newvalue, 3600);
+}
+
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 36a0417de..04a6c0757 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -32,6 +32,7 @@ var CMD_PREV = <?php echo CMD_PREV ?>;
 var CMD_NEXT = <?php echo CMD_NEXT ?>;
 var CMD_SEEK = <?php echo CMD_SEEK ?>;
 var CMD_QUERY = <?php echo CMD_QUERY ?>;
+var CMD_MAXFPS = <?php echo CMD_MAXFPS ?>;
 
 var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
 var POPUP_ON_ALARM = <?php echo ZM_WEB_POPUP_ON_ALARM ?>;
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 58d24ac85..6acce1b5c 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -81,23 +81,27 @@ $monitor = new ZM\Monitor($mid);
 $nextMid = ($monitor_index == count($monitors)-1) ? $monitors[0]->Id() : $monitors[$monitor_index+1]->Id();
 $cycle = isset($_REQUEST['cycle']) and ($_REQUEST['cycle'] == 'true');
 $showCycle = $cycle;
-ZM\Error("Show cycle: $showCycle");
 if (isset($_COOKIE['zmCycleShow'])) {
   $showCycle = $_COOKIE['zmCycleShow'] == 'true';
-  ZM\Error("Show cycle: $showCycle");
-} else {
-  ZM\Error("Show cycle: not set");
 }
 #Whether to show the controls button
 $showPtzControls = ( ZM_OPT_CONTROL && $monitor->Controllable() && canView('Control') && $monitor->Type() != 'WebSite' );
 
 $options = array();
-if (empty($_REQUEST['mode'])) {
-  $options['mode'] = canStream() ? 'stream' : 'still';
-} else {
+if (!empty($_REQUEST['mode']) and ($_REQUEST['mode']=='still' or $_REQUEST['mode']=='stream')) {
   $options['mode'] = validHtmlStr($_REQUEST['mode']);
+} else if (isset($_COOKIE['zmWatchMode'])) {
+  $options['mode'] = $_COOKIE['zmWatchMode'];
+} else {
+  $options['mode'] = canStream() ? 'stream' : 'still';
+}
+if (!empty($_REQUEST['maxfps']) and validFloat($_REQUEST['maxfps']) and ($_REQUEST['maxfps']>0)) {
+  $options['maxfps'] = validHtmlStr($_REQUEST['maxfps']);
+} else if (isset($_COOKIE['zmWatchRate'])) {
+  $options['maxfps'] = $_COOKIE['zmWatchRate'];
+} else {
+  $options['maxfps'] = ''; // unlimited
 }
-zm_session_start();
 
 $period = ZM_WEB_REFRESH_CYCLE;
 if (isset($_REQUEST['period'])) {
@@ -118,22 +122,17 @@ $options['scale'] = $scale;
 if (isset($_REQUEST['width'])) {
   $options['width'] = validInt($_REQUEST['width']); 
 } else if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
-  $_SESSION['zmCycleWidth'] = $options['width'] = $_COOKIE['zmCycleWidth'];
-#} elseif ( isset($_SESSION['zmCycleWidth']) and $_SESSION['zmCycleWidth'] ) {
-  #$options['width'] = $_SESSION['zmCycleWidth'];
+  $options['width'] = $_COOKIE['zmCycleWidth'];
 } else {
   $options['width'] = '';
 }
 if (isset($_REQUEST['height'])) {
   $options['height'] =validInt($_REQUEST['height']);
 } else if (isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight']) {
-  $_SESSION['zmCycleHeight'] = $options['height'] = $_COOKIE['zmCycleHeight'];
-#else if ( isset($_SESSION['zmCycleHeight']) and $_SESSION['zmCycleHeight'] )
-  #$options['height'] = $_SESSION['zmCycleHeight'];
+  $options['height'] = $_COOKIE['zmCycleHeight'];
 } else {
   $options['height'] = '';
 }
-session_write_close();
 
 $connkey = generateConnKey();
 $streamMode = getStreamMode();
@@ -161,15 +160,24 @@ xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
       </div>
       <div id="headerButtons">
 <!--
-<?php if ( $options['mode'] == 'stream' ) { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
-<?php } else { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
-<?php } ?>
+        <button type="button" id="streamToggle" class="btn <?php echo $options['mode'] == 'stream' ? 'btn-primary':'btn-secondary'?>" title="<?php echo translate('Toggle Streaming/Stills')?>">
+            <span class="material-icons md-18">switch_video</span>
+        </button>
 -->
         <button type="button" id="cycleToggle" class="btn <?php echo $showCycle ? 'btn-primary':'btn-secondary'?>" title="<?php echo translate('Toggle cycle sidebar')?>">
             <span class="material-icons md-18">view_carousel</span>
         </button>
+          <?php
+$maxfps_options = array(''=>translate('Unlimited'),
+  '0' => translate('Stills'),
+  '1' => '1 '.translate('FPS'),
+  '2' => '2 '.translate('FPS'),
+  '5' => '5 '.translate('FPS'),
+  '10' => '10 '.translate('FPS'),
+  '20' => '20 '.translate('FPS'),
+);
+echo htmlSelect('changeRate', $maxfps_options, $options['maxfps']);
+?>
       </div>
       <div id="sizeControl">
         <span id="widthControl">
@@ -241,9 +249,8 @@ if ($streamMode == 'jpeg') {
   echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
 }
 ?>
-><?php echo getStreamHTML($monitor, array('scale'=>$scale)); ?>
+><?php echo getStreamHTML($monitor, $options); ?>
         </div>
-
 <?php if ($monitor->Type() != 'WebSite') { ?>
         <div id="monitorStatus">
           <div id="monitorState">
@@ -262,8 +269,7 @@ if ($streamMode == 'jpeg') {
           <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
           <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
         </div>
-        <div class="buttons">
-          <div id="dvrControls">
+        <div class="buttons" id="dvrControls">
 <?php
 if ($streamMode == 'jpeg') {
   if ($monitor->StreamReplayBuffer() != 0) {
@@ -308,7 +314,6 @@ if ($streamMode == 'jpeg') {
 } // end if streamMode==jpeg
 ?>
       </div><!--dvrButtons-->
-      </div>
 <?php } // end if $monitor->Type() != 'WebSite' ?>
 <?php
 if ( $showPtzControls ) {

From 1bc0e1820e4b5436f2a911bd612141e48f2b8069 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 16 Dec 2021 17:02:20 -0500
Subject: [PATCH 199/501] fix build on older c++

---
 src/zm_time.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_time.cpp b/src/zm_time.cpp
index 9d4c281c4..041962003 100644
--- a/src/zm_time.cpp
+++ b/src/zm_time.cpp
@@ -28,7 +28,7 @@ std::string SystemTimePointToString(SystemTimePoint tp) {
 
   std::string timeString;
   timeString.reserve(64);
-  char *timePtr = timeString.data();
+  char *timePtr = &*(timeString.begin());
   tm tp_tm = {};
   timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
   snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));
@@ -44,7 +44,7 @@ std::string TimePointToString(TimePoint tp) {
 
   std::string timeString;
   timeString.reserve(64);
-  char *timePtr = timeString.data();
+  char *timePtr = &*(timeString.begin());
   tm tp_tm = {};
   timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
   snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));

From edbe726e8653cd829dbbd67de5888a8cade19603 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 17 Dec 2021 09:41:45 -0500
Subject: [PATCH 200/501] Implement semaphore retry. Make not getting the
 semaphore an error

---
 web/ajax/stream.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 2557977ca..ade101845 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -1,5 +1,5 @@
 <?php
-  error_reporting(0);
+error_reporting(0);
 
 $start_time = time();
 
@@ -7,7 +7,7 @@ define('MSG_TIMEOUT', ZM_WEB_AJAX_TIMEOUT/2);
 define('MSG_DATA_SIZE', 4+256);
 
 if ( !($_REQUEST['connkey'] && $_REQUEST['command']) ) {
-  ajaxError("Unexpected received message type '$type'");
+  ajaxError('No connkey or no command in stream ajax');
 }
 
 mkdir(ZM_PATH_SOCKS);
@@ -15,7 +15,17 @@ mkdir(ZM_PATH_SOCKS);
 # The file that we point ftok to has to exist, and only exist if zms is running, so we are pointing it at the .sock
 $key = ftok(ZM_PATH_SOCKS.'/zms-'.sprintf('%06d',$_REQUEST['connkey']).'s.sock', 'Z');
 $semaphore = sem_get($key,1);
-if ( sem_acquire($semaphore,1) !== false ) {
+$semaphore_tries = 10;
+$have_semaphore = false;
+
+while ( $semaphore_tries ) {
+  $have_semaphore = sem_acquire($semaphore,1);
+  if ($have_semaphore !== false) break;
+  ZM\Debug("Failed to get semaphore, trying again");
+  usleep(100000);
+  $semaphore_tries -= 1;
+}
+if ($have_semaphore) {
   if ( !($socket = @socket_create(AF_UNIX, SOCK_DGRAM, 0)) ) {
     ajaxError('socket_create() failed: '.socket_strerror(socket_last_error()));
   }
@@ -161,12 +171,11 @@ if ( sem_acquire($semaphore,1) !== false ) {
     ajaxResponse(array('status'=>$data));
     break;
   default :
-    ajaxError("Unexpected received message type '$type'");
+    ajaxError('Unexpected received message type '.$data['type']);
   }
   sem_release($semaphore);
 } else {
-  ZM\Debug('Couldn\'t get semaphore');
-  ajaxResponse(array());
+  ajaxError("Unable to get semaphore.");
 }
 
 ajaxError('Unrecognised action or insufficient permissions in ajax/stream');

From 77793da70ed1701a56d2c1bfed7d782ee0a765d1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 17 Dec 2021 13:28:13 -0500
Subject: [PATCH 201/501] If no max_fps set we don't care how long it takes to
 send frame

---
 src/zm_monitorstream.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 4ce0eebeb..e2adcf57b 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -460,16 +460,18 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
 
   }  // Not mpeg
 
-  TimePoint send_end_time = std::chrono::steady_clock::now();
-  TimePoint::duration frame_send_time = send_end_time - send_start_time;
-  TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
+  if (maxfps) {
+    TimePoint send_end_time = std::chrono::steady_clock::now();
+    TimePoint::duration frame_send_time = send_end_time - send_start_time;
+    TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
 
-  if (frame_send_time > maxfps_milliseconds) {
-    //maxfps /= 1.5;
-    Warning("Frame send time %" PRIi64 " msec too slow (> %" PRIi64 ", throttling maxfps to %.3f",
-        static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
-        static_cast<int64>(std::chrono::duration_cast<Milliseconds>(maxfps_milliseconds).count()),
-        maxfps);
+    if (frame_send_time > maxfps_milliseconds) {
+      //maxfps /= 1.5;
+      Warning("Frame send time %" PRIi64 " msec too slow (> %" PRIi64 ", throttling maxfps to %.3f",
+          static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
+          static_cast<int64>(std::chrono::duration_cast<Milliseconds>(maxfps_milliseconds).count()),
+          maxfps);
+    }
   }
   last_frame_sent = send_end_time;
   return true;

From 81048b61916255db918d24d9b83be05e5b7d2009 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 17 Dec 2021 13:29:25 -0500
Subject: [PATCH 202/501] Reduce code

---
 src/zm_monitorstream.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index e2adcf57b..d4d387219 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -460,9 +460,9 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
 
   }  // Not mpeg
 
+  last_frame_sent = std::chrono::steady_clock::now();
   if (maxfps) {
-    TimePoint send_end_time = std::chrono::steady_clock::now();
-    TimePoint::duration frame_send_time = send_end_time - send_start_time;
+    TimePoint::duration frame_send_time = last_frame_sent - send_start_time;
     TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
 
     if (frame_send_time > maxfps_milliseconds) {
@@ -473,7 +473,6 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
           maxfps);
     }
   }
-  last_frame_sent = send_end_time;
   return true;
 }  // end bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp)
 

From 80166a1ab54eeb42989c9cecd3ba21bbad94fa75 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 22 Dec 2021 11:25:46 -0500
Subject: [PATCH 203/501] Fix preset labels not being populated and causing
 javascript errors when they are.

---
 web/skins/classic/views/js/watch.js.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 04a6c0757..be8065d12 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -60,16 +60,16 @@ var mode = "<?php echo $options['mode'] ?>";
 
 var monitorData = new Array();
 <?php
-foreach ($monitors as $monitor) {
+foreach ($monitors as $m) {
 ?>
 monitorData[monitorData.length] = {
-  'id': <?php echo $monitor->Id() ?>,
-  'width': <?php echo $monitor->ViewWidth() ?>,
-  'height':<?php echo $monitor->ViewHeight() ?>,
-  'url': '<?php echo $monitor->UrlToIndex() ?>',
-  'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
-  'type': '<?php echo $monitor->Type() ?>',
-  'refresh': '<?php echo $monitor->Refresh() ?>'
+  'id': <?php echo $m->Id() ?>,
+  'width': <?php echo $m->ViewWidth() ?>,
+  'height':<?php echo $m->ViewHeight() ?>,
+  'url': '<?php echo $m->UrlToIndex() ?>',
+  'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $m->Id() ?>' );},
+  'type': '<?php echo $m->Type() ?>',
+  'refresh': '<?php echo $m->Refresh() ?>'
 };
 <?php
 } // end foreach monitor
@@ -101,9 +101,10 @@ var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
 var labels = new Array();
 <?php
 $labels = array();
+ZM\Debug("Presets");
 foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor->Id())) as $row) {
   $label = $labels[$row['Preset']] = $row['Label'];
-  echo 'labels['. validInt($index) .'] = \''.validJsStr($label).'\'';
+  echo 'labels['. validInt($row['Preset']) .'] = \''.validJsStr($label).'\';'.PHP_EOL;
 }
 ?>
 var deleteString = "<?php echo translate('Delete') ?>";

From 185dc4a50d9c3e9b7774579b31073b5ce5305f7d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 22 Dec 2021 11:28:00 -0500
Subject: [PATCH 204/501] Do a git pull instead of fetch so as to actually get
 the changes

---
 utils/do_debian_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index efe16401b..f20ee6183 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -119,8 +119,8 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
   if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then
     echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from."
     cd "${GITHUB_FORK}_ZoneMinder.git"
-    echo "git fetch..."
-    git fetch
+    echo "git pull..."
+    git pull
     cd ../
 
     echo "git clone ${GITHUB_FORK}_ZoneMinder.git ${GITHUB_FORK}_zoneminder_release"

From 2aacbf790af051c95a804603bddec0cabd169c82 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 21 Dec 2021 20:24:28 -0500
Subject: [PATCH 205/501] handle warning due to not defined last_run

---
 scripts/zmfilter.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index c0cdf7235..960c090cb 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -184,7 +184,7 @@ while (!$zm_terminate) {
   foreach my $filter (@filters) {
     last if $zm_terminate;
 
-    my $elapsed = ($now - $$filter{last_ran});
+    my $elapsed = ($now - ($$filter{last_ran} ? $$filter{last_ran} : 0));
     if ($$filter{last_ran} and ($elapsed < $$filter{ExecuteInterval})) {
       my $filter_delay = $$filter{ExecuteInterval} - ($now - $$filter{last_ran});
       $delay = $filter_delay if $filter_delay < $delay;

From bdcb7950cdc98857868a6a7ecb9a374e4d19db78 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 26 Dec 2021 11:51:22 -0500
Subject: [PATCH 206/501] Fix export from event view due to conflict with
 function name in skin.js

---
 web/skins/classic/views/js/event.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 04bf66b7e..2c03dd9ca 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -710,10 +710,6 @@ function renameEvent() {
   actQuery('rename', {eventName: newName});
 }
 
-function exportEvent() {
-  window.location.assign('?view=export&eids[]='+eventData.Id);
-}
-
 function showEventFrames() {
   window.location.assign('?view=frames&eid='+eventData.Id);
 }
@@ -1020,11 +1016,11 @@ function initPage() {
   // Manage the EXPORT button
   bindButton('#exportBtn', 'click', null, function onExportClick(evt) {
     evt.preventDefault();
-    exportEvent();
+    window.location.assign('?view=export&eids[]='+eventData.Id);
   });
 
   // Manage the generateVideo button
-  bindButton('#videoBtn', 'click', null, function onExportClick(evt) {
+  bindButton('#videoBtn', 'click', null, function onVideoClick(evt) {
     evt.preventDefault();
     videoEvent();
   });

From f9f87645077cc9d1893bd69f9fd7c568e275e498 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 12:30:16 -0500
Subject: [PATCH 207/501] Change Event->Cause to a TEXT instead of varchar(32)
 because we now inclue Alarmed Zone name and could include other info as well.
 Fixes #3403

---
 db/zm_create.sql.in     | 2 +-
 db/zm_update-1.37.7.sql | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 db/zm_update-1.37.7.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index fbc7cad3c..72b0be56f 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -188,7 +188,7 @@ CREATE TABLE `Events` (
   `StorageId`	smallint(5) unsigned default 0,
   `SecondaryStorageId`	smallint(5) unsigned default 0,
   `Name` varchar(64) NOT NULL default '',
-  `Cause` varchar(32) NOT NULL default '',
+  `Cause` TEXT,
   `StartDateTime` datetime default NULL,
   `EndDateTime` datetime default NULL,
   `Width` smallint(5) unsigned NOT NULL default '0',
diff --git a/db/zm_update-1.37.7.sql b/db/zm_update-1.37.7.sql
new file mode 100644
index 000000000..7d45f67c6
--- /dev/null
+++ b/db/zm_update-1.37.7.sql
@@ -0,0 +1,2 @@
+/* Change Cause from varchar(32) to TEXT.  We now include alarmed zone name */
+ALTER TABLE `Events` MODIFY `Cause` TEXT;

From 0e148d809abc9d78024ae3bc9ec6ac42289e11d0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 12:33:23 -0500
Subject: [PATCH 208/501] cleanup logic and fix the zone names coming before
 the Motion: label

---
 src/zm_monitor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index fff655177..c4e82a69a 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1894,16 +1894,14 @@ bool Monitor::Analyse() {
                     alarm_cause += std::string(zone.Label());
                   }
                 }
-                if (!alarm_cause.empty())
-                  cause = cause+" "+alarm_cause;
-
                 Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
                     score, last_motion_score, motion_score);
                 motion_frame_count += 1;
                 last_motion_score = motion_score;
+
                 if (motion_score) {
                   if (cause.length()) cause += ", ";
-                  cause += MOTION_CAUSE;
+                  cause += MOTION_CAUSE+":"+alarm_cause;
                   noteSetMap[MOTION_CAUSE] = zoneSet;
                 } // end if motion_score
               }

From e81384bba4c49ec55e67842ec64e573c0bb9cd7b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 12:45:02 -0500
Subject: [PATCH 209/501] Fix fail to build

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c4e82a69a..ac2703b71 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1901,7 +1901,7 @@ bool Monitor::Analyse() {
 
                 if (motion_score) {
                   if (cause.length()) cause += ", ";
-                  cause += MOTION_CAUSE+":"+alarm_cause;
+                  cause += MOTION_CAUSE+std::string(":")+alarm_cause;
                   noteSetMap[MOTION_CAUSE] = zoneSet;
                 } // end if motion_score
               }

From 87962a3723189c1cfa53b9f9ed21196eba50a453 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 13:48:37 -0500
Subject: [PATCH 210/501] Invert Importance so that Normal is the auto-selected
 first value

---
 web/skins/classic/views/monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 657c2ce8c..fe3cc9950 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -1286,9 +1286,9 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
 <?php
       echo htmlselect('newMonitor[Importance]',
               array(
-                'Not'=>translate('Not important'),
-                'Less'=>translate('Less important'),
                 'Normal'=>translate('Normal')
+                'Less'=>translate('Less important'),
+                'Not'=>translate('Not important'),
               ), $monitor->Importance());
 ?>
           </td>

From 46b95e28ec21b871861649e876fd8b64fff0587f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 13:51:36 -0500
Subject: [PATCH 211/501] Fix commas

---
 web/skins/classic/views/monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index fe3cc9950..bfb0638c9 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -1286,9 +1286,9 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
 <?php
       echo htmlselect('newMonitor[Importance]',
               array(
-                'Normal'=>translate('Normal')
+                'Normal'=>translate('Normal'),
                 'Less'=>translate('Less important'),
-                'Not'=>translate('Not important'),
+                'Not'=>translate('Not important')
               ), $monitor->Importance());
 ?>
           </td>

From e7a33a3dbed4a30a35970778bf4981c603367f68 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 13:51:47 -0500
Subject: [PATCH 212/501] Add Importance to monitors view

---
 web/skins/classic/views/monitors.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/web/skins/classic/views/monitors.php b/web/skins/classic/views/monitors.php
index db02d92d5..fb63e09fa 100644
--- a/web/skins/classic/views/monitors.php
+++ b/web/skins/classic/views/monitors.php
@@ -86,6 +86,17 @@ The following monitors will have these settings update when you click Save:<br/>
           <label for="newMonitor[Enabled]"><?php echo translate('Enabled') ?></label>
           <input type="checkbox" name="newMonitor[Enabled]" id="newMonitor[Enabled]" value="1"<?php if ( !empty($monitors[0]->Enabled()) ) { ?> checked="checked"<?php } ?>/>
         </p>
+        <p>
+          <label for="newMonitor[Importance]"><?php echo translate('Importance'); echo makeHelpLink('OPTIONS_IMPORTANCE') ?></label>
+<?php
+      echo htmlselect('newMonitor[Importance]',
+              array(
+                'Normal'=>translate('Normal'),
+                'Less'=>translate('Less important'),
+                'Not'=>translate('Not important')
+              ), $monitor->Importance());
+?>
+        </p>
         <div id="contentButtons">
           <button type="submit" value="Save"><?php echo translate('Save') ?></button>
           <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>

From 5933aa8a6f3445e3c8465e48d91f0d3a1d806759 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Dec 2021 15:34:31 -0500
Subject: [PATCH 213/501] Use > 0.0 instead of boolean when testing maxfps

---
 src/zm_monitorstream.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index d4d387219..35cd1beb2 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -371,13 +371,15 @@ bool MonitorStream::sendFrame(const std::string &filepath, SystemTimePoint times
     fputs("\r\n", stdout);
     fflush(stdout);
 
-    TimePoint send_end_time = std::chrono::steady_clock::now();
-    TimePoint::duration frame_send_time = send_end_time - send_start_time;
+    if (maxfps > 0.0) {
+      TimePoint send_end_time = std::chrono::steady_clock::now();
+      TimePoint::duration frame_send_time = send_end_time - send_start_time;
 
-    if (frame_send_time > Milliseconds(lround(Milliseconds::period::den / maxfps))) {
-      Info("Frame send time %" PRIi64 " ms too slow, throttling maxfps to %.2f",
-           static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
-           maxfps);
+      if (frame_send_time > Milliseconds(lround(Milliseconds::period::den / maxfps))) {
+        Info("Frame send time %" PRIi64 " ms too slow, throttling maxfps to %.2f",
+            static_cast<int64>(std::chrono::duration_cast<Milliseconds>(frame_send_time).count()),
+            maxfps);
+      }
     }
 
     last_frame_sent = now;
@@ -461,7 +463,7 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
   }  // Not mpeg
 
   last_frame_sent = std::chrono::steady_clock::now();
-  if (maxfps) {
+  if (maxfps > 0.0) {
     TimePoint::duration frame_send_time = last_frame_sent - send_start_time;
     TimePoint::duration maxfps_milliseconds = Milliseconds(lround(Milliseconds::period::den / maxfps));
 
@@ -803,7 +805,7 @@ void MonitorStream::runStream() {
       // sent a frame, so update
 
       double capture_fps = monitor->GetFPS();
-      double fps = (maxfps && (capture_fps > maxfps)) ? maxfps : capture_fps;
+      double fps = ((maxfps > 0.0) && (capture_fps > maxfps)) ? maxfps : capture_fps;
       double sleep_time_seconds = (1 / ((fps ? fps : 1)))    // 1 second / fps
         * (replay_rate ? abs(replay_rate)/ZM_RATE_BASE : 1); // replay_rate is 100 for 1x
       Debug(3, "Using %f for maxfps.  capture_fps: %f maxfps %f * replay_rate: %d = %f", fps, capture_fps, maxfps, replay_rate, sleep_time_seconds);

From 698fe14453430378cce79b012a44cfe58f9de4da Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 26 Dec 2021 15:19:13 -0500
Subject: [PATCH 214/501] set zm_terminate instead of exit() so that all the
 cleanup code happens

---
 src/zm_eventstream.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 0c104ffd0..7ef3619c2 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -837,12 +837,13 @@ void EventStream::runStream() {
 
   //checkInitialised();
 
-  if ( type == STREAM_JPEG )
+  if (type == STREAM_JPEG)
     fputs("Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY "\r\n\r\n", stdout);
 
-  if ( !event_data ) {
+  if (!event_data) {
     sendTextFrame("No event data found");
-    exit(0);
+    zm_terminate = true;
+    return;
   }
 
   double fps = 1.0;

From e73765c5bf1c5273e23ef776fb839dfd75c2aa4f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 1 Jan 2022 17:55:28 -0500
Subject: [PATCH 215/501] add basic readthedocs config

---
 .readthedocs.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000..38593578d
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,9 @@
+version: 2
+
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.8"
+
+sphinx:
+  fail_on_warning: true

From a76128e9c468bcb979cdd74cbd5c1d737319db36 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 1 Jan 2022 18:56:13 -0500
Subject: [PATCH 216/501] include monitor->Importance when logging failed
 camera connects

---
 src/zm_ffmpeg_camera.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 728b51783..2b36c34f6 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -295,7 +295,8 @@ int FfmpegCamera::OpenFfmpeg() {
   ret = avformat_open_input(&mFormatContext, mPath.c_str(), nullptr, &opts);
   if ( ret != 0 )
   {
-    Error("Unable to open input %s due to: %s", mPath.c_str(),
+    logPrintf(Logger::ERROR + monitor->Importance(),
+        "Unable to open input %s due to: %s", mPath.c_str(),
         av_make_error_string(ret).c_str());
 
     if ( mFormatContext ) {

From e2a81cc2c5454192f5039757b809611131c6269d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 2 Jan 2022 18:38:34 -0500
Subject: [PATCH 217/501] make max_score an int to get rid of the casts.  Move
 assignment of it above the event UPDATE sql so that it is immediately
 accurate.

---
 src/zm_event.cpp | 15 ++++++++-------
 src/zm_event.h   |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 2d95ec23a..f927eac5c 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -55,7 +55,7 @@ Event::Event(
   alarm_frames(0),
   alarm_frame_written(false),
   tot_score(0),
-  max_score(0),
+  max_score(-1),
   //path(""),
   //snapshit_file(),
   //alarm_file(""),
@@ -486,12 +486,12 @@ void Event::AddFrame(Image *image,
 
     Debug(1, "frames %d, score %d max_score %d", frames, score, max_score);
     // If this is the first frame, we should add a thumbnail to the event directory
-    if ((frames == 1) || (score > (int)max_score)) {
+    if ((frames == 1) || (score > max_score)) {
       write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
       Debug(1, "Writing snapshot");
       WriteFrameImage(image, timestamp, snapshot_file.c_str());
     } else {
-      Debug(1, "Not Writing snapshot because score %d > max %d", score, max_score);
+      Debug(1, "Not Writing snapshot because frames %d score %d > max %d", frames, score, max_score);
     }
 
     // We are writing an Alarm frame
@@ -523,11 +523,15 @@ void Event::AddFrame(Image *image,
   bool db_frame = ( frame_type == BULK )
     or ( frame_type == ALARM )
     or ( frames == 1 )
-    or ( score > (int)max_score )
+    or ( score > max_score )
     or ( monitor_state == Monitor::ALERT )
     or ( monitor_state == Monitor::ALARM )
     or ( monitor_state == Monitor::PREALARM );
 
+  if (score > max_score) {
+    max_score = score;
+  }
+
   if (db_frame) {
     Microseconds delta_time = std::chrono::duration_cast<Microseconds>(timestamp - start_time);
     Debug(1, "Frame delta is %.2f s - %.2f s = %.2f s, score %u zone_stats.size %zu",
@@ -568,9 +572,6 @@ void Event::AddFrame(Image *image,
     } // end if frame_type == BULK
   } // end if db_frame
 
-  if (score > (int) max_score) {
-    max_score = score;
-  }
   end_time = timestamp;
 }
 
diff --git a/src/zm_event.h b/src/zm_event.h
index 611b2f716..a26c029b5 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -77,8 +77,8 @@ class Event {
     int        frames;
     int        alarm_frames;
     bool alarm_frame_written;
-    unsigned int  tot_score;
-    unsigned int  max_score;
+    int  tot_score;
+    int  max_score;
     std::string path;
     std::string snapshot_file;
     std::string alarm_file;

From 205ff6c033507d697e5dab1dd509b36e4e774ded Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 2 Jan 2022 19:25:44 -0500
Subject: [PATCH 218/501] apply fix to RtspServer

---
 dep/RtspServer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dep/RtspServer b/dep/RtspServer
index cd7fd49be..1b40f1661 160000
--- a/dep/RtspServer
+++ b/dep/RtspServer
@@ -1 +1 @@
-Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
+Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f

From 7215756fed4a428e0514e9173114a1703cbc6f68 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 3 Jan 2022 19:03:04 -0500
Subject: [PATCH 219/501] Introduce a method update the noteSetMap after event
 creation (addNote).

---
 src/zm_event.cpp |  4 ++++
 src/zm_event.h   | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index f927eac5c..7db8f84f3 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -291,6 +291,10 @@ void Event::createNotes(std::string &notes) {
   }
 }  // void Event::createNotes(std::string &notes)
 
+void Event::addNote(const char *cause, const std::string &note) {
+  noteSetMap[cause].insert(note);
+}
+
 bool Event::WriteFrameImage(Image *image, SystemTimePoint timestamp, const char *event_file, bool alarm_frame) const {
   int thisquality = 
     (alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality)) ?
diff --git a/src/zm_event.h b/src/zm_event.h
index a26c029b5..4fb5c7469 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -110,6 +110,7 @@ class Event {
 
     uint64_t Id() const { return id; }
     const std::string &Cause() const { return cause; }
+    void addNote(const char *cause, const std::string &note);
     int Frames() const { return frames; }
     int AlarmFrames() const { return alarm_frames; }
 
@@ -123,7 +124,7 @@ class Event {
 
     void updateNotes(const StringSetMap &stringSetMap);
 
-  void AddFrame(Image *image,
+    void AddFrame(Image *image,
                 SystemTimePoint timestamp,
                 const std::vector<ZoneStats> &stats,
                 int score = 0,
@@ -134,17 +135,17 @@ class Event {
     bool SetPath(Storage *storage);
 
  public:
-  static std::string getSubPath(tm time) {
-    std::string subpath = stringtf("%02d/%02d/%02d/%02d/%02d/%02d",
-                                   time.tm_year - 100, time.tm_mon + 1, time.tm_mday,
-                                   time.tm_hour, time.tm_min, time.tm_sec);
-    return subpath;
-  }
-  static std::string getSubPath(time_t *time) {
-    tm time_tm = {};
-    localtime_r(time, &time_tm);
-    return Event::getSubPath(time_tm);
-  }
+    static std::string getSubPath(tm time) {
+      std::string subpath = stringtf("%02d/%02d/%02d/%02d/%02d/%02d",
+          time.tm_year - 100, time.tm_mon + 1, time.tm_mday,
+          time.tm_hour, time.tm_min, time.tm_sec);
+      return subpath;
+    }
+    static std::string getSubPath(time_t *time) {
+      tm time_tm = {};
+      localtime_r(time, &time_tm);
+      return Event::getSubPath(time_tm);
+    }
 
     const char* getEventFile() const {
       return video_file.c_str();

From b1353823cf8653fb3cab0983d61baab7156e44ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 3 Jan 2022 19:04:21 -0500
Subject: [PATCH 220/501] clean up signal change code a bit, using new event
 notesetmap update function.  So now when we lose signal, the event will close
 but it will have signal change :Lost added to it's notes.  A new event will
 only be created if in RECORD/MOCORD.

---
 src/zm_monitor.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index ac2703b71..5fa6728f9 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1769,29 +1769,25 @@ bool Monitor::Analyse() {
     // FIXME this snap might not be the one that caused the signal change.  Need to store that in the packet.
     if (signal_change) {
       Debug(2, "Signal change, new signal is %d", signal);
-      const char *signalText = "Unknown";
       if (!signal) {
-        signalText = "Lost";
         if (event) {
+          event->addNote(SIGNAL_CAUSE, "Lost");
           Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
           closeEvent();
           last_section_mod = 0;
         }
-      } else {
-        signalText = "Reacquired";
-        score += 100;
+      } else if (function == MOCORD or function == RECORD) {
+        if (!event) {
+          if (cause.length()) cause += ", ";
+          cause += SIGNAL_CAUSE + std::string(": Reacquired");
+        } else {
+          event->addNote(SIGNAL_CAUSE, "Reacquired");
+        }
+        if (snap->image)
+          ref_image.Assign(*(snap->image));
       }
-      if (!event) {
-        if (cause.length()) cause += ", ";
-        cause += SIGNAL_CAUSE;
-      }
-      Event::StringSet noteSet;
-      noteSet.insert(signalText);
-      noteSetMap[SIGNAL_CAUSE] = noteSet;
       shared_data->state = state = IDLE;
       shared_data->active = signal;
-      if ((function == MODECT or function == MOCORD) and snap->image)
-        ref_image.Assign(*(snap->image));
     }  // end if signal change
 
     if (signal) {

From a59e33d8b0634f33dac3c7e3d5f8a75de17116e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 3 Jan 2022 19:14:27 -0500
Subject: [PATCH 221/501] remove unused last_section_mod

---
 src/zm_monitor.cpp | 3 ---
 src/zm_monitor.h   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 5fa6728f9..52fca1218 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -375,7 +375,6 @@ Monitor::Monitor()
   first_alarm_count(0),
   last_alarm_count(0),
   last_signal(false),
-  last_section_mod(0),
   buffer_count(0),
   state(IDLE),
   last_motion_score(0),
@@ -426,7 +425,6 @@ Monitor::Monitor()
     event_close_mode = CLOSE_IDLE;
 
   event = nullptr;
-  last_section_mod = 0;
 
   adaptive_skip = true;
 
@@ -1774,7 +1772,6 @@ bool Monitor::Analyse() {
           event->addNote(SIGNAL_CAUSE, "Lost");
           Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
           closeEvent();
-          last_section_mod = 0;
         }
       } else if (function == MOCORD or function == RECORD) {
         if (!event) {
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 8d6bbd95e..447ea3580 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -351,7 +351,6 @@ protected:
   int        first_alarm_count;
   int        last_alarm_count;
   bool       last_signal;
-  int        last_section_mod;
   int        buffer_count;
   State      state;
   SystemTimePoint start_time;

From 198ee73d0e34ba5873bdb53cd2df0ea2f8699946 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 4 Jan 2022 17:38:25 -0500
Subject: [PATCH 222/501] Add alarm_cause to zm_packet.  Clean up code dealing
 with decoding not being ready

---
 src/zm_monitor.cpp | 87 +++++++++++++++++++---------------------------
 src/zm_packet.h    |  1 +
 2 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 52fca1218..36f735aa7 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1828,27 +1828,14 @@ bool Monitor::Analyse() {
 
         /* try to stay behind the decoder. */
         if (decoding_enabled) {
-          while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
+          if (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
             Debug(1, "Waiting for decode");
             packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
             packetqueue.wait();
-
-            // Another thread may have moved our it. Unlikely but possible
-            packet_lock = packetqueue.get_packet(analysis_it);
-            if (!packet_lock) return false;
-            snap = packet_lock->packet_;
-
-            if (!snap->image and snap->decoded) {
-              Debug(1, "No image but was decoded, giving up");
-              delete packet_lock;
-              return false;
-            }
-          }  // end while ! decoded
-          if (zm_terminate) {
-            delete packet_lock;
+            // Everything may have changed, just return and start again.  This needs to be more RAII
             return false;
-          }
+          }  // end while ! decoded
         }  // end if decoding enabled
 
         SystemTimePoint timestamp = snap->timestamp;
@@ -1864,46 +1851,43 @@ bool Monitor::Analyse() {
                 motion_frame_skip, capture_fps, analysis_fps_limit);
           }
 
-          if (!(analysis_image_count % (motion_frame_skip+1))) {
-            if (snap->image) {
-              // decoder may not have been able to provide an image
-              if (!ref_image.Buffer()) {
-                Debug(1, "Assigning instead of Detecting");
-                ref_image.Assign(*(snap->image));
-              } else {
-                Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
-                // Get new score.
-                int motion_score = DetectMotion(*(snap->image), zoneSet);
+          if (snap->image) {
+            // decoder may not have been able to provide an image
+            if (!ref_image.Buffer()) {
+              Debug(1, "Assigning instead of Detecting");
+              ref_image.Assign(*(snap->image));
+            } else if (!(analysis_image_count % (motion_frame_skip+1))) {
+              Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
+              // Get new score.
+              int motion_score = DetectMotion(*(snap->image), zoneSet);
 
-                // lets construct alarm cause. It will contain cause + names of zones alarmed
-                std::string alarm_cause;
-                snap->zone_stats.reserve(zones.size());
-                for (const Zone &zone : zones) {
-                  const ZoneStats &stats = zone.GetStats();
-                  stats.DumpToLog("After detect motion");
-                  snap->zone_stats.push_back(stats);
-                  if (zone.Alarmed()) {
-                    if (!alarm_cause.empty()) alarm_cause += ",";
-                    alarm_cause += std::string(zone.Label());
-                  }
+              // lets construct alarm cause. It will contain cause + names of zones alarmed
+              snap->zone_stats.reserve(zones.size());
+              for (const Zone &zone : zones) {
+                const ZoneStats &stats = zone.GetStats();
+                stats.DumpToLog("After detect motion");
+                snap->zone_stats.push_back(stats);
+                if (zone.Alarmed()) {
+                  if (!snap->alarm_cause.empty()) snap->alarm_cause += ",";
+                  snap->alarm_cause += std::string(zone.Label());
                 }
-                Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
-                    score, last_motion_score, motion_score);
-                motion_frame_count += 1;
-                last_motion_score = motion_score;
-
-                if (motion_score) {
-                  if (cause.length()) cause += ", ";
-                  cause += MOTION_CAUSE+std::string(":")+alarm_cause;
-                  noteSetMap[MOTION_CAUSE] = zoneSet;
-                } // end if motion_score
               }
+              Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
+                  score, last_motion_score, motion_score);
+              motion_frame_count += 1;
+              last_motion_score = motion_score;
+
+              if (motion_score) {
+                if (cause.length()) cause += ", ";
+                cause += MOTION_CAUSE+std::string(":")+snap->alarm_cause;
+                noteSetMap[MOTION_CAUSE] = zoneSet;
+              } // end if motion_score
             } else {
-              Debug(1, "no image so skipping motion detection");
-            }  // end if has image
+              Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
+            }
           } else {
-            Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
-          }
+            Debug(1, "no image so skipping motion detection");
+          }  // end if has image
           score += last_motion_score;
         } else {
           Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
@@ -1912,7 +1896,6 @@ bool Monitor::Analyse() {
               );
         } // end if active and doing motion detection
 
-
         if (function == RECORD or function == MOCORD) {
           // If doing record, check to see if we need to close the event or not.
           if (event) {
diff --git a/src/zm_packet.h b/src/zm_packet.h
index 9cce4dd03..8a6a31de5 100644
--- a/src/zm_packet.h
+++ b/src/zm_packet.h
@@ -57,6 +57,7 @@ class ZMPacket {
     int64_t   pts;                // pts in the packet can be in another time base. This MUST be in AV_TIME_BASE_Q
     bool decoded;
     std::vector<ZoneStats> zone_stats;
+    std::string  alarm_cause;
 
   public:
     AVPacket *av_packet() { return &packet; }

From cce24ea427c81af80aad39880b26a31f10ca34c7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 5 Jan 2022 16:48:46 -0500
Subject: [PATCH 223/501] Add RTSPServer and Importance fields

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index d179534d4..25db048fc 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -133,6 +133,9 @@ $serial = $primary_key = 'Id';
   DefaultCodec
   Latitude
   Longitude
+  RTSPServer
+  RTSPStreamName
+  Importance
   );
 
 %defaults = (

From bfac696fb7177373abddf0ba531c04e80a038d44 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 5 Jan 2022 16:49:00 -0500
Subject: [PATCH 224/501] return logger from loginit so that we can use it

---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 43ae38e72..03bc84cd3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -638,6 +638,7 @@ sub logInit( ;@ ) {
   $logger = ZoneMinder::Logger->new() if !$logger;
   $logger->initialise(%options);
   logSetSignal();
+  return $logger;
 }
 
 sub logReinit {

From bc67493f91ca7597d5c465b6a8b5c400d7a5544b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 5 Jan 2022 16:49:20 -0500
Subject: [PATCH 225/501] Alter log level of restart events based on Importance
 setting

---
 scripts/zmwatch.pl.in | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 1b4790bce..dd5cfc252 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -67,7 +67,7 @@ $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-logInit();
+my $log = logInit();
 logSetSignal();
 my $zm_terminate = 0;
 sub TermHandler {
@@ -114,7 +114,7 @@ while (!$zm_terminate) {
       # We can't get the last capture time so can't be sure it's died, it might just be starting up.
       my $startup_time = zmGetStartupTime($monitor);
       if (($now - $startup_time) > $Config{ZM_WATCH_MAX_DELAY}) {
-        Warning(
+        $log->logPrint(ZoneMinder::Logger::WARNING+$monitor->Importance(),
           "Restarting capture daemon for $$monitor{Name}, no image since startup. ".
           "Startup time was $startup_time - now $now > $Config{ZM_WATCH_MAX_DELAY}"
         );
@@ -133,8 +133,9 @@ while (!$zm_terminate) {
     my $image_delay = $now - $capture_time;
     Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
     if ($image_delay > $max_image_delay) {
-      Warning('Restarting capture daemon for '.$monitor->{Name}.
-        ", time since last capture $image_delay seconds ($now-$capture_time)");
+        $log->logPrint(ZoneMinder::Logger::WARNING+$monitor->Importance(),
+          'Restarting capture daemon for '.$monitor->{Name}.
+          ", time since last capture $image_delay seconds ($now-$capture_time)");
       $monitor->control('restart');
       next;
     }
@@ -160,10 +161,11 @@ while (!$zm_terminate) {
         my $image_delay = $now-$image_time;
         Debug("Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay");
         if ($image_delay > $max_image_delay) {
-          Warning("Analysis daemon for $$monitor{Id} $$monitor{Name} needs restarting,"
-              ." time since last analysis $image_delay seconds ($now-$image_time)");
-            $monitor->control('restart');
-            next;
+          $log->logPrint(ZoneMinder::Logger::WARNING+$monitor->Importance(),
+            "daemon for $$monitor{Id} $$monitor{Name} needs restarting,"
+            ." time since last analysis $image_delay seconds ($now-$image_time)");
+          $monitor->control('restart');
+          next;
         }
       }
 

From 738c2529485db210c2f8ec4be1c2d400ff627dee Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 5 Jan 2022 20:15:39 -0500
Subject: [PATCH 226/501] load onvif settings and provide accessors

---
 src/zm_monitor.cpp | 10 +++++++++-
 src/zm_monitor.h   | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 36f735aa7..52202e947 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -83,6 +83,7 @@ std::string load_monitor_sql =
 "`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
 "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`,"
 "`RTSPServer`, `RTSPStreamName`,"
+"`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`,"
 "`SignalCheckPoints`, `SignalCheckColour`, `Importance`-1 FROM `Monitors`";
 
 std::string CameraType_Strings[] = {
@@ -445,6 +446,7 @@ Monitor::Monitor()
  "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, "
  "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif,"
  "`RTSPServer`,`RTSPStreamName`,
+ "`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`,"
  "SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors";
 */
 
@@ -615,6 +617,13 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   rtsp_server = (*dbrow[col] != '0'); col++;
   rtsp_streamname = dbrow[col]; col++;
 
+  onvif_url = std::string(dbrow[col] ? dbrow[col] : ""); col++;
+  onvif_username = std::string(dbrow[col] ? dbrow[col] : ""); col++;
+  onvif_password = std::string(dbrow[col] ? dbrow[col] : ""); col++;
+  onvif_options = std::string(dbrow[col] ? dbrow[col] : ""); col++;
+
+  importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
+
  /*"SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors"; */
   signal_check_points = atoi(dbrow[col]); col++;
   signal_check_colour = strtol(dbrow[col][0] == '#' ? dbrow[col]+1 : dbrow[col], 0, 16); col++;
@@ -626,7 +635,6 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   blue_val = BLUE_VAL_BGRA(signal_check_colour);
   grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
 
-  importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
   if (importance < 0) importance = 0; // Should only be >= 0
 
   // How many frames we need to have before we start analysing
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 447ea3580..804750585 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -268,6 +268,11 @@ protected:
   std::string path;
   std::string second_path;
 
+  std::string onvif_url;
+  std::string onvif_username;
+  std::string onvif_password;
+  std::string onvif_options;
+
   std::string     device;
   int             palette;
   int             channel;
@@ -534,6 +539,11 @@ public:
   std::string GetAudioFifoPath() const { return shared_data ? shared_data->audio_fifo_path : ""; };
   std::string GetRTSPStreamName() const { return rtsp_streamname; };
 
+  const std::string &getONVIF_URL() const { return onvif_url; };
+  const std::string &getONVIF_Username() const { return onvif_username; };
+  const std::string &getONVIF_Password() const { return onvif_password; };
+  const std::string &getONVIF_Options() const { return onvif_options; };
+
   int GetImage(int32_t index=-1, int scale=100);
   ZMPacket *getSnapshot( int index=-1 ) const;
   SystemTimePoint GetTimestamp(int index = -1) const;

From 1333d8c7513be6771777ee49403d7afe7ada7ef8 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 4 Jan 2022 11:58:19 -0600
Subject: [PATCH 227/501] Adds ONVIF Motion Detection Support

---
 CMakeLists.txt                               |   9 +
 cmake/Modules/FindGSOAP.cmake                | 113 +++++++++++++
 db/zm_create.sql.in                          |   1 +
 db/zm_update-1.37.7.sql                      |  19 +++
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm |   7 +
 src/CMakeLists.txt                           |  75 +++++++++
 src/zm_monitor.cpp                           | 167 ++++++++++++++++++-
 src/zm_monitor.h                             |  24 +++
 src/zm_poll_thread.cpp                       |  32 ++++
 src/zm_poll_thread.h                         |  29 ++++
 web/includes/Monitor.php                     |   1 +
 web/skins/classic/views/monitor.php          |   4 +
 12 files changed, 479 insertions(+), 2 deletions(-)
 create mode 100644 cmake/Modules/FindGSOAP.cmake
 create mode 100644 src/zm_poll_thread.cpp
 create mode 100644 src/zm_poll_thread.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b789e4c8..0479ce1fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -518,6 +518,15 @@ endif()
 #list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
 #endif()
 
+
+find_package(GSOAP 2.0.0)
+if (GSOAP_FOUND)
+  set(optlibsfound "${optlibsfound} gsoap")
+  add_compile_definitions(WITH_GSOAP)
+else()
+  set(optlibsnotfound "${optlibsnotfound} gsoap")
+endif()
+
 if(NOT ZM_NO_RTSPSERVER)
   set(HAVE_RTSP_SERVER 1)
 else()
diff --git a/cmake/Modules/FindGSOAP.cmake b/cmake/Modules/FindGSOAP.cmake
new file mode 100644
index 000000000..c7f181bec
--- /dev/null
+++ b/cmake/Modules/FindGSOAP.cmake
@@ -0,0 +1,113 @@
+#
+# This module detects if gsoap is installed and determines where the
+# include files and libraries are.
+#
+# This code sets the following variables:
+#
+# GSOAP_IMPORT_DIR      = full path to the gsoap import directory
+# GSOAP_LIBRARIES       = full path to the gsoap libraries
+# GSOAP_SSL_LIBRARIES   = full path to the gsoap ssl libraries
+# GSOAP_INCLUDE_DIR     = include dir to be used when using the gsoap library
+# GSOAP_PLUGIN_DIR      = gsoap plugins directory
+# GSOAP_WSDL2H          = wsdl2h binary
+# GSOAP_SOAPCPP2        = soapcpp2 binary
+# GSOAP_FOUND           = set to true if gsoap was found successfully
+#
+# GSOAP_ROOT
+#   setting this enables search for gsoap libraries / headers in this location
+
+# -----------------------------------------------------
+# GSOAP Import Directories
+# -----------------------------------------------------
+find_path(GSOAP_IMPORT_DIR
+  NAMES wsa.h
+  PATHS ${GSOAP_ROOT}/import ${GSOAP_ROOT}/share/gsoap/import
+)
+
+# -----------------------------------------------------
+# GSOAP Libraries
+# -----------------------------------------------------
+find_library(GSOAP_CXX_LIBRARIES
+	NAMES gsoap++
+	HINTS ${GSOAP_ROOT}/lib ${GSOAP_ROOT}/lib64
+		  ${GSOAP_ROOT}/lib32
+	DOC "The main gsoap library"
+)
+find_library(GSOAP_SSL_CXX_LIBRARIES
+	NAMES gsoapssl++
+	HINTS ${GSOAP_ROOT}/lib ${GSOAP_ROOT}/lib64
+		  ${GSOAP_ROOT}/lib32
+	DOC "The ssl gsoap library"
+)
+
+
+# -----------------------------------------------------
+# GSOAP Include Directories
+# -----------------------------------------------------
+find_path(GSOAP_INCLUDE_DIR
+	NAMES stdsoap2.h
+	HINTS ${GSOAP_ROOT} ${GSOAP_ROOT}/include ${GSOAP_ROOT}/include/*
+	DOC "The gsoap include directory"
+)
+
+# -----------------------------------------------------
+# GSOAP plugin Directories
+# -----------------------------------------------------
+find_path(GSOAP_PLUGIN_DIR
+	NAMES wsseapi.c
+	HINTS ${GSOAP_ROOT} /usr/share/gsoap/plugin
+	DOC "The gsoap plugin directory"
+)
+
+# -----------------------------------------------------
+# GSOAP Binaries
+# ----------------------------------------------------
+if(NOT GSOAP_TOOL_DIR)
+	set(GSOAP_TOOL_DIR GSOAP_ROOT)
+endif()
+
+find_program(GSOAP_WSDL2H
+	NAMES wsdl2h
+	HINTS ${GSOAP_TOOL_DIR}/bin
+	DOC "The gsoap bin directory"
+)
+find_program(GSOAP_SOAPCPP2
+	NAMES soapcpp2
+	HINTS ${GSOAP_TOOL_DIR}/bin
+	DOC "The gsoap bin directory"
+)
+# -----------------------------------------------------
+# GSOAP version
+# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# ----------------------------------------------------
+if(GSOAP_SOAPCPP2)
+  execute_process(COMMAND ${GSOAP_SOAPCPP2}  "-V"   OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION )
+  string(REGEX MATCH "[0-9]*\\.[0-9]*\\.[0-9]*" GSOAP_VERSION ${GSOAP_STRING_VERSION})
+endif()
+# -----------------------------------------------------
+# GSOAP_276_COMPAT_FLAGS and GSOAPVERSION
+# try to determine the flagfor the 2.7.6 compatiblity, break with 2.7.13 and re-break with 2.7.16
+# ----------------------------------------------------
+if( "${GSOAP_VERSION}"  VERSION_LESS "2.7.6")
+	set(GSOAP_276_COMPAT_FLAGS "")
+elseif ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.14")
+	set(GSOAP_276_COMPAT_FLAGS "-z")
+else ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.14")
+	set(GSOAP_276_COMPAT_FLAGS "-z1 -z2")
+endif ( "${GSOAP_VERSION}"  VERSION_LESS "2.7.6")
+
+# -----------------------------------------------------
+# handle the QUIETLY and REQUIRED arguments and set GSOAP_FOUND to TRUE if
+# all listed variables are TRUE
+# -----------------------------------------------------
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GSOAP DEFAULT_MSG GSOAP_CXX_LIBRARIES
+	GSOAP_INCLUDE_DIR GSOAP_WSDL2H GSOAP_SOAPCPP2)
+mark_as_advanced(GSOAP_INCLUDE_DIR GSOAP_LIBRARIES GSOAP_WSDL2H GSOAP_SOAPCPP2)
+
+if(GSOAP_FOUND)
+  if(GSOAP_FIND_REQUIRED AND GSOAP_FIND_VERSION AND ${GSOAP_VERSION} VERSION_LESS ${GSOAP_FIND_VERSION})
+	message(SEND_ERROR "Found GSOAP version ${GSOAP_VERSION} less then required ${GSOAP_FIND_VERSION}.")
+  endif()
+endif()
+
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 72b0be56f..110365125 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -463,6 +463,7 @@ CREATE TABLE `Monitors` (
   `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
   `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
   `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
+  `ONVIF_Event_Listener`  BOOLEAN NOT NULL DEFAULT FALSE,
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
diff --git a/db/zm_update-1.37.7.sql b/db/zm_update-1.37.7.sql
index 7d45f67c6..39000e912 100644
--- a/db/zm_update-1.37.7.sql
+++ b/db/zm_update-1.37.7.sql
@@ -1,2 +1,21 @@
 /* Change Cause from varchar(32) to TEXT.  We now include alarmed zone name */
 ALTER TABLE `Events` MODIFY `Cause` TEXT;
+
+--
+-- Update Monitors table to have a ONVIF_Event_Listener Column
+--
+
+SELECT 'Checking for ONVIF_Event_Listener in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Event_Listener'
+  ) > 0,
+"SELECT 'Column ONVIF_Event_Listener already exists in Monitorss'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Event_Listener` BOOLEAN NOT NULL default false AFTER `ONVIF_Options`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 25db048fc..54ce25c87 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -56,6 +56,13 @@ $serial = $primary_key = 'Id';
   Enabled
   LinkedMonitors
   Triggers
+  EventStartCommand
+  EventEndCommand
+  ONVIF_URL
+  ONVIF_Username
+  ONVIF_Password
+  ONVIF_Options
+  ONVIF_Event_Listener
   Device
   Channel
   Format
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8852391a4..6878a6589 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ configure_file(zm_config_data.h.in "${CMAKE_BINARY_DIR}/zm_config_data.h" @ONLY)
 # Group together all the source files that are used by all the binaries (zmc, zmu, zms etc)
 set(ZM_BIN_SRC_FILES
   zm_analysis_thread.cpp
+  zm_poll_thread.cpp
   zm_buffer.cpp
   zm_camera.cpp
   zm_comms.cpp
@@ -67,6 +68,57 @@ set(ZM_BIN_SRC_FILES
   zm_zone.cpp
   zm_storage.cpp)
 
+if(GSOAP_FOUND)
+  set(ZM_BIN_SRC_FILES
+  ${ZM_BIN_SRC_FILES}
+  ${CMAKE_BINARY_DIR}/generated/soapPullPointSubscriptionBindingProxy.cpp
+  ${CMAKE_BINARY_DIR}/generated/soapC.cpp
+  ${GSOAP_PLUGIN_DIR}/smdevp.c
+  ${GSOAP_PLUGIN_DIR}/mecevp.c
+  ${GSOAP_PLUGIN_DIR}/wsaapi.c
+  ${GSOAP_PLUGIN_DIR}/wsseapi.c
+  ${GSOAP_PLUGIN_DIR}/../custom/struct_timeval.c
+  )
+
+  SET(GCC_COMPILE_FLAGS "-DWITH_OPENSSL -DWITH_DOM")
+  SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
+
+  #Create the directory that will host files generated by GSOAP
+  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/generated)
+
+  #some files are generated by gsoap
+  set_source_files_properties( ${CMAKE_BINARY_DIR}/generated/soapClientLib.c       PROPERTIES GENERATED TRUE )
+  set_source_files_properties( ${CMAKE_BINARY_DIR}/generated/soapC.c       PROPERTIES GENERATED TRUE )
+  set_source_files_properties( ${CMAKE_BINARY_DIR}/generated/soapPullPointSubscriptionBindingProxy.cpp     PROPERTIES GENERATED TRUE )
+  set_source_files_properties( ${GSOAP_PLUGIN_DIR}/smdevp.c PROPERTIES LANGUAGE CXX)
+  set_source_files_properties( ${GSOAP_PLUGIN_DIR}/mecevp.c PROPERTIES LANGUAGE CXX)
+  set_source_files_properties( ${GSOAP_PLUGIN_DIR}/wsaapi.c PROPERTIES LANGUAGE CXX)
+  set_source_files_properties( ${GSOAP_PLUGIN_DIR}/wsseapi.c PROPERTIES LANGUAGE CXX)
+  set_source_files_properties( ${GSOAP_PLUGIN_DIR}/../custom/struct_timeval.c PROPERTIES LANGUAGE CXX)
+
+  #Create a cmake target that generate gsoap files
+  add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/generated/soapC.cpp
+    OUTPUT ${CMAKE_BINARY_DIR}/generated/soapPullPointSubscriptionBindingProxy.cpp
+    COMMAND ${GSOAP_WSDL2H} -d -P -O2 -o ${CMAKE_BINARY_DIR}/generated/bindings.h http://www.onvif.org/onvif/ver10/events/wsdl/event.wsdl
+    COMMAND echo '\#import \"wsse.h\"' >> ${CMAKE_BINARY_DIR}/generated/bindings.h
+    COMMAND echo '\#import \"struct_timeval.h\"' >> ${CMAKE_BINARY_DIR}/generated/bindings.h
+    COMMAND ${GSOAP_SOAPCPP2} -n -2 -C -I ${GSOAP_PLUGIN_DIR}/.. -I ${GSOAP_PLUGIN_DIR}/../import/ -I ${GSOAP_PLUGIN_DIR}/../custom/ -d ${CMAKE_BINARY_DIR}/generated -j -x ${CMAKE_BINARY_DIR}/generated/bindings.h
+    COMMENT "CREATING STUBS AND GLUE CODE"
+  )
+
+  add_custom_target(GSOAP_GENERATION_TARGET
+        DEPENDS ${CMAKE_BINARY_DIR}/generated/soapC.cpp
+        DEPENDS ${CMAKE_BINARY_DIR}/generated/soapPullPointSubscriptionBindingProxy.cpp
+        DEPENDS ${GSOAP_PLUGIN_DIR}/smdevp.c
+        DEPENDS ${GSOAP_PLUGIN_DIR}/mecevp.c
+        DEPENDS ${GSOAP_PLUGIN_DIR}/wsaapi.c
+        DEPENDS ${GSOAP_PLUGIN_DIR}/wsseapi.c
+        DEPENDS ${GSOAP_PLUGIN_DIR}/../custom/struct_timeval.c
+  )
+
+endif()
+
 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})
 
@@ -75,6 +127,15 @@ target_include_directories(zm
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR})
 
+if(GSOAP_FOUND)
+target_include_directories(zm
+  PUBLIC
+    ${CMAKE_BINARY_DIR}/generated
+    ${GSOAP_PLUGIN_DIR}/..
+    ${GSOAP_INCLUDE_DIR})
+
+endif()
+
 target_link_libraries(zm
   PUBLIC
     FFMPEG::avcodec
@@ -89,6 +150,15 @@ target_link_libraries(zm
   PRIVATE
     zm-core-interface)
 
+if(GSOAP_FOUND)
+  target_link_libraries(zm
+    PUBLIC
+      ${GSOAP_CXX_LIBRARIES}
+      ${GSOAP_SSL_CXX_LIBRARIES}
+      ${OPENSSL_SSL_LIBRARY}
+      ${OPENSSL_CRYPTO_LIBRARY})
+endif()
+
 if(${ZM_JWT_BACKEND} STREQUAL "jwt_cpp")
   target_link_libraries(zm
     PUBLIC
@@ -110,6 +180,11 @@ add_executable(zms zms.cpp)
 add_executable(zmu zmu.cpp)
 add_executable(zmbenchmark zmbenchmark.cpp)
 
+if(GSOAP_FOUND)
+  #Make sure that the client is compiled only after gsoap has been processed
+  add_dependencies(zmc GSOAP_GENERATION_TARGET)
+endif()
+
 target_link_libraries(zmc
   PRIVATE
     zm-core-interface
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 52202e947..cfc88891f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -66,6 +66,14 @@
 #define MAP_LOCKED 0
 #endif
 
+#ifdef WITH_GSOAP
+//Workaround for the gsoap library on RHEL
+struct Namespace namespaces[] =
+{
+   {NULL, NULL} // end of table
+};
+#endif
+
 // This is the official SQL (and ordering of the fields) to load a Monitor.
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
@@ -83,7 +91,7 @@ std::string load_monitor_sql =
 "`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
 "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`,"
 "`RTSPServer`, `RTSPStreamName`,"
-"`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`,"
+"`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, "
 "`SignalCheckPoints`, `SignalCheckColour`, `Importance`-1 FROM `Monitors`";
 
 std::string CameraType_Strings[] = {
@@ -446,7 +454,7 @@ Monitor::Monitor()
  "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, "
  "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif,"
  "`RTSPServer`,`RTSPStreamName`,
- "`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`,"
+ "`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, "
  "SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors";
 */
 
@@ -621,6 +629,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   onvif_username = std::string(dbrow[col] ? dbrow[col] : ""); col++;
   onvif_password = std::string(dbrow[col] ? dbrow[col] : ""); col++;
   onvif_options = std::string(dbrow[col] ? dbrow[col] : ""); col++;
+  onvif_event_listener = (*dbrow[col] != '0'); col++;
 
   importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
 
@@ -1059,6 +1068,42 @@ bool Monitor::connect() {
     return false;
   }
 
+  //ONVIF Setup
+#ifdef WITH_GSOAP
+  ONVIF_Trigger_State = FALSE;
+  if (onvif_event_listener) { //Temporarily using this option to enable the feature
+    Debug(1, "Starting ONVIF");
+    ONVIF_Healthy = FALSE;
+    tev__PullMessages.Timeout = "PT600S";
+    tev__PullMessages.MessageLimit = 100;
+    soap = soap_new();
+    soap->connect_timeout = 5;
+    soap->recv_timeout = 5;
+    soap->send_timeout = 5;
+    soap_register_plugin(soap, soap_wsse);
+    proxyEvent = PullPointSubscriptionBindingProxy(soap);
+    std::string full_url = onvif_url + "/Events";
+    proxyEvent.soap_endpoint = full_url.c_str();
+    set_credentials(soap);
+    Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
+    if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
+      Warning("Couldn't create subscription!");
+    } else {
+      //Empty the stored messages
+      set_credentials(soap);
+      if (proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) {
+        Warning("Couldn't do initial event pull! %s", response.SubscriptionReference.Address);
+      } else {
+        Debug(1, "Good Initial ONVIF Pull");
+        ONVIF_Healthy = TRUE;
+      }
+    }
+  } else {
+    Debug(1, "Not Starting ONVIF");
+  }
+  //End ONVIF Setup
+#endif
+
   // We set these here because otherwise the first fps calc is meaningless
   last_fps_time = std::chrono::system_clock::now();
   last_analysis_fps_time = std::chrono::system_clock::now();
@@ -1713,6 +1758,50 @@ void Monitor::UpdateFPS() {
   } // end if report fps
 }  // void Monitor::UpdateFPS()
 
+//Thread where ONVIF polling, and other similar status polling can happen.
+//Since these can be blocking, run here to avoid intefering with other processing
+bool Monitor::Poll() {
+
+#ifdef WITH_GSOAP
+  if (ONVIF_Healthy) {
+    set_credentials(soap);
+    int result = proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse);
+    if (result != SOAP_OK) {
+      if (result != -1) //Ignore the timeout error
+        Warning("Failed to get ONVIF messages! %i", result);
+    } else {
+      Debug(1, "Got Good Response! %i", result);
+      for (auto msg : tev__PullMessagesResponse.wsnt__NotificationMessage) {
+        if (msg->Topic->__any.text != NULL &&
+        std::strstr(msg->Topic->__any.text, "MotionAlarm") &&
+        msg->Message.__any.elts != NULL &&
+        msg->Message.__any.elts->next != NULL &&
+        msg->Message.__any.elts->next->elts != NULL &&
+        msg->Message.__any.elts->next->elts->atts != NULL &&
+        msg->Message.__any.elts->next->elts->atts->next != NULL &&
+        msg->Message.__any.elts->next->elts->atts->next->text != NULL) {
+        Debug(1,"Got Motion Alarm!");
+          if (strcmp(msg->Message.__any.elts->next->elts->atts->next->text, "true") == 0) {
+          //Event Start
+            Debug(1,"Triggered on ONVIF");
+            if (!ONVIF_Trigger_State) {
+              Debug(1,"Triggered Event");
+              ONVIF_Trigger_State = TRUE;
+            }
+          } else {
+            Debug(1, "Triggered off ONVIF");
+            ONVIF_Trigger_State = FALSE;
+          }
+        }
+      }
+    }
+  }
+#endif
+  return TRUE;
+} //end Poll
+
+
+
 // Would be nice if this JUST did analysis
 // This idea is that we should be analysing as close to the capture frame as possible.
 // This function should process as much as possible before returning
@@ -1760,6 +1849,19 @@ bool Monitor::Analyse() {
     std::string cause;
     Event::StringSetMap noteSetMap;
 
+#ifdef WITH_GSOAP
+    if (ONVIF_Trigger_State) {
+      score += 9;
+      Debug(1, "Triggered on ONVIF");
+      if (!event) {
+        cause += "ONVIF";
+      }
+      Event::StringSet noteSet;
+      noteSet.insert("ONVIF2");
+      noteSetMap[MOTION_CAUSE] = noteSet;
+    }  // end ONVIF_Trigger
+#endif
+
     // Specifically told to be on.  Setting the score here will trigger the alarm.
     if (trigger_data->trigger_state == TriggerState::TRIGGER_ON) {
       score += trigger_data->trigger_score;
@@ -2999,6 +3101,16 @@ int Monitor::PrimeCapture() {
     }
   }  // end if rtsp_server
 
+#ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
+  //ONVIF Thread
+  if (onvif_event_listener) {
+    if (!Poller) {
+      Poller = zm::make_unique<PollThread>(this);
+    } else {
+      Poller->Start();
+    }
+  }
+#endif
   if (decoding_enabled) {
     if (!decoder_it) decoder_it = packetqueue.get_video_it(false);
     if (!decoder) {
@@ -3033,6 +3145,24 @@ int Monitor::Close() {
   if (decoder) {
     decoder->Stop();
   }
+
+#ifdef WITH_GSOAP
+  //ONVIF Teardown
+  if (Poller) {
+    Poller->Stop();
+  }
+  if (onvif_event_listener && soap != nullptr) {
+    Debug(1, "Tearing Down Onvif");
+    _wsnt__Unsubscribe wsnt__Unsubscribe;
+    _wsnt__UnsubscribeResponse wsnt__UnsubscribeResponse;
+    proxyEvent.Unsubscribe(response.SubscriptionReference.Address, NULL, &wsnt__Unsubscribe, wsnt__UnsubscribeResponse);
+    soap_destroy(soap);
+    soap_end(soap);
+    soap_free(soap);
+    soap = nullptr;
+  }//End ONVIF
+#endif
+
   if (analysis_thread) {
     analysis_thread->Stop();
   }
@@ -3138,3 +3268,36 @@ StringVector Monitor::GroupNames() {
   }
   return groupnames;
 } // end Monitor::GroupNames()
+
+#ifdef WITH_GSOAP
+//ONVIF Set Credentials
+void Monitor::set_credentials(struct soap *soap)
+{
+  soap_wsse_delete_Security(soap);
+  soap_wsse_add_Timestamp(soap, NULL, 10);
+  soap_wsse_add_UsernameTokenDigest(soap, "Auth", onvif_username.c_str(), onvif_password.c_str());
+}
+
+//GSOAP boilerplate
+int SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char *faultactor, struct SOAP_ENV__Detail *detail, struct SOAP_ENV__Code *SOAP_ENV__Code, struct SOAP_ENV__Reason *SOAP_ENV__Reason, char *SOAP_ENV__Node, char *SOAP_ENV__Role, struct SOAP_ENV__Detail *SOAP_ENV__Detail)
+{
+  // populate the fault struct from the operation arguments to print it
+  soap_fault(soap);
+  // SOAP 1.1
+  soap->fault->faultcode = faultcode;
+  soap->fault->faultstring = faultstring;
+  soap->fault->faultactor = faultactor;
+  soap->fault->detail = detail;
+  // SOAP 1.2
+  soap->fault->SOAP_ENV__Code = SOAP_ENV__Code;
+  soap->fault->SOAP_ENV__Reason = SOAP_ENV__Reason;
+  soap->fault->SOAP_ENV__Node = SOAP_ENV__Node;
+  soap->fault->SOAP_ENV__Role = SOAP_ENV__Role;
+  soap->fault->SOAP_ENV__Detail = SOAP_ENV__Detail;
+  // set error
+  soap->error = SOAP_FAULT;
+  // handle or display the fault here with soap_stream_fault(soap, std::cerr);
+  // return HTTP 202 Accepted
+  return soap_send_empty_response(soap, SOAP_OK);
+}
+#endif
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 804750585..b1df66b90 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -23,6 +23,7 @@
 #include "zm_define.h"
 #include "zm_camera.h"
 #include "zm_analysis_thread.h"
+#include "zm_poll_thread.h"
 #include "zm_decoder_thread.h"
 #include "zm_event.h"
 #include "zm_fifo.h"
@@ -34,6 +35,12 @@
 #include <sys/time.h>
 #include <vector>
 
+#ifdef WITH_GSOAP
+#include "soapPullPointSubscriptionBindingProxy.h"
+#include "plugin/wsseapi.h"
+#include <openssl/err.h>
+#endif
+
 class Group;
 
 #define SIGNAL_CAUSE "Signal"
@@ -248,6 +255,20 @@ protected:
   };
 
   protected:
+
+  //ONVIF
+#ifdef WITH_GSOAP
+  struct soap *soap;
+  bool ONVIF_Trigger_State;
+  bool ONVIF_Healthy;
+  _tev__CreatePullPointSubscription request;
+  _tev__CreatePullPointSubscriptionResponse response;
+  _tev__PullMessages tev__PullMessages;
+  _tev__PullMessagesResponse tev__PullMessagesResponse;
+  PullPointSubscriptionBindingProxy proxyEvent;
+  void set_credentials(struct soap *soap);
+#endif
+
   // These are read from the DB and thereafter remain unchanged
   unsigned int    id;
   std::string     name;
@@ -272,6 +293,7 @@ protected:
   std::string onvif_username;
   std::string onvif_password;
   std::string onvif_options;
+  bool        onvif_event_listener;
 
   std::string     device;
   int             palette;
@@ -394,6 +416,7 @@ protected:
 
   VideoStore          *videoStore;
   PacketQueue      packetqueue;
+  std::unique_ptr<PollThread> Poller;
   packetqueue_iterator  *analysis_it;
   std::unique_ptr<AnalysisThread> analysis_thread;
   packetqueue_iterator  *decoder_it;
@@ -600,6 +623,7 @@ public:
   bool CheckSignal( const Image *image );
   bool Analyse();
   bool Decode();
+  bool Poll();
   void DumpImage( Image *dump_image ) const;
   void TimestampImage(Image *ts_image, SystemTimePoint ts_time) const;
   Event *openEvent(
diff --git a/src/zm_poll_thread.cpp b/src/zm_poll_thread.cpp
new file mode 100644
index 000000000..ee46dbfe5
--- /dev/null
+++ b/src/zm_poll_thread.cpp
@@ -0,0 +1,32 @@
+#include "zm_poll_thread.h"
+
+#include "zm_monitor.h"
+#include "zm_signal.h"
+#include "zm_time.h"
+
+PollThread::PollThread(Monitor *monitor) :
+    monitor_(monitor), terminate_(false) {
+  thread_ = std::thread(&PollThread::Run, this);
+}
+
+PollThread::~PollThread() {
+  Stop();
+}
+
+void PollThread::Start() {
+  if (thread_.joinable()) thread_.join();
+  terminate_ = false;
+  Debug(3, "Starting polling thread");
+  thread_ = std::thread(&PollThread::Run, this);
+}
+void PollThread::Stop() {
+  terminate_ = true;
+  if (thread_.joinable()) {
+    thread_.join();
+  }
+}
+void PollThread::Run() {
+  while (!(terminate_ or zm_terminate)) {
+    monitor_->Poll();
+  }
+}
diff --git a/src/zm_poll_thread.h b/src/zm_poll_thread.h
new file mode 100644
index 000000000..16444a951
--- /dev/null
+++ b/src/zm_poll_thread.h
@@ -0,0 +1,29 @@
+#ifndef ZM_POLL_THREAD_H
+#define ZM_POLL_THREAD_H
+
+#include <atomic>
+#include <memory>
+#include <thread>
+
+class Monitor;
+
+class PollThread {
+ public:
+  explicit PollThread(Monitor *monitor);
+  ~PollThread();
+  PollThread(PollThread &rhs) = delete;
+  PollThread(PollThread &&rhs) = delete;
+
+  void Start();
+  void Stop();
+  bool Stopped() const { return terminate_; }
+
+ private:
+  void Run();
+
+  Monitor *monitor_;
+  std::atomic<bool> terminate_;
+  std::thread thread_;
+};
+
+#endif
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index b5e2ef853..b57fc2748 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -63,6 +63,7 @@ class Monitor extends ZM_Object {
     'ONVIF_Username'  =>  '',
     'ONVIF_Password'  =>  '',
     'ONVIF_Options'   =>  '',
+    'ONVIF_Event_Listener'  =>  '0',
     'Device'  =>  '',
     'Channel' =>  0,
     'Format'  =>  '0',
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index bfb0638c9..4c9ce3810 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -706,6 +706,10 @@ if (count($available_monitor_ids)) {
               <td class="text-right pr-3"><?php echo translate('ONVIF_Options') ?></td>
               <td><input type="text" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/></td>
             </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ONVIF_Event_Listener') ?></td>
+              <td><?php echo html_radio('newMonitor[ONVIF_Event_Listener]', array('1'=>translate('Enabled'), '0'=>'Disabled'), $monitor->ONVIF_Event_Listener()); ?></td>
+            </tr>
 <?php
         break;
     }

From 6d3c6330df0e2b5c5c227b4c1d6320cd0e98ad81 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 10:34:39 -0500
Subject: [PATCH 228/501] Fix freebsd build by fixing incorrect use of
 SystemTimePoint when we want TimePoint

---
 src/zm_monitorstream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 35cd1beb2..457458306 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -746,7 +746,7 @@ void MonitorStream::runStream() {
             frame_count++;
             frame_count++;
           } else {
-            SystemTimePoint::duration actual_delta_time = now - last_frame_sent;
+            TimePoint::duration actual_delta_time = now - last_frame_sent;
             if (actual_delta_time > Seconds(5)) {
               if (paused_image) {
                 // Send keepalive

From 16964cf3278fcd811433d34948101931cafc71de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Sep 2020 13:27:33 -0400
Subject: [PATCH 229/501] fix zms running past end of event

---
 src/zm_eventstream.cpp | 87 +++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 7ef3619c2..927c3b3aa 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -702,9 +702,7 @@ bool EventStream::sendFrame(Microseconds delta_us) {
 
   // This needs to be abstracted.  If we are saving jpgs, then load the capture file.
   // If we are only saving analysis frames, then send that.
-  if (event_data->SaveJPEGs & 1) {
-    filepath = stringtf(staticConfig.capture_file_format.c_str(), event_data->path.c_str(), curr_frame_id);
-  } else if (event_data->SaveJPEGs & 2) {
+  if ((frame_type == FRAME_ANALYSIS) && (event_data->SaveJPEGs & 2)) {
     filepath = stringtf(staticConfig.analyse_file_format.c_str(), event_data->path.c_str(), curr_frame_id);
     if (stat(filepath.c_str(), &filestat) < 0) {
       Debug(1, "analyze file %s not found will try to stream from other", filepath.c_str());
@@ -714,7 +712,9 @@ bool EventStream::sendFrame(Microseconds delta_us) {
         filepath = "";
       }
     }
-  } else if ( !ffmpeg_input ) {
+  } else if (event_data->SaveJPEGs & 1) {
+    filepath = stringtf(staticConfig.capture_file_format.c_str(), event_data->path.c_str(), curr_frame_id);
+  } else if (!ffmpeg_input) {
     Fatal("JPEGS not saved. zms is not capable of streaming jpegs from mp4 yet");
     return false;
   }
@@ -991,45 +991,51 @@ void EventStream::runStream() {
         // Have to reset start to now when replaying
         start = now;
       }
-      frame_data = &event_data->frames[curr_frame_id-1];
 
-      // frame_data->delta is the time since last frame as a float in seconds
-      // but what if we are skipping frames? We need the distance from the last frame sent
-      // Also, what about reverse? needs to be absolute value
+      if ((unsigned int)curr_frame_id <= event_data->frame_count) {
+        frame_data = &event_data->frames[curr_frame_id-1];
 
-      // There are two ways to go about this, not sure which is correct.
-      // you can calculate the relationship between now and the start
-      // or calc the relationship from the last frame.  I think from the start is better as it self-corrects
-      //
-      if (last_frame_offset != Seconds(0)) {
-        // We assume that we are going forward and the next frame is in the future.
-        delta = std::chrono::duration_cast<Microseconds>(frame_data->offset - (now - start));
+        // frame_data->delta is the time since last frame as a float in seconds
+        // but what if we are skipping frames? We need the distance from the last frame sent
+        // Also, what about reverse? needs to be absolute value
 
-        Debug(2, "New delta: now - start = %" PRIu64 " us offset %" PRIi64 " us- elapsed = %" PRIu64 " us",
-              static_cast<int64>(std::chrono::duration_cast<Microseconds>(now - start).count()),
-              static_cast<int64>(std::chrono::duration_cast<Microseconds>(frame_data->offset).count()),
-              static_cast<int64>(std::chrono::duration_cast<Microseconds>(delta).count()));
-      } else {
-        Debug(2, "No last frame_offset, no sleep");
-        delta = Seconds(0);
-      }
-      last_frame_offset = frame_data->offset;
+        // There are two ways to go about this, not sure which is correct.
+        // you can calculate the relationship between now and the start
+        // or calc the relationship from the last frame.  I think from the start is better as it self-corrects
+        //
+        if (last_frame_offset != Seconds(0)) {
+          // We assume that we are going forward and the next frame is in the future.
+          delta = std::chrono::duration_cast<Microseconds>(frame_data->offset - (now - start));
 
-      if (send_frame && type != STREAM_MPEG) {
-        if (delta != Seconds(0)) {
-          if (delta > MAX_SLEEP) {
-            Debug(1, "Limiting sleep to %" PRIi64 " ms because calculated sleep is too long: %" PRIi64" us",
+          Debug(2, "New delta: now - start = %" PRIu64 " us offset %" PRIi64 " us- elapsed = %" PRIu64 " us",
+                static_cast<int64>(std::chrono::duration_cast<Microseconds>(now - start).count()),
+                static_cast<int64>(std::chrono::duration_cast<Microseconds>(frame_data->offset).count()),
+                static_cast<int64>(std::chrono::duration_cast<Microseconds>(delta).count()));
+        } else {
+          Debug(2, "No last frame_offset, no sleep");
+          delta = Seconds(0);
+        }
+        last_frame_offset = frame_data->offset;
+
+        if (send_frame && type != STREAM_MPEG) {
+          if (delta != Seconds(0)) {
+            if (delta > MAX_SLEEP) {
+              Debug(1, "Limiting sleep to %" PRIi64 " ms because calculated sleep is too long: %" PRIi64" us",
                   static_cast<int64>(std::chrono::duration_cast<Milliseconds>(MAX_SLEEP).count()),
                   static_cast<int64>(std::chrono::duration_cast<Microseconds>(delta).count()));
-            delta = MAX_SLEEP;
-          }
+              delta = MAX_SLEEP;
+            }
 
-          std::this_thread::sleep_for(delta);
-          Debug(3, "Done sleeping: %" PRIi64 " us",
+            std::this_thread::sleep_for(delta);
+            Debug(3, "Done sleeping: %" PRIi64 " us",
                 static_cast<int64>(std::chrono::duration_cast<Microseconds>(delta).count()));
-        }
-      }
+          }
+        } // end if need to sleep
+      } else {
+        Debug(1, "invalid curr_frame_id %ld !< %lu", curr_frame_id, event_data->frame_count);
+      }  // end if not at end of event
     } else {
+      // Paused
       delta = std::chrono::duration_cast<Microseconds>(FPSeconds(
           ZM_RATE_BASE / ((base_fps ? base_fps : 1) * (replay_rate ? abs(replay_rate * 2) : 2))));
 
@@ -1088,11 +1094,6 @@ void EventStream::runStream() {
 } // end void EventStream::runStream()
 
 bool EventStream::send_file(const std::string &filepath) {
-  static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
-
-  int img_buffer_size = 0;
-  uint8_t *img_buffer = temp_img_buffer;
-
   FILE *fdj = nullptr;
   fdj = fopen(filepath.c_str(), "rb");
   if ( !fdj ) {
@@ -1122,10 +1123,16 @@ bool EventStream::send_file(const std::string &filepath) {
     // Success
     fclose(fdj); /* Close the file handle */
     return true;
+  } else {
+    Debug(1, "Failed to sendfile?");
   }
   Warning("Unable to send raw frame %ld: %s rc %d", curr_frame_id, strerror(errno), rc);
 #endif
-  img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
+
+  static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+
+  uint8_t *img_buffer = temp_img_buffer;
+  int img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
   fclose(fdj); /* Close the file handle */
   if ( !img_buffer_size ) {
     Info("Unable to read raw frame %ld: %s", curr_frame_id, strerror(errno));

From 8863fc0e0fb937e16ac31af4adef11eba8b6b10e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Sep 2020 13:27:59 -0400
Subject: [PATCH 230/501] Add FrameType to StreamBase so we can sends analysis
 frames

---
 src/zm_stream.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/zm_stream.h b/src/zm_stream.h
index 09bd5bd80..827908e6d 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -40,6 +40,7 @@ public:
     STREAM_SINGLE,
     STREAM_MPEG
   } StreamType;
+  typedef enum { FRAME_NORMAL, FRAME_ANALYSIS } FrameType;
 
 protected:
   static constexpr Seconds MAX_STREAM_DELAY = Seconds(5);
@@ -97,6 +98,7 @@ protected:
   std::shared_ptr<Monitor> monitor;
 
   StreamType type;
+  FrameType   frame_type;
   const char *format;
   int replay_rate;
   int scale;
@@ -153,6 +155,7 @@ public:
     monitor_id(0),
     monitor(nullptr),
     type(DEFAULT_TYPE),
+    frame_type(FRAME_NORMAL),
     format(""),
     replay_rate(DEFAULT_RATE),
     scale(DEFAULT_SCALE),
@@ -198,7 +201,9 @@ public:
       type = STREAM_RAW;
     }
 #endif
-
+  }
+  void setStreamFrameType(FrameType p_type) {
+    frame_type = p_type;
   }
   void setStreamFormat(const char *p_format) {
     format = p_format;

From 7ae9bebea46d5db2cb10cdfe1b0a7529cae4c21e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Sep 2020 13:28:23 -0400
Subject: [PATCH 231/501] Add analysis boolean query param

---
 src/zms.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/zms.cpp b/src/zms.cpp
index dda3791ac..e22fd1ae1 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -63,6 +63,7 @@ int main(int argc, const char *argv[], char **envp) {
   double maxfps = 10.0;
   unsigned int bitrate = 100000;
   unsigned int ttl = 0;
+  bool  analysis_frames = false;
   EventStream::StreamMode replay = EventStream::MODE_NONE;
   std::string username;
   std::string password;
@@ -115,7 +116,14 @@ int main(int argc, const char *argv[], char **envp) {
     char const *value = strtok(nullptr, "=");
     if ( !value )
       value = "";
-    if ( !strcmp(name, "source") ) {
+    if ( !strcmp(name, "analysis") ) {
+      if ( !strcmp(value, "true") ) {
+        analysis_frames = true;
+      } else {
+        analysis_frames = (atoi(value) == 1);
+      }
+      Debug(1, "Viewing analysis frames");
+    } else if ( !strcmp(name, "source") ) {
       if ( !strcmp(value, "event") ) {
         source = ZMS_EVENT;
       } else if ( !strcmp(value, "fifo") ) {
@@ -271,6 +279,7 @@ int main(int argc, const char *argv[], char **envp) {
       zmDbClose();
       return -1;
     }
+    stream.setStreamFrameType(analysis_frames ? StreamBase::FRAME_ANALYSIS: StreamBase::FRAME_NORMAL);
 
     if ( mode == ZMS_JPEG ) {
       stream.setStreamType(MonitorStream::STREAM_JPEG);
@@ -307,6 +316,7 @@ int main(int argc, const char *argv[], char **envp) {
       Debug(3, "Setting stream start to frame (%d)", frame_id);
       stream.setStreamStart(event_id, frame_id);
     }
+    stream.setStreamFrameType(analysis_frames ? StreamBase::FRAME_ANALYSIS: StreamBase::FRAME_NORMAL);
     if ( mode == ZMS_JPEG ) {
       stream.setStreamType(EventStream::STREAM_JPEG);
     } else {

From 58858d2d25667955a3fe79b46cc56c06c14c20c1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Sep 2020 16:24:14 -0400
Subject: [PATCH 232/501] Include alarm_image in shared_mem

---
 src/zm_monitor.cpp       | 108 ++++++++++++++++++++++++++++++++++-----
 src/zm_monitor.h         |   1 +
 src/zm_monitorstream.cpp |  23 ++++++++-
 3 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index cfc88891f..c42fbee7e 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -233,7 +233,7 @@ bool Monitor::MonitorLink::connect() {
     return true;
   }
   return false;
-} // end bool Monitor::MonitorLink::connect()
+}  // end bool Monitor::MonitorLink::connect()
 
 bool Monitor::MonitorLink::disconnect() {
   if (connected) {
@@ -665,8 +665,9 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   mem_size = sizeof(SharedData)
        + sizeof(TriggerData)
        + sizeof(VideoStoreData) //Information to pass back to the capture process
-       + (image_buffer_count * sizeof(struct timeval))
-       + (image_buffer_count * image_size)
+       + (image_buffer_count*sizeof(struct timeval))
+       + (image_buffer_count*camera->ImageSize())
+       + camera->ImageSize() // alarm_image
        + 64; /* Padding used to permit aligning the images buffer to 64 byte boundary */
 
   Debug(1,
@@ -1022,6 +1023,8 @@ bool Monitor::connect() {
     image_buffer[i] = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
     image_buffer[i]->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
   }
+  alarm_image.AssignDirect(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[image_buffer_count*camera->ImageSize()]));
+  alarm_image.HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
   Debug(3, "Allocated %zu %zu image buffers", image_buffer.capacity(), image_buffer.size());
 
   if (purpose == CAPTURE) {
@@ -1217,6 +1220,14 @@ void Monitor::AddPrivacyBitmask() {
     privacy_bitmask = privacy_image->Buffer();
 }
 
+Monitor::State Monitor::GetState() const {
+  return (State)shared_data->state;
+}
+
+Image &Monitor::GetAlarmImage() {
+  return alarm_image;
+}
+
 int Monitor::GetImage(int32_t index, int scale) {
   if (index < 0 || index > image_buffer_count) {
     Debug(1, "Invalid index %d passed. image_buffer_count = %d", index, image_buffer_count);
@@ -1231,26 +1242,23 @@ int Monitor::GetImage(int32_t index, int scale) {
     return 0;
   }
 
-  Image *image;
+  std::string filename = stringtf("Monitor%u.jpg", id);
   // If we are going to be modifying the snapshot before writing, then we need to copy it
   if ((scale != ZM_SCALE_BASE) || (!config.timestamp_on_capture)) {
-    alarm_image.Assign(*image_buffer[index]);
+    Image image;
+    image.Assign(*image_buffer[index]);
 
     if (scale != ZM_SCALE_BASE) {
-      alarm_image.Scale(scale);
+      image.Scale(scale);
     }
 
     if (!config.timestamp_on_capture) {
-      TimestampImage(&alarm_image, SystemTimePoint(zm::chrono::duration_cast<Microseconds>(shared_timestamps[index])));
+      TimestampImage(&image, SystemTimePoint(zm::chrono::duration_cast<Microseconds>(shared_timestamps[index])));
     }
-    image = &alarm_image;
+    return image.WriteJpeg(filename);
   } else {
-    image = image_buffer[index];
+    return image_buffer[index]->WriteJpeg(filename);
   }
-
-  std::string filename = stringtf("Monitor%u.jpg", id);
-  image->WriteJpeg(filename);
-  return 1;
 }
 
 ZMPacket *Monitor::getSnapshot(int index) const {
@@ -2121,6 +2129,7 @@ bool Monitor::Analyse() {
                 shared_data->state = state = TAPE;
               }
             }
+<<<<<<< HEAD
           } else if (state == PREALARM) {
             // Back to IDLE
             shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
@@ -2163,6 +2172,79 @@ bool Monitor::Analyse() {
                 if (!snap->analysis_image)
                   snap->analysis_image = new Image(*(snap->image));
                 snap->analysis_image->Overlay(*(zone.AlarmImage()));
+=======
+          } // end if ALARM or ALERT
+
+          if ( state == PREALARM ) {
+            if ( function != MOCORD ) {
+              shared_data->state = state = IDLE;
+            } else {
+              shared_data->state = state = TAPE;
+            }
+						// Not in PREALARM state anymore, can clear PreAlarmCount
+						if ( Event::PreAlarmCount() )
+							Event::EmptyPreAlarmFrames();
+					}
+				} // end if score or not
+
+        if ( state != IDLE ) {
+          if ( state == PREALARM || state == ALARM ) {
+            if ( savejpegs > 1 ) {
+              bool got_anal_image = false;
+              Debug(1, "Assigning alarm image");
+              alarm_image->Assign(*snap_image);
+              for ( int i = 0; i < n_zones; i++ ) {
+                if ( zones[i]->Alarmed() ) {
+                  if ( zones[i]->AlarmImage() ) {
+                    alarm_image->Overlay(*(zones[i]->AlarmImage()));
+                    got_anal_image = true;
+                  }
+                  if ( config.record_event_stats && (state == ALARM) )
+                    zones[i]->RecordStats(event);
+                } // end if zone is alarmed
+              } // end foreach zone
+
+              if ( state == PREALARM ) {
+                Event::AddPreAlarmFrame(snap_image, *timestamp, score, (got_anal_image?alarm_image:nullptr));
+              } else {
+								event->AddFrame(snap_image, *timestamp, score, (got_anal_image?alarm_image:nullptr));
+							}
+            } else {
+              // Not doing alarm frame storage
+              if ( state == PREALARM ) {
+                Event::AddPreAlarmFrame(snap_image, *timestamp, score);
+              } else {
+                event->AddFrame(snap_image, *timestamp, score);
+                if ( config.record_event_stats ) {
+                  for ( int i = 0; i < n_zones; i++ ) {
+                    if ( zones[i]->Alarmed() )
+                      zones[i]->RecordStats(event);
+                  }
+                } // end if  config.record_event_stats
+              }
+            } // end if savejpegs > 1 
+
+            if ( event ) {
+              if ( noteSetMap.size() > 0 )
+                event->updateNotes(noteSetMap);
+
+              if ( section_length
+                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                  && ! (image_count % fps_report_interval)
+                 ) {
+                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
+                    name, image_count, event->Id(),
+                    timestamp->tv_sec, video_store_data->recording.tv_sec,
+                    timestamp->tv_sec - video_store_data->recording.tv_sec,
+                    section_length
+                    );
+                closeEvent();
+                event = new Event(this, *timestamp, cause, noteSetMap);
+                shared_data->last_event = event->Id();
+                //set up video store data
+                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
+                video_store_data->recording = event->StartTime();
+>>>>>>> 89ff8a7fc (Include alarm_image in shared_mem)
               }
             }  // end if zone is alarmed
           }  // end foreach zone
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index b1df66b90..99390ef92 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -567,6 +567,7 @@ public:
   const std::string &getONVIF_Password() const { return onvif_password; };
   const std::string &getONVIF_Options() const { return onvif_options; };
 
+  Image *GetAlarmImage();
   int GetImage(int32_t index=-1, int scale=100);
   ZMPacket *getSnapshot( int index=-1 ) const;
   SystemTimePoint GetTimestamp(int index = -1) const;
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 457458306..fe6a51fa5 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -79,6 +79,7 @@ bool MonitorStream::checkSwapPath(const char *path, bool create_path) {
 
 void MonitorStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
+  Debug(2, "CMD_ANALYZE_ON %d", CMD_ANALYZE_ON);
   // Check for incoming command
   switch ( (MsgCommand)msg->msg_data[0] ) {
     case CMD_PAUSE :
@@ -243,6 +244,14 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
       Info("User initiated exit - CMD_QUIT");
       zm_terminate = true;
       break;
+    case CMD_ANALYZE_ON : 
+      frame_type = FRAME_ANALYSIS;
+      Debug(1, "ANALYSIS on");
+      break;
+    case CMD_ANALYZE_OFF : 
+      frame_type = FRAME_NORMAL;
+      Debug(1, "ANALYSIS off");
+      break;
     case CMD_QUERY :
       Debug(1, "Got QUERY command, sending STATUS");
       break;
@@ -713,9 +722,19 @@ void MonitorStream::runStream() {
           // Perhaps we should use NOW instead. 
           last_frame_timestamp =
               SystemTimePoint(zm::chrono::duration_cast<Microseconds>(monitor->shared_timestamps[index]));
-          Image *image = monitor->image_buffer[index];
 
-          if (!sendFrame(image, last_frame_timestamp)) {
+          Image *send_image = nullptr;
+          if ( ( frame_type == FRAME_ANALYSIS ) && ( monitor->GetOptSaveJPEGs() & 2 ) ) {
+            send_image = monitor->GetAlarmImage();
+            if ( !send_image ) {
+              Debug(1, "Falling back");
+              send_image = monitor->image_buffer[index];
+            }
+          } else {
+            send_image = monitor->image_buffer[index];
+          }
+
+          if (!sendFrame(send_image, last_frame_timestamp)) {
             Debug(2, "sendFrame failed, quiting.");
             zm_terminate = true;
             break;

From 24bb43bbebd15befd073f730d188c8ea390d144b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 13:16:51 -0500
Subject: [PATCH 233/501] finish merge.  Assign the alarm image to the shmem

---
 src/zm_monitor.cpp | 74 +---------------------------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c42fbee7e..8c0d3938f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2161,6 +2161,7 @@ bool Monitor::Analyse() {
                   snap->analysis_image->Overlay(*(zone.AlarmImage()));
               } // end if zone is alarmed
             } // end foreach zone
+            alarm_image.Assign(snap->analysis_imageimage);
           } // end if savejpegs
 
           // incremement pre alarm image count
@@ -2172,79 +2173,6 @@ bool Monitor::Analyse() {
                 if (!snap->analysis_image)
                   snap->analysis_image = new Image(*(snap->image));
                 snap->analysis_image->Overlay(*(zone.AlarmImage()));
-=======
-          } // end if ALARM or ALERT
-
-          if ( state == PREALARM ) {
-            if ( function != MOCORD ) {
-              shared_data->state = state = IDLE;
-            } else {
-              shared_data->state = state = TAPE;
-            }
-						// Not in PREALARM state anymore, can clear PreAlarmCount
-						if ( Event::PreAlarmCount() )
-							Event::EmptyPreAlarmFrames();
-					}
-				} // end if score or not
-
-        if ( state != IDLE ) {
-          if ( state == PREALARM || state == ALARM ) {
-            if ( savejpegs > 1 ) {
-              bool got_anal_image = false;
-              Debug(1, "Assigning alarm image");
-              alarm_image->Assign(*snap_image);
-              for ( int i = 0; i < n_zones; i++ ) {
-                if ( zones[i]->Alarmed() ) {
-                  if ( zones[i]->AlarmImage() ) {
-                    alarm_image->Overlay(*(zones[i]->AlarmImage()));
-                    got_anal_image = true;
-                  }
-                  if ( config.record_event_stats && (state == ALARM) )
-                    zones[i]->RecordStats(event);
-                } // end if zone is alarmed
-              } // end foreach zone
-
-              if ( state == PREALARM ) {
-                Event::AddPreAlarmFrame(snap_image, *timestamp, score, (got_anal_image?alarm_image:nullptr));
-              } else {
-								event->AddFrame(snap_image, *timestamp, score, (got_anal_image?alarm_image:nullptr));
-							}
-            } else {
-              // Not doing alarm frame storage
-              if ( state == PREALARM ) {
-                Event::AddPreAlarmFrame(snap_image, *timestamp, score);
-              } else {
-                event->AddFrame(snap_image, *timestamp, score);
-                if ( config.record_event_stats ) {
-                  for ( int i = 0; i < n_zones; i++ ) {
-                    if ( zones[i]->Alarmed() )
-                      zones[i]->RecordStats(event);
-                  }
-                } // end if  config.record_event_stats
-              }
-            } // end if savejpegs > 1 
-
-            if ( event ) {
-              if ( noteSetMap.size() > 0 )
-                event->updateNotes(noteSetMap);
-
-              if ( section_length
-                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                  && ! (image_count % fps_report_interval)
-                 ) {
-                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
-                    name, image_count, event->Id(),
-                    timestamp->tv_sec, video_store_data->recording.tv_sec,
-                    timestamp->tv_sec - video_store_data->recording.tv_sec,
-                    section_length
-                    );
-                closeEvent();
-                event = new Event(this, *timestamp, cause, noteSetMap);
-                shared_data->last_event = event->Id();
-                //set up video store data
-                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                video_store_data->recording = event->StartTime();
->>>>>>> 89ff8a7fc (Include alarm_image in shared_mem)
               }
             }  // end if zone is alarmed
           }  // end foreach zone

From df0a0c7853e1c4de7769a4669219a0750aea15e5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Sep 2020 17:41:36 -0400
Subject: [PATCH 234/501] Add CMD_ANALYZE_ON and OFF

---
 src/zm_monitor.cpp         | 17 ++++++++---------
 src/zm_monitorstream.cpp   |  2 +-
 src/zm_stream.h            |  2 ++
 web/includes/config.php.in |  2 ++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 8c0d3938f..23a0f71e2 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1023,7 +1023,11 @@ bool Monitor::connect() {
     image_buffer[i] = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
     image_buffer[i]->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
   }
-  alarm_image.AssignDirect(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[image_buffer_count*camera->ImageSize()]));
+  alarm_image.AssignDirect(width, height, camera->Colours(), camera->SubpixelOrder(),
+      &(shared_images[image_buffer_count*camera->ImageSize()]),
+        camera->ImageSize(),
+        ZM_BUFTYPE_DONTFREE
+        );
   alarm_image.HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
   Debug(3, "Allocated %zu %zu image buffers", image_buffer.capacity(), image_buffer.size());
 
@@ -1220,12 +1224,8 @@ void Monitor::AddPrivacyBitmask() {
     privacy_bitmask = privacy_image->Buffer();
 }
 
-Monitor::State Monitor::GetState() const {
-  return (State)shared_data->state;
-}
-
-Image &Monitor::GetAlarmImage() {
-  return alarm_image;
+Image *Monitor::GetAlarmImage() {
+  return &alarm_image;
 }
 
 int Monitor::GetImage(int32_t index, int scale) {
@@ -2129,7 +2129,6 @@ bool Monitor::Analyse() {
                 shared_data->state = state = TAPE;
               }
             }
-<<<<<<< HEAD
           } else if (state == PREALARM) {
             // Back to IDLE
             shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
@@ -2161,7 +2160,7 @@ bool Monitor::Analyse() {
                   snap->analysis_image->Overlay(*(zone.AlarmImage()));
               } // end if zone is alarmed
             } // end foreach zone
-            alarm_image.Assign(snap->analysis_imageimage);
+            alarm_image.Assign(*snap->analysis_image);
           } // end if savejpegs
 
           // incremement pre alarm image count
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index fe6a51fa5..27e82b83b 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -743,7 +743,7 @@ void MonitorStream::runStream() {
           if (frame_count == 0) {
             // Chrome will not display the first frame until it receives another.
             // Firefox is fine.  So just send the first frame twice.
-            if (!sendFrame(image, last_frame_timestamp)) {
+            if (!sendFrame(send_image, last_frame_timestamp)) {
               Debug(2, "sendFrame failed, quiting.");
               zm_terminate = true;
               break;
diff --git a/src/zm_stream.h b/src/zm_stream.h
index 827908e6d..d89d97e7f 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -90,6 +90,8 @@ protected:
     CMD_GET_IMAGE,
     CMD_QUIT,
     CMD_MAXFPS,
+    CMD_ANALYZE_ON,
+    CMD_ANALYZE_OFF,
     CMD_QUERY=99
   } MsgCommand;
 
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index fcd3a936d..b30aebdea 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -120,6 +120,8 @@ define('CMD_SEEK', 14 );
 define('CMD_VARPLAY', 15);
 define('CMD_QUIT', 17);
 define('CMD_MAXFPS', 18);
+define('CMD_ANALYZE_ON', 19);
+define('CMD_ANALYZE_OFF', 20);
 define('CMD_QUERY', 99);
 
 //

From 6f5eee6c0f428578f934673cd6eac7b33d06003a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 9 Sep 2020 12:09:23 -0400
Subject: [PATCH 235/501] Add show_analyze_frames function to tell zms to send
 analysis frames

---
 web/js/MonitorStream.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index feb4b3611..da082d0e6 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -276,4 +276,10 @@ function MonitorStream(monitorData) {
           .fail(this.onFailure.bind(this));
     };
   }
+  this.analyze_frames = true;
+  this.show_analyze_frames = function(toggle) {
+    this.analyze_frames = toggle;
+    console.log("Sending command " + (this.analyze_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF));
+    this.streamCmdReq.send(this.streamCmdParms+"&command="+(this.analyze_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF));
+  }
 } // end function MonitorStream

From c914f00126d8355ae358d5f9867328ab30600245 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 9 Sep 2020 15:06:49 -0400
Subject: [PATCH 236/501] browser doesn't seem to like step=0.01 add
 analyze_frames button handling and update to jquery instead of mootools
 styles

---
 web/skins/classic/views/js/zone.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 58c286b43..6e9f40403 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -5,6 +5,7 @@ var cancelBtn = $j('#cancelBtn');
 var backBtn = $j('#backBtn');
 var refreshBtn = $j('#refreshBtn');
 var monitors = [];
+var analyze_frames = true;
 
 function validateForm( form ) {
   var errors = [];
@@ -566,6 +567,7 @@ function watchdogCheck(type) {
 function watchdogOk(type) {
   watchdogInactive[type] = false;
 }
+
 function presetSelectorBlur() {
   this.selectedIndex = 0;
 }
@@ -656,6 +658,21 @@ function initPage() {
     };
   }
 
+  if ( el = $('analyzeBtn') ) {
+    $('analyzeBtn').onclick = function() {
+      console.log(analyze_frames);
+      analyze_frames = !analyze_frames;
+      if ( analyze_frames ) {
+        $('analyzeBtn').classList.add('disabled');
+      } else {
+        $('analyzeBtn').classList.remove('disabled');
+      }
+      for ( var i = 0, length = monitors.length; i < length; i++ ) {
+        monitors[i].show_analyze_frames(analyze_frames);
+      }
+    }
+  }
+
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
     monitors[i] = new MonitorStream(monitorData[i]);
 

From 7219809364b4da2b4e873d28676df3d348992e24 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 9 Sep 2020 15:07:10 -0400
Subject: [PATCH 237/501] Add CMD_ANALYZE_ON/OFF

---
 web/skins/classic/views/js/zone.js.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 2ba286d55..ddaadf605 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -97,6 +97,8 @@ var deleteString = "<?php echo translate('Delete') ?>";
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
 var CMD_STOP = <?php echo CMD_STOP ?>;
+var CMD_ANALYZE_ON = <?php echo CMD_ANALYZE_ON ?>;
+var CMD_ANALYZE_OFF = <?php echo CMD_ANALYZE_OFF ?>;
 var CMD_QUERY = <?php echo CMD_QUERY ?>;
 
 var SCALE_BASE = <?php echo SCALE_BASE ?>;

From f4c813a26fcb045164161fcb9849b0ec221945a1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 15:57:01 -0500
Subject: [PATCH 238/501] Assign image to analysis_image before doing motion
 detection so there is always an image to see. Fix crash.

---
 src/zm_monitor.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 23a0f71e2..04e3d8604 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -666,8 +666,8 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
        + sizeof(TriggerData)
        + sizeof(VideoStoreData) //Information to pass back to the capture process
        + (image_buffer_count*sizeof(struct timeval))
-       + (image_buffer_count*camera->ImageSize())
-       + camera->ImageSize() // alarm_image
+       + (image_buffer_count*image_size)
+       + image_size // alarm_image
        + 64; /* Padding used to permit aligning the images buffer to 64 byte boundary */
 
   Debug(1,
@@ -1970,6 +1970,8 @@ bool Monitor::Analyse() {
           }
 
           if (snap->image) {
+            alarm_image.Assign(*(snap->image));
+
             // decoder may not have been able to provide an image
             if (!ref_image.Buffer()) {
               Debug(1, "Assigning instead of Detecting");
@@ -2152,7 +2154,7 @@ bool Monitor::Analyse() {
 
         if (state == PREALARM) {
           // Generate analysis images if necessary
-          if ((savejpegs > 1) and snap->image) {
+          if (snap->image) {
             for (const Zone &zone : zones) {
               if (zone.Alarmed() and zone.AlarmImage()) {
                   if (!snap->analysis_image)
@@ -2160,21 +2162,23 @@ bool Monitor::Analyse() {
                   snap->analysis_image->Overlay(*(zone.AlarmImage()));
               } // end if zone is alarmed
             } // end foreach zone
-            alarm_image.Assign(*snap->analysis_image);
-          } // end if savejpegs
+            alarm_image.Assign(*(snap->analysis_image));
+          } // end if image.
 
           // incremement pre alarm image count
           Event::AddPreAlarmFrame(snap->image, timestamp, score, nullptr);
         } else if (state == ALARM) {
-          for (const Zone &zone : zones) {
-            if (zone.Alarmed()) {
-              if (zone.AlarmImage() and (savejpegs > 1) and snap->image) {
+          if (snap->image) {
+            for (const Zone &zone : zones) {
+              if (zone.Alarmed() and zone.AlarmImage()) {
                 if (!snap->analysis_image)
                   snap->analysis_image = new Image(*(snap->image));
                 snap->analysis_image->Overlay(*(zone.AlarmImage()));
-              }
-            }  // end if zone is alarmed
-          }  // end foreach zone
+              }  // end if zone is alarmed
+            }  // end foreach zone
+            alarm_image.Assign(*(snap->analysis_image));
+          }
+
           if (event) {
             if (noteSetMap.size() > 0)
               event->updateNotes(noteSetMap);

From 76fe20c69fd0b579d04dcab15310e82cceb67b05 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 15:57:28 -0500
Subject: [PATCH 239/501] Only send analysis_frame if doing motion detection. 
 Add debuging. Remove other debugging

---
 src/zm_monitorstream.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 27e82b83b..f9e91d94b 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -79,7 +79,6 @@ bool MonitorStream::checkSwapPath(const char *path, bool create_path) {
 
 void MonitorStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
-  Debug(2, "CMD_ANALYZE_ON %d", CMD_ANALYZE_ON);
   // Check for incoming command
   switch ( (MsgCommand)msg->msg_data[0] ) {
     case CMD_PAUSE :
@@ -724,13 +723,16 @@ void MonitorStream::runStream() {
               SystemTimePoint(zm::chrono::duration_cast<Microseconds>(monitor->shared_timestamps[index]));
 
           Image *send_image = nullptr;
-          if ( ( frame_type == FRAME_ANALYSIS ) && ( monitor->GetOptSaveJPEGs() & 2 ) ) {
+          if ((frame_type == FRAME_ANALYSIS) && 
+              (monitor->GetFunction() == Monitor::MOCORD || monitor->GetFunction() == Monitor::MODECT)) {
+              Debug(1, "Sending analysis image");
             send_image = monitor->GetAlarmImage();
             if ( !send_image ) {
               Debug(1, "Falling back");
               send_image = monitor->image_buffer[index];
             }
           } else {
+             Debug(1, "Sending regular image");
             send_image = monitor->image_buffer[index];
           }
 

From 939f165b22810b49ada4644951e6d7eb122d08b6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:05:52 -0500
Subject: [PATCH 240/501] rename analyze to analyse

---
 web/js/MonitorStream.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index da082d0e6..5e652eb3d 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -276,10 +276,10 @@ function MonitorStream(monitorData) {
           .fail(this.onFailure.bind(this));
     };
   }
-  this.analyze_frames = true;
-  this.show_analyze_frames = function(toggle) {
-    this.analyze_frames = toggle;
-    console.log("Sending command " + (this.analyze_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF));
-    this.streamCmdReq.send(this.streamCmdParms+"&command="+(this.analyze_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF));
-  }
+  this.analyse_frames = true;
+  this.show_analyse_frames = function(toggle) {
+    this.analyse_frames = toggle;
+    this.streamCmdParms.command = this.analyse_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF;
+    this.streamCmdReq(this.streamCmdParms);
+  };
 } // end function MonitorStream

From 1a3bee102fa9eb559771dc4798dd16b72396bf27 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:06:38 -0500
Subject: [PATCH 241/501] analyze->analyse, fixup how we show enabled/disabled
 and start with analysis frame displayed

---
 web/skins/classic/views/js/zone.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 6e9f40403..772d4be1a 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -4,8 +4,9 @@ var saveBtn = $j('#saveBtn');
 var cancelBtn = $j('#cancelBtn');
 var backBtn = $j('#backBtn');
 var refreshBtn = $j('#refreshBtn');
+var analyseBtn = $j('#analyseBtn');
 var monitors = [];
-var analyze_frames = true;
+var analyse_frames = true;
 
 function validateForm( form ) {
   var errors = [];
@@ -658,19 +659,21 @@ function initPage() {
     };
   }
 
-  if ( el = $('analyzeBtn') ) {
-    $('analyzeBtn').onclick = function() {
-      console.log(analyze_frames);
-      analyze_frames = !analyze_frames;
-      if ( analyze_frames ) {
-        $('analyzeBtn').classList.add('disabled');
+  if ( el = analyseBtn[0] ) {
+    el.onclick = function() {
+      console.log(analyse_frames);
+      analyse_frames = !analyse_frames;
+      if (analyse_frames) {
+        analyseBtn.toggleClass('btn-primary');
       } else {
-        $('analyzeBtn').classList.remove('disabled');
+        analyseBtn.toggleClass('btn-secondary');
       }
       for ( var i = 0, length = monitors.length; i < length; i++ ) {
-        monitors[i].show_analyze_frames(analyze_frames);
+        monitors[i].show_analyse_frames(analyse_frames);
       }
-    }
+    };
+  } else {
+    console.log('Analyse button not found');
   }
 
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
@@ -679,6 +682,7 @@ function initPage() {
     // Start the fps and status updates. give a random delay so that we don't assault the server
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
     monitors[i].setScale('auto');
+    monitors[i].show_analyse_frames(analyse_frames);
     monitors[i].start(delay);
   }
 

From 038bff0df2c5b4aa02001902f6b5a91a66c7e297 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:06:53 -0500
Subject: [PATCH 242/501] Add analyse button

---
 web/skins/classic/views/zone.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 7a4761a50..9b6e3dc24 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -169,6 +169,9 @@ if ( count($other_zones) ) {
               <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
             </div>
             <div id="StreamControlButtons">
+              <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Show Analysis') ?>">
+                <i class="material-icons md-18">assessment</i>
+              </button>
               <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>">
                 <i class="material-icons md-18">pause</i>
               </button>

From 79c45f50d5a3b5d9faf30f0bdc761407ff782b5c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:21:34 -0500
Subject: [PATCH 243/501] define raw as an empty array so we don't generate js
 errors

---
 web/ajax/stats.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/ajax/stats.php b/web/ajax/stats.php
index 9226814b4..98b07b01e 100644
--- a/web/ajax/stats.php
+++ b/web/ajax/stats.php
@@ -9,6 +9,7 @@ $raw = isset($_REQUEST['raw']);
 $data = array();
 
 if ($raw) {
+  $data['raw'] = array();
   $sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName
     FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id
     WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';

From cfac99be4e7f93c4042cb59d56b7ea84dc6bbeae Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:21:49 -0500
Subject: [PATCH 244/501] better debugging when the row has no Id

---
 web/includes/Object.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/includes/Object.php b/web/includes/Object.php
index 1a9011586..ff5d40baa 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -11,19 +11,24 @@ class ZM_Object {
     $class = get_class($this);
 
     $row = NULL;
-    if ( $IdOrRow ) {
+    if ($IdOrRow) {
 
-      if ( is_integer($IdOrRow) or ctype_digit($IdOrRow) ) {
+      if (is_integer($IdOrRow) or ctype_digit($IdOrRow)) {
         $table = $class::$table;
         $row = dbFetchOne("SELECT * FROM `$table` WHERE `Id`=?", NULL, array($IdOrRow));
-        if ( !$row ) {
+        if (!$row) {
           Error("Unable to load $class record for Id=$IdOrRow");
+          return;
         }
-      } else if ( is_array($IdOrRow) ) {
+      } else if (is_array($IdOrRow)) {
         $row = $IdOrRow;
       }
 
       if ( $row ) {
+        if (!isset($row['Id'])) {
+          Error("No Id in " . print_r($row, true));
+          return;
+        }
         foreach ($row as $k => $v) {
           $this->{$k} = $v;
         }

From 8f372e6a6c70ac8ceb4fa429bc1560d8c6347887 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:22:11 -0500
Subject: [PATCH 245/501] Add useful title to frame image telling us which we
 are looking at

---
 web/skins/classic/views/frame.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 9931c910a..7a281a29a 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -116,7 +116,10 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
         <p id="image">
 <?php
 if ( $imageData['hasAnalImage'] ) {
-  echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s">', $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ) );
+  echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">',
+    $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ),
+    ( $show=='anal'?'without':'with' ),
+  );
 }
 ?>
 <img id="frameImg"

From deaff43f6630e74b90f1a6b957298d8d27102907 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:22:24 -0500
Subject: [PATCH 246/501] use let/const

---
 web/skins/classic/views/js/frame.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js
index 1040d5a48..6786412f9 100644
--- a/web/skins/classic/views/js/frame.js
+++ b/web/skins/classic/views/js/frame.js
@@ -40,8 +40,8 @@ function changeScale() {
 }
 
 function getFrameStatsCookie() {
-  var cookie = 'zmFrameStats';
-  var stats = getCookie(cookie);
+  const cookie = 'zmFrameStats';
+  let stats = getCookie(cookie);
 
   if (!stats) {
     stats = 'on';
@@ -53,7 +53,7 @@ function getFrameStatsCookie() {
 function getStat(params) {
   $j.getJSON(thisUrl + '?view=request&request=stats&raw=true', params)
       .done(function(data) {
-        var stats = data.raw;
+        const stats = data.raw;
 
 
         $j('#frameStatsTable').empty().append('<tbody>');

From 71ff1e3ceaed7fe3339519336d0b72c2b7cd48ea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:30:14 -0500
Subject: [PATCH 247/501] Add translates for analyse button. Fixup styles

---
 web/skins/classic/views/js/zone.js     | 8 ++++++--
 web/skins/classic/views/js/zone.js.php | 4 ++++
 web/skins/classic/views/zone.php       | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 772d4be1a..049df4ba9 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -664,9 +664,13 @@ function initPage() {
       console.log(analyse_frames);
       analyse_frames = !analyse_frames;
       if (analyse_frames) {
-        analyseBtn.toggleClass('btn-primary');
+        analyseBtn.addClass('btn-primary');
+        analyseBtn.removeClass('btn-secondary');
+        analyseBtn.attr('title', translate['Showing Analysis']);
       } else {
-        analyseBtn.toggleClass('btn-secondary');
+        analyseBtn.removeClass('btn-primaryary');
+        analyseBtn.addClass('btn-secondary');
+        analyseBtn.attr('title', translate['Not Showing Analysis']);
       }
       for ( var i = 0, length = monitors.length; i < length; i++ ) {
         monitors[i].show_analyse_frames(analyse_frames);
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index ddaadf605..0c94a90ee 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -122,3 +122,7 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
 var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
 
+var translate = {
+  "Showing Analysis": '<?php echo translate('Showing Analysis'); ?>',
+  "Not Showing Analysis": '<?php echo translate('Not Showing Analysis'); ?>'
+};
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 9b6e3dc24..5031c316f 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -169,13 +169,13 @@ if ( count($other_zones) ) {
               <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
             </div>
             <div id="StreamControlButtons">
-              <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Show Analysis') ?>">
+              <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Showing Analysis') ?>">
                 <i class="material-icons md-18">assessment</i>
               </button>
-              <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>">
+              <button type="button" id="pauseBtn" class="btn btn-primary" title="<?php echo translate('Pause') ?>">
                 <i class="material-icons md-18">pause</i>
               </button>
-              <button type="button" id="playBtn" title="<?php echo translate('Play') ?>">
+              <button type="button" id="playBtn" class="btn btn-primary" title="<?php echo translate('Play') ?>">
                 <i class="material-icons md-18">play_arrow</i>
               </button>
             </div>

From a2a04edcf7a3e10e7e34ffb8972d3743ff2ccb00 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:31:45 -0500
Subject: [PATCH 248/501] Only init gsoap if we are capturing

---
 src/zm_monitor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 04e3d8604..8bb5b2a29 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1070,10 +1070,6 @@ bool Monitor::connect() {
     video_store_data->size = sizeof(VideoStoreData);
     usedsubpixorder = camera->SubpixelOrder();  // Used in CheckSignal
     shared_data->valid = true;
-  } else if (!shared_data->valid) {
-    Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
-    return false;
-  }
 
   //ONVIF Setup
 #ifdef WITH_GSOAP
@@ -1110,6 +1106,10 @@ bool Monitor::connect() {
   }
   //End ONVIF Setup
 #endif
+  } else if (!shared_data->valid) {
+    Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
+    return false;
+  }
 
   // We set these here because otherwise the first fps calc is meaningless
   last_fps_time = std::chrono::system_clock::now();

From 36a493ad5e48713a0ce4703053df77c1efa53baf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 7 Jan 2022 16:35:52 -0500
Subject: [PATCH 249/501] bump to 1.37.7

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index f5aeebf2d..0d189dc9c 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.6
+Version: 1.37.7
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index e22b12fd6..199e8f7a3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.6
+1.37.7

From c8bc0661b11c5a1105057215640d1c06f68dfa24 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 8 Jan 2022 12:14:28 -0500
Subject: [PATCH 250/501] Have to clear src before resetting or some browsers
 won't load the new image

---
 web/js/MonitorStream.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 5e652eb3d..ef4d6db41 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -2,6 +2,8 @@
 function MonitorStream(monitorData) {
   this.id = monitorData.id;
   this.connKey = monitorData.connKey;
+  this.auth_relay = auth_relay;
+  this.auth_hash = auth_hash;
   this.url = monitorData.url;
   this.url_to_zms = monitorData.url_to_zms;
   this.width = monitorData.width;
@@ -206,36 +208,38 @@ function MonitorStream(monitorData) {
         var newAlarm = ( isAlarmed && !wasAlarmed );
         var oldAlarm = ( !isAlarmed && wasAlarmed );
 
-        if ( newAlarm ) {
-          if ( false && SOUND_ON_ALARM ) {
+        if (newAlarm) {
+          if (false && SOUND_ON_ALARM) {
             // Enable the alarm sound
             $j('#alarmSound').removeClass('hidden');
           }
-          if ( (typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM ) {
+          if ((typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM) {
             windowToFront();
           }
         }
-        if ( false && SOUND_ON_ALARM ) {
+        if (false && SOUND_ON_ALARM) {
           if ( oldAlarm ) {
             // Disable alarm sound
             $j('#alarmSound').addClass('hidden');
           }
         }
-        if ( this.status.auth ) {
-          if ( this.status.auth != auth_hash ) {
+        if (this.status.auth) {
+          if (this.status.auth != auth_hash) {
             // Try to reload the image stream.
-            if ( stream ) {
-              stream.src = stream.src.replace(/auth=\w+/i, 'auth='+this.status.auth);
+            if (stream) {
+              const oldsrc = stream.src;
+              stream.src = '';
+              stream.src = oldsrc.replace(/auth=\w+/i, 'auth='+this.status.auth);
             }
-            console.log("Changed auth from " + auth_hash + " to " + this.status.auth);
-            auth_hash = this.status.auth;
+            console.log("Changed auth from " + this.auth_hash + " to " + this.status.auth);
+            this.auth_hash = this.status.auth;
           }
         } // end if have a new auth hash
       } // end if has state
     } else {
       console.error(respObj.message);
       // Try to reload the image stream.
-      if ( stream ) {
+      if (stream) {
         if ( stream.src ) {
           console.log('Reloading stream: ' + stream.src);
           src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));

From dc975daa7a316f57157c124c906d968ebe331b5f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 8 Jan 2022 12:21:29 -0500
Subject: [PATCH 251/501] init soap to null in constructor. Stop analysis
 thread before destroying soap.

---
 src/zm_monitor.cpp | 15 +++++++--------
 src/zm_monitor.h   | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 8bb5b2a29..a29e42c30 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -423,7 +423,8 @@ Monitor::Monitor()
   green_val(0),
   blue_val(0),
   grayscale_val(0),
-  colour_val(0)
+  colour_val(0),
+  soap(nullptr)
 {
 
   if ( strcmp(config.event_close_mode, "time") == 0 )
@@ -1808,8 +1809,6 @@ bool Monitor::Poll() {
   return TRUE;
 } //end Poll
 
-
-
 // Would be nice if this JUST did analysis
 // This idea is that we should be analysing as close to the capture frame as possible.
 // This function should process as much as possible before returning
@@ -3158,13 +3157,16 @@ int Monitor::Close() {
   if (decoder) {
     decoder->Stop();
   }
+  if (analysis_thread) {
+    analysis_thread->Stop();
+  }
 
 #ifdef WITH_GSOAP
   //ONVIF Teardown
   if (Poller) {
     Poller->Stop();
   }
-  if (onvif_event_listener && soap != nullptr) {
+  if (onvif_event_listener && (soap != nullptr)) {
     Debug(1, "Tearing Down Onvif");
     _wsnt__Unsubscribe wsnt__Unsubscribe;
     _wsnt__UnsubscribeResponse wsnt__UnsubscribeResponse;
@@ -3173,12 +3175,9 @@ int Monitor::Close() {
     soap_end(soap);
     soap_free(soap);
     soap = nullptr;
-  }//End ONVIF
+  }  //End ONVIF
 #endif
 
-  if (analysis_thread) {
-    analysis_thread->Stop();
-  }
   packetqueue.clear();
   if (audio_fifo) {
     delete audio_fifo;
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 99390ef92..fe67b6f3b 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -256,18 +256,6 @@ protected:
 
   protected:
 
-  //ONVIF
-#ifdef WITH_GSOAP
-  struct soap *soap;
-  bool ONVIF_Trigger_State;
-  bool ONVIF_Healthy;
-  _tev__CreatePullPointSubscription request;
-  _tev__CreatePullPointSubscriptionResponse response;
-  _tev__PullMessages tev__PullMessages;
-  _tev__PullMessagesResponse tev__PullMessagesResponse;
-  PullPointSubscriptionBindingProxy proxyEvent;
-  void set_credentials(struct soap *soap);
-#endif
 
   // These are read from the DB and thereafter remain unchanged
   unsigned int    id;
@@ -451,6 +439,18 @@ protected:
   Rgb colour_val; /* RGB32 color */
   int usedsubpixorder;
 
+  //ONVIF
+#ifdef WITH_GSOAP
+  struct soap *soap;
+  bool ONVIF_Trigger_State;
+  bool ONVIF_Healthy;
+  _tev__CreatePullPointSubscription request;
+  _tev__CreatePullPointSubscriptionResponse response;
+  _tev__PullMessages tev__PullMessages;
+  _tev__PullMessagesResponse tev__PullMessagesResponse;
+  PullPointSubscriptionBindingProxy proxyEvent;
+  void set_credentials(struct soap *soap);
+#endif
 public:
   explicit Monitor();
 

From f01ecf2a16d68738fad2c0ab5de013166c6df0ed Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 8 Jan 2022 12:37:05 -0500
Subject: [PATCH 252/501] Add libgsoap to dependencies

---
 distros/ubuntu2004/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index d14c3fb52..37c0e5e51 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -30,6 +30,7 @@ Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,libdata-entropy-perl
               ,libvncserver-dev
               ,libjwt-gnutls-dev|libjwt-dev
+              ,libgsoap-dev
 Standards-Version: 4.5.0
 Homepage: https://www.zoneminder.com/
 
@@ -73,6 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdata-entropy-perl
         ,libvncclient1|libvncclient0
         ,libjwt-gnutls0|libjwt0
+        ,libgsoap-2.8.104|libgsoap-2.8.91|libgsoap-2.8.75|libgsoap-2.8.60|libgsoap10
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php | php-fpm
            ,default-mysql-server | mariadb-server | virtual-mysql-server

From a153798b475be3b328f88d7f23b28761b26abaf0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 8 Jan 2022 12:37:23 -0500
Subject: [PATCH 253/501] fix init when no GSOAP

---
 src/zm_monitor.cpp |  6 ++++--
 src/zm_monitor.h   | 17 +++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index a29e42c30..008ca8a77 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -419,12 +419,14 @@ Monitor::Monitor()
   privacy_bitmask(nullptr),
   n_linked_monitors(0),
   linked_monitors(nullptr),
+#ifdef WITH_GSOAP
+  soap(nullptr),
+#endif
   red_val(0),
   green_val(0),
   blue_val(0),
   grayscale_val(0),
-  colour_val(0),
-  soap(nullptr)
+  colour_val(0)
 {
 
   if ( strcmp(config.event_close_mode, "time") == 0 )
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index fe67b6f3b..371f8a231 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -431,14 +431,6 @@ protected:
   std::string diag_path_ref;
   std::string diag_path_delta;
 
-  // Used in check signal
-  uint8_t red_val;
-  uint8_t green_val;
-  uint8_t blue_val;
-  uint8_t grayscale_val; /* 8bit grayscale color */
-  Rgb colour_val; /* RGB32 color */
-  int usedsubpixorder;
-
   //ONVIF
 #ifdef WITH_GSOAP
   struct soap *soap;
@@ -451,6 +443,15 @@ protected:
   PullPointSubscriptionBindingProxy proxyEvent;
   void set_credentials(struct soap *soap);
 #endif
+
+  // Used in check signal
+  uint8_t red_val;
+  uint8_t green_val;
+  uint8_t blue_val;
+  uint8_t grayscale_val; /* 8bit grayscale color */
+  Rgb colour_val; /* RGB32 color */
+  int usedsubpixorder;
+
 public:
   explicit Monitor();
 

From a3c298ca930ed108dc4f1d86b0d46bb60310a64e Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 8 Jan 2022 13:17:04 -0600
Subject: [PATCH 254/501] Add nullptr checks to prevent a crash when in NODECT
 mode

---
 src/zm_monitor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 008ca8a77..7a8d49b4d 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2163,6 +2163,7 @@ bool Monitor::Analyse() {
                   snap->analysis_image->Overlay(*(zone.AlarmImage()));
               } // end if zone is alarmed
             } // end foreach zone
+            if (snap->analysis_image != nullptr)
             alarm_image.Assign(*(snap->analysis_image));
           } // end if image.
 
@@ -2177,6 +2178,7 @@ bool Monitor::Analyse() {
                 snap->analysis_image->Overlay(*(zone.AlarmImage()));
               }  // end if zone is alarmed
             }  // end foreach zone
+            if (snap->analysis_image != nullptr)
             alarm_image.Assign(*(snap->analysis_image));
           }
 

From 52b377ca8667580a20fba57c13b0ca2fad752206 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 8 Jan 2022 14:05:57 -0600
Subject: [PATCH 255/501] Adds the 'closes_event" ONVIF option, to handle
 motionDetection message quirks.

---
 src/zm_monitor.cpp | 11 +++++++++++
 src/zm_monitor.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 7a8d49b4d..f194378d3 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -421,6 +421,7 @@ Monitor::Monitor()
   linked_monitors(nullptr),
 #ifdef WITH_GSOAP
   soap(nullptr),
+  ONVIF_Closes_Event(FALSE),
 #endif
   red_val(0),
   green_val(0),
@@ -1080,6 +1081,9 @@ bool Monitor::connect() {
   if (onvif_event_listener) { //Temporarily using this option to enable the feature
     Debug(1, "Starting ONVIF");
     ONVIF_Healthy = FALSE;
+    if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
+      ONVIF_Closes_Event = TRUE;
+    }
     tev__PullMessages.Timeout = "PT600S";
     tev__PullMessages.MessageLimit = 100;
     soap = soap_new();
@@ -1802,6 +1806,10 @@ bool Monitor::Poll() {
           } else {
             Debug(1, "Triggered off ONVIF");
             ONVIF_Trigger_State = FALSE;
+            if (!ONVIF_Closes_Event) { //If we get a close event, then we know to expect them.
+              ONVIF_Closes_Event = TRUE;
+              Debug(1,"Setting ClosesEvent");
+            }
           }
         }
       }
@@ -1868,6 +1876,9 @@ bool Monitor::Analyse() {
       Event::StringSet noteSet;
       noteSet.insert("ONVIF2");
       noteSetMap[MOTION_CAUSE] = noteSet;
+      //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
+      if (!ONVIF_Closes_Event && state == ALARM)
+        ONVIF_Trigger_State = FALSE;
     }  // end ONVIF_Trigger
 #endif
 
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 371f8a231..f461c6430 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -436,6 +436,7 @@ protected:
   struct soap *soap;
   bool ONVIF_Trigger_State;
   bool ONVIF_Healthy;
+  bool ONVIF_Closes_Event;
   _tev__CreatePullPointSubscription request;
   _tev__CreatePullPointSubscriptionResponse response;
   _tev__PullMessages tev__PullMessages;

From c832fabafdf8c9d10972bd043eded60298055ea8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 7 Jan 2022 23:14:22 -0500
Subject: [PATCH 256/501] solve ccpcheck complaints

---
 src/zm_ffmpeg_input.cpp | 3 +--
 src/zm_fifo_stream.h    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index 17ce88eab..8e0a5b0e8 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -31,8 +31,7 @@ int FFmpeg_Input::Open(
     const AVStream * audio_in_stream,
     const AVCodecContext * audio_in_ctx
     ) {
-  video_stream_id = video_in_stream->index;
-  int max_stream_index = video_in_stream->index;
+ int max_stream_index = video_stream_id = video_in_stream->index;
 
   if ( audio_in_stream ) {
     max_stream_index = video_in_stream->index > audio_in_stream->index ? video_in_stream->index : audio_in_stream->index;
diff --git a/src/zm_fifo_stream.h b/src/zm_fifo_stream.h
index 911980d48..332275771 100644
--- a/src/zm_fifo_stream.h
+++ b/src/zm_fifo_stream.h
@@ -28,7 +28,6 @@ class FifoStream : public StreamBase {
     std::string stream_path;
     int total_read;
     int bytes_read;
-    unsigned int frame_count;
 
  protected:
     typedef enum { UNKNOWN, MJPEG, RAW } StreamType;
@@ -39,9 +38,9 @@ class FifoStream : public StreamBase {
 
  public:
     FifoStream() : 
+      StreamBase(),
       total_read(0),
       bytes_read(0),
-      frame_count(0),
       stream_type(UNKNOWN)
     {}
 

From f0c6413dc83ebaa7ba97cee5895724a742551e60 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 7 Jan 2022 23:14:38 -0500
Subject: [PATCH 257/501] solve ccpcheck complaints

---
 src/zm_file_camera.cpp |  4 +--
 src/zm_image.cpp       | 55 +++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp
index fd07515ad..feaad3fe0 100644
--- a/src/zm_file_camera.cpp
+++ b/src/zm_file_camera.cpp
@@ -46,9 +46,9 @@ FileCamera::FileCamera(
       p_hue,
       p_colour,
       p_capture,
-      p_record_audio)
+      p_record_audio),
+  path(p_path)
 {
-  path = std::string(p_path);
   if (capture) {
     Initialise();
   }
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 295426254..99fcf4ee1 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -214,25 +214,26 @@ Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_sub
   update_function_pointers();
 }
 
-Image::Image(const AVFrame *frame) {
+Image::Image(const AVFrame *frame) :
+  colours(ZM_COLOUR_RGB32),
+  padding(0),
+  subpixelorder(ZM_SUBPIX_ORDER_RGBA),
+  imagePixFormat(AV_PIX_FMT_RGBA),
+  buffer(0),
+  holdbuffer(0)
+{
   width = frame->width;
   height = frame->height;
   pixels = width*height;
 
   zm_dump_video_frame(frame, "Image.Assign(frame)");
   // FIXME
-  colours = ZM_COLOUR_RGB32;
-  subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-  imagePixFormat = AV_PIX_FMT_RGBA;
-    //(AVPixelFormat)frame->format;
+  //(AVPixelFormat)frame->format;
 
   size = av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 32);
   // av_image_get_linesize isn't aligned, so we have to do that.
   linesize = FFALIGN(av_image_get_linesize(AV_PIX_FMT_RGBA, width, 0), 32);
-  padding = 0;
 
-  buffer = nullptr;
-  holdbuffer = 0;
   AllocImgBuffer(size);
   this->Assign(frame);
 }
@@ -1677,15 +1678,15 @@ void Image::Overlay( const Image &image ) {
 }
 
 /* RGB32 compatible: complete */
-void Image::Overlay( const Image &image, unsigned int x, unsigned int y ) {
+void Image::Overlay( const Image &image, const unsigned int lo_x, const unsigned int lo_y ) {
   if ( !(width < image.width || height < image.height) ) {
     Panic("Attempt to overlay image too big for destination, %dx%d > %dx%d",
         image.width, image.height, width, height );
   }
 
-  if ( !(width < (x+image.width) || height < (y+image.height)) ) {
+  if ( !(width < (lo_x+image.width) || height < (lo_y+image.height)) ) {
     Panic("Attempt to overlay image outside of destination bounds, %dx%d @ %dx%d > %dx%d",
-        image.width, image.height, x, y, width, height );
+        image.width, image.height, lo_x, lo_y, width, height );
   }
 
   if ( !(colours == image.colours) ) {
@@ -1693,10 +1694,8 @@ void Image::Overlay( const Image &image, unsigned int x, unsigned int y ) {
         colours, image.colours);
   }
 
-  unsigned int lo_x = x;
-  unsigned int lo_y = y;
-  unsigned int hi_x = (x+image.width)-1;
-  unsigned int hi_y = (y+image.height-1);
+  unsigned int hi_x = (lo_x+image.width)-1;
+  unsigned int hi_y = (lo_y+image.height-1);
   if ( colours == ZM_COLOUR_GRAY8 ) {
     const uint8_t *psrc = image.buffer;
     for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
@@ -2732,7 +2731,7 @@ void Image::Flip( bool leftright ) {
   AssignDirect(width, height, colours, subpixelorder, flip_buffer, size, ZM_BUFTYPE_ZM);
 }
 
-void Image::Scale(unsigned int factor) {
+void Image::Scale(const unsigned int factor) {
   if ( !factor ) {
     Error("Bogus scale factor %d found", factor);
     return;
@@ -2756,15 +2755,13 @@ void Image::Scale(unsigned int factor) {
     unsigned int h_count = ZM_SCALE_BASE/2;
     unsigned int last_h_index = 0;
     unsigned int last_w_index = 0;
-    unsigned int h_index;
     for ( unsigned int y = 0; y < height; y++ ) {
       unsigned char *ps = &buffer[y*wc];
       unsigned int w_count = ZM_SCALE_BASE/2;
-      unsigned int w_index;
       last_w_index = 0;
       for ( unsigned int x = 0; x < width; x++ ) {
         w_count += factor;
-        w_index = w_count/ZM_SCALE_BASE;
+        unsigned int w_index = w_count/ZM_SCALE_BASE;
         for (unsigned int f = last_w_index; f < w_index; f++ ) {
           for ( unsigned int c = 0; c < colours; c++ ) {
             *pd++ = *(ps+c);
@@ -2774,7 +2771,7 @@ void Image::Scale(unsigned int factor) {
         last_w_index = w_index;
       }
       h_count += factor;
-      h_index = h_count/ZM_SCALE_BASE;
+      unsigned int h_index = h_count/ZM_SCALE_BASE;
       for ( unsigned int f = last_h_index+1; f < h_index; f++ ) {
         memcpy(pd, pd-nwc, nwc);
         pd += nwc;
@@ -2786,17 +2783,14 @@ void Image::Scale(unsigned int factor) {
   } else {
     unsigned char *pd = scale_buffer;
     unsigned int wc = width*colours;
-    unsigned int xstart = factor/2;
-    unsigned int ystart = factor/2;
-    unsigned int h_count = ystart;
+    unsigned int h_count = factor/2;
     unsigned int last_h_index = 0;
     unsigned int last_w_index = 0;
-    unsigned int h_index;
     for ( unsigned int y = 0; y < height; y++ ) {
       h_count += factor;
-      h_index = h_count/ZM_SCALE_BASE;
+      unsigned int h_index = h_count/ZM_SCALE_BASE;
       if ( h_index > last_h_index ) {
-        unsigned int w_count = xstart;
+        unsigned int w_count = factor/2;
         unsigned int w_index;
         last_w_index = 0;
 
@@ -2825,6 +2819,7 @@ void Image::Scale(unsigned int factor) {
 
 void Image::Deinterlace_Discard() {
   /* Simple deinterlacing. Copy the even lines into the odd lines */
+  // ICON: These can be drastically improved.  But who cares?
 
   if ( colours == ZM_COLOUR_GRAY8 ) {
     const uint8_t *psrc;
@@ -3107,9 +3102,9 @@ __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-  static uint32_t divider = 0;
-  static uint32_t clearmask = 0;
   static double current_blendpercent = 0.0;
+  static uint32_t clearmask = 0;
+  static uint32_t divider = 0;
 
   if ( current_blendpercent != blendpercent ) {
     /* Attempt to match the blending percent to one of the possible values */
@@ -3310,10 +3305,10 @@ void neon32_armv7_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* r
 
 __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
 #if (defined(__aarch64__) && !defined(ZM_STRIP_NEON))
-  static int8_t divider = 0;
   static double current_blendpercent = 0.0;
 
-  if(current_blendpercent != blendpercent) {
+  if (current_blendpercent != blendpercent) {
+    static int8_t divider = 0;
     /* Attempt to match the blending percent to one of the possible values */
     if(blendpercent < 2.34375) {
       // 1.5625% blending

From 1f6874dd53f906ab6a858bed940eb97a7cf3a2f7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 9 Jan 2022 14:41:48 -0500
Subject: [PATCH 258/501] add explicit

---
 src/zm_time.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_time.h b/src/zm_time.h
index 7aaea7316..d9d131944 100644
--- a/src/zm_time.h
+++ b/src/zm_time.h
@@ -91,7 +91,7 @@ Duration duration_cast(timeval const &tv) {
 //
 class TimeSegmentAdder {
  public:
-  TimeSegmentAdder(Microseconds &in_target) :
+  explicit TimeSegmentAdder(Microseconds &in_target) :
       target_(in_target),
       start_time_(std::chrono::steady_clock::now()),
       finished_(false) {

From 21762585d96654fd1ac65cc317a34e764e4ccc7a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 9 Jan 2022 14:42:15 -0500
Subject: [PATCH 259/501] rework getting second packet for de-interlace.  Pass
 notesetmap by reference

---
 src/zm_monitor.cpp | 16 +++++++---------
 src/zm_monitor.h   |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f194378d3..6c1fdf452 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2675,23 +2675,21 @@ bool Monitor::Decode() {
       } else if (deinterlacing_value == 3) {
         capture_image->Deinterlace_Blend();
       } else if (deinterlacing_value == 4) {
-        ZMLockedPacket *deinterlace_packet_lock = nullptr;
         while (!zm_terminate) {
-          ZMLockedPacket *second_packet_lock = packetqueue.get_packet(decoder_it);
-          if (!second_packet_lock) {
+          ZMLockedPacket *deinterlace_packet_lock = packetqueue.get_packet(decoder_it);
+          if (!deinterlace_packet_lock) {
             packetqueue.unlock(packet_lock);
             return false;
           }
-          if (second_packet_lock->packet_->codec_type == packet->codec_type) {
-            deinterlace_packet_lock = second_packet_lock;
+          if (deinterlace_packet_lock->packet_->codec_type == packet->codec_type) {
+            capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
+            packetqueue.unlock(deinterlace_packet_lock);
             break;
           }
-          packetqueue.unlock(second_packet_lock);
+          packetqueue.unlock(deinterlace_packet_lock);
           packetqueue.increment_it(decoder_it);
         }
         if (zm_terminate) return false;
-        capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
-        packetqueue.unlock(deinterlace_packet_lock);
       } else if (deinterlacing_value == 5) {
         capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
       }
@@ -2786,7 +2784,7 @@ void Monitor::TimestampImage(Image *ts_image, SystemTimePoint ts_time) const {
 Event * Monitor::openEvent(
     const std::shared_ptr<ZMPacket> &snap,
     const std::string &cause,
-    const Event::StringSetMap noteSetMap) {
+    const Event::StringSetMap &noteSetMap) {
 
   // FIXME this iterator is not protected from invalidation
   packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index f461c6430..0396253ca 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -632,7 +632,7 @@ public:
   Event *openEvent(
       const std::shared_ptr<ZMPacket> &snap,
       const std::string &cause,
-      const Event::StringSetMap noteSetMap);
+      const Event::StringSetMap &noteSetMap);
   void closeEvent();
 
   void Reload();

From e9db12ca94a7ba34858851bfd1d5d13c1e19bb35 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 9 Jan 2022 14:46:48 -0500
Subject: [PATCH 260/501] Fix importance got cutnpasted to where it shouldn't
 be

---
 src/zm_monitor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 6c1fdf452..e07b872fc 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -635,8 +635,6 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   onvif_options = std::string(dbrow[col] ? dbrow[col] : ""); col++;
   onvif_event_listener = (*dbrow[col] != '0'); col++;
 
-  importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
-
  /*"SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors"; */
   signal_check_points = atoi(dbrow[col]); col++;
   signal_check_colour = strtol(dbrow[col][0] == '#' ? dbrow[col]+1 : dbrow[col], 0, 16); col++;
@@ -648,6 +646,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   blue_val = BLUE_VAL_BGRA(signal_check_colour);
   grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
 
+  importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
   if (importance < 0) importance = 0; // Should only be >= 0
 
   // How many frames we need to have before we start analysing

From 701045393cb107d1aebfe1878f50bbb481e559de Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 09:07:59 -0500
Subject: [PATCH 261/501] fix typo

---
 db/zm_update-1.37.7.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.37.7.sql b/db/zm_update-1.37.7.sql
index 39000e912..d7d592974 100644
--- a/db/zm_update-1.37.7.sql
+++ b/db/zm_update-1.37.7.sql
@@ -13,7 +13,7 @@ SET @s = (SELECT IF(
   AND table_schema = DATABASE()
   AND column_name = 'ONVIF_Event_Listener'
   ) > 0,
-"SELECT 'Column ONVIF_Event_Listener already exists in Monitorss'",
+"SELECT 'Column ONVIF_Event_Listener already exists in Monitors'",
 "ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Event_Listener` BOOLEAN NOT NULL default false AFTER `ONVIF_Options`"
 ));
 

From 947132284d2a2a5bda192838e22671d0d20b0793 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 10 Jan 2022 14:44:52 -0500
Subject: [PATCH 262/501] When transitioning from ALERT to IDLE, close the
 event if CLOSE_MODE is IDLE as well as ALARM.

---
 src/zm_monitor.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e07b872fc..093a32ad7 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2132,8 +2132,11 @@ bool Monitor::Analyse() {
                ((timestamp - event->StartTime()) >= min_section_length)) {
               Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                   name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
-              //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
-              if ( (function != RECORD && function != MOCORD ) || event_close_mode == CLOSE_ALARM ) {
+              if (
+                  (function != RECORD && function != MOCORD)
+                  ||
+                  (event_close_mode == CLOSE_ALARM || event_close_mode=CLOSE_IDLE)
+                  ) {
                 shared_data->state = state = IDLE;
                 Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
                     name.c_str(), analysis_image_count, event->Id(), (function==MOCORD)?", section truncated":"" );

From 3f7e4c67a086c97066c72687f75011c3e5afaa4e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 10 Jan 2022 12:49:13 -0500
Subject: [PATCH 263/501] Provide better logging when there is no data passwed
 to setAlarmCues

---
 web/skins/classic/views/js/event.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 2c03dd9ca..ac05f51fe 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -88,9 +88,15 @@ function initialAlarmCues(eventId) {
 }
 
 function setAlarmCues(data) {
-  cueFrames = data.frames;
-  alarmSpans = renderAlarmCues(vid ? $j("#videoobj") : $j("#evtStream"));//use videojs width or zms width
-  $j(".alarmCue").html(alarmSpans);
+  if (!data) {
+    Error('No data in setAlarmCues for event ' + eventData.Id);
+  } else if (!data.frames) {
+    Error('No data.frames in setAlarmCues for event ' + eventData.Id);
+  } else {
+    cueFrames = data.frames;
+    alarmSpans = renderAlarmCues(vid ? $j("#videoobj") : $j("#evtStream"));//use videojs width or zms width
+    $j(".alarmCue").html(alarmSpans);
+  }
 }
 
 function renderAlarmCues(containerEl) {

From ec95c8da575359c5b79f2f01b573e0a7b818da32 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 10 Jan 2022 15:24:57 -0500
Subject: [PATCH 264/501] Rename the monitor type define from CURL to LIBCURL
 to fix namespace conflict

---
 src/zm_monitor.cpp | 4 ++--
 src/zm_monitor.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e07b872fc..eb82b3f39 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -487,7 +487,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   } else if ( ! strcmp(dbrow[col], "Libvlc") ) {
     type = LIBVLC;
   } else if ( ! strcmp(dbrow[col], "cURL") ) {
-    type = CURL;
+    type = LIBCURL;
   } else if ( ! strcmp(dbrow[col], "VNC") ) {
     type = VNC;
   } else {
@@ -859,7 +859,7 @@ void Monitor::LoadCamera() {
 #endif // HAVE_LIBVLC
       break;
     }
-    case CURL: {
+    case LIBCURL: {
 #if HAVE_LIBCURL
       camera = zm::make_unique<cURLCamera>(this,
                                            path.c_str(),
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 0396253ca..4be731c5b 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -76,7 +76,7 @@ public:
     FILE,
     FFMPEG,
     LIBVLC,
-    CURL,
+    LIBCURL,
     NVSOCKET,
     VNC,
   } CameraType;

From ed7bc7c4b473c4e4c5e3478840bc25840267a52d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 10 Jan 2022 15:25:12 -0500
Subject: [PATCH 265/501] whitespace

---
 src/zm_ffmpeg_camera.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 2b36c34f6..4a0c94ec9 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -293,18 +293,16 @@ int FfmpegCamera::OpenFfmpeg() {
   mFormatContext->interrupt_callback.opaque = this;
 
   ret = avformat_open_input(&mFormatContext, mPath.c_str(), nullptr, &opts);
-  if ( ret != 0 )
-  {
+  if (ret != 0) {
     logPrintf(Logger::ERROR + monitor->Importance(),
         "Unable to open input %s due to: %s", mPath.c_str(),
         av_make_error_string(ret).c_str());
 
-    if ( mFormatContext ) {
+    if (mFormatContext) {
       avformat_close_input(&mFormatContext);
       mFormatContext = nullptr;
     }
     av_dict_free(&opts);
-
     return -1;
   }
   AVDictionaryEntry *e = nullptr;

From b406bf8fd101d358bbbaa7633185ff281d49fdb4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 10:13:11 -0500
Subject: [PATCH 266/501] remove last_send_image_width/height.  Not really
 useful or relevant

---
 src/zm_stream.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index aba98e0c3..084bd6754 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -157,7 +157,6 @@ Image *StreamBase::prepareImage(Image *image) {
   int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
   int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
   int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
-  int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
 
   Debug(3,
       "Scaling by %d, zooming by %d = magnifying by %d(%d)\n"
@@ -169,8 +168,7 @@ Image *StreamBase::prepareImage(Image *image) {
       "Last actual image width = %d, height = %d\n"
       "Display image width = %d, height = %d\n"
       "Last display image width = %d, height = %d\n"
-      "Send image width = %d, height = %d\n"
-      "Last send image width = %d, height = %d\n",
+      "Send image width = %d, height = %d\n",
       scale, zoom, mag, act_mag,
       last_scale, last_zoom, last_mag, last_act_mag,
       base_image_width, base_image_height,
@@ -180,8 +178,7 @@ Image *StreamBase::prepareImage(Image *image) {
       last_act_image_width, last_act_image_height,
       disp_image_width, disp_image_height,
       last_disp_image_width, last_disp_image_height,
-      send_image_width, send_image_height,
-      last_send_image_width, last_send_image_height
+      send_image_width, send_image_height
       );
 
   if ( ( mag != ZM_SCALE_BASE ) && (act_mag != ZM_SCALE_BASE) ) {

From 037771539d9973bc46dea58c7983acc850569b75 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 10:13:53 -0500
Subject: [PATCH 267/501] spacing, return a success value from setupCodec
 instead of using Fatal

---
 src/zm_mpeg.cpp | 182 ++++++++++++++++++++++++------------------------
 src/zm_mpeg.h   |   2 +-
 2 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index b8f7eeb66..275e36628 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -1,17 +1,17 @@
 /*
  * ZoneMinder MPEG class implementation, $Date$, $Revision$
  * Copyright (C) 2001-2008 Philip Coombes
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -42,19 +42,26 @@ void VideoStream::SetupFormat( ) {
 	ofc = nullptr;
 	avformat_alloc_output_context2(&ofc, nullptr, format, filename);
 
-	if ( !ofc ) {
+	if (!ofc) {
 		Fatal("avformat_alloc_..._context failed");
 	}
 
 	of = ofc->oformat;
-	Debug(1, "Using output format: %s (%s)", of->name, of->long_name);
+  Debug(1, "Using output format: %s (%s)", of->name, of->long_name);
 }
 
-void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate ) {
+int VideoStream::SetupCodec(
+    int colours,
+    int subpixelorder,
+    int width,
+    int height,
+    int bitrate,
+    double frame_rate
+    ) {
 	/* ffmpeg format matching */
-	switch ( colours ) {
+	switch (colours) {
 	  case ZM_COLOUR_RGB24:
-	    if ( subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+	    if (subpixelorder == ZM_SUBPIX_ORDER_BGR) {
 	      /* BGR subpixel order */
 	      pf = AV_PIX_FMT_BGR24;
 	    } else {
@@ -63,13 +70,13 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	    }
 	    break;
 	  case ZM_COLOUR_RGB32:
-	    if ( subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
+	    if (subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
 	      /* ARGB subpixel order */
 	      pf = AV_PIX_FMT_ARGB;
-	    } else if ( subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
+	    } else if (subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
 	      /* ABGR subpixel order */
 	      pf = AV_PIX_FMT_ABGR;
-	    } else if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
+	    } else if (subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
 	      /* BGRA subpixel order */
 	      pf = AV_PIX_FMT_BGRA;
 	    } else {
@@ -85,22 +92,22 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	    break;
 	}
 
-	if ( strcmp("rtp", of->name) == 0 ) {
+	if (strcmp("rtp", of->name) == 0) {
 		// RTP must have a packet_size.
 		// Not sure what this value should be really...
 		ofc->packet_size = width*height;
     Debug(1,"Setting packet_size to %d", ofc->packet_size);
-		
-		if ( of->video_codec ==  AV_CODEC_ID_NONE ) {
+
+		if (of->video_codec == AV_CODEC_ID_NONE) {
 			// RTP does not have a default codec in ffmpeg <= 0.8.
 			of->video_codec = AV_CODEC_ID_MPEG4;
 		}
 	}
-	
+
 	_AVCODECID codec_id = of->video_codec;
-	if ( codec_name ) {
+	if (codec_name) {
     AVCodec *a = avcodec_find_encoder_by_name(codec_name);
-    if ( a ) {
+    if (a) {
       codec_id = a->id;
       Debug(1, "Using codec \"%s\"", codec_name);
     } else {
@@ -111,31 +118,29 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	/* add the video streams using the default format codecs
 	   and initialize the codecs */
 	ost = nullptr;
-	if ( codec_id != AV_CODEC_ID_NONE ) {
+	if (codec_id != AV_CODEC_ID_NONE) {
 		codec = avcodec_find_encoder(codec_id);
-		if ( !codec ) {
-			Fatal("Could not find encoder for '%s'", avcodec_get_name(codec_id));
+		if (!codec) {
+			Error("Could not find encoder for '%s'", avcodec_get_name(codec_id));
+      return -1;
 		}
 
 		Debug(1, "Found encoder for '%s'", avcodec_get_name(codec_id));
-
-		ost = avformat_new_stream( ofc, codec );
-		
-		if ( !ost ) {
-			Fatal( "Could not alloc stream" );
-      return;
+		ost = avformat_new_stream(ofc, codec);
+		if (!ost) {
+			Error("Could not alloc stream");
+      return -1;
 		}
-		Debug( 1, "Allocated stream (%d) !=? (%d)", ost->id , ofc->nb_streams - 1 );
+		Debug(1, "Allocated stream (%d) !=? (%d)", ost->id , ofc->nb_streams - 1);
 		ost->id = ofc->nb_streams - 1;
 
     codec_context = avcodec_alloc_context3(nullptr);
     //avcodec_parameters_to_context(codec_context, ost->codecpar);
-
 		codec_context->codec_id = codec->id;
 		codec_context->codec_type = codec->type;
 
 		codec_context->pix_fmt = strcmp("mjpeg", ofc->oformat->name) == 0 ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV420P;
-		if ( bitrate <= 100 ) {
+		if (bitrate <= 100) {
 			// Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
 			// This gets rid of artifacts in the beginning of the movie; and well, even quality.
 			codec_context->flags |= AV_CODEC_FLAG_QSCALE;
@@ -155,22 +160,22 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 		codec_context->time_base.num = 1;
     ost->time_base.den = frame_rate;
 		ost->time_base.num = 1;
-
-		
 		Debug( 1, "Will encode in %d fps. %dx%d", codec_context->time_base.den, width, height );
-		
+
 		/* emit one intra frame every second */
 		codec_context->gop_size = frame_rate;
 
 		// some formats want stream headers to be separate
-		if ( of->flags & AVFMT_GLOBALHEADER )
+		if (of->flags & AVFMT_GLOBALHEADER)
 			codec_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
     avcodec_parameters_from_context(ost->codecpar, codec_context);
     zm_dump_codecpar(ost->codecpar);
 	} else {
-		Fatal( "of->video_codec == AV_CODEC_ID_NONE" );
-	}
+		Error("of->video_codec == AV_CODEC_ID_NONE");
+    return -1;
+  }
+  return 0;
 }
 
 void VideoStream::SetParameters( ) {
@@ -198,11 +203,11 @@ const char *VideoStream::MimeType() const {
 bool VideoStream::OpenStream( ) {
 	int ret;
 
-	/* now that all the parameters are set, we can open the 
+	/* now that all the parameters are set, we can open the
 	   video codecs and allocate the necessary encode buffers */
 	if ( ost ) {
     Debug(1,"Opening codec");
-    
+
 		/* open the codec */
 
       if ((ret = avcodec_open2(codec_context, codec, nullptr)) < 0) {
@@ -319,7 +324,7 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
 	if ( !initialised ) {
 		Initialise( );
 	}
-	
+
 	if ( format ) {
 		int length = strlen(format);
 		codec_and_format = new char[length+1];;
@@ -337,13 +342,13 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
 	SetupFormat( );
 	SetupCodec( colours, subpixelorder, width, height, bitrate, frame_rate );
 	SetParameters( );
-    
+
   // Allocate buffered packets.
   packet_buffers = new AVPacket*[2];
   packet_buffers[0] = new AVPacket();
   packet_buffers[1] = new AVPacket();
   packet_index = 0;
-	
+
 	// Initialize mutex used by streaming thread.
 	if ( pthread_mutex_init( buffer_copy_lock, nullptr ) != 0 ) {
 		Fatal("pthread_mutex_init failed");
@@ -353,35 +358,35 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
 
 VideoStream::~VideoStream( ) {
 	Debug( 1, "VideoStream destructor." );
-	
+
 	// Stop streaming thread.
 	if ( streaming_thread ) {
 		do_streaming = false;
 		void* thread_exit_code;
-		
+
 		Debug( 1, "Asking streaming thread to exit." );
-		
+
 		// Wait for thread to exit.
 		pthread_join(streaming_thread, &thread_exit_code);
 	}
-	
+
 	if ( buffer_copy != nullptr ) {
 		av_free( buffer_copy );
 	}
-    
+
 	if ( buffer_copy_lock ) {
 		if ( pthread_mutex_destroy( buffer_copy_lock ) != 0 ) {
 			Error( "pthread_mutex_destroy failed" );
 		}
 		delete buffer_copy_lock;
 	}
-    
+
   if (packet_buffers) {
     delete packet_buffers[0];
     delete packet_buffers[1];
     delete[] packet_buffers;
   }
-	
+
 	/* close each codec */
 	if ( ost ) {
 		avcodec_close( codec_context );
@@ -409,7 +414,7 @@ VideoStream::~VideoStream( ) {
 
 	/* free the stream */
 	av_free( ofc );
-	
+
 	/* free format and codec_name data. */
 	if ( codec_and_format ) {
 		delete codec_and_format;
@@ -420,12 +425,12 @@ double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _a
 	if ( pthread_mutex_lock(buffer_copy_lock) != 0 ) {
 		Fatal( "EncodeFrame: pthread_mutex_lock failed." );
 	}
-	
+
 	if (buffer_copy_size < buffer_size) {
 		if ( buffer_copy ) {
 			av_free(buffer_copy);
 		}
-		
+
 		// Allocate a buffer to store source images for the streaming thread to encode.
 		buffer_copy = (uint8_t *)av_malloc(buffer_size);
 		if ( !buffer_copy ) {
@@ -435,35 +440,34 @@ double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _a
 		}
 		buffer_copy_size = buffer_size;
 	}
-	
+
 	add_timestamp = _add_timestamp;
 	timestamp = _timestamp;
 	buffer_copy_used = buffer_size;
 	memcpy(buffer_copy, buffer, buffer_size);
-	
+
 	if ( pthread_mutex_unlock(buffer_copy_lock) != 0 ) {
 		Fatal( "EncodeFrame: pthread_mutex_unlock failed." );
 	}
-	
+
 	if ( streaming_thread == 0 ) {
 		Debug( 1, "Starting streaming thread" );
-		
+
 		// Start a thread for streaming encoded video.
 		if (pthread_create( &streaming_thread, nullptr, StreamingThreadCallback, (void*) this) != 0){
 			// Log a fatal error and exit the process.
 			Fatal( "VideoStream failed to create streaming thread." );
 		}
 	}
-	
+
 	//return ActuallyEncodeFrame( buffer, buffer_size, add_timestamp, timestamp);
-	
+
 	return _timestamp;
 }
 
 double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp, unsigned int timestamp ) {
-
 	if ( codec_context->pix_fmt != pf ) {
-	static struct SwsContext *img_convert_ctx = nullptr;
+    static struct SwsContext *img_convert_ctx = nullptr;
 		memcpy( tmp_opicture->data[0], buffer, buffer_size );
 		if ( !img_convert_ctx ) {
 			img_convert_ctx = sws_getCachedContext( nullptr, codec_context->width, codec_context->height, pf, codec_context->width, codec_context->height, codec_context->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr );
@@ -475,37 +479,36 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 		memcpy( opicture->data[0], buffer, buffer_size );
 	}
 	AVFrame *opicture_ptr = opicture;
-	
+
 	AVPacket *pkt = packet_buffers[packet_index];
 	av_init_packet( pkt );
-    int got_packet = 0;
-    if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO &&
-       codec_context->codec_id == AV_CODEC_ID_RAWVIDEO) {
-		pkt->flags |= AV_PKT_FLAG_KEY;
-		pkt->stream_index = ost->index;
-		pkt->data = (uint8_t *)opicture_ptr;
-		pkt->size = sizeof (AVPicture);
-      got_packet = 1;
+  int got_packet = 0;
+  if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO &&
+      codec_context->codec_id == AV_CODEC_ID_RAWVIDEO) {
+    pkt->flags |= AV_PKT_FLAG_KEY;
+    pkt->stream_index = ost->index;
+    pkt->data = (uint8_t *)opicture_ptr;
+    pkt->size = sizeof (AVPicture);
+    got_packet = 1;
 	} else {
 		opicture_ptr->pts = codec_context->frame_number;
 		opicture_ptr->quality = codec_context->global_quality;
 
-      avcodec_send_frame(codec_context, opicture_ptr);
-      int ret = avcodec_receive_packet(codec_context, pkt);
-      if ( ret < 0 ) {
-        if ( AVERROR_EOF != ret ) {
-          Error("ERror encoding video (%d) (%s)", ret,
-                av_err2str(ret));
-        }
-      } else {
-        got_packet = 1;
+    avcodec_send_frame(codec_context, opicture_ptr);
+    int ret = avcodec_receive_packet(codec_context, pkt);
+    if (ret < 0) {
+      if (AVERROR_EOF != ret) {
+        Error("ERror encoding video (%d) (%s)", ret, av_err2str(ret));
       }
+    } else {
+      got_packet = 1;
+    }
 
-    if ( got_packet ) {
-//      if ( c->coded_frame->key_frame )
-//      {
-//        pkt->flags |= AV_PKT_FLAG_KEY;
-//      }
+    if (got_packet) {
+      //      if ( c->coded_frame->key_frame )
+      //      {
+      //        pkt->flags |= AV_PKT_FLAG_KEY;
+      //      }
 
       if ( pkt->pts != (int64_t)AV_NOPTS_VALUE ) {
         pkt->pts = av_rescale_q( pkt->pts, codec_context->time_base, ost->time_base );
@@ -517,18 +520,17 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
       pkt->stream_index = ost->index;
     }
   }
-  
-  return ( opicture_ptr->pts);
+
+  return opicture_ptr->pts;
 }
 
 int VideoStream::SendPacket(AVPacket *packet) {
-    
-    int ret = av_write_frame( ofc, packet );
-    if ( ret != 0 ) {
-        Fatal( "Error %d while writing video frame: %s", ret, av_err2str( errno ) );
-    }
-    av_packet_unref( packet );
-    return ret;
+  int ret = av_write_frame(ofc, packet);
+  if (ret < 0) {
+    Error("Error %d while writing video frame: %s", ret, av_err2str(errno));
+  }
+  av_packet_unref(packet);
+  return ret;
 }
 
 void *VideoStream::StreamingThreadCallback(void *ctx) {
diff --git a/src/zm_mpeg.h b/src/zm_mpeg.h
index b6a6f49be..552652a1d 100644
--- a/src/zm_mpeg.h
+++ b/src/zm_mpeg.h
@@ -68,7 +68,7 @@ protected:
   static void Initialise();
 
   void SetupFormat( );
-  void SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate );
+  int SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate );
   void SetParameters();
   void ActuallyOpenStream();
   double ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );

From 4697e36f114474a8ad5746728207a281c5541901 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 10:14:03 -0500
Subject: [PATCH 268/501] add explicit

---
 src/zm_rtsp_server_server_media_subsession.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_rtsp_server_server_media_subsession.h b/src/zm_rtsp_server_server_media_subsession.h
index d3780cd6e..04632c44b 100644
--- a/src/zm_rtsp_server_server_media_subsession.h
+++ b/src/zm_rtsp_server_server_media_subsession.h
@@ -21,7 +21,7 @@ class ZoneMinderDeviceSource;
 
 class BaseServerMediaSubsession {
 	public:
-    BaseServerMediaSubsession(StreamReplicator* replicator):
+    explicit BaseServerMediaSubsession(StreamReplicator* replicator):
       m_replicator(replicator) {};
 
 		FramedSource* createSource(

From 9f86fd3b1608384682d1d12bab17450e9e9c9be9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 10:16:07 -0500
Subject: [PATCH 269/501] add default_width and height to constructor

---
 src/zm_swscale.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/zm_swscale.cpp b/src/zm_swscale.cpp
index 20b322ab9..68e7af4ef 100644
--- a/src/zm_swscale.cpp
+++ b/src/zm_swscale.cpp
@@ -22,7 +22,14 @@
 #include "zm_image.h"
 #include "zm_logger.h"
 
-SWScale::SWScale() : gotdefaults(false), swscale_ctx(nullptr), input_avframe(nullptr), output_avframe(nullptr) {
+SWScale::SWScale() :
+  gotdefaults(false),
+  swscale_ctx(nullptr),
+  input_avframe(nullptr),
+  output_avframe(nullptr),
+  default_width(0),
+  default_height(0)
+{
   Debug(4, "SWScale object created");
 }
 

From 78a10b6095b3759d341a1a336ac2b73a880871b4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 17:35:11 -0500
Subject: [PATCH 270/501] cppcheck fixes

---
 src/zm_utils.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index 409429667..bc17e5758 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -120,9 +120,6 @@ std::string Join(const StringVector &values, const std::string &delim) {
 std::string stringtf(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  va_list args2;
-  va_copy(args2, args);
-
   int size = vsnprintf(nullptr, 0, format, args) + 1; // Extra space for '\0'
   va_end(args);
 
@@ -131,6 +128,8 @@ std::string stringtf(const char* format, ...) {
   }
 
   std::unique_ptr<char[]> buf(new char[size]);
+  va_list args2;
+  va_copy(args2, args);
   vsnprintf(buf.get(), size, format, args2);
   va_end(args2);
 
@@ -259,6 +258,8 @@ void HwCapsDetect() {
   unsigned long auxval = 0;
   elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval));
   if (auxval & HWCAP_NEON) {
+  #else
+  {
   #error Unsupported OS.
   #endif
     Debug(1,"Detected ARM (AArch32) processor with Neon");

From 376d7fd7e530a66293c7b932ef2404388028d39e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 17:35:57 -0500
Subject: [PATCH 271/501] log error if avcodec_parameters_to_context fails.
 Mostly to quiet cppcheck. Remove duplicated assignment to sample_fmt.

---
 src/zm_videostore.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index ad401b22c..abd541535 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -401,6 +401,10 @@ bool VideoStore::open() {
       } else {
         audio_in_ctx = avcodec_alloc_context3(audio_out_codec);
         ret = avcodec_parameters_to_context(audio_in_ctx, audio_in_stream->codecpar);
+        if (ret < 0)
+          Error("Failure from avcodec_parameters_to_context %s",
+              av_make_error_string(ret).c_str());
+
         audio_in_ctx->time_base = audio_in_stream->time_base;
 
         audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
@@ -729,7 +733,6 @@ bool VideoStore::setup_resampler() {
   audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
   audio_out_ctx->channels = audio_in_ctx->channels;
   audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
-  audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
   if (!audio_out_ctx->channel_layout) {
     Debug(3, "Correcting channel layout from (%" PRIi64 ") to (%" PRIi64 ")",
         audio_out_ctx->channel_layout,
@@ -852,7 +855,7 @@ bool VideoStore::setup_resampler() {
     return false;
   }
   if ((ret = swr_init(resample_ctx)) < 0) {
-    Error("Could not open resampler");
+    Error("Could not open resampler %d", ret);
     av_frame_free(&in_frame);
     av_frame_free(&out_frame);
     swr_free(&resample_ctx);

From 3f7b9dfff7c57fcf80fa8a6998e2a29d26642cb9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 17:36:45 -0500
Subject: [PATCH 272/501] fix cppcheck error about lo_x.  Inner scope
 overwriting it.

---
 src/zm_zone.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 4fc1bf61b..29511f6bd 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -219,7 +219,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
   int alarm_mid_x = -1;
   int alarm_mid_y = -1;
 
-  unsigned int lo_x = polygon.Extent().Lo().x_;
+  //unsigned int lo_x = polygon.Extent().Lo().x_;
   unsigned int lo_y = polygon.Extent().Lo().y_;
   unsigned int hi_x = polygon.Extent().Hi().x_;
   unsigned int hi_y = polygon.Extent().Hi().y_;
@@ -699,6 +699,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
     if ((type < PRECLUSIVE) && (check_method >= BLOBS) && (monitor->GetOptSaveJPEGs() > 1)) {
 
+      unsigned int lo_x = polygon.Extent().Lo().x_;
       // First mask out anything we don't want
       for (unsigned int y = lo_y; y <= hi_y; y++) {
         pdiff = diff_buff + ((diff_width * y) + lo_x);

From a0c34f0d96deea7015e60f7f8629e30fd3696966 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 18:33:01 -0500
Subject: [PATCH 273/501] Fix. cppcheck was wrong about divider being able to
 go into deeper scope.

---
 src/zm_image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 99fcf4ee1..1c58130cc 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -3306,9 +3306,9 @@ void neon32_armv7_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* r
 __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
 #if (defined(__aarch64__) && !defined(ZM_STRIP_NEON))
   static double current_blendpercent = 0.0;
+  static int8_t divider = 0;
 
   if (current_blendpercent != blendpercent) {
-    static int8_t divider = 0;
     /* Attempt to match the blending percent to one of the possible values */
     if(blendpercent < 2.34375) {
       // 1.5625% blending

From cb30f7639f29ec21214450094ea3ddd4f4505273 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 10 Jan 2022 18:47:26 -0500
Subject: [PATCH 274/501] revert broken commit.  Isaac doesn't know what he's
 doing.

---
 src/zm_utils.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index bc17e5758..6ea4e0dae 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -120,16 +120,18 @@ std::string Join(const StringVector &values, const std::string &delim) {
 std::string stringtf(const char* format, ...) {
   va_list args;
   va_start(args, format);
-  int size = vsnprintf(nullptr, 0, format, args) + 1; // Extra space for '\0'
-  va_end(args);
-
-  if (size <= 0) {
-    throw std::runtime_error("Error during formatting.");
-  }
-
-  std::unique_ptr<char[]> buf(new char[size]);
   va_list args2;
   va_copy(args2, args);
+  int size = vsnprintf(nullptr, 0, format, args);
+  va_end(args);
+
+  if (size < 0) {
+    va_end(args2);
+    throw std::runtime_error("Error during formatting.");
+  }
+  size += 1; // Extra space for '\0'
+
+  std::unique_ptr<char[]> buf(new char[size]);
   vsnprintf(buf.get(), size, format, args2);
   va_end(args2);
 

From 81fc392bc2184a4bc84808701eae518acad8f313 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 10 Jan 2022 19:56:00 -0500
Subject: [PATCH 275/501] If error is ENOSPACE just give up.  ffmpeg crashes if
 we try again.

---
 src/zm_videostore.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index ad401b22c..0038348ef 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -497,8 +497,14 @@ bool VideoStore::open() {
     Debug(1, "using movflags %s", movflags_entry->value);
   }
   if ((ret = avformat_write_header(oc, &opts)) < 0) {
-    Warning("Unable to set movflags trying with defaults.");
-    ret = avformat_write_header(oc, nullptr);
+    // we crash if we try again
+    if (ENOSPC != ret) {
+      Warning("Unable to set movflags trying with defaults.%d %s",
+          ret, av_make_error_string(ret).c_str());
+
+      ret = avformat_write_header(oc, nullptr);
+      Debug(1, "Done %d", ret);
+    }
   } else if (av_dict_count(opts) != 0) {
     Info("some options not used, turn on debugging for a list.");
     AVDictionaryEntry *e = nullptr;

From 3a9c16aeeaef051d35cd3862f1ddf5e0fd3047eb Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Mon, 10 Jan 2022 23:22:37 -0600
Subject: [PATCH 276/501] First working Janus build

---
 CMakeLists.txt                            |    2 +-
 db/zm_create.sql.in                       |    1 +
 db/zm_update-1.37.8.sql                   |   18 +
 src/zm_monitor.cpp                        |  210 +-
 src/zm_monitor.h                          |   12 +-
 web/ajax/modals/function.php              |   10 +
 web/includes/Monitor.php                  |    1 +
 web/includes/functions.php                |    2 +
 web/js/MonitorStream.js                   |   66 +
 web/js/janus.js                           | 3649 +++++++++++++++++++++
 web/lang/en_gb.php                        |    5 +
 web/skins/classic/views/js/montage.js     |  109 +-
 web/skins/classic/views/js/montage.js.php |    1 +
 web/skins/classic/views/js/watch.js.php   |    1 +
 web/skins/classic/views/monitor.php       |   10 +
 web/skins/classic/views/montage.php       |    2 +
 16 files changed, 4047 insertions(+), 52 deletions(-)
 create mode 100644 db/zm_update-1.37.8.sql
 create mode 100644 web/js/janus.js

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0479ce1fd..7df6aaa70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,7 +321,7 @@ if(NOT ZM_NO_CURL)
   find_package(CURL)
   if(CURL_FOUND)
     set(HAVE_LIBCURL 1)
-    #list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+    list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
     include_directories(${CURL_INCLUDE_DIRS})
     set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
     check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 110365125..06d2ab385 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -455,6 +455,7 @@ CREATE TABLE `Monitors` (
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
+  `JanusEnabled` BOOLEAN NOT NULL default false,
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
   `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '',
diff --git a/db/zm_update-1.37.8.sql b/db/zm_update-1.37.8.sql
new file mode 100644
index 000000000..650489e7b
--- /dev/null
+++ b/db/zm_update-1.37.8.sql
@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have JanusEnabled
+--
+
+SELECT 'Checking for JanusEnabled in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'JanusEnabled'
+  ) > 0,
+"SELECT 'Column JanusEnabled already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `JanusEnabled` BOOLEAN NOT NULL default false AFTER `DecodingEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e07b872fc..80770a964 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -77,7 +77,7 @@ struct Namespace namespaces[] =
 // This is the official SQL (and ordering of the fields) to load a Monitor.
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
-"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, "
+"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, `JanusEnabled`,"
 "`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
 "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
 "`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
@@ -306,6 +306,7 @@ Monitor::Monitor()
   function(NONE),
   enabled(false),
   decoding_enabled(false),
+  janus_enabled(false),
   //protocol
   //method
   //options
@@ -446,7 +447,7 @@ Monitor::Monitor()
 
 /*
   std::string load_monitor_sql =
- "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
+ "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, JanusEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
  "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
  "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
  "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
@@ -487,7 +488,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   } else if ( ! strcmp(dbrow[col], "Libvlc") ) {
     type = LIBVLC;
   } else if ( ! strcmp(dbrow[col], "cURL") ) {
-    type = CURL;
+    type = LIBCURL;
   } else if ( ! strcmp(dbrow[col], "VNC") ) {
     type = VNC;
   } else {
@@ -499,6 +500,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
   decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
   // See below after save_jpegs for a recalculation of decoding_enabled
+  janus_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
 
   ReloadLinkedMonitors(dbrow[col]); col++;
   event_start_command = dbrow[col] ? dbrow[col] : ""; col++;
@@ -859,7 +861,7 @@ void Monitor::LoadCamera() {
 #endif // HAVE_LIBVLC
       break;
     }
-    case CURL: {
+    case LIBCURL: {
 #if HAVE_LIBCURL
       camera = zm::make_unique<cURLCamera>(this,
                                            path.c_str(),
@@ -1074,44 +1076,55 @@ bool Monitor::connect() {
     usedsubpixorder = camera->SubpixelOrder();  // Used in CheckSignal
     shared_data->valid = true;
 
-  //ONVIF Setup
 #ifdef WITH_GSOAP
-  ONVIF_Trigger_State = FALSE;
-  if (onvif_event_listener) { //Temporarily using this option to enable the feature
-    Debug(1, "Starting ONVIF");
-    ONVIF_Healthy = FALSE;
-    if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
-      ONVIF_Closes_Event = TRUE;
-    }
-    tev__PullMessages.Timeout = "PT600S";
-    tev__PullMessages.MessageLimit = 100;
-    soap = soap_new();
-    soap->connect_timeout = 5;
-    soap->recv_timeout = 5;
-    soap->send_timeout = 5;
-    soap_register_plugin(soap, soap_wsse);
-    proxyEvent = PullPointSubscriptionBindingProxy(soap);
-    std::string full_url = onvif_url + "/Events";
-    proxyEvent.soap_endpoint = full_url.c_str();
-    set_credentials(soap);
-    Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
-    if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
-      Warning("Couldn't create subscription!");
-    } else {
-      //Empty the stored messages
-      set_credentials(soap);
-      if (proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) {
-        Warning("Couldn't do initial event pull! %s", response.SubscriptionReference.Address);
-      } else {
-        Debug(1, "Good Initial ONVIF Pull");
-        ONVIF_Healthy = TRUE;
+    //ONVIF Setup
+    ONVIF_Trigger_State = FALSE;
+    if (onvif_event_listener) { //Temporarily using this option to enable the feature
+      Debug(1, "Starting ONVIF");
+      ONVIF_Healthy = FALSE;
+      if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
+        ONVIF_Closes_Event = TRUE;
       }
+      tev__PullMessages.Timeout = "PT600S";
+      tev__PullMessages.MessageLimit = 100;
+      soap = soap_new();
+      soap->connect_timeout = 5;
+      soap->recv_timeout = 5;
+      soap->send_timeout = 5;
+      soap_register_plugin(soap, soap_wsse);
+      proxyEvent = PullPointSubscriptionBindingProxy(soap);
+      std::string full_url = onvif_url + "/Events";
+      proxyEvent.soap_endpoint = full_url.c_str();
+      set_credentials(soap);
+      Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
+      if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
+        Warning("Couldn't create subscription!");
+      } else {
+        //Empty the stored messages
+        set_credentials(soap);
+        if (proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) {
+          Warning("Couldn't do initial event pull! %s", response.SubscriptionReference.Address);
+        } else {
+          Debug(1, "Good Initial ONVIF Pull");
+          ONVIF_Healthy = TRUE;
+        }
+      }
+    } else {
+      Debug(1, "Not Starting ONVIF");
     }
-  } else {
-    Debug(1, "Not Starting ONVIF");
-  }
-  //End ONVIF Setup
+    //End ONVIF Setup
 #endif
+
+//janus setup.
+    if (janus_enabled) {
+      add_to_janus();
+    }
+//ifdef janus, and if url contains rtsp
+//look for username and password
+//make the initial call, scrape id, then connect to plugin
+//add stream using the same id
+
+
   } else if (!shared_data->valid) {
     Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
     return false;
@@ -3189,6 +3202,10 @@ int Monitor::Close() {
     soap = nullptr;
   }  //End ONVIF
 #endif
+  //Janus Teardown
+    if (janus_enabled && (purpose == CAPTURE)) {
+      remove_from_janus();
+    }
 
   packetqueue.clear();
   if (audio_fifo) {
@@ -3325,3 +3342,120 @@ int SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char
   return soap_send_empty_response(soap, SOAP_OK);
 }
 #endif
+
+size_t Monitor::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
+{
+    ((std::string*)userp)->append((char*)contents, size * nmemb);
+    return size * nmemb;
+}
+
+int Monitor::add_to_janus() {
+  //TODO clean this up, add error checking, etc
+  std::string response;
+  std::string endpoint = "127.0.0.1:8088/janus/";
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  std::string rtsp_username;
+  std::string rtsp_password;
+  std::string rtsp_path = "rtsp://";
+  std::size_t pos;
+  std::size_t pos2;
+
+  curl = curl_easy_init();
+
+  //parse username and password
+  pos = path.find(":", 7);
+  rtsp_username = path.substr(7, pos-7);
+
+  pos2 = path.find("@", pos);
+  rtsp_password = path.substr(pos+1, pos2 - pos - 1);
+  rtsp_path += path.substr(pos2 + 1);
+
+  //Start Janus API init. Need to get a session_id and handle_id
+  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  pos = response.find("\"id\": ");
+  std::string janus_id = response.substr(pos + 6, 16);
+  response = "";
+  endpoint += janus_id;
+  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  pos = response.find("\"id\": ");
+  std::string handle_id = response.substr(pos + 6, 16);
+  endpoint += "/";
+  endpoint += handle_id;
+
+  //Assemble our actual request
+  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"create\", \"admin_key\" : \"supersecret\", \"type\" : \"rtsp\", ";
+  postData +=  "\"url\" : \"";
+  postData += rtsp_path;
+  postData += "\", \"rtsp_user\" : \"";
+  postData += rtsp_username;
+  postData += "\", \"rtsp_pwd\" : \"";
+  postData += rtsp_password;
+  postData += "\", \"id\" : ";
+  postData += std::to_string(id);
+  postData += ", \"video\" : true}}";
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  Warning(response.c_str());
+  curl_easy_cleanup(curl);
+
+}
+int Monitor::remove_from_janus() {
+  //TODO clean this up, add error checking, etc
+  std::string response;
+  std::string endpoint = "127.0.0.1:8088/janus/";
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  std::size_t pos;
+
+  curl = curl_easy_init();
+
+
+  //Start Janus API init. Need to get a session_id and handle_id
+  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  pos = response.find("\"id\": ");
+  std::string janus_id = response.substr(pos + 6, 16);
+  response = "";
+  endpoint += janus_id;
+  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  pos = response.find("\"id\": ");
+  std::string handle_id = response.substr(pos + 6, 16);
+  endpoint += "/";
+  endpoint += handle_id;
+
+  //Assemble our actual request
+  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"destroy\", \"admin_key\" : \"supersecret\", \"id\" : ";
+  postData += std::to_string(id);
+  postData += "}}";
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  curl_easy_perform(curl);
+  Warning(response.c_str());
+  curl_easy_cleanup(curl);
+
+}
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 0396253ca..0d63816e9 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -34,6 +34,7 @@
 #include <memory>
 #include <sys/time.h>
 #include <vector>
+#include <curl/curl.h>
 
 #ifdef WITH_GSOAP
 #include "soapPullPointSubscriptionBindingProxy.h"
@@ -47,6 +48,7 @@ class Group;
 #define MOTION_CAUSE "Motion"
 #define LINKED_CAUSE "Linked"
 
+
 //
 // This is the main class for monitors. Each monitor is associated
 // with a camera and is effectively a collector for events.
@@ -76,7 +78,7 @@ public:
     FILE,
     FFMPEG,
     LIBVLC,
-    CURL,
+    LIBCURL,
     NVSOCKET,
     VNC,
   } CameraType;
@@ -266,6 +268,7 @@ protected:
   Function        function;           // What the monitor is doing
   bool            enabled;            // Whether the monitor is enabled or asleep
   bool            decoding_enabled;   // Whether the monitor will decode h264/h265 packets
+  bool            janus_enabled;      // Whether we set the h264/h265 stream up on janus
 
   std::string protocol;
   std::string method;
@@ -445,6 +448,13 @@ protected:
   void set_credentials(struct soap *soap);
 #endif
 
+  //curl stuff for Janus
+  CURL *curl;
+  //helper class for CURL
+  static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
+  int add_to_janus();
+  int remove_from_janus();
+
   // Used in check signal
   uint8_t red_val;
   uint8_t green_val;
diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php
index 08b470840..b23bbb649 100644
--- a/web/ajax/modals/function.php
+++ b/web/ajax/modals/function.php
@@ -69,6 +69,16 @@ if ( !canEdit('Monitors') ) return;
   }
 ?>
 
+        </div>
+        <div class="form-group" id="FunctionJanusEnabled">
+          <label for="newJanusEnabled"><?php echo translate('Janus Enabled') ?></label>
+          <input type="checkbox" name="newJanusEnabled" id="newJanusEnabled" value="1"/>
+<?php
+  if ( isset($OLANG['FUNCTION_JANUS_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_JANUS_ENABLED']['Help'].'</div>';
+  }
+?>
+
         </div>
       </div>
       <div class="modal-footer">
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index b57fc2748..199e9a9c2 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -55,6 +55,7 @@ class Monitor extends ZM_Object {
     'Function'  => 'Mocord',
     'Enabled'   => array('type'=>'boolean','default'=>1),
     'DecodingEnabled'   => array('type'=>'boolean','default'=>1),
+    'JanusEnabled'   => array('type'=>'boolean','default'=>0),
     'LinkedMonitors' => array('type'=>'set', 'default'=>null),
     'Triggers'  =>  array('type'=>'set','default'=>''),
     'EventStartCommand' => '',
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 6f292357e..f9b8abf72 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2094,6 +2094,8 @@ function getStreamHTML($monitor, $options = array()) {
       'format' => ZM_MPEG_LIVE_FORMAT
     ) );
     return getVideoStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
+  } else if ( $monitor->JanusEnabled() ) {
+    return '<video id="liveStream'.$monitor->Id().'" width="'.$options['width'].'"autoplay muted playsinline=""></video>';
   } else if ( $options['mode'] == 'stream' and canStream() ) {
     $options['mode'] = 'jpeg';
     $streamSrc = $monitor->getStreamSrc($options);
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index ef4d6db41..1bc96d62a 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -5,6 +5,7 @@ function MonitorStream(monitorData) {
   this.auth_relay = auth_relay;
   this.auth_hash = auth_hash;
   this.url = monitorData.url;
+  this.janusEnabled = monitorData.janusEnabled;
   this.url_to_zms = monitorData.url_to_zms;
   this.width = monitorData.width;
   this.height = monitorData.height;
@@ -86,6 +87,71 @@ function MonitorStream(monitorData) {
       console.log(stream);
       return;
     }
+    if (this.janusEnabled) {
+      var id = parseInt(this.id);
+      var opaqueId = "streamingtest-"+Janus.randomString(12);
+      var server = "http://zm-dev:8088/janus";
+      Janus.init({debug: "all", callback: function() {
+        janus = new Janus({
+          server: server,
+          success: function() {
+      janus.attach({
+        plugin: "janus.plugin.streaming",
+        opaqueId: opaqueId,
+        success: function(pluginHandle) {
+          streaming = pluginHandle;
+          var body = { "request": "watch", "id": id };
+          streaming.send({"message": body});
+        },
+        error: function(error) {
+          Janus.error("  -- Error attaching plugin... ", error);
+        },
+        onmessage: function(msg, jsep) {
+          Janus.debug(" ::: Got a message :::");
+          Janus.debug(msg);
+          var result = msg["result"];
+          if(result !== null && result !== undefined) {
+            if(result["status"] !== undefined && result["status"] !== null) {
+              var status = result["status"];
+            }
+          } else if(msg["error"] !== undefined && msg["error"] !== null) {
+            alert(msg["error"]);
+            stopStream();
+            return;
+          }
+          if(jsep !== undefined && jsep !== null) {
+            Janus.debug("Handling SDP as well...");
+            Janus.debug(jsep);
+            // Offer from the plugin, let's answer
+            streaming.createAnswer({
+              jsep: jsep,
+              // We want recvonly audio/video and, if negotiated, datachannels
+              media: { audioSend: false, videoSend: false, data: true },
+              success: function(jsep) {
+                Janus.debug("Got SDP!");
+                Janus.debug(jsep);
+                var body = { "request": "start"};
+                streaming.send({"message": body, "jsep": jsep});
+              },
+              error: function(error) {
+                Janus.error("WebRTC error:", error);
+                alert("WebRTC error... " + JSON.stringify(error));
+              }
+            });
+          }
+        }, //onmessage function
+        onremotestream: function(ourstream) {
+          Janus.debug(" ::: Got a remote track :::");
+          Janus.debug(ourstream);
+          Janus.attachMediaStream(stream, ourstream);
+          stream.play()
+        }
+      });// attach
+    } //Success functio
+  }); //new Janus
+}}); //janus.init callback
+      return;
+    }
     src = stream.src.replace(/mode=single/i, 'mode=jpeg');
     if ( -1 == src.search('connkey') ) {
       src += '&connkey='+this.connKey;
diff --git a/web/js/janus.js b/web/js/janus.js
new file mode 100644
index 000000000..177bcf2f7
--- /dev/null
+++ b/web/js/janus.js
@@ -0,0 +1,3649 @@
+"use strict";
+
+/*
+	The MIT License (MIT)
+
+	Copyright (c) 2016 Meetecho
+
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of this software and associated documentation files (the "Software"),
+	to deal in the Software without restriction, including without limitation
+	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+	and/or sell copies of the Software, and to permit persons to whom the
+	Software is furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included
+	in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+	THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+	OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+	OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// List of sessions
+Janus.sessions = {};
+
+Janus.isExtensionEnabled = function() {
+	if(navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia) {
+		// No need for the extension, getDisplayMedia is supported
+		return true;
+	}
+	if(window.navigator.userAgent.match('Chrome')) {
+		var chromever = parseInt(window.navigator.userAgent.match(/Chrome\/(.*) /)[1], 10);
+		var maxver = 33;
+		if(window.navigator.userAgent.match('Linux'))
+			maxver = 35;	// "known" crash in chrome 34 and 35 on linux
+		if(chromever >= 26 && chromever <= maxver) {
+			// Older versions of Chrome don't support this extension-based approach, so lie
+			return true;
+		}
+		return Janus.extension.isInstalled();
+	} else {
+		// Firefox and others, no need for the extension (but this doesn't mean it will work)
+		return true;
+	}
+};
+
+var defaultExtension = {
+	// Screensharing Chrome Extension ID
+	extensionId: 'hapfgfdkleiggjjpfpenajgdnfckjpaj',
+	isInstalled: function() { return document.querySelector('#janus-extension-installed') !== null; },
+	getScreen: function (callback) {
+		var pending = window.setTimeout(function () {
+			var error = new Error('NavigatorUserMediaError');
+			error.name = 'The required Chrome extension is not installed: click <a href="#">here</a> to install it. (NOTE: this will need you to refresh the page)';
+			return callback(error);
+		}, 1000);
+		this.cache[pending] = callback;
+		window.postMessage({ type: 'janusGetScreen', id: pending }, '*');
+	},
+	init: function () {
+		var cache = {};
+		this.cache = cache;
+		// Wait for events from the Chrome Extension
+		window.addEventListener('message', function (event) {
+			if(event.origin != window.location.origin)
+				return;
+			if(event.data.type == 'janusGotScreen' && cache[event.data.id]) {
+				var callback = cache[event.data.id];
+				delete cache[event.data.id];
+
+				if (event.data.sourceId === '') {
+					// user canceled
+					var error = new Error('NavigatorUserMediaError');
+					error.name = 'You cancelled the request for permission, giving up...';
+					callback(error);
+				} else {
+					callback(null, event.data.sourceId);
+				}
+			} else if (event.data.type == 'janusGetScreenPending') {
+				console.log('clearing ', event.data.id);
+				window.clearTimeout(event.data.id);
+			}
+		});
+	}
+};
+
+Janus.useDefaultDependencies = function (deps) {
+	var f = (deps && deps.fetch) || fetch;
+	var p = (deps && deps.Promise) || Promise;
+	var socketCls = (deps && deps.WebSocket) || WebSocket;
+
+	return {
+		newWebSocket: function(server, proto) { return new socketCls(server, proto); },
+		extension: (deps && deps.extension) || defaultExtension,
+		isArray: function(arr) { return Array.isArray(arr); },
+		webRTCAdapter: (deps && deps.adapter) || adapter,
+		httpAPICall: function(url, options) {
+			var fetchOptions = {
+				method: options.verb,
+				headers: {
+					'Accept': 'application/json, text/plain, */*'
+				},
+				cache: 'no-cache'
+			};
+			if(options.verb === "POST") {
+				fetchOptions.headers['Content-Type'] = 'application/json';
+			}
+			if(options.withCredentials !== undefined) {
+				fetchOptions.credentials = options.withCredentials === true ? 'include' : (options.withCredentials ? options.withCredentials : 'omit');
+			}
+			if(options.body) {
+				fetchOptions.body = JSON.stringify(options.body);
+			}
+
+			var fetching = f(url, fetchOptions).catch(function(error) {
+				return p.reject({message: 'Probably a network error, is the server down?', error: error});
+			});
+
+			/*
+			 * fetch() does not natively support timeouts.
+			 * Work around this by starting a timeout manually, and racing it agains the fetch() to see which thing resolves first.
+			 */
+
+			if(options.timeout) {
+				var timeout = new p(function(resolve, reject) {
+					var timerId = setTimeout(function() {
+						clearTimeout(timerId);
+						return reject({message: 'Request timed out', timeout: options.timeout});
+					}, options.timeout);
+				});
+				fetching = p.race([fetching, timeout]);
+			}
+
+			fetching.then(function(response) {
+				if(response.ok) {
+					if(typeof(options.success) === typeof(Janus.noop)) {
+						return response.json().then(function(parsed) {
+							try {
+								options.success(parsed);
+							} catch(error) {
+								Janus.error('Unhandled httpAPICall success callback error', error);
+							}
+						}, function(error) {
+							return p.reject({message: 'Failed to parse response body', error: error, response: response});
+						});
+					}
+				}
+				else {
+					return p.reject({message: 'API call failed', response: response});
+				}
+			}).catch(function(error) {
+				if(typeof(options.error) === typeof(Janus.noop)) {
+					options.error(error.message || '<< internal error >>', error);
+				}
+			});
+
+			return fetching;
+		}
+	}
+};
+
+Janus.useOldDependencies = function (deps) {
+	var jq = (deps && deps.jQuery) || jQuery;
+	var socketCls = (deps && deps.WebSocket) || WebSocket;
+	return {
+		newWebSocket: function(server, proto) { return new socketCls(server, proto); },
+		isArray: function(arr) { return jq.isArray(arr); },
+		extension: (deps && deps.extension) || defaultExtension,
+		webRTCAdapter: (deps && deps.adapter) || adapter,
+		httpAPICall: function(url, options) {
+			var payload = options.body !== undefined ? {
+				contentType: 'application/json',
+				data: JSON.stringify(options.body)
+			} : {};
+			var credentials = options.withCredentials !== undefined ? {xhrFields: {withCredentials: options.withCredentials}} : {};
+
+			return jq.ajax(jq.extend(payload, credentials, {
+				url: url,
+				type: options.verb,
+				cache: false,
+				dataType: 'json',
+				async: options.async,
+				timeout: options.timeout,
+				success: function(result) {
+					if(typeof(options.success) === typeof(Janus.noop)) {
+						options.success(result);
+					}
+				},
+				error: function(xhr, status, err) {
+					if(typeof(options.error) === typeof(Janus.noop)) {
+						options.error(status, err);
+					}
+				}
+			}));
+		}
+	};
+};
+
+Janus.noop = function() {};
+
+Janus.dataChanDefaultLabel = "JanusDataChannel";
+
+// Note: in the future we may want to change this, e.g., as was
+// attempted in https://github.com/meetecho/janus-gateway/issues/1670
+Janus.endOfCandidates = null;
+
+// Stop all tracks from a given stream
+Janus.stopAllTracks = function(stream) {
+	try {
+		// Try a MediaStreamTrack.stop() for each track
+		var tracks = stream.getTracks();
+		for(var mst of tracks) {
+			Janus.log(mst);
+			if(mst) {
+				mst.stop();
+			}
+		}
+	} catch(e) {
+		// Do nothing if this fails
+	}
+}
+
+// Initialization
+Janus.init = function(options) {
+	options = options || {};
+	options.callback = (typeof options.callback == "function") ? options.callback : Janus.noop;
+	if(Janus.initDone) {
+		// Already initialized
+		options.callback();
+	} else {
+		if(typeof console.log == "undefined") {
+			console.log = function() {};
+		}
+		// Console logging (all debugging disabled by default)
+		Janus.trace = Janus.noop;
+		Janus.debug = Janus.noop;
+		Janus.vdebug = Janus.noop;
+		Janus.log = Janus.noop;
+		Janus.warn = Janus.noop;
+		Janus.error = Janus.noop;
+		if(options.debug === true || options.debug === "all") {
+			// Enable all debugging levels
+			Janus.trace = console.trace.bind(console);
+			Janus.debug = console.debug.bind(console);
+			Janus.vdebug = console.debug.bind(console);
+			Janus.log = console.log.bind(console);
+			Janus.warn = console.warn.bind(console);
+			Janus.error = console.error.bind(console);
+		} else if(Array.isArray(options.debug)) {
+			for(var d of options.debug) {
+				switch(d) {
+					case "trace":
+						Janus.trace = console.trace.bind(console);
+						break;
+					case "debug":
+						Janus.debug = console.debug.bind(console);
+						break;
+					case "vdebug":
+						Janus.vdebug = console.debug.bind(console);
+						break;
+					case "log":
+						Janus.log = console.log.bind(console);
+						break;
+					case "warn":
+						Janus.warn = console.warn.bind(console);
+						break;
+					case "error":
+						Janus.error = console.error.bind(console);
+						break;
+					default:
+						console.error("Unknown debugging option '" + d + "' (supported: 'trace', 'debug', 'vdebug', 'log', warn', 'error')");
+						break;
+				}
+			}
+		}
+		Janus.log("Initializing library");
+
+		var usedDependencies = options.dependencies || Janus.useDefaultDependencies();
+		Janus.isArray = usedDependencies.isArray;
+		Janus.webRTCAdapter = usedDependencies.webRTCAdapter;
+		Janus.httpAPICall = usedDependencies.httpAPICall;
+		Janus.newWebSocket = usedDependencies.newWebSocket;
+		Janus.extension = usedDependencies.extension;
+		Janus.extension.init();
+
+		// Helper method to enumerate devices
+		Janus.listDevices = function(callback, config) {
+			callback = (typeof callback == "function") ? callback : Janus.noop;
+			if (config == null) config = { audio: true, video: true };
+			if(Janus.isGetUserMediaAvailable()) {
+				navigator.mediaDevices.getUserMedia(config)
+				.then(function(stream) {
+					navigator.mediaDevices.enumerateDevices().then(function(devices) {
+						Janus.debug(devices);
+						callback(devices);
+						// Get rid of the now useless stream
+						Janus.stopAllTracks(stream)
+					});
+				})
+				.catch(function(err) {
+					Janus.error(err);
+					callback([]);
+				});
+			} else {
+				Janus.warn("navigator.mediaDevices unavailable");
+				callback([]);
+			}
+		};
+		// Helper methods to attach/reattach a stream to a video element (previously part of adapter.js)
+		Janus.attachMediaStream = function(element, stream) {
+			try {
+				element.srcObject = stream;
+			} catch (e) {
+				try {
+					element.src = URL.createObjectURL(stream);
+				} catch (e) {
+					Janus.error("Error attaching stream to element");
+				}
+			}
+		};
+		Janus.reattachMediaStream = function(to, from) {
+			try {
+				to.srcObject = from.srcObject;
+			} catch (e) {
+				try {
+					to.src = from.src;
+				} catch (e) {
+					Janus.error("Error reattaching stream to element");
+				}
+			}
+		};
+		// Detect tab close: make sure we don't loose existing onbeforeunload handlers
+		// (note: for iOS we need to subscribe to a different event, 'pagehide', see
+		// https://gist.github.com/thehunmonkgroup/6bee8941a49b86be31a787fe8f4b8cfe)
+		var iOS = ['iPad', 'iPhone', 'iPod'].indexOf(navigator.platform) >= 0;
+		var eventName = iOS ? 'pagehide' : 'beforeunload';
+		var oldOBF = window["on" + eventName];
+		window.addEventListener(eventName, function() {
+			Janus.log("Closing window");
+			for(var s in Janus.sessions) {
+				if(Janus.sessions[s] && Janus.sessions[s].destroyOnUnload) {
+					Janus.log("Destroying session " + s);
+					Janus.sessions[s].destroy({unload: true, notifyDestroyed: false});
+				}
+			}
+			if(oldOBF && typeof oldOBF == "function") {
+				oldOBF();
+			}
+		});
+		// If this is a Safari Technology Preview, check if VP8 is supported
+		Janus.safariVp8 = false;
+		if(Janus.webRTCAdapter.browserDetails.browser === 'safari' &&
+				Janus.webRTCAdapter.browserDetails.version >= 605) {
+			// Let's see if RTCRtpSender.getCapabilities() is there
+			if(RTCRtpSender && RTCRtpSender.getCapabilities && RTCRtpSender.getCapabilities("video") &&
+					RTCRtpSender.getCapabilities("video").codecs && RTCRtpSender.getCapabilities("video").codecs.length) {
+				for(var codec of RTCRtpSender.getCapabilities("video").codecs) {
+					if(codec && codec.mimeType && codec.mimeType.toLowerCase() === "video/vp8") {
+						Janus.safariVp8 = true;
+						break;
+					}
+				}
+				if(Janus.safariVp8) {
+					Janus.log("This version of Safari supports VP8");
+				} else {
+					Janus.warn("This version of Safari does NOT support VP8: if you're using a Technology Preview, " +
+						"try enabling the 'WebRTC VP8 codec' setting in the 'Experimental Features' Develop menu");
+				}
+			} else {
+				// We do it in a very ugly way, as there's no alternative...
+				// We create a PeerConnection to see if VP8 is in an offer
+				var testpc = new RTCPeerConnection({});
+				testpc.createOffer({offerToReceiveVideo: true}).then(function(offer) {
+					Janus.safariVp8 = offer.sdp.indexOf("VP8") !== -1;
+					if(Janus.safariVp8) {
+						Janus.log("This version of Safari supports VP8");
+					} else {
+						Janus.warn("This version of Safari does NOT support VP8: if you're using a Technology Preview, " +
+							"try enabling the 'WebRTC VP8 codec' setting in the 'Experimental Features' Develop menu");
+					}
+					testpc.close();
+					testpc = null;
+				});
+			}
+		}
+		// Check if this browser supports Unified Plan and transceivers
+		// Based on https://codepen.io/anon/pen/ZqLwWV?editors=0010
+		Janus.unifiedPlan = false;
+		if(Janus.webRTCAdapter.browserDetails.browser === 'firefox' &&
+				Janus.webRTCAdapter.browserDetails.version >= 59) {
+			// Firefox definitely does, starting from version 59
+			Janus.unifiedPlan = true;
+		} else if(Janus.webRTCAdapter.browserDetails.browser === 'chrome' &&
+				Janus.webRTCAdapter.browserDetails.version >= 72) {
+			// Chrome does, but it's only usable from version 72 on
+			Janus.unifiedPlan = true;
+		} else if(!window.RTCRtpTransceiver || !('currentDirection' in RTCRtpTransceiver.prototype)) {
+			// Safari supports addTransceiver() but not Unified Plan when
+			// currentDirection is not defined (see codepen above).
+			Janus.unifiedPlan = false;
+		} else {
+			// Check if addTransceiver() throws an exception
+			var tempPc = new RTCPeerConnection();
+			try {
+				tempPc.addTransceiver('audio');
+				Janus.unifiedPlan = true;
+			} catch (e) {}
+			tempPc.close();
+		}
+		Janus.initDone = true;
+		options.callback();
+	}
+};
+
+// Helper method to check whether WebRTC is supported by this browser
+Janus.isWebrtcSupported = function() {
+	return !!window.RTCPeerConnection;
+};
+// Helper method to check whether devices can be accessed by this browser (e.g., not possible via plain HTTP)
+Janus.isGetUserMediaAvailable = function() {
+	return navigator.mediaDevices && navigator.mediaDevices.getUserMedia;
+};
+
+// Helper method to create random identifiers (e.g., transaction)
+Janus.randomString = function(len) {
+	var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	var randomString = '';
+	for (var i = 0; i < len; i++) {
+		var randomPoz = Math.floor(Math.random() * charSet.length);
+		randomString += charSet.substring(randomPoz,randomPoz+1);
+	}
+	return randomString;
+};
+
+function Janus(gatewayCallbacks) {
+	gatewayCallbacks = gatewayCallbacks || {};
+	gatewayCallbacks.success = (typeof gatewayCallbacks.success == "function") ? gatewayCallbacks.success : Janus.noop;
+	gatewayCallbacks.error = (typeof gatewayCallbacks.error == "function") ? gatewayCallbacks.error : Janus.noop;
+	gatewayCallbacks.destroyed = (typeof gatewayCallbacks.destroyed == "function") ? gatewayCallbacks.destroyed : Janus.noop;
+	if(!Janus.initDone) {
+		gatewayCallbacks.error("Library not initialized");
+		return {};
+	}
+	if(!Janus.isWebrtcSupported()) {
+		gatewayCallbacks.error("WebRTC not supported by this browser");
+		return {};
+	}
+	Janus.log("Library initialized: " + Janus.initDone);
+	if(!gatewayCallbacks.server) {
+		gatewayCallbacks.error("Invalid server url");
+		return {};
+	}
+	var websockets = false;
+	var ws = null;
+	var wsHandlers = {};
+	var wsKeepaliveTimeoutId = null;
+	var servers = null;
+	var serversIndex = 0;
+	var server = gatewayCallbacks.server;
+	if(Janus.isArray(server)) {
+		Janus.log("Multiple servers provided (" + server.length + "), will use the first that works");
+		server = null;
+		servers = gatewayCallbacks.server;
+		Janus.debug(servers);
+	} else {
+		if(server.indexOf("ws") === 0) {
+			websockets = true;
+			Janus.log("Using WebSockets to contact Janus: " + server);
+		} else {
+			websockets = false;
+			Janus.log("Using REST API to contact Janus: " + server);
+		}
+	}
+	var iceServers = gatewayCallbacks.iceServers || [{urls: "stun:stun.l.google.com:19302"}];
+	var iceTransportPolicy = gatewayCallbacks.iceTransportPolicy;
+	var bundlePolicy = gatewayCallbacks.bundlePolicy;
+	// Whether IPv6 candidates should be gathered
+	var ipv6Support = (gatewayCallbacks.ipv6 === true);
+	// Whether we should enable the withCredentials flag for XHR requests
+	var withCredentials = false;
+	if(gatewayCallbacks.withCredentials !== undefined && gatewayCallbacks.withCredentials !== null)
+		withCredentials = gatewayCallbacks.withCredentials === true;
+	// Optional max events
+	var maxev = 10;
+	if(gatewayCallbacks.max_poll_events !== undefined && gatewayCallbacks.max_poll_events !== null)
+		maxev = gatewayCallbacks.max_poll_events;
+	if(maxev < 1)
+		maxev = 1;
+	// Token to use (only if the token based authentication mechanism is enabled)
+	var token = null;
+	if(gatewayCallbacks.token !== undefined && gatewayCallbacks.token !== null)
+		token = gatewayCallbacks.token;
+	// API secret to use (only if the shared API secret is enabled)
+	var apisecret = null;
+	if(gatewayCallbacks.apisecret !== undefined && gatewayCallbacks.apisecret !== null)
+		apisecret = gatewayCallbacks.apisecret;
+	// Whether we should destroy this session when onbeforeunload is called
+	this.destroyOnUnload = true;
+	if(gatewayCallbacks.destroyOnUnload !== undefined && gatewayCallbacks.destroyOnUnload !== null)
+		this.destroyOnUnload = (gatewayCallbacks.destroyOnUnload === true);
+	// Some timeout-related values
+	var keepAlivePeriod = 25000;
+	if(gatewayCallbacks.keepAlivePeriod !== undefined && gatewayCallbacks.keepAlivePeriod !== null)
+		keepAlivePeriod = gatewayCallbacks.keepAlivePeriod;
+	if(isNaN(keepAlivePeriod))
+		keepAlivePeriod = 25000;
+	var longPollTimeout = 60000;
+	if(gatewayCallbacks.longPollTimeout !== undefined && gatewayCallbacks.longPollTimeout !== null)
+		longPollTimeout = gatewayCallbacks.longPollTimeout;
+	if(isNaN(longPollTimeout))
+		longPollTimeout = 60000;
+
+	// overrides for default maxBitrate values for simulcasting
+	function getMaxBitrates(simulcastMaxBitrates) {
+		var maxBitrates = {
+			high: 900000,
+			medium: 300000,
+			low: 100000,
+		};
+
+		if (simulcastMaxBitrates !== undefined && simulcastMaxBitrates !== null) {
+			if (simulcastMaxBitrates.high)
+				maxBitrates.high = simulcastMaxBitrates.high;
+			if (simulcastMaxBitrates.medium)
+				maxBitrates.medium = simulcastMaxBitrates.medium;
+			if (simulcastMaxBitrates.low)
+				maxBitrates.low = simulcastMaxBitrates.low;
+		}
+
+		return maxBitrates;
+	}
+
+	var connected = false;
+	var sessionId = null;
+	var pluginHandles = {};
+	var that = this;
+	var retries = 0;
+	var transactions = {};
+	createSession(gatewayCallbacks);
+
+	// Public methods
+	this.getServer = function() { return server; };
+	this.isConnected = function() { return connected; };
+	this.reconnect = function(callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		callbacks["reconnect"] = true;
+		createSession(callbacks);
+	};
+	this.getSessionId = function() { return sessionId; };
+	this.getInfo = function(callbacks) { getInfo(callbacks); };
+	this.destroy = function(callbacks) { destroySession(callbacks); };
+	this.attach = function(callbacks) { createHandle(callbacks); };
+
+	function eventHandler() {
+		if(sessionId == null)
+			return;
+		Janus.debug('Long poll...');
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			return;
+		}
+		var longpoll = server + "/" + sessionId + "?rid=" + new Date().getTime();
+		if(maxev)
+			longpoll = longpoll + "&maxev=" + maxev;
+		if(token)
+			longpoll = longpoll + "&token=" + encodeURIComponent(token);
+		if(apisecret)
+			longpoll = longpoll + "&apisecret=" + encodeURIComponent(apisecret);
+		Janus.httpAPICall(longpoll, {
+			verb: 'GET',
+			withCredentials: withCredentials,
+			success: handleEvent,
+			timeout: longPollTimeout,
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);
+				retries++;
+				if(retries > 3) {
+					// Did we just lose the server? :-(
+					connected = false;
+					gatewayCallbacks.error("Lost connection to the server (is it down?)");
+					return;
+				}
+				eventHandler();
+			}
+		});
+	}
+
+	// Private event handler: this will trigger plugin callbacks, if set
+	function handleEvent(json, skipTimeout) {
+		retries = 0;
+		if(!websockets && sessionId !== undefined && sessionId !== null && skipTimeout !== true)
+			eventHandler();
+		if(!websockets && Janus.isArray(json)) {
+			// We got an array: it means we passed a maxev > 1, iterate on all objects
+			for(var i=0; i<json.length; i++) {
+				handleEvent(json[i], true);
+			}
+			return;
+		}
+		if(json["janus"] === "keepalive") {
+			// Nothing happened
+			Janus.vdebug("Got a keepalive on session " + sessionId);
+			return;
+		} else if(json["janus"] === "server_info") {
+			// Just info on the Janus instance
+			Janus.debug("Got info on the Janus instance");
+			Janus.debug(json);
+			const transaction = json["transaction"];
+			if(transaction) {
+				const reportSuccess = transactions[transaction];
+				if(reportSuccess)
+					reportSuccess(json);
+				delete transactions[transaction];
+			}
+			return;
+		} else if(json["janus"] === "ack") {
+			// Just an ack, we can probably ignore
+			Janus.debug("Got an ack on session " + sessionId);
+			Janus.debug(json);
+			const transaction = json["transaction"];
+			if(transaction) {
+				const reportSuccess = transactions[transaction];
+				if(reportSuccess)
+					reportSuccess(json);
+				delete transactions[transaction];
+			}
+			return;
+		} else if(json["janus"] === "success") {
+			// Success!
+			Janus.debug("Got a success on session " + sessionId);
+			Janus.debug(json);
+			const transaction = json["transaction"];
+			if(transaction) {
+				const reportSuccess = transactions[transaction];
+				if(reportSuccess)
+					reportSuccess(json);
+				delete transactions[transaction];
+			}
+			return;
+		} else if(json["janus"] === "trickle") {
+			// We got a trickle candidate from Janus
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.debug("This handle is not attached to this session");
+				return;
+			}
+			var candidate = json["candidate"];
+			Janus.debug("Got a trickled candidate on session " + sessionId);
+			Janus.debug(candidate);
+			var config = pluginHandle.webrtcStuff;
+			if(config.pc && config.remoteSdp) {
+				// Add candidate right now
+				Janus.debug("Adding remote candidate:", candidate);
+				if(!candidate || candidate.completed === true) {
+					// end-of-candidates
+					config.pc.addIceCandidate(Janus.endOfCandidates);
+				} else {
+					// New candidate
+					config.pc.addIceCandidate(candidate);
+				}
+			} else {
+				// We didn't do setRemoteDescription (trickle got here before the offer?)
+				Janus.debug("We didn't do setRemoteDescription (trickle got here before the offer?), caching candidate");
+				if(!config.candidates)
+					config.candidates = [];
+				config.candidates.push(candidate);
+				Janus.debug(config.candidates);
+			}
+		} else if(json["janus"] === "webrtcup") {
+			// The PeerConnection with the server is up! Notify this
+			Janus.debug("Got a webrtcup event on session " + sessionId);
+			Janus.debug(json);
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.debug("This handle is not attached to this session");
+				return;
+			}
+			pluginHandle.webrtcState(true);
+			return;
+		} else if(json["janus"] === "hangup") {
+			// A plugin asked the core to hangup a PeerConnection on one of our handles
+			Janus.debug("Got a hangup event on session " + sessionId);
+			Janus.debug(json);
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.debug("This handle is not attached to this session");
+				return;
+			}
+			pluginHandle.webrtcState(false, json["reason"]);
+			pluginHandle.hangup();
+		} else if(json["janus"] === "detached") {
+			// A plugin asked the core to detach one of our handles
+			Janus.debug("Got a detached event on session " + sessionId);
+			Janus.debug(json);
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				// Don't warn here because destroyHandle causes this situation.
+				return;
+			}
+			pluginHandle.ondetached();
+			pluginHandle.detach();
+		} else if(json["janus"] === "media") {
+			// Media started/stopped flowing
+			Janus.debug("Got a media event on session " + sessionId);
+			Janus.debug(json);
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.debug("This handle is not attached to this session");
+				return;
+			}
+			pluginHandle.mediaState(json["type"], json["receiving"]);
+		} else if(json["janus"] === "slowlink") {
+			Janus.debug("Got a slowlink event on session " + sessionId);
+			Janus.debug(json);
+			// Trouble uplink or downlink
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.debug("This handle is not attached to this session");
+				return;
+			}
+			pluginHandle.slowLink(json["uplink"], json["lost"]);
+		} else if(json["janus"] === "error") {
+			// Oops, something wrong happened
+			Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+			Janus.debug(json);
+			var transaction = json["transaction"];
+			if(transaction) {
+				var reportSuccess = transactions[transaction];
+				if(reportSuccess) {
+					reportSuccess(json);
+				}
+				delete transactions[transaction];
+			}
+			return;
+		} else if(json["janus"] === "event") {
+			Janus.debug("Got a plugin event on session " + sessionId);
+			Janus.debug(json);
+			const sender = json["sender"];
+			if(!sender) {
+				Janus.warn("Missing sender...");
+				return;
+			}
+			var plugindata = json["plugindata"];
+			if(!plugindata) {
+				Janus.warn("Missing plugindata...");
+				return;
+			}
+			Janus.debug("  -- Event is coming from " + sender + " (" + plugindata["plugin"] + ")");
+			var data = plugindata["data"];
+			Janus.debug(data);
+			const pluginHandle = pluginHandles[sender];
+			if(!pluginHandle) {
+				Janus.warn("This handle is not attached to this session");
+				return;
+			}
+			var jsep = json["jsep"];
+			if(jsep) {
+				Janus.debug("Handling SDP as well...");
+				Janus.debug(jsep);
+			}
+			var callback = pluginHandle.onmessage;
+			if(callback) {
+				Janus.debug("Notifying application...");
+				// Send to callback specified when attaching plugin handle
+				callback(data, jsep);
+			} else {
+				// Send to generic callback (?)
+				Janus.debug("No provided notification callback");
+			}
+		} else if(json["janus"] === "timeout") {
+			Janus.error("Timeout on session " + sessionId);
+			Janus.debug(json);
+			if (websockets) {
+				ws.close(3504, "Gateway timeout");
+			}
+			return;
+		} else {
+			Janus.warn("Unknown message/event  '" + json["janus"] + "' on session " + sessionId);
+			Janus.debug(json);
+		}
+	}
+
+	// Private helper to send keep-alive messages on WebSockets
+	function keepAlive() {
+		if(!server || !websockets || !connected)
+			return;
+		wsKeepaliveTimeoutId = setTimeout(keepAlive, keepAlivePeriod);
+		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": Janus.randomString(12) };
+		if(token)
+			request["token"] = token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		ws.send(JSON.stringify(request));
+	}
+
+	// Private method to create a session
+	function createSession(callbacks) {
+		var transaction = Janus.randomString(12);
+		var request = { "janus": "create", "transaction": transaction };
+		if(callbacks["reconnect"]) {
+			// We're reconnecting, claim the session
+			connected = false;
+			request["janus"] = "claim";
+			request["session_id"] = sessionId;
+			// If we were using websockets, ignore the old connection
+			if(ws) {
+				ws.onopen = null;
+				ws.onerror = null;
+				ws.onclose = null;
+				if(wsKeepaliveTimeoutId) {
+					clearTimeout(wsKeepaliveTimeoutId);
+					wsKeepaliveTimeoutId = null;
+				}
+			}
+		}
+		if(token)
+			request["token"] = token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(!server && Janus.isArray(servers)) {
+			// We still need to find a working server from the list we were given
+			server = servers[serversIndex];
+			if(server.indexOf("ws") === 0) {
+				websockets = true;
+				Janus.log("Server #" + (serversIndex+1) + ": trying WebSockets to contact Janus (" + server + ")");
+			} else {
+				websockets = false;
+				Janus.log("Server #" + (serversIndex+1) + ": trying REST API to contact Janus (" + server + ")");
+			}
+		}
+		if(websockets) {
+			ws = Janus.newWebSocket(server, 'janus-protocol');
+			wsHandlers = {
+				'error': function() {
+					Janus.error("Error connecting to the Janus WebSockets server... " + server);
+					if (Janus.isArray(servers) && !callbacks["reconnect"]) {
+						serversIndex++;
+						if (serversIndex === servers.length) {
+							// We tried all the servers the user gave us and they all failed
+							callbacks.error("Error connecting to any of the provided Janus servers: Is the server down?");
+							return;
+						}
+						// Let's try the next server
+						server = null;
+						setTimeout(function() {
+							createSession(callbacks);
+						}, 200);
+						return;
+					}
+					callbacks.error("Error connecting to the Janus WebSockets server: Is the server down?");
+				},
+
+				'open': function() {
+					// We need to be notified about the success
+					transactions[transaction] = function(json) {
+						Janus.debug(json);
+						if (json["janus"] !== "success") {
+							Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+							callbacks.error(json["error"].reason);
+							return;
+						}
+						wsKeepaliveTimeoutId = setTimeout(keepAlive, keepAlivePeriod);
+						connected = true;
+						sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
+						if(callbacks["reconnect"]) {
+							Janus.log("Claimed session: " + sessionId);
+						} else {
+							Janus.log("Created session: " + sessionId);
+						}
+						Janus.sessions[sessionId] = that;
+						callbacks.success();
+					};
+					ws.send(JSON.stringify(request));
+				},
+
+				'message': function(event) {
+					handleEvent(JSON.parse(event.data));
+				},
+
+				'close': function() {
+					if (!server || !connected) {
+						return;
+					}
+					connected = false;
+					// FIXME What if this is called when the page is closed?
+					gatewayCallbacks.error("Lost connection to the server (is it down?)");
+				}
+			};
+
+			for(var eventName in wsHandlers) {
+				ws.addEventListener(eventName, wsHandlers[eventName]);
+			}
+
+			return;
+		}
+		Janus.httpAPICall(server, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.debug(json);
+				if(json["janus"] !== "success") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+					callbacks.error(json["error"].reason);
+					return;
+				}
+				connected = true;
+				sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
+				if(callbacks["reconnect"]) {
+					Janus.log("Claimed session: " + sessionId);
+				} else {
+					Janus.log("Created session: " + sessionId);
+				}
+				Janus.sessions[sessionId] = that;
+				eventHandler();
+				callbacks.success();
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				if(Janus.isArray(servers) && !callbacks["reconnect"]) {
+					serversIndex++;
+					if(serversIndex === servers.length) {
+						// We tried all the servers the user gave us and they all failed
+						callbacks.error("Error connecting to any of the provided Janus servers: Is the server down?");
+						return;
+					}
+					// Let's try the next server
+					server = null;
+					setTimeout(function() { createSession(callbacks); }, 200);
+					return;
+				}
+				if(errorThrown === "")
+					callbacks.error(textStatus + ": Is the server down?");
+				else
+					callbacks.error(textStatus + ": " + errorThrown);
+			}
+		});
+	}
+
+	// Private method to get info on the server
+	function getInfo(callbacks) {
+		callbacks = callbacks || {};
+		// FIXME This method triggers a success even when we fail
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		Janus.log("Getting info on Janus instance");
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			callbacks.error("Is the server down? (connected=false)");
+			return;
+		}
+		// We just need to send an "info" request
+		var transaction = Janus.randomString(12);
+		var request = { "janus": "info", "transaction": transaction };
+		if(token)
+			request["token"] = token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(websockets) {
+			transactions[transaction] = function(json) {
+				Janus.log("Server info:");
+				Janus.debug(json);
+				if(json["janus"] !== "server_info") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+				}
+				callbacks.success(json);
+			}
+			ws.send(JSON.stringify(request));
+			return;
+		}
+		Janus.httpAPICall(server, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.log("Server info:");
+				Janus.debug(json);
+				if(json["janus"] !== "server_info") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+				}
+				callbacks.success(json);
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				if(errorThrown === "")
+					callbacks.error(textStatus + ": Is the server down?");
+				else
+					callbacks.error(textStatus + ": " + errorThrown);
+			}
+		});
+	}
+
+	// Private method to destroy a session
+	function destroySession(callbacks) {
+		callbacks = callbacks || {};
+		// FIXME This method triggers a success even when we fail
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		var unload = (callbacks.unload === true);
+		var notifyDestroyed = true;
+		if(callbacks.notifyDestroyed !== undefined && callbacks.notifyDestroyed !== null)
+			notifyDestroyed = (callbacks.notifyDestroyed === true);
+		var cleanupHandles = (callbacks.cleanupHandles === true);
+		Janus.log("Destroying session " + sessionId + " (unload=" + unload + ")");
+		if(!sessionId) {
+			Janus.warn("No session to destroy");
+			callbacks.success();
+			if(notifyDestroyed)
+				gatewayCallbacks.destroyed();
+			return;
+		}
+		if(cleanupHandles) {
+			for(var handleId in pluginHandles)
+				destroyHandle(handleId, { noRequest: true });
+		}
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			sessionId = null;
+			callbacks.success();
+			return;
+		}
+		// No need to destroy all handles first, Janus will do that itself
+		var request = { "janus": "destroy", "transaction": Janus.randomString(12) };
+		if(token)
+			request["token"] = token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(unload) {
+			// We're unloading the page: use sendBeacon for HTTP instead,
+			// or just close the WebSocket connection if we're using that
+			if(websockets) {
+				ws.onclose = null;
+				ws.close();
+				ws = null;
+			} else {
+				navigator.sendBeacon(server + "/" + sessionId, JSON.stringify(request));
+			}
+			Janus.log("Destroyed session:");
+			sessionId = null;
+			connected = false;
+			callbacks.success();
+			if(notifyDestroyed)
+				gatewayCallbacks.destroyed();
+			return;
+		}
+		if(websockets) {
+			request["session_id"] = sessionId;
+
+			var unbindWebSocket = function() {
+				for(var eventName in wsHandlers) {
+					ws.removeEventListener(eventName, wsHandlers[eventName]);
+				}
+				ws.removeEventListener('message', onUnbindMessage);
+				ws.removeEventListener('error', onUnbindError);
+				if(wsKeepaliveTimeoutId) {
+					clearTimeout(wsKeepaliveTimeoutId);
+				}
+				ws.close();
+			};
+
+			var onUnbindMessage = function(event){
+				var data = JSON.parse(event.data);
+				if(data.session_id == request.session_id && data.transaction == request.transaction) {
+					unbindWebSocket();
+					callbacks.success();
+					if(notifyDestroyed)
+						gatewayCallbacks.destroyed();
+				}
+			};
+			var onUnbindError = function() {
+				unbindWebSocket();
+				callbacks.error("Failed to destroy the server: Is the server down?");
+				if(notifyDestroyed)
+					gatewayCallbacks.destroyed();
+			};
+
+			ws.addEventListener('message', onUnbindMessage);
+			ws.addEventListener('error', onUnbindError);
+
+			if (ws.readyState === 1) {
+				ws.send(JSON.stringify(request));
+			} else {
+				onUnbindError();
+			}
+
+			return;
+		}
+		Janus.httpAPICall(server + "/" + sessionId, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.log("Destroyed session:");
+				Janus.debug(json);
+				sessionId = null;
+				connected = false;
+				if(json["janus"] !== "success") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+				}
+				callbacks.success();
+				if(notifyDestroyed)
+					gatewayCallbacks.destroyed();
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				// Reset everything anyway
+				sessionId = null;
+				connected = false;
+				callbacks.success();
+				if(notifyDestroyed)
+					gatewayCallbacks.destroyed();
+			}
+		});
+	}
+
+	// Private method to create a plugin handle
+	function createHandle(callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		callbacks.dataChannelOptions = callbacks.dataChannelOptions || { ordered: true };
+		callbacks.consentDialog = (typeof callbacks.consentDialog == "function") ? callbacks.consentDialog : Janus.noop;
+		callbacks.iceState = (typeof callbacks.iceState == "function") ? callbacks.iceState : Janus.noop;
+		callbacks.mediaState = (typeof callbacks.mediaState == "function") ? callbacks.mediaState : Janus.noop;
+		callbacks.webrtcState = (typeof callbacks.webrtcState == "function") ? callbacks.webrtcState : Janus.noop;
+		callbacks.slowLink = (typeof callbacks.slowLink == "function") ? callbacks.slowLink : Janus.noop;
+		callbacks.onmessage = (typeof callbacks.onmessage == "function") ? callbacks.onmessage : Janus.noop;
+		callbacks.onlocalstream = (typeof callbacks.onlocalstream == "function") ? callbacks.onlocalstream : Janus.noop;
+		callbacks.onremotestream = (typeof callbacks.onremotestream == "function") ? callbacks.onremotestream : Janus.noop;
+		callbacks.ondata = (typeof callbacks.ondata == "function") ? callbacks.ondata : Janus.noop;
+		callbacks.ondataopen = (typeof callbacks.ondataopen == "function") ? callbacks.ondataopen : Janus.noop;
+		callbacks.oncleanup = (typeof callbacks.oncleanup == "function") ? callbacks.oncleanup : Janus.noop;
+		callbacks.ondetached = (typeof callbacks.ondetached == "function") ? callbacks.ondetached : Janus.noop;
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			callbacks.error("Is the server down? (connected=false)");
+			return;
+		}
+		var plugin = callbacks.plugin;
+		if(!plugin) {
+			Janus.error("Invalid plugin");
+			callbacks.error("Invalid plugin");
+			return;
+		}
+		var opaqueId = callbacks.opaqueId;
+		var loopIndex = callbacks.loopIndex;
+		var handleToken = callbacks.token ? callbacks.token : token;
+		var transaction = Janus.randomString(12);
+		var request = { "janus": "attach", "plugin": plugin, "opaque_id": opaqueId, "loop_index": loopIndex, "transaction": transaction };
+		if(handleToken)
+			request["token"] = handleToken;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(websockets) {
+			transactions[transaction] = function(json) {
+				Janus.debug(json);
+				if(json["janus"] !== "success") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+					callbacks.error("Ooops: " + json["error"].code + " " + json["error"].reason);
+					return;
+				}
+				var handleId = json.data["id"];
+				Janus.log("Created handle: " + handleId);
+				var pluginHandle =
+					{
+						session : that,
+						plugin : plugin,
+						id : handleId,
+						token : handleToken,
+						detached : false,
+						webrtcStuff : {
+							started : false,
+							myStream : null,
+							streamExternal : false,
+							remoteStream : null,
+							mySdp : null,
+							mediaConstraints : null,
+							pc : null,
+							dataChannelOptions: callbacks.dataChannelOptions,
+							dataChannel : {},
+							dtmfSender : null,
+							trickle : true,
+							iceDone : false,
+							volume : {
+								value : null,
+								timer : null
+							},
+							bitrate : {
+								value : null,
+								bsnow : null,
+								bsbefore : null,
+								tsnow : null,
+								tsbefore : null,
+								timer : null
+							}
+						},
+						getId : function() { return handleId; },
+						getPlugin : function() { return plugin; },
+						getVolume : function() { return getVolume(handleId, true); },
+						getRemoteVolume : function() { return getVolume(handleId, true); },
+						getLocalVolume : function() { return getVolume(handleId, false); },
+						isAudioMuted : function() { return isMuted(handleId, false); },
+						muteAudio : function() { return mute(handleId, false, true); },
+						unmuteAudio : function() { return mute(handleId, false, false); },
+						isVideoMuted : function() { return isMuted(handleId, true); },
+						muteVideo : function() { return mute(handleId, true, true); },
+						unmuteVideo : function() { return mute(handleId, true, false); },
+						getBitrate : function() { return getBitrate(handleId); },
+						send : function(callbacks) { sendMessage(handleId, callbacks); },
+						data : function(callbacks) { sendData(handleId, callbacks); },
+						dtmf : function(callbacks) { sendDtmf(handleId, callbacks); },
+						consentDialog : callbacks.consentDialog,
+						iceState : callbacks.iceState,
+						mediaState : callbacks.mediaState,
+						webrtcState : callbacks.webrtcState,
+						slowLink : callbacks.slowLink,
+						onmessage : callbacks.onmessage,
+						createOffer : function(callbacks) { prepareWebrtc(handleId, true, callbacks); },
+						createAnswer : function(callbacks) { prepareWebrtc(handleId, false, callbacks); },
+						handleRemoteJsep : function(callbacks) { prepareWebrtcPeer(handleId, callbacks); },
+						onlocalstream : callbacks.onlocalstream,
+						onremotestream : callbacks.onremotestream,
+						ondata : callbacks.ondata,
+						ondataopen : callbacks.ondataopen,
+						oncleanup : callbacks.oncleanup,
+						ondetached : callbacks.ondetached,
+						hangup : function(sendRequest) { cleanupWebrtc(handleId, sendRequest === true); },
+						detach : function(callbacks) { destroyHandle(handleId, callbacks); }
+					};
+				pluginHandles[handleId] = pluginHandle;
+				callbacks.success(pluginHandle);
+			};
+			request["session_id"] = sessionId;
+			ws.send(JSON.stringify(request));
+			return;
+		}
+		Janus.httpAPICall(server + "/" + sessionId, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.debug(json);
+				if(json["janus"] !== "success") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+					callbacks.error("Ooops: " + json["error"].code + " " + json["error"].reason);
+					return;
+				}
+				var handleId = json.data["id"];
+				Janus.log("Created handle: " + handleId);
+				var pluginHandle =
+					{
+						session : that,
+						plugin : plugin,
+						id : handleId,
+						token : handleToken,
+						detached : false,
+						webrtcStuff : {
+							started : false,
+							myStream : null,
+							streamExternal : false,
+							remoteStream : null,
+							mySdp : null,
+							mediaConstraints : null,
+							pc : null,
+							dataChannelOptions: callbacks.dataChannelOptions,
+							dataChannel : {},
+							dtmfSender : null,
+							trickle : true,
+							iceDone : false,
+							volume : {
+								value : null,
+								timer : null
+							},
+							bitrate : {
+								value : null,
+								bsnow : null,
+								bsbefore : null,
+								tsnow : null,
+								tsbefore : null,
+								timer : null
+							}
+						},
+						getId : function() { return handleId; },
+						getPlugin : function() { return plugin; },
+						getVolume : function() { return getVolume(handleId, true); },
+						getRemoteVolume : function() { return getVolume(handleId, true); },
+						getLocalVolume : function() { return getVolume(handleId, false); },
+						isAudioMuted : function() { return isMuted(handleId, false); },
+						muteAudio : function() { return mute(handleId, false, true); },
+						unmuteAudio : function() { return mute(handleId, false, false); },
+						isVideoMuted : function() { return isMuted(handleId, true); },
+						muteVideo : function() { return mute(handleId, true, true); },
+						unmuteVideo : function() { return mute(handleId, true, false); },
+						getBitrate : function() { return getBitrate(handleId); },
+						send : function(callbacks) { sendMessage(handleId, callbacks); },
+						data : function(callbacks) { sendData(handleId, callbacks); },
+						dtmf : function(callbacks) { sendDtmf(handleId, callbacks); },
+						consentDialog : callbacks.consentDialog,
+						iceState : callbacks.iceState,
+						mediaState : callbacks.mediaState,
+						webrtcState : callbacks.webrtcState,
+						slowLink : callbacks.slowLink,
+						onmessage : callbacks.onmessage,
+						createOffer : function(callbacks) { prepareWebrtc(handleId, true, callbacks); },
+						createAnswer : function(callbacks) { prepareWebrtc(handleId, false, callbacks); },
+						handleRemoteJsep : function(callbacks) { prepareWebrtcPeer(handleId, callbacks); },
+						onlocalstream : callbacks.onlocalstream,
+						onremotestream : callbacks.onremotestream,
+						ondata : callbacks.ondata,
+						ondataopen : callbacks.ondataopen,
+						oncleanup : callbacks.oncleanup,
+						ondetached : callbacks.ondetached,
+						hangup : function(sendRequest) { cleanupWebrtc(handleId, sendRequest === true); },
+						detach : function(callbacks) { destroyHandle(handleId, callbacks); }
+					}
+				pluginHandles[handleId] = pluginHandle;
+				callbacks.success(pluginHandle);
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				if(errorThrown === "")
+					callbacks.error(textStatus + ": Is the server down?");
+				else
+					callbacks.error(textStatus + ": " + errorThrown);
+			}
+		});
+	}
+
+	// Private method to send a message
+	function sendMessage(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			callbacks.error("Is the server down? (connected=false)");
+			return;
+		}
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var message = callbacks.message;
+		var jsep = callbacks.jsep;
+		var transaction = Janus.randomString(12);
+		var request = { "janus": "message", "body": message, "transaction": transaction };
+		if(pluginHandle.token)
+			request["token"] = pluginHandle.token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(jsep) {
+			request.jsep = {
+				type: jsep.type,
+				sdp: jsep.sdp
+			};
+			if(jsep.e2ee)
+				request.jsep.e2ee = true;
+			if(jsep.rid_order === "hml" || jsep.rid_order === "lmh")
+				request.jsep.rid_order = jsep.rid_order;
+			if(jsep.force_relay)
+				request.jsep.force_relay = true;
+		}
+		Janus.debug("Sending message to plugin (handle=" + handleId + "):");
+		Janus.debug(request);
+		if(websockets) {
+			request["session_id"] = sessionId;
+			request["handle_id"] = handleId;
+			transactions[transaction] = function(json) {
+				Janus.debug("Message sent!");
+				Janus.debug(json);
+				if(json["janus"] === "success") {
+					// We got a success, must have been a synchronous transaction
+					var plugindata = json["plugindata"];
+					if(!plugindata) {
+						Janus.warn("Request succeeded, but missing plugindata...");
+						callbacks.success();
+						return;
+					}
+					Janus.log("Synchronous transaction successful (" + plugindata["plugin"] + ")");
+					var data = plugindata["data"];
+					Janus.debug(data);
+					callbacks.success(data);
+					return;
+				} else if(json["janus"] !== "ack") {
+					// Not a success and not an ack, must be an error
+					if(json["error"]) {
+						Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+						callbacks.error(json["error"].code + " " + json["error"].reason);
+					} else {
+						Janus.error("Unknown error");	// FIXME
+						callbacks.error("Unknown error");
+					}
+					return;
+				}
+				// If we got here, the plugin decided to handle the request asynchronously
+				callbacks.success();
+			};
+			ws.send(JSON.stringify(request));
+			return;
+		}
+		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.debug("Message sent!");
+				Janus.debug(json);
+				if(json["janus"] === "success") {
+					// We got a success, must have been a synchronous transaction
+					var plugindata = json["plugindata"];
+					if(!plugindata) {
+						Janus.warn("Request succeeded, but missing plugindata...");
+						callbacks.success();
+						return;
+					}
+					Janus.log("Synchronous transaction successful (" + plugindata["plugin"] + ")");
+					var data = plugindata["data"];
+					Janus.debug(data);
+					callbacks.success(data);
+					return;
+				} else if(json["janus"] !== "ack") {
+					// Not a success and not an ack, must be an error
+					if(json["error"]) {
+						Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+						callbacks.error(json["error"].code + " " + json["error"].reason);
+					} else {
+						Janus.error("Unknown error");	// FIXME
+						callbacks.error("Unknown error");
+					}
+					return;
+				}
+				// If we got here, the plugin decided to handle the request asynchronously
+				callbacks.success();
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				callbacks.error(textStatus + ": " + errorThrown);
+			}
+		});
+	}
+
+	// Private method to send a trickle candidate
+	function sendTrickleCandidate(handleId, candidate) {
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			return;
+		}
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return;
+		}
+		var request = { "janus": "trickle", "candidate": candidate, "transaction": Janus.randomString(12) };
+		if(pluginHandle.token)
+			request["token"] = pluginHandle.token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		Janus.vdebug("Sending trickle candidate (handle=" + handleId + "):");
+		Janus.vdebug(request);
+		if(websockets) {
+			request["session_id"] = sessionId;
+			request["handle_id"] = handleId;
+			ws.send(JSON.stringify(request));
+			return;
+		}
+		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.vdebug("Candidate sent!");
+				Janus.vdebug(json);
+				if(json["janus"] !== "ack") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+					return;
+				}
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+			}
+		});
+	}
+
+	// Private method to create a data channel
+	function createDataChannel(handleId, dclabel, dcprotocol, incoming, pendingData) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(!config.pc) {
+			Janus.warn("Invalid PeerConnection");
+			return;
+		}
+		var onDataChannelMessage = function(event) {
+			Janus.log('Received message on data channel:', event);
+			var label = event.target.label;
+			pluginHandle.ondata(event.data, label);
+		};
+		var onDataChannelStateChange = function(event) {
+			Janus.log('Received state change on data channel:', event);
+			var label = event.target.label;
+			var protocol = event.target.protocol;
+			var dcState = config.dataChannel[label] ? config.dataChannel[label].readyState : "null";
+			Janus.log('State change on <' + label + '> data channel: ' + dcState);
+			if(dcState === 'open') {
+				// Any pending messages to send?
+				if(config.dataChannel[label].pending && config.dataChannel[label].pending.length > 0) {
+					Janus.log("Sending pending messages on <" + label + ">:", config.dataChannel[label].pending.length);
+					for(var data of config.dataChannel[label].pending) {
+						Janus.log("Sending data on data channel <" + label + ">");
+						Janus.debug(data);
+						config.dataChannel[label].send(data);
+					}
+					config.dataChannel[label].pending = [];
+				}
+				// Notify the open data channel
+				pluginHandle.ondataopen(label, protocol);
+			}
+		};
+		var onDataChannelError = function(error) {
+			Janus.error('Got error on data channel:', error);
+			// TODO
+		};
+		if(!incoming) {
+			// FIXME Add options (ordered, maxRetransmits, etc.)
+			var dcoptions = config.dataChannelOptions;
+			if(dcprotocol)
+				dcoptions.protocol = dcprotocol;
+			config.dataChannel[dclabel] = config.pc.createDataChannel(dclabel, dcoptions);
+		} else {
+			// The channel was created by Janus
+			config.dataChannel[dclabel] = incoming;
+		}
+		config.dataChannel[dclabel].onmessage = onDataChannelMessage;
+		config.dataChannel[dclabel].onopen = onDataChannelStateChange;
+		config.dataChannel[dclabel].onclose = onDataChannelStateChange;
+		config.dataChannel[dclabel].onerror = onDataChannelError;
+		config.dataChannel[dclabel].pending = [];
+		if(pendingData)
+			config.dataChannel[dclabel].pending.push(pendingData);
+	}
+
+	// Private method to send a data channel message
+	function sendData(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		var data = callbacks.text || callbacks.data;
+		if(!data) {
+			Janus.warn("Invalid data");
+			callbacks.error("Invalid data");
+			return;
+		}
+		var label = callbacks.label ? callbacks.label : Janus.dataChanDefaultLabel;
+		if(!config.dataChannel[label]) {
+			// Create new data channel and wait for it to open
+			createDataChannel(handleId, label, callbacks.protocol, false, data, callbacks.protocol);
+			callbacks.success();
+			return;
+		}
+		if(config.dataChannel[label].readyState !== "open") {
+			config.dataChannel[label].pending.push(data);
+			callbacks.success();
+			return;
+		}
+		Janus.log("Sending data on data channel <" + label + ">");
+		Janus.debug(data);
+		config.dataChannel[label].send(data);
+		callbacks.success();
+	}
+
+	// Private method to send a DTMF tone
+	function sendDtmf(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(!config.dtmfSender) {
+			// Create the DTMF sender the proper way, if possible
+			if(config.pc) {
+				var senders = config.pc.getSenders();
+				var audioSender = senders.find(function(sender) {
+					return sender.track && sender.track.kind === 'audio';
+				});
+				if(!audioSender) {
+					Janus.warn("Invalid DTMF configuration (no audio track)");
+					callbacks.error("Invalid DTMF configuration (no audio track)");
+					return;
+				}
+				config.dtmfSender = audioSender.dtmf;
+				if(config.dtmfSender) {
+					Janus.log("Created DTMF Sender");
+					config.dtmfSender.ontonechange = function(tone) { Janus.debug("Sent DTMF tone: " + tone.tone); };
+				}
+			}
+			if(!config.dtmfSender) {
+				Janus.warn("Invalid DTMF configuration");
+				callbacks.error("Invalid DTMF configuration");
+				return;
+			}
+		}
+		var dtmf = callbacks.dtmf;
+		if(!dtmf) {
+			Janus.warn("Invalid DTMF parameters");
+			callbacks.error("Invalid DTMF parameters");
+			return;
+		}
+		var tones = dtmf.tones;
+		if(!tones) {
+			Janus.warn("Invalid DTMF string");
+			callbacks.error("Invalid DTMF string");
+			return;
+		}
+		var duration = (typeof dtmf.duration === 'number') ? dtmf.duration : 500; // We choose 500ms as the default duration for a tone
+		var gap = (typeof dtmf.gap === 'number') ? dtmf.gap : 50; // We choose 50ms as the default gap between tones
+		Janus.debug("Sending DTMF string " + tones + " (duration " + duration + "ms, gap " + gap + "ms)");
+		config.dtmfSender.insertDTMF(tones, duration, gap);
+		callbacks.success();
+	}
+
+	// Private method to destroy a plugin handle
+	function destroyHandle(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		var noRequest = (callbacks.noRequest === true);
+		Janus.log("Destroying handle " + handleId + " (only-locally=" + noRequest + ")");
+		cleanupWebrtc(handleId);
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || pluginHandle.detached) {
+			// Plugin was already detached by Janus, calling detach again will return a handle not found error, so just exit here
+			delete pluginHandles[handleId];
+			callbacks.success();
+			return;
+		}
+		pluginHandle.detached = true;
+		if(noRequest) {
+			// We're only removing the handle locally
+			delete pluginHandles[handleId];
+			callbacks.success();
+			return;
+		}
+		if(!connected) {
+			Janus.warn("Is the server down? (connected=false)");
+			callbacks.error("Is the server down? (connected=false)");
+			return;
+		}
+		var request = { "janus": "detach", "transaction": Janus.randomString(12) };
+		if(pluginHandle.token)
+			request["token"] = pluginHandle.token;
+		if(apisecret)
+			request["apisecret"] = apisecret;
+		if(websockets) {
+			request["session_id"] = sessionId;
+			request["handle_id"] = handleId;
+			ws.send(JSON.stringify(request));
+			delete pluginHandles[handleId];
+			callbacks.success();
+			return;
+		}
+		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
+			verb: 'POST',
+			withCredentials: withCredentials,
+			body: request,
+			success: function(json) {
+				Janus.log("Destroyed handle:");
+				Janus.debug(json);
+				if(json["janus"] !== "success") {
+					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
+				}
+				delete pluginHandles[handleId];
+				callbacks.success();
+			},
+			error: function(textStatus, errorThrown) {
+				Janus.error(textStatus + ":", errorThrown);	// FIXME
+				// We cleanup anyway
+				delete pluginHandles[handleId];
+				callbacks.success();
+			}
+		});
+	}
+
+	// WebRTC stuff
+	function streamsDone(handleId, jsep, media, callbacks, stream) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			// Close all tracks if the given stream has been created internally
+			if(!callbacks.stream) {
+				Janus.stopAllTracks(stream);
+			}
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		Janus.debug("streamsDone:", stream);
+		if(stream) {
+			Janus.debug("  -- Audio tracks:", stream.getAudioTracks());
+			Janus.debug("  -- Video tracks:", stream.getVideoTracks());
+		}
+		// We're now capturing the new stream: check if we're updating or if it's a new thing
+		var addTracks = false;
+		if(!config.myStream || !media.update || (config.streamExternal && !media.replaceAudio && !media.replaceVideo)) {
+			config.myStream = stream;
+			addTracks = true;
+		} else {
+			// We only need to update the existing stream
+			if(((!media.update && isAudioSendEnabled(media)) || (media.update && (media.addAudio || media.replaceAudio))) &&
+					stream.getAudioTracks() && stream.getAudioTracks().length) {
+				config.myStream.addTrack(stream.getAudioTracks()[0]);
+				if(Janus.unifiedPlan) {
+					// Use Transceivers
+					Janus.log((media.replaceAudio ? "Replacing" : "Adding") + " audio track:", stream.getAudioTracks()[0]);
+					var audioTransceiver = null;
+					const transceivers = config.pc.getTransceivers();
+					if(transceivers && transceivers.length > 0) {
+						for(const t of transceivers) {
+							if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
+									(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
+								audioTransceiver = t;
+								break;
+							}
+						}
+					}
+					if(audioTransceiver && audioTransceiver.sender) {
+						audioTransceiver.sender.replaceTrack(stream.getAudioTracks()[0]);
+					} else {
+						config.pc.addTrack(stream.getAudioTracks()[0], stream);
+					}
+				} else {
+					Janus.log((media.replaceAudio ? "Replacing" : "Adding") + " audio track:", stream.getAudioTracks()[0]);
+					config.pc.addTrack(stream.getAudioTracks()[0], stream);
+				}
+			}
+			if(((!media.update && isVideoSendEnabled(media)) || (media.update && (media.addVideo || media.replaceVideo))) &&
+					stream.getVideoTracks() && stream.getVideoTracks().length) {
+				config.myStream.addTrack(stream.getVideoTracks()[0]);
+				if(Janus.unifiedPlan) {
+					// Use Transceivers
+					Janus.log((media.replaceVideo ? "Replacing" : "Adding") + " video track:", stream.getVideoTracks()[0]);
+					var videoTransceiver = null;
+					const transceivers = config.pc.getTransceivers();
+					if(transceivers && transceivers.length > 0) {
+						for(const t of transceivers) {
+							if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
+									(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
+								videoTransceiver = t;
+								break;
+							}
+						}
+					}
+					if(videoTransceiver && videoTransceiver.sender) {
+						videoTransceiver.sender.replaceTrack(stream.getVideoTracks()[0]);
+					} else {
+						config.pc.addTrack(stream.getVideoTracks()[0], stream);
+					}
+				} else {
+					Janus.log((media.replaceVideo ? "Replacing" : "Adding") + " video track:", stream.getVideoTracks()[0]);
+					config.pc.addTrack(stream.getVideoTracks()[0], stream);
+				}
+			}
+		}
+		// If we still need to create a PeerConnection, let's do that
+		if(!config.pc) {
+			var pc_config = {"iceServers": iceServers, "iceTransportPolicy": iceTransportPolicy, "bundlePolicy": bundlePolicy};
+			if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
+				// For Chrome versions before 72, we force a plan-b semantic, and unified-plan otherwise
+				pc_config["sdpSemantics"] = (Janus.webRTCAdapter.browserDetails.version < 72) ? "plan-b" : "unified-plan";
+			}
+			var pc_constraints = {
+				"optional": [{"DtlsSrtpKeyAgreement": true}]
+			};
+			if(ipv6Support) {
+				pc_constraints.optional.push({"googIPv6":true});
+			}
+			// Any custom constraint to add?
+			if(callbacks.rtcConstraints && typeof callbacks.rtcConstraints === 'object') {
+				Janus.debug("Adding custom PeerConnection constraints:", callbacks.rtcConstraints);
+				for(var i in callbacks.rtcConstraints) {
+					pc_constraints.optional.push(callbacks.rtcConstraints[i]);
+				}
+			}
+			if(Janus.webRTCAdapter.browserDetails.browser === "edge") {
+				// This is Edge, enable BUNDLE explicitly
+				pc_config.bundlePolicy = "max-bundle";
+			}
+			// Check if a sender or receiver transform has been provided
+			if(RTCRtpSender && (RTCRtpSender.prototype.createEncodedStreams ||
+					(RTCRtpSender.prototype.createEncodedAudioStreams &&
+					RTCRtpSender.prototype.createEncodedVideoStreams)) &&
+					(callbacks.senderTransforms || callbacks.receiverTransforms)) {
+				config.senderTransforms = callbacks.senderTransforms;
+				config.receiverTransforms = callbacks.receiverTransforms;
+				pc_config["forceEncodedAudioInsertableStreams"] = true;
+				pc_config["forceEncodedVideoInsertableStreams"] = true;
+				pc_config["encodedInsertableStreams"] = true;
+			}
+			Janus.log("Creating PeerConnection");
+			Janus.debug(pc_constraints);
+			config.pc = new RTCPeerConnection(pc_config, pc_constraints);
+			Janus.debug(config.pc);
+			if(config.pc.getStats) {	// FIXME
+				config.volume = {};
+				config.bitrate.value = "0 kbits/sec";
+			}
+			Janus.log("Preparing local SDP and gathering candidates (trickle=" + config.trickle + ")");
+			config.pc.oniceconnectionstatechange = function() {
+				if(config.pc)
+					pluginHandle.iceState(config.pc.iceConnectionState);
+			};
+			config.pc.onicecandidate = function(event) {
+				if (!event.candidate ||
+						(Janus.webRTCAdapter.browserDetails.browser === 'edge' && event.candidate.candidate.indexOf('endOfCandidates') > 0)) {
+					Janus.log("End of candidates.");
+					config.iceDone = true;
+					if(config.trickle === true) {
+						// Notify end of candidates
+						sendTrickleCandidate(handleId, {"completed": true});
+					} else {
+						// No trickle, time to send the complete SDP (including all candidates)
+						sendSDP(handleId, callbacks);
+					}
+				} else {
+					// JSON.stringify doesn't work on some WebRTC objects anymore
+					// See https://code.google.com/p/chromium/issues/detail?id=467366
+					var candidate = {
+						"candidate": event.candidate.candidate,
+						"sdpMid": event.candidate.sdpMid,
+						"sdpMLineIndex": event.candidate.sdpMLineIndex
+					};
+					if(config.trickle === true) {
+						// Send candidate
+						sendTrickleCandidate(handleId, candidate);
+					}
+				}
+			};
+			config.pc.ontrack = function(event) {
+				Janus.log("Handling Remote Track");
+				Janus.debug(event);
+				if(!event.streams)
+					return;
+				config.remoteStream = event.streams[0];
+				pluginHandle.onremotestream(config.remoteStream);
+				if(event.track.onended)
+					return;
+				if(config.receiverTransforms) {
+					var receiverStreams = null;
+					if(RTCRtpSender.prototype.createEncodedStreams) {
+						receiverStreams = event.receiver.createEncodedStreams();
+					} else if(RTCRtpSender.prototype.createAudioEncodedStreams || RTCRtpSender.prototype.createEncodedVideoStreams) {
+						if(event.track.kind === "audio" && config.receiverTransforms["audio"]) {
+							receiverStreams = event.receiver.createEncodedAudioStreams();
+						} else if(event.track.kind === "video" && config.receiverTransforms["video"]) {
+							receiverStreams = event.receiver.createEncodedVideoStreams();
+						}
+					}
+					if(receiverStreams) {
+						console.log(receiverStreams);
+						if(receiverStreams.readableStream && receiverStreams.writableStream) {
+							receiverStreams.readableStream
+								.pipeThrough(config.receiverTransforms[event.track.kind])
+								.pipeTo(receiverStreams.writableStream);
+						} else if(receiverStreams.readable && receiverStreams.writable) {
+							receiverStreams.readable
+								.pipeThrough(config.receiverTransforms[event.track.kind])
+								.pipeTo(receiverStreams.writable);
+						}
+					}
+				}
+				var trackMutedTimeoutId = null;
+				Janus.log("Adding onended callback to track:", event.track);
+				event.track.onended = function(ev) {
+					Janus.log("Remote track removed:", ev);
+					if(config.remoteStream) {
+						clearTimeout(trackMutedTimeoutId);
+						config.remoteStream.removeTrack(ev.target);
+						pluginHandle.onremotestream(config.remoteStream);
+					}
+				};
+				event.track.onmute = function(ev) {
+					Janus.log("Remote track muted:", ev);
+					if(config.remoteStream && trackMutedTimeoutId == null) {
+						trackMutedTimeoutId = setTimeout(function() {
+							Janus.log("Removing remote track");
+							if (config.remoteStream) {
+								config.remoteStream.removeTrack(ev.target);
+								pluginHandle.onremotestream(config.remoteStream);
+							}
+							trackMutedTimeoutId = null;
+						// Chrome seems to raise mute events only at multiples of 834ms;
+						// we set the timeout to three times this value (rounded to 840ms)
+						}, 3 * 840);
+					}
+				};
+				event.track.onunmute = function(ev) {
+					Janus.log("Remote track flowing again:", ev);
+					if(trackMutedTimeoutId != null) {
+						clearTimeout(trackMutedTimeoutId);
+						trackMutedTimeoutId = null;
+					} else {
+						try {
+							config.remoteStream.addTrack(ev.target);
+							pluginHandle.onremotestream(config.remoteStream);
+						} catch(e) {
+							Janus.error(e);
+						}
+					}
+				};
+			};
+		}
+		if(addTracks && stream) {
+			Janus.log('Adding local stream');
+			var simulcast2 = (callbacks.simulcast2 === true);
+			stream.getTracks().forEach(function(track) {
+				Janus.log('Adding local track:', track);
+				var sender = null;
+				if(!simulcast2 || track.kind === 'audio') {
+					sender = config.pc.addTrack(track, stream);
+				} else {
+					Janus.log('Enabling rid-based simulcasting:', track);
+					var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
+					var tr = config.pc.addTransceiver(track, {
+						direction: "sendrecv",
+						streams: [stream],
+						sendEncodings: callbacks.sendEncodings || [
+							{ rid: "h", active: true, maxBitrate: maxBitrates.high },
+							{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2 },
+							{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4 }
+						]
+					});
+					if(tr)
+						sender = tr.sender;
+				}
+				// Check if insertable streams are involved
+				if(sender && config.senderTransforms) {
+					var senderStreams = null;
+					if(RTCRtpSender.prototype.createEncodedStreams) {
+						senderStreams = sender.createEncodedStreams();
+					} else if(RTCRtpSender.prototype.createAudioEncodedStreams || RTCRtpSender.prototype.createEncodedVideoStreams) {
+						if(sender.track.kind === "audio" && config.senderTransforms["audio"]) {
+							senderStreams = sender.createEncodedAudioStreams();
+						} else if(sender.track.kind === "video" && config.senderTransforms["video"]) {
+							senderStreams = sender.createEncodedVideoStreams();
+						}
+					}
+					if(senderStreams) {
+						console.log(senderStreams);
+						if(senderStreams.readableStream && senderStreams.writableStream) {
+							senderStreams.readableStream
+								.pipeThrough(config.senderTransforms[sender.track.kind])
+								.pipeTo(senderStreams.writableStream);
+						} else if(senderStreams.readable && senderStreams.writable) {
+							senderStreams.readable
+								.pipeThrough(config.senderTransforms[sender.track.kind])
+								.pipeTo(senderStreams.writable);
+						}
+					}
+				}
+			});
+		}
+		// Any data channel to create?
+		if(isDataEnabled(media) && !config.dataChannel[Janus.dataChanDefaultLabel]) {
+			Janus.log("Creating default data channel");
+			createDataChannel(handleId, Janus.dataChanDefaultLabel, null, false);
+			config.pc.ondatachannel = function(event) {
+				Janus.log("Data channel created by Janus:", event);
+				createDataChannel(handleId, event.channel.label, event.channel.protocol, event.channel);
+			};
+		}
+		// If there's a new local stream, let's notify the application
+		if(config.myStream) {
+			pluginHandle.onlocalstream(config.myStream);
+		}
+		// Create offer/answer now
+		if(!jsep) {
+			createOffer(handleId, media, callbacks);
+		} else {
+			config.pc.setRemoteDescription(jsep)
+				.then(function() {
+					Janus.log("Remote description accepted!");
+					config.remoteSdp = jsep.sdp;
+					// Any trickle candidate we cached?
+					if(config.candidates && config.candidates.length > 0) {
+						for(var i = 0; i< config.candidates.length; i++) {
+							var candidate = config.candidates[i];
+							Janus.debug("Adding remote candidate:", candidate);
+							if(!candidate || candidate.completed === true) {
+								// end-of-candidates
+								config.pc.addIceCandidate(Janus.endOfCandidates);
+							} else {
+								// New candidate
+								config.pc.addIceCandidate(candidate);
+							}
+						}
+						config.candidates = [];
+					}
+					// Create the answer now
+					createAnswer(handleId, media, callbacks);
+				}, callbacks.error);
+		}
+	}
+
+	function prepareWebrtc(handleId, offer, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : webrtcError;
+		var jsep = callbacks.jsep;
+		if(offer && jsep) {
+			Janus.error("Provided a JSEP to a createOffer");
+			callbacks.error("Provided a JSEP to a createOffer");
+			return;
+		} else if(!offer && (!jsep || !jsep.type || !jsep.sdp)) {
+			Janus.error("A valid JSEP is required for createAnswer");
+			callbacks.error("A valid JSEP is required for createAnswer");
+			return;
+		}
+		/* Check that callbacks.media is a (not null) Object */
+		callbacks.media = (typeof callbacks.media === 'object' && callbacks.media) ? callbacks.media : { audio: true, video: true };
+		var media = callbacks.media;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		config.trickle = isTrickleEnabled(callbacks.trickle);
+		// Are we updating a session?
+		if(!config.pc) {
+			// Nope, new PeerConnection
+			media.update = false;
+			media.keepAudio = false;
+			media.keepVideo = false;
+		} else {
+			Janus.log("Updating existing media session");
+			media.update = true;
+			// Check if there's anything to add/remove/replace, or if we
+			// can go directly to preparing the new SDP offer or answer
+			if(callbacks.stream) {
+				// External stream: is this the same as the one we were using before?
+				if(callbacks.stream !== config.myStream) {
+					Janus.log("Renegotiation involves a new external stream");
+				}
+			} else {
+				// Check if there are changes on audio
+				if(media.addAudio) {
+					media.keepAudio = false;
+					media.replaceAudio = false;
+					media.removeAudio = false;
+					media.audioSend = true;
+					if(config.myStream && config.myStream.getAudioTracks() && config.myStream.getAudioTracks().length) {
+						Janus.error("Can't add audio stream, there already is one");
+						callbacks.error("Can't add audio stream, there already is one");
+						return;
+					}
+				} else if(media.removeAudio) {
+					media.keepAudio = false;
+					media.replaceAudio = false;
+					media.addAudio = false;
+					media.audioSend = false;
+				} else if(media.replaceAudio) {
+					media.keepAudio = false;
+					media.addAudio = false;
+					media.removeAudio = false;
+					media.audioSend = true;
+				}
+				if(!config.myStream) {
+					// No media stream: if we were asked to replace, it's actually an "add"
+					if(media.replaceAudio) {
+						media.keepAudio = false;
+						media.replaceAudio = false;
+						media.addAudio = true;
+						media.audioSend = true;
+					}
+					if(isAudioSendEnabled(media)) {
+						media.keepAudio = false;
+						media.addAudio = true;
+					}
+				} else {
+					if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
+						// No audio track: if we were asked to replace, it's actually an "add"
+						if(media.replaceAudio) {
+							media.keepAudio = false;
+							media.replaceAudio = false;
+							media.addAudio = true;
+							media.audioSend = true;
+						}
+						if(isAudioSendEnabled(media)) {
+							media.keepAudio = false;
+							media.addAudio = true;
+						}
+					} else {
+						// We have an audio track: should we keep it as it is?
+						if(isAudioSendEnabled(media) &&
+								!media.removeAudio && !media.replaceAudio) {
+							media.keepAudio = true;
+						}
+					}
+				}
+				// Check if there are changes on video
+				if(media.addVideo) {
+					media.keepVideo = false;
+					media.replaceVideo = false;
+					media.removeVideo = false;
+					media.videoSend = true;
+					if(config.myStream && config.myStream.getVideoTracks() && config.myStream.getVideoTracks().length) {
+						Janus.error("Can't add video stream, there already is one");
+						callbacks.error("Can't add video stream, there already is one");
+						return;
+					}
+				} else if(media.removeVideo) {
+					media.keepVideo = false;
+					media.replaceVideo = false;
+					media.addVideo = false;
+					media.videoSend = false;
+				} else if(media.replaceVideo) {
+					media.keepVideo = false;
+					media.addVideo = false;
+					media.removeVideo = false;
+					media.videoSend = true;
+				}
+				if(!config.myStream) {
+					// No media stream: if we were asked to replace, it's actually an "add"
+					if(media.replaceVideo) {
+						media.keepVideo = false;
+						media.replaceVideo = false;
+						media.addVideo = true;
+						media.videoSend = true;
+					}
+					if(isVideoSendEnabled(media)) {
+						media.keepVideo = false;
+						media.addVideo = true;
+					}
+				} else {
+					if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
+						// No video track: if we were asked to replace, it's actually an "add"
+						if(media.replaceVideo) {
+							media.keepVideo = false;
+							media.replaceVideo = false;
+							media.addVideo = true;
+							media.videoSend = true;
+						}
+						if(isVideoSendEnabled(media)) {
+							media.keepVideo = false;
+							media.addVideo = true;
+						}
+					} else {
+						// We have a video track: should we keep it as it is?
+						if(isVideoSendEnabled(media) && !media.removeVideo && !media.replaceVideo) {
+							media.keepVideo = true;
+						}
+					}
+				}
+				// Data channels can only be added
+				if(media.addData) {
+					media.data = true;
+				}
+			}
+			// If we're updating and keeping all tracks, let's skip the getUserMedia part
+			if((isAudioSendEnabled(media) && media.keepAudio) &&
+					(isVideoSendEnabled(media) && media.keepVideo)) {
+				pluginHandle.consentDialog(false);
+				streamsDone(handleId, jsep, media, callbacks, config.myStream);
+				return;
+			}
+		}
+		// If we're updating, check if we need to remove/replace one of the tracks
+		if(media.update && (!config.streamExternal || (config.streamExternal && (media.replaceAudio || media.replaceVideo)))) {
+			if(media.removeAudio || media.replaceAudio) {
+				if(config.myStream && config.myStream.getAudioTracks() && config.myStream.getAudioTracks().length) {
+					var at = config.myStream.getAudioTracks()[0];
+					Janus.log("Removing audio track:", at);
+					config.myStream.removeTrack(at);
+					try {
+						at.stop();
+					} catch(e) {}
+				}
+				if(config.pc.getSenders() && config.pc.getSenders().length) {
+					var ra = true;
+					if(media.replaceAudio && Janus.unifiedPlan) {
+						// We can use replaceTrack
+						ra = false;
+					}
+					if(ra) {
+						for(var asnd of config.pc.getSenders()) {
+							if(asnd && asnd.track && asnd.track.kind === "audio") {
+								Janus.log("Removing audio sender:", asnd);
+								config.pc.removeTrack(asnd);
+							}
+						}
+					}
+				}
+			}
+			if(media.removeVideo || media.replaceVideo) {
+				if(config.myStream && config.myStream.getVideoTracks() && config.myStream.getVideoTracks().length) {
+					var vt = config.myStream.getVideoTracks()[0];
+					Janus.log("Removing video track:", vt);
+					config.myStream.removeTrack(vt);
+					try {
+						vt.stop();
+					} catch(e) {}
+				}
+				if(config.pc.getSenders() && config.pc.getSenders().length) {
+					var rv = true;
+					if(media.replaceVideo && Janus.unifiedPlan) {
+						// We can use replaceTrack
+						rv = false;
+					}
+					if(rv) {
+						for(var vsnd of config.pc.getSenders()) {
+							if(vsnd && vsnd.track && vsnd.track.kind === "video") {
+								Janus.log("Removing video sender:", vsnd);
+								config.pc.removeTrack(vsnd);
+							}
+						}
+					}
+				}
+			}
+		}
+		// Was a MediaStream object passed, or do we need to take care of that?
+		if(callbacks.stream) {
+			var stream = callbacks.stream;
+			Janus.log("MediaStream provided by the application");
+			Janus.debug(stream);
+			// If this is an update, let's check if we need to release the previous stream
+			if(media.update && config.myStream && config.myStream !== callbacks.stream && !config.streamExternal && !media.replaceAudio && !media.replaceVideo) {
+				// We're replacing a stream we captured ourselves with an external one
+				Janus.stopAllTracks(config.myStream);
+				config.myStream = null;
+			}
+			// Skip the getUserMedia part
+			config.streamExternal = true;
+			pluginHandle.consentDialog(false);
+			streamsDone(handleId, jsep, media, callbacks, stream);
+			return;
+		}
+		if(isAudioSendEnabled(media) || isVideoSendEnabled(media)) {
+			if(!Janus.isGetUserMediaAvailable()) {
+				callbacks.error("getUserMedia not available");
+				return;
+			}
+			var constraints = { mandatory: {}, optional: []};
+			pluginHandle.consentDialog(true);
+			var audioSupport = isAudioSendEnabled(media);
+			if(audioSupport && media && typeof media.audio === 'object')
+				audioSupport = media.audio;
+			var videoSupport = isVideoSendEnabled(media);
+			if(videoSupport && media) {
+				var simulcast = (callbacks.simulcast === true);
+				var simulcast2 = (callbacks.simulcast2 === true);
+				if((simulcast || simulcast2) && !jsep && !media.video)
+					media.video = "hires";
+				if(media.video && media.video != 'screen' && media.video != 'window') {
+					if(typeof media.video === 'object') {
+						videoSupport = media.video;
+					} else {
+						var width = 0;
+						var height = 0;
+						if(media.video === 'lowres') {
+							// Small resolution, 4:3
+							height = 240;
+							width = 320;
+						} else if(media.video === 'lowres-16:9') {
+							// Small resolution, 16:9
+							height = 180;
+							width = 320;
+						} else if(media.video === 'hires' || media.video === 'hires-16:9' || media.video === 'hdres') {
+							// High(HD) resolution is only 16:9
+							height = 720;
+							width = 1280;
+						} else if(media.video === 'fhdres') {
+							// Full HD resolution is only 16:9
+							height = 1080;
+							width = 1920;
+						} else if(media.video === '4kres') {
+							// 4K resolution is only 16:9
+							height = 2160;
+							width = 3840;
+						} else if(media.video === 'stdres') {
+							// Normal resolution, 4:3
+							height = 480;
+							width = 640;
+						} else if(media.video === 'stdres-16:9') {
+							// Normal resolution, 16:9
+							height = 360;
+							width = 640;
+						} else {
+							Janus.log("Default video setting is stdres 4:3");
+							height = 480;
+							width = 640;
+						}
+						Janus.log("Adding media constraint:", media.video);
+						videoSupport = {
+							'height': {'ideal': height},
+							'width': {'ideal': width}
+						};
+						Janus.log("Adding video constraint:", videoSupport);
+					}
+				} else if(media.video === 'screen' || media.video === 'window') {
+					if(navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia) {
+						// The new experimental getDisplayMedia API is available, let's use that
+						// https://groups.google.com/forum/#!topic/discuss-webrtc/Uf0SrR4uxzk
+						// https://webrtchacks.com/chrome-screensharing-getdisplaymedia/
+						constraints.video = {};
+						if(media.screenshareFrameRate) {
+							constraints.video.frameRate = media.screenshareFrameRate;
+						}
+						if(media.screenshareHeight) {
+							constraints.video.height = media.screenshareHeight;
+						}
+						if(media.screenshareWidth) {
+							constraints.video.width = media.screenshareWidth;
+						}
+						constraints.audio = media.captureDesktopAudio;
+						navigator.mediaDevices.getDisplayMedia(constraints)
+							.then(function(stream) {
+								pluginHandle.consentDialog(false);
+								if(isAudioSendEnabled(media) && !media.keepAudio) {
+									navigator.mediaDevices.getUserMedia({ audio: true, video: false })
+									.then(function (audioStream) {
+										stream.addTrack(audioStream.getAudioTracks()[0]);
+										streamsDone(handleId, jsep, media, callbacks, stream);
+									})
+								} else {
+									streamsDone(handleId, jsep, media, callbacks, stream);
+								}
+							}, function (error) {
+								pluginHandle.consentDialog(false);
+								callbacks.error(error);
+							});
+						return;
+					}
+					// We're going to try and use the extension for Chrome 34+, the old approach
+					// for older versions of Chrome, or the experimental support in Firefox 33+
+					const callbackUserMedia = function(error, stream) {
+						pluginHandle.consentDialog(false);
+						if(error) {
+							callbacks.error(error);
+						} else {
+							streamsDone(handleId, jsep, media, callbacks, stream);
+						}
+					}
+					const getScreenMedia = function(constraints, gsmCallback, useAudio) {
+						Janus.log("Adding media constraint (screen capture)");
+						Janus.debug(constraints);
+						navigator.mediaDevices.getUserMedia(constraints)
+							.then(function(stream) {
+								if(useAudio) {
+									navigator.mediaDevices.getUserMedia({ audio: true, video: false })
+									.then(function (audioStream) {
+										stream.addTrack(audioStream.getAudioTracks()[0]);
+										gsmCallback(null, stream);
+									})
+								} else {
+									gsmCallback(null, stream);
+								}
+							})
+							.catch(function(error) { pluginHandle.consentDialog(false); gsmCallback(error); });
+					}
+					if(Janus.webRTCAdapter.browserDetails.browser === 'chrome') {
+						var chromever = Janus.webRTCAdapter.browserDetails.version;
+						var maxver = 33;
+						if(window.navigator.userAgent.match('Linux'))
+							maxver = 35;	// "known" crash in chrome 34 and 35 on linux
+						if(chromever >= 26 && chromever <= maxver) {
+							// Chrome 26->33 requires some awkward chrome://flags manipulation
+							constraints = {
+								video: {
+									mandatory: {
+										googLeakyBucket: true,
+										maxWidth: window.screen.width,
+										maxHeight: window.screen.height,
+										minFrameRate: media.screenshareFrameRate,
+										maxFrameRate: media.screenshareFrameRate,
+										chromeMediaSource: 'screen'
+									}
+								},
+								audio: isAudioSendEnabled(media) && !media.keepAudio
+							};
+							getScreenMedia(constraints, callbackUserMedia);
+						} else {
+							// Chrome 34+ requires an extension
+							Janus.extension.getScreen(function (error, sourceId) {
+								if (error) {
+									pluginHandle.consentDialog(false);
+									return callbacks.error(error);
+								}
+								constraints = {
+									audio: false,
+									video: {
+										mandatory: {
+											chromeMediaSource: 'desktop',
+											maxWidth: window.screen.width,
+											maxHeight: window.screen.height,
+											minFrameRate: media.screenshareFrameRate,
+											maxFrameRate: media.screenshareFrameRate,
+										},
+										optional: [
+											{googLeakyBucket: true},
+											{googTemporalLayeredScreencast: true}
+										]
+									}
+								};
+								constraints.video.mandatory.chromeMediaSourceId = sourceId;
+								getScreenMedia(constraints, callbackUserMedia,
+									isAudioSendEnabled(media) && !media.keepAudio);
+							});
+						}
+					} else if(Janus.webRTCAdapter.browserDetails.browser === 'firefox') {
+						if(Janus.webRTCAdapter.browserDetails.version >= 33) {
+							// Firefox 33+ has experimental support for screen sharing
+							constraints = {
+								video: {
+									mozMediaSource: media.video,
+									mediaSource: media.video
+								},
+								audio: isAudioSendEnabled(media) && !media.keepAudio
+							};
+							getScreenMedia(constraints, function (err, stream) {
+								callbackUserMedia(err, stream);
+								// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1045810
+								if (!err) {
+									var lastTime = stream.currentTime;
+									var polly = window.setInterval(function () {
+										if(!stream)
+											window.clearInterval(polly);
+										if(stream.currentTime == lastTime) {
+											window.clearInterval(polly);
+											if(stream.onended) {
+												stream.onended();
+											}
+										}
+										lastTime = stream.currentTime;
+									}, 500);
+								}
+							});
+						} else {
+							var error = new Error('NavigatorUserMediaError');
+							error.name = 'Your version of Firefox does not support screen sharing, please install Firefox 33 (or more recent versions)';
+							pluginHandle.consentDialog(false);
+							callbacks.error(error);
+							return;
+						}
+					}
+					return;
+				}
+			}
+			// If we got here, we're not screensharing
+			if(!media || media.video !== 'screen') {
+				// Check whether all media sources are actually available or not
+				navigator.mediaDevices.enumerateDevices().then(function(devices) {
+					var audioExist = devices.some(function(device) {
+						return device.kind === 'audioinput';
+					}),
+					videoExist = isScreenSendEnabled(media) || devices.some(function(device) {
+						return device.kind === 'videoinput';
+					});
+
+					// Check whether a missing device is really a problem
+					var audioSend = isAudioSendEnabled(media);
+					var videoSend = isVideoSendEnabled(media);
+					var needAudioDevice = isAudioSendRequired(media);
+					var needVideoDevice = isVideoSendRequired(media);
+					if(audioSend || videoSend || needAudioDevice || needVideoDevice) {
+						// We need to send either audio or video
+						var haveAudioDevice = audioSend ? audioExist : false;
+						var haveVideoDevice = videoSend ? videoExist : false;
+						if(!haveAudioDevice && !haveVideoDevice) {
+							// FIXME Should we really give up, or just assume recvonly for both?
+							pluginHandle.consentDialog(false);
+							callbacks.error('No capture device found');
+							return false;
+						} else if(!haveAudioDevice && needAudioDevice) {
+							pluginHandle.consentDialog(false);
+							callbacks.error('Audio capture is required, but no capture device found');
+							return false;
+						} else if(!haveVideoDevice && needVideoDevice) {
+							pluginHandle.consentDialog(false);
+							callbacks.error('Video capture is required, but no capture device found');
+							return false;
+						}
+					}
+
+					var gumConstraints = {
+						audio: (audioExist && !media.keepAudio) ? audioSupport : false,
+						video: (videoExist && !media.keepVideo) ? videoSupport : false
+					};
+					Janus.debug("getUserMedia constraints", gumConstraints);
+					if (!gumConstraints.audio && !gumConstraints.video) {
+						pluginHandle.consentDialog(false);
+						streamsDone(handleId, jsep, media, callbacks, stream);
+					} else {
+						navigator.mediaDevices.getUserMedia(gumConstraints)
+							.then(function(stream) {
+								pluginHandle.consentDialog(false);
+								streamsDone(handleId, jsep, media, callbacks, stream);
+							}).catch(function(error) {
+								pluginHandle.consentDialog(false);
+								callbacks.error({code: error.code, name: error.name, message: error.message});
+							});
+					}
+				})
+				.catch(function(error) {
+					pluginHandle.consentDialog(false);
+					callbacks.error(error);
+				});
+			}
+		} else {
+			// No need to do a getUserMedia, create offer/answer right away
+			streamsDone(handleId, jsep, media, callbacks);
+		}
+	}
+
+	function prepareWebrtcPeer(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : webrtcError;
+		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
+		var jsep = callbacks.jsep;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(jsep) {
+			if(!config.pc) {
+				Janus.warn("Wait, no PeerConnection?? if this is an answer, use createAnswer and not handleRemoteJsep");
+				callbacks.error("No PeerConnection: if this is an answer, use createAnswer and not handleRemoteJsep");
+				return;
+			}
+			callbacks.customizeSdp(jsep);
+			config.pc.setRemoteDescription(jsep)
+				.then(function() {
+					Janus.log("Remote description accepted!");
+					config.remoteSdp = jsep.sdp;
+					// Any trickle candidate we cached?
+					if(config.candidates && config.candidates.length > 0) {
+						for(var i = 0; i< config.candidates.length; i++) {
+							var candidate = config.candidates[i];
+							Janus.debug("Adding remote candidate:", candidate);
+							if(!candidate || candidate.completed === true) {
+								// end-of-candidates
+								config.pc.addIceCandidate(Janus.endOfCandidates);
+							} else {
+								// New candidate
+								config.pc.addIceCandidate(candidate);
+							}
+						}
+						config.candidates = [];
+					}
+					// Done
+					callbacks.success();
+				}, callbacks.error);
+		} else {
+			callbacks.error("Invalid JSEP");
+		}
+	}
+
+	function createOffer(handleId, media, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		var simulcast = (callbacks.simulcast === true);
+		if(!simulcast) {
+			Janus.log("Creating offer (iceDone=" + config.iceDone + ")");
+		} else {
+			Janus.log("Creating offer (iceDone=" + config.iceDone + ", simulcast=" + simulcast + ")");
+		}
+		// https://code.google.com/p/webrtc/issues/detail?id=3508
+		var mediaConstraints = {};
+		if(Janus.unifiedPlan) {
+			// We can use Transceivers
+			var audioTransceiver = null, videoTransceiver = null;
+			var transceivers = config.pc.getTransceivers();
+			if(transceivers && transceivers.length > 0) {
+				for(var t of transceivers) {
+					if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
+							(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
+						if(!audioTransceiver) {
+							audioTransceiver = t;
+						}
+						continue;
+					}
+					if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
+							(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
+						if(!videoTransceiver) {
+							videoTransceiver = t;
+						}
+						continue;
+					}
+				}
+			}
+			// Handle audio (and related changes, if any)
+			var audioSend = isAudioSendEnabled(media);
+			var audioRecv = isAudioRecvEnabled(media);
+			if(!audioSend && !audioRecv) {
+				// Audio disabled: have we removed it?
+				if(media.removeAudio && audioTransceiver) {
+					if (audioTransceiver.setDirection) {
+						audioTransceiver.setDirection("inactive");
+					} else {
+						audioTransceiver.direction = "inactive";
+					}
+					Janus.log("Setting audio transceiver to inactive:", audioTransceiver);
+				}
+			} else {
+				// Take care of audio m-line
+				if(audioSend && audioRecv) {
+					if(audioTransceiver) {
+						if (audioTransceiver.setDirection) {
+							audioTransceiver.setDirection("sendrecv");
+						} else {
+							audioTransceiver.direction = "sendrecv";
+						}
+						Janus.log("Setting audio transceiver to sendrecv:", audioTransceiver);
+					}
+				} else if(audioSend && !audioRecv) {
+					if(audioTransceiver) {
+						if (audioTransceiver.setDirection) {
+							audioTransceiver.setDirection("sendonly");
+						} else {
+							audioTransceiver.direction = "sendonly";
+						}
+						Janus.log("Setting audio transceiver to sendonly:", audioTransceiver);
+					}
+				} else if(!audioSend && audioRecv) {
+					if(audioTransceiver) {
+						if (audioTransceiver.setDirection) {
+							audioTransceiver.setDirection("recvonly");
+						} else {
+							audioTransceiver.direction = "recvonly";
+						}
+						Janus.log("Setting audio transceiver to recvonly:", audioTransceiver);
+					} else {
+						// In theory, this is the only case where we might not have a transceiver yet
+						audioTransceiver = config.pc.addTransceiver("audio", { direction: "recvonly" });
+						Janus.log("Adding recvonly audio transceiver:", audioTransceiver);
+					}
+				}
+			}
+			// Handle video (and related changes, if any)
+			var videoSend = isVideoSendEnabled(media);
+			var videoRecv = isVideoRecvEnabled(media);
+			if(!videoSend && !videoRecv) {
+				// Video disabled: have we removed it?
+				if(media.removeVideo && videoTransceiver) {
+					if (videoTransceiver.setDirection) {
+						videoTransceiver.setDirection("inactive");
+					} else {
+						videoTransceiver.direction = "inactive";
+					}
+					Janus.log("Setting video transceiver to inactive:", videoTransceiver);
+				}
+			} else {
+				// Take care of video m-line
+				if(videoSend && videoRecv) {
+					if(videoTransceiver) {
+						if (videoTransceiver.setDirection) {
+							videoTransceiver.setDirection("sendrecv");
+						} else {
+							videoTransceiver.direction = "sendrecv";
+						}
+						Janus.log("Setting video transceiver to sendrecv:", videoTransceiver);
+					}
+				} else if(videoSend && !videoRecv) {
+					if(videoTransceiver) {
+						if (videoTransceiver.setDirection) {
+							videoTransceiver.setDirection("sendonly");
+						} else {
+							videoTransceiver.direction = "sendonly";
+						}
+						Janus.log("Setting video transceiver to sendonly:", videoTransceiver);
+					}
+				} else if(!videoSend && videoRecv) {
+					if(videoTransceiver) {
+						if (videoTransceiver.setDirection) {
+							videoTransceiver.setDirection("recvonly");
+						} else {
+							videoTransceiver.direction = "recvonly";
+						}
+						Janus.log("Setting video transceiver to recvonly:", videoTransceiver);
+					} else {
+						// In theory, this is the only case where we might not have a transceiver yet
+						videoTransceiver = config.pc.addTransceiver("video", { direction: "recvonly" });
+						Janus.log("Adding recvonly video transceiver:", videoTransceiver);
+					}
+				}
+			}
+		} else {
+			mediaConstraints["offerToReceiveAudio"] = isAudioRecvEnabled(media);
+			mediaConstraints["offerToReceiveVideo"] = isVideoRecvEnabled(media);
+		}
+		var iceRestart = (callbacks.iceRestart === true);
+		if(iceRestart) {
+			mediaConstraints["iceRestart"] = true;
+		}
+		Janus.debug(mediaConstraints);
+		// Check if this is Firefox and we've been asked to do simulcasting
+		var sendVideo = isVideoSendEnabled(media);
+		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
+			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
+			Janus.log("Enabling Simulcasting for Firefox (RID)");
+			var sender = config.pc.getSenders().find(function(s) {return s.track && s.track.kind === "video"});
+			if(sender) {
+				var parameters = sender.getParameters();
+				if(!parameters) {
+					parameters = {};
+				}
+				var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
+				parameters.encodings = callbacks.sendEncodings || [
+					{ rid: "h", active: true, maxBitrate: maxBitrates.high },
+					{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2 },
+					{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4 }
+				];
+				sender.setParameters(parameters);
+			}
+		}
+		config.pc.createOffer(mediaConstraints)
+			.then(function(offer) {
+				Janus.debug(offer);
+				// JSON.stringify doesn't work on some WebRTC objects anymore
+				// See https://code.google.com/p/chromium/issues/detail?id=467366
+				var jsep = {
+					"type": offer.type,
+					"sdp": offer.sdp
+				};
+				callbacks.customizeSdp(jsep);
+				offer.sdp = jsep.sdp;
+				Janus.log("Setting local description");
+				if(sendVideo && simulcast) {
+					// This SDP munging only works with Chrome (Safari STP may support it too)
+					if(Janus.webRTCAdapter.browserDetails.browser === "chrome" ||
+							Janus.webRTCAdapter.browserDetails.browser === "safari") {
+						Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
+						offer.sdp = mungeSdpForSimulcasting(offer.sdp);
+					} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
+						Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
+					}
+				}
+				config.mySdp = {
+					type: "offer",
+					sdp: offer.sdp
+				};
+				config.pc.setLocalDescription(offer)
+					.catch(callbacks.error);
+				config.mediaConstraints = mediaConstraints;
+				if(!config.iceDone && !config.trickle) {
+					// Don't do anything until we have all candidates
+					Janus.log("Waiting for all candidates...");
+					return;
+				}
+				// If transforms are present, notify Janus that the media is end-to-end encrypted
+				if(config.senderTransforms || config.receiverTransforms) {
+					offer["e2ee"] = true;
+				}
+				callbacks.success(offer);
+			}, callbacks.error);
+	}
+
+	function createAnswer(handleId, media, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			callbacks.error("Invalid handle");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		var simulcast = (callbacks.simulcast === true);
+		if(!simulcast) {
+			Janus.log("Creating answer (iceDone=" + config.iceDone + ")");
+		} else {
+			Janus.log("Creating answer (iceDone=" + config.iceDone + ", simulcast=" + simulcast + ")");
+		}
+		var mediaConstraints = null;
+		if(Janus.unifiedPlan) {
+			// We can use Transceivers
+			mediaConstraints = {};
+			var audioTransceiver = null, videoTransceiver = null;
+			var transceivers = config.pc.getTransceivers();
+			if(transceivers && transceivers.length > 0) {
+				for(var t of transceivers) {
+					if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
+							(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
+						if(!audioTransceiver)
+							audioTransceiver = t;
+						continue;
+					}
+					if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
+							(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
+						if(!videoTransceiver)
+							videoTransceiver = t;
+						continue;
+					}
+				}
+			}
+			// Handle audio (and related changes, if any)
+			var audioSend = isAudioSendEnabled(media);
+			var audioRecv = isAudioRecvEnabled(media);
+			if(!audioSend && !audioRecv) {
+				// Audio disabled: have we removed it?
+				if(media.removeAudio && audioTransceiver) {
+					try {
+						if (audioTransceiver.setDirection) {
+							audioTransceiver.setDirection("inactive");
+						} else {
+							audioTransceiver.direction = "inactive";
+						}
+						Janus.log("Setting audio transceiver to inactive:", audioTransceiver);
+					} catch(e) {
+						Janus.error(e);
+					}
+				}
+			} else {
+				// Take care of audio m-line
+				if(audioSend && audioRecv) {
+					if(audioTransceiver) {
+						try {
+							if (audioTransceiver.setDirection) {
+								audioTransceiver.setDirection("sendrecv");
+							} else {
+								audioTransceiver.direction = "sendrecv";
+							}
+							Janus.log("Setting audio transceiver to sendrecv:", audioTransceiver);
+						} catch(e) {
+							Janus.error(e);
+						}
+					}
+				} else if(audioSend && !audioRecv) {
+					try {
+						if(audioTransceiver) {
+							if (audioTransceiver.setDirection) {
+								audioTransceiver.setDirection("sendonly");
+							} else {
+								audioTransceiver.direction = "sendonly";
+							}
+							Janus.log("Setting audio transceiver to sendonly:", audioTransceiver);
+						}
+					} catch(e) {
+						Janus.error(e);
+					}
+				} else if(!audioSend && audioRecv) {
+					if(audioTransceiver) {
+						try {
+							if (audioTransceiver.setDirection) {
+								audioTransceiver.setDirection("recvonly");
+							} else {
+								audioTransceiver.direction = "recvonly";
+							}
+							Janus.log("Setting audio transceiver to recvonly:", audioTransceiver);
+						} catch(e) {
+							Janus.error(e);
+						}
+					} else {
+						// In theory, this is the only case where we might not have a transceiver yet
+						audioTransceiver = config.pc.addTransceiver("audio", { direction: "recvonly" });
+						Janus.log("Adding recvonly audio transceiver:", audioTransceiver);
+					}
+				}
+			}
+			// Handle video (and related changes, if any)
+			var videoSend = isVideoSendEnabled(media);
+			var videoRecv = isVideoRecvEnabled(media);
+			if(!videoSend && !videoRecv) {
+				// Video disabled: have we removed it?
+				if(media.removeVideo && videoTransceiver) {
+					try {
+						if (videoTransceiver.setDirection) {
+							videoTransceiver.setDirection("inactive");
+						} else {
+							videoTransceiver.direction = "inactive";
+						}
+						Janus.log("Setting video transceiver to inactive:", videoTransceiver);
+					} catch(e) {
+						Janus.error(e);
+					}
+				}
+			} else {
+				// Take care of video m-line
+				if(videoSend && videoRecv) {
+					if(videoTransceiver) {
+						try {
+							if (videoTransceiver.setDirection) {
+								videoTransceiver.setDirection("sendrecv");
+							} else {
+								videoTransceiver.direction = "sendrecv";
+							}
+							Janus.log("Setting video transceiver to sendrecv:", videoTransceiver);
+						} catch(e) {
+							Janus.error(e);
+						}
+					}
+				} else if(videoSend && !videoRecv) {
+					if(videoTransceiver) {
+						try {
+							if (videoTransceiver.setDirection) {
+								videoTransceiver.setDirection("sendonly");
+							} else {
+								videoTransceiver.direction = "sendonly";
+							}
+							Janus.log("Setting video transceiver to sendonly:", videoTransceiver);
+						} catch(e) {
+							Janus.error(e);
+						}
+					}
+				} else if(!videoSend && videoRecv) {
+					if(videoTransceiver) {
+						try {
+							if (videoTransceiver.setDirection) {
+								videoTransceiver.setDirection("recvonly");
+							} else {
+								videoTransceiver.direction = "recvonly";
+							}
+							Janus.log("Setting video transceiver to recvonly:", videoTransceiver);
+						} catch(e) {
+							Janus.error(e);
+						}
+					} else {
+						// In theory, this is the only case where we might not have a transceiver yet
+						videoTransceiver = config.pc.addTransceiver("video", { direction: "recvonly" });
+						Janus.log("Adding recvonly video transceiver:", videoTransceiver);
+					}
+				}
+			}
+		} else {
+			if(Janus.webRTCAdapter.browserDetails.browser === "firefox" || Janus.webRTCAdapter.browserDetails.browser === "edge") {
+				mediaConstraints = {
+					offerToReceiveAudio: isAudioRecvEnabled(media),
+					offerToReceiveVideo: isVideoRecvEnabled(media)
+				};
+			} else {
+				mediaConstraints = {
+					mandatory: {
+						OfferToReceiveAudio: isAudioRecvEnabled(media),
+						OfferToReceiveVideo: isVideoRecvEnabled(media)
+					}
+				};
+			}
+		}
+		Janus.debug(mediaConstraints);
+		// Check if this is Firefox and we've been asked to do simulcasting
+		var sendVideo = isVideoSendEnabled(media);
+		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
+			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
+			Janus.log("Enabling Simulcasting for Firefox (RID)");
+			var sender = config.pc.getSenders()[1];
+			Janus.log(sender);
+			var parameters = sender.getParameters();
+			Janus.log(parameters);
+
+			var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
+			sender.setParameters({encodings: callbacks.sendEncodings || [
+				{ rid: "h", active: true, maxBitrate: maxBitrates.high },
+				{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2},
+				{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4}
+			]});
+		}
+		config.pc.createAnswer(mediaConstraints)
+			.then(function(answer) {
+				Janus.debug(answer);
+				// JSON.stringify doesn't work on some WebRTC objects anymore
+				// See https://code.google.com/p/chromium/issues/detail?id=467366
+				var jsep = {
+					"type": answer.type,
+					"sdp": answer.sdp
+				};
+				callbacks.customizeSdp(jsep);
+				answer.sdp = jsep.sdp;
+				Janus.log("Setting local description");
+				if(sendVideo && simulcast) {
+					// This SDP munging only works with Chrome
+					if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
+						// FIXME Apparently trying to simulcast when answering breaks video in Chrome...
+						//~ Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
+						//~ answer.sdp = mungeSdpForSimulcasting(answer.sdp);
+						Janus.warn("simulcast=true, but this is an answer, and video breaks in Chrome if we enable it");
+					} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
+						Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
+					}
+				}
+				config.mySdp = {
+					type: "answer",
+					sdp: answer.sdp
+				};
+				config.pc.setLocalDescription(answer)
+					.catch(callbacks.error);
+				config.mediaConstraints = mediaConstraints;
+				if(!config.iceDone && !config.trickle) {
+					// Don't do anything until we have all candidates
+					Janus.log("Waiting for all candidates...");
+					return;
+				}
+				// If transforms are present, notify Janus that the media is end-to-end encrypted
+				if(config.senderTransforms || config.receiverTransforms) {
+					answer["e2ee"] = true;
+				}
+				callbacks.success(answer);
+			}, callbacks.error);
+	}
+
+	function sendSDP(handleId, callbacks) {
+		callbacks = callbacks || {};
+		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
+		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle, not sending anything");
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		Janus.log("Sending offer/answer SDP...");
+		if(!config.mySdp) {
+			Janus.warn("Local SDP instance is invalid, not sending anything...");
+			return;
+		}
+		config.mySdp = {
+			"type": config.pc.localDescription.type,
+			"sdp": config.pc.localDescription.sdp
+		};
+		if(config.trickle === false)
+			config.mySdp["trickle"] = false;
+		Janus.debug(callbacks);
+		config.sdpSent = true;
+		callbacks.success(config.mySdp);
+	}
+
+	function getVolume(handleId, remote) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return 0;
+		}
+		var stream = remote ? "remote" : "local";
+		var config = pluginHandle.webrtcStuff;
+		if(!config.volume[stream])
+			config.volume[stream] = { value: 0 };
+		// Start getting the volume, if audioLevel in getStats is supported (apparently
+		// they're only available in Chrome/Safari right now: https://webrtc-stats.callstats.io/)
+		if(config.pc.getStats && (Janus.webRTCAdapter.browserDetails.browser === "chrome" ||
+				Janus.webRTCAdapter.browserDetails.browser === "safari")) {
+			if(remote && !config.remoteStream) {
+				Janus.warn("Remote stream unavailable");
+				return 0;
+			} else if(!remote && !config.myStream) {
+				Janus.warn("Local stream unavailable");
+				return 0;
+			}
+			if(!config.volume[stream].timer) {
+				Janus.log("Starting " + stream + " volume monitor");
+				config.volume[stream].timer = setInterval(function() {
+					config.pc.getStats()
+						.then(function(stats) {
+							stats.forEach(function (res) {
+								if(!res || res.kind !== "audio")
+									return;
+								if((remote && !res.remoteSource) || (!remote && res.type !== "media-source"))
+									return;
+								config.volume[stream].value = (res.audioLevel ? res.audioLevel : 0);
+							});
+						});
+				}, 200);
+				return 0;	// We don't have a volume to return yet
+			}
+			return config.volume[stream].value;
+		} else {
+			// audioInputLevel and audioOutputLevel seem only available in Chrome? audioLevel
+			// seems to be available on Chrome and Firefox, but they don't seem to work
+			Janus.warn("Getting the " + stream + " volume unsupported by browser");
+			return 0;
+		}
+	}
+
+	function isMuted(handleId, video) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return true;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(!config.pc) {
+			Janus.warn("Invalid PeerConnection");
+			return true;
+		}
+		if(!config.myStream) {
+			Janus.warn("Invalid local MediaStream");
+			return true;
+		}
+		if(video) {
+			// Check video track
+			if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
+				Janus.warn("No video track");
+				return true;
+			}
+			return !config.myStream.getVideoTracks()[0].enabled;
+		} else {
+			// Check audio track
+			if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
+				Janus.warn("No audio track");
+				return true;
+			}
+			return !config.myStream.getAudioTracks()[0].enabled;
+		}
+	}
+
+	function mute(handleId, video, mute) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return false;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(!config.pc) {
+			Janus.warn("Invalid PeerConnection");
+			return false;
+		}
+		if(!config.myStream) {
+			Janus.warn("Invalid local MediaStream");
+			return false;
+		}
+		if(video) {
+			// Mute/unmute video track
+			if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
+				Janus.warn("No video track");
+				return false;
+			}
+			config.myStream.getVideoTracks()[0].enabled = !mute;
+			return true;
+		} else {
+			// Mute/unmute audio track
+			if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
+				Janus.warn("No audio track");
+				return false;
+			}
+			config.myStream.getAudioTracks()[0].enabled = !mute;
+			return true;
+		}
+	}
+
+	function getBitrate(handleId) {
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle || !pluginHandle.webrtcStuff) {
+			Janus.warn("Invalid handle");
+			return "Invalid handle";
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(!config.pc)
+			return "Invalid PeerConnection";
+		// Start getting the bitrate, if getStats is supported
+		if(config.pc.getStats) {
+			if(!config.bitrate.timer) {
+				Janus.log("Starting bitrate timer (via getStats)");
+				config.bitrate.timer = setInterval(function() {
+					config.pc.getStats()
+						.then(function(stats) {
+							stats.forEach(function (res) {
+								if(!res)
+									return;
+								var inStats = false;
+								// Check if these are statistics on incoming media
+								if((res.mediaType === "video" || res.id.toLowerCase().indexOf("video") > -1) &&
+										res.type === "inbound-rtp" && res.id.indexOf("rtcp") < 0) {
+									// New stats
+									inStats = true;
+								} else if(res.type == 'ssrc' && res.bytesReceived &&
+										(res.googCodecName === "VP8" || res.googCodecName === "")) {
+									// Older Chromer versions
+									inStats = true;
+								}
+								// Parse stats now
+								if(inStats) {
+									config.bitrate.bsnow = res.bytesReceived;
+									config.bitrate.tsnow = res.timestamp;
+									if(config.bitrate.bsbefore === null || config.bitrate.tsbefore === null) {
+										// Skip this round
+										config.bitrate.bsbefore = config.bitrate.bsnow;
+										config.bitrate.tsbefore = config.bitrate.tsnow;
+									} else {
+										// Calculate bitrate
+										var timePassed = config.bitrate.tsnow - config.bitrate.tsbefore;
+										if(Janus.webRTCAdapter.browserDetails.browser === "safari")
+											timePassed = timePassed/1000;	// Apparently the timestamp is in microseconds, in Safari
+										var bitRate = Math.round((config.bitrate.bsnow - config.bitrate.bsbefore) * 8 / timePassed);
+										if(Janus.webRTCAdapter.browserDetails.browser === "safari")
+											bitRate = parseInt(bitRate/1000);
+										config.bitrate.value = bitRate + ' kbits/sec';
+										//~ Janus.log("Estimated bitrate is " + config.bitrate.value);
+										config.bitrate.bsbefore = config.bitrate.bsnow;
+										config.bitrate.tsbefore = config.bitrate.tsnow;
+									}
+								}
+							});
+						});
+				}, 1000);
+				return "0 kbits/sec";	// We don't have a bitrate value yet
+			}
+			return config.bitrate.value;
+		} else {
+			Janus.warn("Getting the video bitrate unsupported by browser");
+			return "Feature unsupported by browser";
+		}
+	}
+
+	function webrtcError(error) {
+		Janus.error("WebRTC error:", error);
+	}
+
+	function cleanupWebrtc(handleId, hangupRequest) {
+		Janus.log("Cleaning WebRTC stuff");
+		var pluginHandle = pluginHandles[handleId];
+		if(!pluginHandle) {
+			// Nothing to clean
+			return;
+		}
+		var config = pluginHandle.webrtcStuff;
+		if(config) {
+			if(hangupRequest === true) {
+				// Send a hangup request (we don't really care about the response)
+				var request = { "janus": "hangup", "transaction": Janus.randomString(12) };
+				if(pluginHandle.token)
+					request["token"] = pluginHandle.token;
+				if(apisecret)
+					request["apisecret"] = apisecret;
+				Janus.debug("Sending hangup request (handle=" + handleId + "):");
+				Janus.debug(request);
+				if(websockets) {
+					request["session_id"] = sessionId;
+					request["handle_id"] = handleId;
+					ws.send(JSON.stringify(request));
+				} else {
+					Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
+						verb: 'POST',
+						withCredentials: withCredentials,
+						body: request
+					});
+				}
+			}
+			// Cleanup stack
+			config.remoteStream = null;
+			if(config.volume) {
+				if(config.volume["local"] && config.volume["local"].timer)
+					clearInterval(config.volume["local"].timer);
+				if(config.volume["remote"] && config.volume["remote"].timer)
+					clearInterval(config.volume["remote"].timer);
+			}
+			config.volume = {};
+			if(config.bitrate.timer)
+				clearInterval(config.bitrate.timer);
+			config.bitrate.timer = null;
+			config.bitrate.bsnow = null;
+			config.bitrate.bsbefore = null;
+			config.bitrate.tsnow = null;
+			config.bitrate.tsbefore = null;
+			config.bitrate.value = null;
+			if(!config.streamExternal && config.myStream) {
+				Janus.log("Stopping local stream tracks");
+				Janus.stopAllTracks(config.myStream);
+			}
+			config.streamExternal = false;
+			config.myStream = null;
+			// Close PeerConnection
+			try {
+				config.pc.close();
+			} catch(e) {
+				// Do nothing
+			}
+			config.pc = null;
+			config.candidates = null;
+			config.mySdp = null;
+			config.remoteSdp = null;
+			config.iceDone = false;
+			config.dataChannel = {};
+			config.dtmfSender = null;
+			config.senderTransforms = null;
+			config.receiverTransforms = null;
+		}
+		pluginHandle.oncleanup();
+	}
+
+	// Helper method to munge an SDP to enable simulcasting (Chrome only)
+	function mungeSdpForSimulcasting(sdp) {
+		// Let's munge the SDP to add the attributes for enabling simulcasting
+		// (based on https://gist.github.com/ggarber/a19b4c33510028b9c657)
+		var lines = sdp.split("\r\n");
+		var video = false;
+		var ssrc = [ -1 ], ssrc_fid = [ -1 ];
+		var cname = null, msid = null, mslabel = null, label = null;
+		var insertAt = -1;
+		for(let i=0; i<lines.length; i++) {
+			const mline = lines[i].match(/m=(\w+) */);
+			if(mline) {
+				const medium = mline[1];
+				if(medium === "video") {
+					// New video m-line: make sure it's the first one
+					if(ssrc[0] < 0) {
+						video = true;
+					} else {
+						// We're done, let's add the new attributes here
+						insertAt = i;
+						break;
+					}
+				} else {
+					// New non-video m-line: do we have what we were looking for?
+					if(ssrc[0] > -1) {
+						// We're done, let's add the new attributes here
+						insertAt = i;
+						break;
+					}
+				}
+				continue;
+			}
+			if(!video)
+				continue;
+			var sim = lines[i].match(/a=ssrc-group:SIM (\d+) (\d+) (\d+)/);
+			if(sim) {
+				Janus.warn("The SDP already contains a SIM attribute, munging will be skipped");
+				return sdp;
+			}
+			var fid = lines[i].match(/a=ssrc-group:FID (\d+) (\d+)/);
+			if(fid) {
+				ssrc[0] = fid[1];
+				ssrc_fid[0] = fid[2];
+				lines.splice(i, 1); i--;
+				continue;
+			}
+			if(ssrc[0]) {
+				var match = lines[i].match('a=ssrc:' + ssrc[0] + ' cname:(.+)')
+				if(match) {
+					cname = match[1];
+				}
+				match = lines[i].match('a=ssrc:' + ssrc[0] + ' msid:(.+)')
+				if(match) {
+					msid = match[1];
+				}
+				match = lines[i].match('a=ssrc:' + ssrc[0] + ' mslabel:(.+)')
+				if(match) {
+					mslabel = match[1];
+				}
+				match = lines[i].match('a=ssrc:' + ssrc[0] + ' label:(.+)')
+				if(match) {
+					label = match[1];
+				}
+				if(lines[i].indexOf('a=ssrc:' + ssrc_fid[0]) === 0) {
+					lines.splice(i, 1); i--;
+					continue;
+				}
+				if(lines[i].indexOf('a=ssrc:' + ssrc[0]) === 0) {
+					lines.splice(i, 1); i--;
+					continue;
+				}
+			}
+			if(lines[i].length == 0) {
+				lines.splice(i, 1); i--;
+				continue;
+			}
+		}
+		if(ssrc[0] < 0) {
+			// Couldn't find a FID attribute, let's just take the first video SSRC we find
+			insertAt = -1;
+			video = false;
+			for(let i=0; i<lines.length; i++) {
+				const mline = lines[i].match(/m=(\w+) */);
+				if(mline) {
+					const medium = mline[1];
+					if(medium === "video") {
+						// New video m-line: make sure it's the first one
+						if(ssrc[0] < 0) {
+							video = true;
+						} else {
+							// We're done, let's add the new attributes here
+							insertAt = i;
+							break;
+						}
+					} else {
+						// New non-video m-line: do we have what we were looking for?
+						if(ssrc[0] > -1) {
+							// We're done, let's add the new attributes here
+							insertAt = i;
+							break;
+						}
+					}
+					continue;
+				}
+				if(!video)
+					continue;
+				if(ssrc[0] < 0) {
+					var value = lines[i].match(/a=ssrc:(\d+)/);
+					if(value) {
+						ssrc[0] = value[1];
+						lines.splice(i, 1); i--;
+						continue;
+					}
+				} else {
+					let match = lines[i].match('a=ssrc:' + ssrc[0] + ' cname:(.+)')
+					if(match) {
+						cname = match[1];
+					}
+					match = lines[i].match('a=ssrc:' + ssrc[0] + ' msid:(.+)')
+					if(match) {
+						msid = match[1];
+					}
+					match = lines[i].match('a=ssrc:' + ssrc[0] + ' mslabel:(.+)')
+					if(match) {
+						mslabel = match[1];
+					}
+					match = lines[i].match('a=ssrc:' + ssrc[0] + ' label:(.+)')
+					if(match) {
+						label = match[1];
+					}
+					if(lines[i].indexOf('a=ssrc:' + ssrc_fid[0]) === 0) {
+						lines.splice(i, 1); i--;
+						continue;
+					}
+					if(lines[i].indexOf('a=ssrc:' + ssrc[0]) === 0) {
+						lines.splice(i, 1); i--;
+						continue;
+					}
+				}
+				if(lines[i].length === 0) {
+					lines.splice(i, 1); i--;
+					continue;
+				}
+			}
+		}
+		if(ssrc[0] < 0) {
+			// Still nothing, let's just return the SDP we were asked to munge
+			Janus.warn("Couldn't find the video SSRC, simulcasting NOT enabled");
+			return sdp;
+		}
+		if(insertAt < 0) {
+			// Append at the end
+			insertAt = lines.length;
+		}
+		// Generate a couple of SSRCs (for retransmissions too)
+		// Note: should we check if there are conflicts, here?
+		ssrc[1] = Math.floor(Math.random()*0xFFFFFFFF);
+		ssrc[2] = Math.floor(Math.random()*0xFFFFFFFF);
+		ssrc_fid[1] = Math.floor(Math.random()*0xFFFFFFFF);
+		ssrc_fid[2] = Math.floor(Math.random()*0xFFFFFFFF);
+		// Add attributes to the SDP
+		for(var i=0; i<ssrc.length; i++) {
+			if(cname) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' cname:' + cname);
+				insertAt++;
+			}
+			if(msid) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' msid:' + msid);
+				insertAt++;
+			}
+			if(mslabel) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' mslabel:' + mslabel);
+				insertAt++;
+			}
+			if(label) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' label:' + label);
+				insertAt++;
+			}
+			// Add the same info for the retransmission SSRC
+			if(cname) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' cname:' + cname);
+				insertAt++;
+			}
+			if(msid) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' msid:' + msid);
+				insertAt++;
+			}
+			if(mslabel) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' mslabel:' + mslabel);
+				insertAt++;
+			}
+			if(label) {
+				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' label:' + label);
+				insertAt++;
+			}
+		}
+		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[2] + ' ' + ssrc_fid[2]);
+		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[1] + ' ' + ssrc_fid[1]);
+		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[0] + ' ' + ssrc_fid[0]);
+		lines.splice(insertAt, 0, 'a=ssrc-group:SIM ' + ssrc[0] + ' ' + ssrc[1] + ' ' + ssrc[2]);
+		sdp = lines.join("\r\n");
+		if(!sdp.endsWith("\r\n"))
+			sdp += "\r\n";
+		return sdp;
+	}
+
+	// Helper methods to parse a media object
+	function isAudioSendEnabled(media) {
+		Janus.debug("isAudioSendEnabled:", media);
+		if(!media)
+			return true;	// Default
+		if(media.audio === false)
+			return false;	// Generic audio has precedence
+		if(media.audioSend === undefined || media.audioSend === null)
+			return true;	// Default
+		return (media.audioSend === true);
+	}
+
+	function isAudioSendRequired(media) {
+		Janus.debug("isAudioSendRequired:", media);
+		if(!media)
+			return false;	// Default
+		if(media.audio === false || media.audioSend === false)
+			return false;	// If we're not asking to capture audio, it's not required
+		if(media.failIfNoAudio === undefined || media.failIfNoAudio === null)
+			return false;	// Default
+		return (media.failIfNoAudio === true);
+	}
+
+	function isAudioRecvEnabled(media) {
+		Janus.debug("isAudioRecvEnabled:", media);
+		if(!media)
+			return true;	// Default
+		if(media.audio === false)
+			return false;	// Generic audio has precedence
+		if(media.audioRecv === undefined || media.audioRecv === null)
+			return true;	// Default
+		return (media.audioRecv === true);
+	}
+
+	function isVideoSendEnabled(media) {
+		Janus.debug("isVideoSendEnabled:", media);
+		if(!media)
+			return true;	// Default
+		if(media.video === false)
+			return false;	// Generic video has precedence
+		if(media.videoSend === undefined || media.videoSend === null)
+			return true;	// Default
+		return (media.videoSend === true);
+	}
+
+	function isVideoSendRequired(media) {
+		Janus.debug("isVideoSendRequired:", media);
+		if(!media)
+			return false;	// Default
+		if(media.video === false || media.videoSend === false)
+			return false;	// If we're not asking to capture video, it's not required
+		if(media.failIfNoVideo === undefined || media.failIfNoVideo === null)
+			return false;	// Default
+		return (media.failIfNoVideo === true);
+	}
+
+	function isVideoRecvEnabled(media) {
+		Janus.debug("isVideoRecvEnabled:", media);
+		if(!media)
+			return true;	// Default
+		if(media.video === false)
+			return false;	// Generic video has precedence
+		if(media.videoRecv === undefined || media.videoRecv === null)
+			return true;	// Default
+		return (media.videoRecv === true);
+	}
+
+	function isScreenSendEnabled(media) {
+		Janus.debug("isScreenSendEnabled:", media);
+		if (!media)
+			return false;
+		if (typeof media.video !== 'object' || typeof media.video.mandatory !== 'object')
+			return false;
+		var constraints = media.video.mandatory;
+		if (constraints.chromeMediaSource)
+			return constraints.chromeMediaSource === 'desktop' || constraints.chromeMediaSource === 'screen';
+		else if (constraints.mozMediaSource)
+			return constraints.mozMediaSource === 'window' || constraints.mozMediaSource === 'screen';
+		else if (constraints.mediaSource)
+			return constraints.mediaSource === 'window' || constraints.mediaSource === 'screen';
+		return false;
+	}
+
+	function isDataEnabled(media) {
+		Janus.debug("isDataEnabled:", media);
+		if(Janus.webRTCAdapter.browserDetails.browser === "edge") {
+			Janus.warn("Edge doesn't support data channels yet");
+			return false;
+		}
+		if(media === undefined || media === null)
+			return false;	// Default
+		return (media.data === true);
+	}
+
+	function isTrickleEnabled(trickle) {
+		Janus.debug("isTrickleEnabled:", trickle);
+		return (trickle === false) ? false : true;
+	}
+}
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 8c6ce9adb..b7556ffe0 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -1174,6 +1174,11 @@ $OLANG = array(
       optionally choose to not decode the H264/H265 packets.  This will drastically reduce cpu use
       but will make live view unavailable for this monitor.'
   ),
+  'FUNCTION_JANUS_ENABLED' => array(
+    'Help' => '
+      Attempt to use Janus streaming server for h264/h265 live view. Experimental, but allows
+      for significantly better performance.'
+  ),
   'ImageBufferCount' => array(
     'Help' => '
     Number of raw images available in /dev/shm. Currently should be set in the 3-5 range.  Used for live viewing.'
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 75b3a74d2..dc0898bfc 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -1,3 +1,9 @@
+var server;
+var janus = null;
+var opaqueId;
+var globalCount = 0;
+var streamingList = [];
+var janusMonitors = [];
 /**
  * called when the layoutControl select element is changed, or the page
  * is rendered
@@ -300,20 +306,43 @@ function initPage() {
     $j("#flipMontageHeader").slideToggle("fast");
     $j("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
   }
-
+  var initJanus = false;
+  var streamingMonitors = [];
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
-    monitors[i] = new MonitorStream(monitorData[i]);
-
-    // Start the fps and status updates. give a random delay so that we don't assault the server
-    var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
-    console.log("delay: " + delay);
-    monitors[i].start(delay);
-
-    var interval = monitors[i].refresh;
-    if ( monitors[i].type == 'WebSite' && interval > 0 ) {
-      setInterval(reloadWebSite, interval*1000, i);
+    if (monitorData[i].janusEnabled) {
+      initJanus = true;
+      janusMonitors.push(monitorData[i]);
+    }
+  }
+  if (initJanus) {
+    server = "http://zm-dev:8088/janus";
+    opaqueId = "streamingtest-"+Janus.randomString(12);
+    Janus.init({debug: "all", callback: function() {
+      janus = new Janus({
+        server: server,
+        success: function() {
+          for ( var i = 0, length = janusMonitors.length; i < length; i++ ) {
+            attachVideo(janus, i);
+          }
+        }
+      });
+    }});
+  }
+  for ( var i = 0, length = monitorData.length; i < length; i++ ) {
+    if (!monitorData[i].janusEnabled) {
+      monitors[i] = new MonitorStream(monitorData[i]);
+
+      // Start the fps and status updates. give a random delay so that we don't assault the server
+      var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+      console.log("delay: " + delay);
+      monitors[i].start(delay);
+
+      var interval = monitors[i].refresh;
+      if ( monitors[i].type == 'WebSite' && interval > 0 ) {
+        setInterval(reloadWebSite, interval*1000, i);
+      }
+      monitors[i].setup_onclick();
     }
-    monitors[i].setup_onclick();
   }
   selectLayout('#zmMontageLayout');
 }
@@ -322,5 +351,61 @@ function watchFullscreen() {
   const content = document.getElementById('content');
   openFullscreen(content);
 }
+
+function attachVideo(janus, i) {
+      janus.attach({
+        plugin: "janus.plugin.streaming",
+        opaqueId:"streamingtest-"+Janus.randomString(12),
+        success: function(pluginHandle) {
+          janusMonitors[i].streaming = pluginHandle;
+          var body = { "request": "watch", "id":parseInt(janusMonitors[i].id) };
+          janusMonitors[i].streaming.send({"message": body});
+        },
+        error: function(error) {
+          Janus.error("  -- Error attaching plugin... ", error);
+        },
+        onmessage: function(msg, jsep) {
+          Janus.debug(" ::: Got a message :::");
+          Janus.debug(msg);
+          var result = msg["result"];
+          if(result !== null && result !== undefined) {
+            if(result["status"] !== undefined && result["status"] !== null) {
+              var status = result["status"];
+            }
+          } else if(msg["error"] !== undefined && msg["error"] !== null) {
+            alert(msg["error"]);
+            stopStream();
+            return;
+          }
+          if(jsep !== undefined && jsep !== null) {
+            Janus.debug("Handling SDP as well...");
+            Janus.debug(jsep);
+            // Offer from the plugin, let's answer
+            janusMonitors[i].streaming.createAnswer({
+              jsep: jsep,
+              // We want recvonly audio/video and, if negotiated, datachannels
+              media: { audioSend: false, videoSend: false, data: true },
+              success: function(jsep) {
+                Janus.debug("Got SDP!");
+                Janus.debug(jsep);
+                var body = { "request": "start"};
+                janusMonitors[i].streaming.send({"message": body, "jsep": jsep});
+              },
+              error: function(error) {
+                Janus.error("WebRTC error:", error);
+                alert("WebRTC error... " + JSON.stringify(error));
+              }
+            });
+          }
+        }, //onmessage function
+        onremotestream: function(ourstream) {
+          Janus.debug(" ::: Got a remote track :::");
+          Janus.debug(ourstream);
+          Janus.attachMediaStream(document.getElementById("liveStream" + janusMonitors[i].id), ourstream);
+          document.getElementById("liveStream" + janusMonitors[i].id).play()
+        }
+      });// attach
+
+}
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 1c1c4130e..fac9e4d84 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -24,6 +24,7 @@ monitorData[monitorData.length] = {
   'connKey': <?php echo $monitor->connKey() ?>, 
   'width': <?php echo $monitor->ViewWidth() ?>,
   'height':<?php echo $monitor->ViewHeight() ?>,
+  'janusEnabled':<?php echo $monitor->JanusEnabled() ?>,
   'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
   'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
   'type': '<?php echo $monitor->Type() ?>',
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index be8065d12..2f383ab24 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -66,6 +66,7 @@ monitorData[monitorData.length] = {
   'id': <?php echo $m->Id() ?>,
   'width': <?php echo $m->ViewWidth() ?>,
   'height':<?php echo $m->ViewHeight() ?>,
+  'janusEnabled':<?php echo $m->JanusEnabled() ?>,
   'url': '<?php echo $m->UrlToIndex() ?>',
   'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $m->Id() ?>' );},
   'type': '<?php echo $m->Type() ?>',
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 4c9ce3810..f129315bc 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -574,6 +574,16 @@ if (count($available_monitor_ids)) {
   if ( isset($OLANG['FUNCTION_DECODING_ENABLED']) ) {
     echo '<div class="form-text">'.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].'</div>';
   }
+?>
+          </td>
+        </tr>
+  <tr id="FunctionJanusEnabled">
+          <td class="text-right pr-3"><?php echo translate('Janus Live Stream') ?></td>
+          <td><input type="checkbox" name="newMonitor[JanusEnabled]" value="1"<?php echo $monitor->JanusEnabled() ? ' checked="checked"' : '' ?>/>
+<?php
+  if ( isset($OLANG['FUNCTION_JANUS_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_JANUS_ENABLED']['Help'].'</div>';
+  }
 ?>
           </td>
         </tr>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index deaddcaf3..e0285cbd4 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -325,5 +325,7 @@ foreach (array_reverse($zones) as $zone) {
       </div>
     </div>
   </div>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/8.1.0/adapter.min.js"></script>
+  <script src="<?php echo cache_bust('js/janus.js') ?>"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>

From 90cbf5a018b615c67be312d0d169354058673cdd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jan 2022 09:06:43 -0500
Subject: [PATCH 277/501] Fix == instead of =

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 9cf2acdce..4feea00fe 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2135,7 +2135,7 @@ bool Monitor::Analyse() {
               if (
                   (function != RECORD && function != MOCORD)
                   ||
-                  (event_close_mode == CLOSE_ALARM || event_close_mode=CLOSE_IDLE)
+                  (event_close_mode == CLOSE_ALARM || event_close_mode==CLOSE_IDLE)
                   ) {
                 shared_data->state = state = IDLE;
                 Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",

From aaaf87abdbcea02d110da556e95b11931ae78b96 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jan 2022 09:08:01 -0500
Subject: [PATCH 278/501] Don't try again if the error was ENOSPACE.  it
 crashes and there is just no point.

---
 src/zm_videostore.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 01e46d9c7..249ff222a 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -508,6 +508,8 @@ bool VideoStore::open() {
 
       ret = avformat_write_header(oc, nullptr);
       Debug(1, "Done %d", ret);
+    } else {
+      Error("ENOSPC. fail");
     }
   } else if (av_dict_count(opts) != 0) {
     Info("some options not used, turn on debugging for a list.");

From cd6c44db47b7df91f889c54303d8858e32ac61e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jan 2022 17:01:04 -0500
Subject: [PATCH 279/501] Revert "Remove sleeping from Analysis thread.  It is
 uneccessary and results in us starting off way behind the capture thread. It
 also limits us to 30fps."

This reverts commit 6c4156a4830da04d6128a9159c32c3bb0be607b1.
---
 src/zm_analysis_thread.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp
index 325d8de59..7d803c16b 100644
--- a/src/zm_analysis_thread.cpp
+++ b/src/zm_analysis_thread.cpp
@@ -23,6 +23,14 @@ void AnalysisThread::Start() {
 
 void AnalysisThread::Run() {
   while (!(terminate_ or zm_terminate)) {
-    monitor_->Analyse();
+    // Some periodic updates are required for variable capturing framerate
+    Debug(2, "Analyzing");
+    if (!monitor_->Analyse()) {
+      if (!(terminate_ or zm_terminate)) {
+        Microseconds sleep_for = monitor_->Active() ? Microseconds(ZM_SAMPLE_RATE) : Microseconds(ZM_SUSPENDED_RATE);
+        Debug(2, "Sleeping for %" PRId64 "us", int64(sleep_for.count()));
+        std::this_thread::sleep_for(sleep_for);
+      }
+    }
   }
 }

From ff91ac62fbb35c719fcc3493f16da5cc1c430c03 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jan 2022 17:02:05 -0500
Subject: [PATCH 280/501] add comment documenting why we sleep

---
 src/zm_analysis_thread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp
index 7d803c16b..a6f1afcc2 100644
--- a/src/zm_analysis_thread.cpp
+++ b/src/zm_analysis_thread.cpp
@@ -24,9 +24,9 @@ void AnalysisThread::Start() {
 void AnalysisThread::Run() {
   while (!(terminate_ or zm_terminate)) {
     // Some periodic updates are required for variable capturing framerate
-    Debug(2, "Analyzing");
     if (!monitor_->Analyse()) {
       if (!(terminate_ or zm_terminate)) {
+        // We only sleep when Analyse returns false because it is an error condition and we will spin like mad if it persists.
         Microseconds sleep_for = monitor_->Active() ? Microseconds(ZM_SAMPLE_RATE) : Microseconds(ZM_SUSPENDED_RATE);
         Debug(2, "Sleeping for %" PRId64 "us", int64(sleep_for.count()));
         std::this_thread::sleep_for(sleep_for);

From c27b0aff977d8e410a8c96b02c954bbbd84a8ce3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jan 2022 22:11:28 -0500
Subject: [PATCH 281/501] Move analysis image assignment up to where motion
 detection is done do remove duplication and simplify logic.  Free analysis
 images as well as captured images after analysis.   remove extra copy of
 image to analysis_image. Replae a packetqueue.unlock with just deleting the
 locked packet. No one waits for analysis. Re-introduce sleeping in the
 analysis thread on error to prevent spinning

---
 src/zm_monitor.cpp | 70 ++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4feea00fe..77607d716 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1849,12 +1849,10 @@ bool Monitor::Analyse() {
 
   // Need to guard around event creation/deletion from Reload()
   std::lock_guard<std::mutex> lck(event_mutex);
-  Debug(3, "Have event lock");
 
   // if we have been told to be OFF, then we are off and don't do any processing.
   if (trigger_data->trigger_state != TriggerState::TRIGGER_OFF) {
     Debug(4, "Trigger not OFF state is (%d)", int(trigger_data->trigger_state));
-    int score = 0;
     // Ready means that we have captured the warmup # of frames
     if (!Ready()) {
       Debug(3, "Not ready?");
@@ -1862,6 +1860,7 @@ bool Monitor::Analyse() {
       return false;
     }
 
+    int score = 0;
     std::string cause;
     Event::StringSetMap noteSetMap;
 
@@ -1886,6 +1885,8 @@ bool Monitor::Analyse() {
       score += trigger_data->trigger_score;
       Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
       if (!event) {
+        if (!cause.empty())
+          cause += ", ";
         cause += trigger_data->trigger_cause;
       }
       Event::StringSet noteSet;
@@ -1904,7 +1905,7 @@ bool Monitor::Analyse() {
         }
       } else if (function == MOCORD or function == RECORD) {
         if (!event) {
-          if (cause.length()) cause += ", ";
+          if (!cause.empty()) cause += ", ";
           cause += SIGNAL_CAUSE + std::string(": Reacquired");
         } else {
           event->addNote(SIGNAL_CAUSE, "Reacquired");
@@ -1963,7 +1964,7 @@ bool Monitor::Analyse() {
             packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
             packetqueue.wait();
             // Everything may have changed, just return and start again.  This needs to be more RAII
-            return false;
+            return true;
           }  // end while ! decoded
         }  // end if decoding enabled
 
@@ -1981,17 +1982,19 @@ bool Monitor::Analyse() {
           }
 
           if (snap->image) {
-            alarm_image.Assign(*(snap->image));
 
             // decoder may not have been able to provide an image
             if (!ref_image.Buffer()) {
               Debug(1, "Assigning instead of Detecting");
               ref_image.Assign(*(snap->image));
+              alarm_image.Assign(*(snap->image));
             } else if (!(analysis_image_count % (motion_frame_skip+1))) {
               Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
               // Get new score.
               int motion_score = DetectMotion(*(snap->image), zoneSet);
 
+              if (!snap->analysis_image)
+                snap->analysis_image = new Image(*(snap->image));
               // lets construct alarm cause. It will contain cause + names of zones alarmed
               snap->zone_stats.reserve(zones.size());
               for (const Zone &zone : zones) {
@@ -2001,8 +2004,11 @@ bool Monitor::Analyse() {
                 if (zone.Alarmed()) {
                   if (!snap->alarm_cause.empty()) snap->alarm_cause += ",";
                   snap->alarm_cause += std::string(zone.Label());
+                  if (zone.AlarmImage())
+                    snap->analysis_image->Overlay(*(zone.AlarmImage()));
                 }
               }
+              alarm_image.Assign(*(snap->analysis_image));
               Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
                   score, last_motion_score, motion_score);
               motion_frame_count += 1;
@@ -2015,13 +2021,14 @@ bool Monitor::Analyse() {
               } // end if motion_score
             } else {
               Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
+              alarm_image.Assign(*(snap->image));
             }
           } else {
             Debug(1, "no image so skipping motion detection");
           }  // end if has image
           score += last_motion_score;
         } else {
-          Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
+          Debug(1, "Not Active(%d) enabled %d shared->active %d doing motion detection: %d",
               Active(), enabled, shared_data->active,
               (function == MODECT or function == MOCORD)
               );
@@ -2167,34 +2174,9 @@ bool Monitor::Analyse() {
         snap->score = score;
 
         if (state == PREALARM) {
-          // Generate analysis images if necessary
-          if (snap->image) {
-            for (const Zone &zone : zones) {
-              if (zone.Alarmed() and zone.AlarmImage()) {
-                  if (!snap->analysis_image)
-                    snap->analysis_image = new Image(*(snap->image));
-                  snap->analysis_image->Overlay(*(zone.AlarmImage()));
-              } // end if zone is alarmed
-            } // end foreach zone
-            if (snap->analysis_image != nullptr)
-            alarm_image.Assign(*(snap->analysis_image));
-          } // end if image.
-
           // incremement pre alarm image count
           Event::AddPreAlarmFrame(snap->image, timestamp, score, nullptr);
         } else if (state == ALARM) {
-          if (snap->image) {
-            for (const Zone &zone : zones) {
-              if (zone.Alarmed() and zone.AlarmImage()) {
-                if (!snap->analysis_image)
-                  snap->analysis_image = new Image(*(snap->image));
-                snap->analysis_image->Overlay(*(zone.AlarmImage()));
-              }  // end if zone is alarmed
-            }  // end foreach zone
-            if (snap->analysis_image != nullptr)
-            alarm_image.Assign(*(snap->analysis_image));
-          }
-
           if (event) {
             if (noteSetMap.size() > 0)
               event->updateNotes(noteSetMap);
@@ -2211,15 +2193,15 @@ bool Monitor::Analyse() {
           } else {
             Error("ALARM but no event");
           }
-        } else if ( state == ALERT ) {
+        } else if (state == ALERT) {
           // Alert means this frame has no motion, but we were alarmed and are still recording.
           if ((noteSetMap.size() > 0) and event)
             event->updateNotes(noteSetMap);
-        } else if ( state == TAPE ) {
+        } else if (state == TAPE) {
           // bulk frame code moved to event.
         } // end if state machine
 
-        if ( (function == MODECT or function == MOCORD) and snap->image ) {
+        if ((function == MODECT or function == MOCORD) and snap->image) {
           if (!ref_image.Buffer()) {
             Debug(1, "Assigning");
             ref_image.Assign(*(snap->image));
@@ -2246,11 +2228,18 @@ bool Monitor::Analyse() {
 
   // In the case where people have pre-alarm frames, the web ui will generate the frame images
   // from the mp4. So no one will notice anyways.
-  if (snap->image and (videowriter == PASSTHROUGH) and !savejpegs) {
-    Debug(1, "Deleting image data for %d", snap->image_index);
-    // Don't need raw images anymore
-    delete snap->image;
-    snap->image = nullptr;
+  if (snap->image and (videowriter == PASSTHROUGH)) {
+   if (!savejpegs) {
+     Debug(1, "Deleting image data for %d", snap->image_index);
+     // Don't need raw images anymore
+     delete snap->image;
+     snap->image = nullptr;
+   }
+   if (snap->analysis_image and !(savejpegs & 2)) {
+     Debug(1, "Deleting analysis image data for %d", snap->image_index);
+     delete snap->analysis_image;
+     snap->analysis_image = nullptr;
+   }
   }
 
   packetqueue.clearPackets(snap);
@@ -2261,7 +2250,8 @@ bool Monitor::Analyse() {
     analysis_image_count++;
   }
   packetqueue.increment_it(analysis_it);
-  packetqueue.unlock(packet_lock);
+  delete packet_lock;
+  //packetqueue.unlock(packet_lock);
   shared_data->last_read_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
   return true;

From 50c824f3bbc818acca2b28a27469fc986e40c047 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 11 Jan 2022 21:19:58 -0600
Subject: [PATCH 282/501] Janus cleanup, adds support to the "watch" view

---
 misc/janus.jcfg                       | 50 ++++++++++++++++
 misc/janus.plugin.streaming.jcfg      |  4 ++
 misc/janus.transport.http.jcfg        | 25 ++++++++
 web/js/MonitorStream.js               | 66 ---------------------
 web/js/adapter.min.js                 |  1 +
 web/skins/classic/views/js/montage.js |  2 +-
 web/skins/classic/views/js/watch.js   | 83 ++++++++++++++++++++++++---
 web/skins/classic/views/montage.php   |  2 +-
 web/skins/classic/views/watch.php     |  8 ++-
 9 files changed, 164 insertions(+), 77 deletions(-)
 create mode 100644 misc/janus.jcfg
 create mode 100644 misc/janus.plugin.streaming.jcfg
 create mode 100644 misc/janus.transport.http.jcfg
 create mode 100644 web/js/adapter.min.js

diff --git a/misc/janus.jcfg b/misc/janus.jcfg
new file mode 100644
index 000000000..a0adffb88
--- /dev/null
+++ b/misc/janus.jcfg
@@ -0,0 +1,50 @@
+general: {
+	configs_folder = "/usr/local/etc/janus"			# Configuration files folder
+	plugins_folder = "/usr/local/lib/janus/plugins"			# Plugins folder
+	transports_folder = "/usr/local/lib/janus/transports"	# Transports folder
+	events_folder = "/usr/local/lib/janus/events"			# Event handlers folder
+	loggers_folder = "/usr/local/lib/janus/loggers"			# External loggers folder
+	debug_level = 4							# Debug/logging level, valid values are 0-7
+	admin_secret = "janusoverlord"	# String that all Janus requests must contain
+	protected_folders = [
+		"/bin",
+		"/boot",
+		"/dev",
+		"/etc",
+		"/initrd",
+		"/lib",
+		"/lib32",
+		"/lib64",
+		"/proc",
+		"/sbin",
+		"/sys",
+		"/usr",
+		"/var",
+		"/opt/janus/bin",
+		"/opt/janus/etc",
+		"/opt/janus/include",
+		"/opt/janus/lib",
+		"/opt/janus/lib32",
+		"/opt/janus/lib64",
+		"/opt/janus/sbin"
+	]
+}
+media: {
+	#ipv6 = true
+	#ipv6_linklocal = true
+	rtp_port_range = "20000-40000"
+}
+nat: {
+	nice_debug = false
+	ignore_mdns = true
+	keep_private_host = true
+	ice_ignore_list = "vmnet"
+}
+
+plugins: {
+	disable = "libjanus_audiobridge.so,libjanus_echotest.so,libjanus_recordplay.so,libjanus_sip.so,libjanus_textroom.so,libjanus_videocall.so,libjanus_videoroom.so,libjanus_voicemail.so,
+        libjanus_nosip.so"
+}
+transports: {
+	disable = "libjanus_rabbitmq.so, libjanus_pfunix.so,libjanus_websockets.so"
+}
diff --git a/misc/janus.plugin.streaming.jcfg b/misc/janus.plugin.streaming.jcfg
new file mode 100644
index 000000000..f93b15a3e
--- /dev/null
+++ b/misc/janus.plugin.streaming.jcfg
@@ -0,0 +1,4 @@
+general: {
+  admin_key = "supersecret"             
+  rtp_port_range = "20000-40000"        
+}
diff --git a/misc/janus.transport.http.jcfg b/misc/janus.transport.http.jcfg
new file mode 100644
index 000000000..8ae9171ad
--- /dev/null
+++ b/misc/janus.transport.http.jcfg
@@ -0,0 +1,25 @@
+general: {
+	json = "indented"				# Whether the JSON messages should be indented (default),
+	base_path = "/janus"			# Base path to bind to in the web server (plain HTTP only)
+	http = true						# Whether to enable the plain HTTP interface
+	port = 8088						# Web server HTTP port
+	https = false					# Whether to enable HTTPS (default=false)
+}
+
+# Janus can also expose an admin/monitor endpoint, to allow you to check
+# which sessions are up, which handles they're managing, their current
+# status and so on. This provides a useful aid when debugging potential
+# issues in Janus. The configuration is pretty much the same as the one
+# already presented above for the webserver stuff, as the API is very
+# similar: choose the base bath for the admin/monitor endpoint (/admin
+# by default), ports, etc. Besides, you can specify
+# a secret that must be provided in all requests as a crude form of
+# authorization mechanism, and partial or full source IPs if you want to
+# limit access basing on IP addresses. For security reasons, this
+# endpoint is disabled by default, enable it by setting admin_http=true.
+admin: {
+	admin_base_path = "/admin"			# Base path to bind to in the admin/monitor web server (plain HTTP only)
+	admin_http = false					# Whether to enable the plain HTTP interface
+	admin_port = 7088					# Admin/monitor web server HTTP port
+	admin_https = false					# Whether to enable HTTPS (default=false)
+}
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 1bc96d62a..ef4d6db41 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -5,7 +5,6 @@ function MonitorStream(monitorData) {
   this.auth_relay = auth_relay;
   this.auth_hash = auth_hash;
   this.url = monitorData.url;
-  this.janusEnabled = monitorData.janusEnabled;
   this.url_to_zms = monitorData.url_to_zms;
   this.width = monitorData.width;
   this.height = monitorData.height;
@@ -87,71 +86,6 @@ function MonitorStream(monitorData) {
       console.log(stream);
       return;
     }
-    if (this.janusEnabled) {
-      var id = parseInt(this.id);
-      var opaqueId = "streamingtest-"+Janus.randomString(12);
-      var server = "http://zm-dev:8088/janus";
-      Janus.init({debug: "all", callback: function() {
-        janus = new Janus({
-          server: server,
-          success: function() {
-      janus.attach({
-        plugin: "janus.plugin.streaming",
-        opaqueId: opaqueId,
-        success: function(pluginHandle) {
-          streaming = pluginHandle;
-          var body = { "request": "watch", "id": id };
-          streaming.send({"message": body});
-        },
-        error: function(error) {
-          Janus.error("  -- Error attaching plugin... ", error);
-        },
-        onmessage: function(msg, jsep) {
-          Janus.debug(" ::: Got a message :::");
-          Janus.debug(msg);
-          var result = msg["result"];
-          if(result !== null && result !== undefined) {
-            if(result["status"] !== undefined && result["status"] !== null) {
-              var status = result["status"];
-            }
-          } else if(msg["error"] !== undefined && msg["error"] !== null) {
-            alert(msg["error"]);
-            stopStream();
-            return;
-          }
-          if(jsep !== undefined && jsep !== null) {
-            Janus.debug("Handling SDP as well...");
-            Janus.debug(jsep);
-            // Offer from the plugin, let's answer
-            streaming.createAnswer({
-              jsep: jsep,
-              // We want recvonly audio/video and, if negotiated, datachannels
-              media: { audioSend: false, videoSend: false, data: true },
-              success: function(jsep) {
-                Janus.debug("Got SDP!");
-                Janus.debug(jsep);
-                var body = { "request": "start"};
-                streaming.send({"message": body, "jsep": jsep});
-              },
-              error: function(error) {
-                Janus.error("WebRTC error:", error);
-                alert("WebRTC error... " + JSON.stringify(error));
-              }
-            });
-          }
-        }, //onmessage function
-        onremotestream: function(ourstream) {
-          Janus.debug(" ::: Got a remote track :::");
-          Janus.debug(ourstream);
-          Janus.attachMediaStream(stream, ourstream);
-          stream.play()
-        }
-      });// attach
-    } //Success functio
-  }); //new Janus
-}}); //janus.init callback
-      return;
-    }
     src = stream.src.replace(/mode=single/i, 'mode=jpeg');
     if ( -1 == src.search('connkey') ) {
       src += '&connkey='+this.connKey;
diff --git a/web/js/adapter.min.js b/web/js/adapter.min.js
new file mode 100644
index 000000000..bcbefc98d
--- /dev/null
+++ b/web/js/adapter.min.js
@@ -0,0 +1 @@
+!function(e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).adapter=e()}(function(){return function n(i,o,a){function s(t,e){if(!o[t]){if(!i[t]){var r="function"==typeof require&&require;if(!e&&r)return r(t,!0);if(c)return c(t,!0);throw(r=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",r}r=o[t]={exports:{}},i[t][0].call(r.exports,function(e){return s(i[t][1][e]||e)},r,r.exports,n,i,o,a)}return o[t].exports}for(var c="function"==typeof require&&require,e=0;e<a.length;e++)s(a[e]);return s}({1:[function(e,t,r){"use strict";e=(0,e("./adapter_factory.js").adapterFactory)({window:"undefined"==typeof window?void 0:window});t.exports=e},{"./adapter_factory.js":2}],2:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.adapterFactory=function(){var e=(0<arguments.length&&void 0!==arguments[0]?arguments[0]:{}).window,t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{shimChrome:!0,shimFirefox:!0,shimSafari:!0},r=o.log,n=o.detectBrowser(e),i={browserDetails:n,commonShim:p,extractVersion:o.extractVersion,disableLog:o.disableLog,disableWarnings:o.disableWarnings,sdp:d};switch(n.browser){case"chrome":if(!a||!a.shimPeerConnection||!t.shimChrome)return r("Chrome shim is not included in this adapter release."),i;if(null===n.version)return r("Chrome shim can not determine version, not shimming."),i;r("adapter.js shimming chrome."),i.browserShim=a,p.shimAddIceCandidateNullOrEmpty(e,n),p.shimParameterlessSetLocalDescription(e,n),a.shimGetUserMedia(e,n),a.shimMediaStream(e,n),a.shimPeerConnection(e,n),a.shimOnTrack(e,n),a.shimAddTrackRemoveTrack(e,n),a.shimGetSendersWithDtmf(e,n),a.shimGetStats(e,n),a.shimSenderReceiverGetStats(e,n),a.fixNegotiationNeeded(e,n),p.shimRTCIceCandidate(e,n),p.shimConnectionState(e,n),p.shimMaxMessageSize(e,n),p.shimSendThrowTypeError(e,n),p.removeExtmapAllowMixed(e,n);break;case"firefox":if(!s||!s.shimPeerConnection||!t.shimFirefox)return r("Firefox shim is not included in this adapter release."),i;r("adapter.js shimming firefox."),i.browserShim=s,p.shimAddIceCandidateNullOrEmpty(e,n),p.shimParameterlessSetLocalDescription(e,n),s.shimGetUserMedia(e,n),s.shimPeerConnection(e,n),s.shimOnTrack(e,n),s.shimRemoveStream(e,n),s.shimSenderGetStats(e,n),s.shimReceiverGetStats(e,n),s.shimRTCDataChannel(e,n),s.shimAddTransceiver(e,n),s.shimGetParameters(e,n),s.shimCreateOffer(e,n),s.shimCreateAnswer(e,n),p.shimRTCIceCandidate(e,n),p.shimConnectionState(e,n),p.shimMaxMessageSize(e,n),p.shimSendThrowTypeError(e,n);break;case"safari":if(!c||!t.shimSafari)return r("Safari shim is not included in this adapter release."),i;r("adapter.js shimming safari."),i.browserShim=c,p.shimAddIceCandidateNullOrEmpty(e,n),p.shimParameterlessSetLocalDescription(e,n),c.shimRTCIceServerUrls(e,n),c.shimCreateOfferLegacy(e,n),c.shimCallbacksAPI(e,n),c.shimLocalStreamsAPI(e,n),c.shimRemoteStreamsAPI(e,n),c.shimTrackEventTransceiver(e,n),c.shimGetUserMedia(e,n),c.shimAudioContext(e,n),p.shimRTCIceCandidate(e,n),p.shimMaxMessageSize(e,n),p.shimSendThrowTypeError(e,n),p.removeExtmapAllowMixed(e,n);break;default:r("Unsupported browser!")}return i};var o=n(e("./utils")),a=n(e("./chrome/chrome_shim")),s=n(e("./firefox/firefox_shim")),c=n(e("./safari/safari_shim")),p=n(e("./common_shim")),d=n(e("sdp"));function n(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}},{"./chrome/chrome_shim":3,"./common_shim":6,"./firefox/firefox_shim":7,"./safari/safari_shim":10,"./utils":11,sdp:12}],3:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.shimGetDisplayMedia=r.shimGetUserMedia=void 0;var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=e("./getusermedia");Object.defineProperty(r,"shimGetUserMedia",{enumerable:!0,get:function(){return n.shimGetUserMedia}});var i=e("./getdisplaymedia");Object.defineProperty(r,"shimGetDisplayMedia",{enumerable:!0,get:function(){return i.shimGetDisplayMedia}}),r.shimMediaStream=function(e){e.MediaStream=e.MediaStream||e.webkitMediaStream},r.shimOnTrack=function(o){{var e;"object"!==(void 0===o?"undefined":s(o))||!o.RTCPeerConnection||"ontrack"in o.RTCPeerConnection.prototype?a.wrapPeerConnectionEvent(o,"track",function(e){return e.transceiver||Object.defineProperty(e,"transceiver",{value:{receiver:e.receiver}}),e}):(Object.defineProperty(o.RTCPeerConnection.prototype,"ontrack",{get:function(){return this._ontrack},set:function(e){this._ontrack&&this.removeEventListener("track",this._ontrack),this.addEventListener("track",this._ontrack=e)},enumerable:!0,configurable:!0}),e=o.RTCPeerConnection.prototype.setRemoteDescription,o.RTCPeerConnection.prototype.setRemoteDescription=function(){var i=this;return this._ontrackpoly||(this._ontrackpoly=function(n){n.stream.addEventListener("addtrack",function(t){var e=void 0,e=o.RTCPeerConnection.prototype.getReceivers?i.getReceivers().find(function(e){return e.track&&e.track.id===t.track.id}):{track:t.track},r=new Event("track");r.track=t.track,r.receiver=e,r.transceiver={receiver:e},r.streams=[n.stream],i.dispatchEvent(r)}),n.stream.getTracks().forEach(function(t){var e=void 0,e=o.RTCPeerConnection.prototype.getReceivers?i.getReceivers().find(function(e){return e.track&&e.track.id===t.id}):{track:t},r=new Event("track");r.track=t,r.receiver=e,r.transceiver={receiver:e},r.streams=[n.stream],i.dispatchEvent(r)})},this.addEventListener("addstream",this._ontrackpoly)),e.apply(this,arguments)})}},r.shimGetSendersWithDtmf=function(e){{var n,i,t,r,o,a;"object"===(void 0===e?"undefined":s(e))&&e.RTCPeerConnection&&!("getSenders"in e.RTCPeerConnection.prototype)&&"createDTMFSender"in e.RTCPeerConnection.prototype?(n=function(e,t){return{track:t,get dtmf(){return void 0===this._dtmf&&("audio"===t.kind?this._dtmf=e.createDTMFSender(t):this._dtmf=null),this._dtmf},_pc:e}},e.RTCPeerConnection.prototype.getSenders||(e.RTCPeerConnection.prototype.getSenders=function(){return this._senders=this._senders||[],this._senders.slice()},i=e.RTCPeerConnection.prototype.addTrack,e.RTCPeerConnection.prototype.addTrack=function(e,t){var r=i.apply(this,arguments);return r||(r=n(this,e),this._senders.push(r)),r},t=e.RTCPeerConnection.prototype.removeTrack,e.RTCPeerConnection.prototype.removeTrack=function(e){t.apply(this,arguments);e=this._senders.indexOf(e);-1!==e&&this._senders.splice(e,1)}),r=e.RTCPeerConnection.prototype.addStream,e.RTCPeerConnection.prototype.addStream=function(e){var t=this;this._senders=this._senders||[],r.apply(this,[e]),e.getTracks().forEach(function(e){t._senders.push(n(t,e))})},o=e.RTCPeerConnection.prototype.removeStream,e.RTCPeerConnection.prototype.removeStream=function(e){var r=this;this._senders=this._senders||[],o.apply(this,[e]),e.getTracks().forEach(function(t){var e=r._senders.find(function(e){return e.track===t});e&&r._senders.splice(r._senders.indexOf(e),1)})}):"object"===(void 0===e?"undefined":s(e))&&e.RTCPeerConnection&&"getSenders"in e.RTCPeerConnection.prototype&&"createDTMFSender"in e.RTCPeerConnection.prototype&&e.RTCRtpSender&&!("dtmf"in e.RTCRtpSender.prototype)&&(a=e.RTCPeerConnection.prototype.getSenders,e.RTCPeerConnection.prototype.getSenders=function(){var t=this,e=a.apply(this,[]);return e.forEach(function(e){return e._pc=t}),e},Object.defineProperty(e.RTCRtpSender.prototype,"dtmf",{get:function(){return void 0===this._dtmf&&("audio"===this.track.kind?this._dtmf=this._pc.createDTMFSender(this.track):this._dtmf=null),this._dtmf}}))}},r.shimGetStats=function(e){var a;e.RTCPeerConnection&&(a=e.RTCPeerConnection.prototype.getStats,e.RTCPeerConnection.prototype.getStats=function(){var r=this,e=Array.prototype.slice.call(arguments),t=e[0],n=e[1],e=e[2];if(0<arguments.length&&"function"==typeof t)return a.apply(this,arguments);if(0===a.length&&(0===arguments.length||"function"!=typeof t))return a.apply(this,[]);function i(e){var n={};return e.result().forEach(function(t){var r={id:t.id,timestamp:t.timestamp,type:{localcandidate:"local-candidate",remotecandidate:"remote-candidate"}[t.type]||t.type};t.names().forEach(function(e){r[e]=t.stat(e)}),n[r.id]=r}),n}function o(t){return new Map(Object.keys(t).map(function(e){return[e,t[e]]}))}if(2<=arguments.length)return a.apply(this,[function(e){n(o(i(e)))},t]);return new Promise(function(t,e){a.apply(r,[function(e){t(o(i(e)))},e])}).then(n,e)})},r.shimSenderReceiverGetStats=function(e){var r,t,n,o;"object"===(void 0===e?"undefined":s(e))&&e.RTCPeerConnection&&e.RTCRtpSender&&e.RTCRtpReceiver&&("getStats"in e.RTCRtpSender.prototype||((r=e.RTCPeerConnection.prototype.getSenders)&&(e.RTCPeerConnection.prototype.getSenders=function(){var t=this,e=r.apply(this,[]);return e.forEach(function(e){return e._pc=t}),e}),(t=e.RTCPeerConnection.prototype.addTrack)&&(e.RTCPeerConnection.prototype.addTrack=function(){var e=t.apply(this,arguments);return e._pc=this,e}),e.RTCRtpSender.prototype.getStats=function(){var t=this;return this._pc.getStats().then(function(e){return a.filterStats(e,t.track,!0)})}),"getStats"in e.RTCRtpReceiver.prototype||((n=e.RTCPeerConnection.prototype.getReceivers)&&(e.RTCPeerConnection.prototype.getReceivers=function(){var t=this,e=n.apply(this,[]);return e.forEach(function(e){return e._pc=t}),e}),a.wrapPeerConnectionEvent(e,"track",function(e){return e.receiver._pc=e.srcElement,e}),e.RTCRtpReceiver.prototype.getStats=function(){var t=this;return this._pc.getStats().then(function(e){return a.filterStats(e,t.track,!1)})}),"getStats"in e.RTCRtpSender.prototype&&"getStats"in e.RTCRtpReceiver.prototype&&(o=e.RTCPeerConnection.prototype.getStats,e.RTCPeerConnection.prototype.getStats=function(){if(0<arguments.length&&arguments[0]instanceof e.MediaStreamTrack){var t=arguments[0],r=void 0,n=void 0,i=void 0;return this.getSenders().forEach(function(e){e.track===t&&(r?i=!0:r=e)}),this.getReceivers().forEach(function(e){return e.track===t&&(n?i=!0:n=e),e.track===t}),i||r&&n?Promise.reject(new DOMException("There are more than one sender or receiver for the track.","InvalidAccessError")):r?r.getStats():n?n.getStats():Promise.reject(new DOMException("There is no sender or receiver for the track.","InvalidAccessError"))}return o.apply(this,arguments)}))},r.shimAddTrackRemoveTrackWithNative=p,r.shimAddTrackRemoveTrack=function(i,e){if(i.RTCPeerConnection){if(i.RTCPeerConnection.prototype.addTrack&&65<=e.version)return p(i);var r=i.RTCPeerConnection.prototype.getLocalStreams;i.RTCPeerConnection.prototype.getLocalStreams=function(){var t=this,e=r.apply(this);return this._reverseStreams=this._reverseStreams||{},e.map(function(e){return t._reverseStreams[e.id]})};var n=i.RTCPeerConnection.prototype.addStream;i.RTCPeerConnection.prototype.addStream=function(e){var t,r=this;this._streams=this._streams||{},this._reverseStreams=this._reverseStreams||{},e.getTracks().forEach(function(t){if(r.getSenders().find(function(e){return e.track===t}))throw new DOMException("Track already exists.","InvalidAccessError")}),this._reverseStreams[e.id]||(t=new i.MediaStream(e.getTracks()),this._streams[e.id]=t,this._reverseStreams[t.id]=e,e=t),n.apply(this,[e])};var t=i.RTCPeerConnection.prototype.removeStream;i.RTCPeerConnection.prototype.removeStream=function(e){this._streams=this._streams||{},this._reverseStreams=this._reverseStreams||{},t.apply(this,[this._streams[e.id]||e]),delete this._reverseStreams[(this._streams[e.id]||e).id],delete this._streams[e.id]},i.RTCPeerConnection.prototype.addTrack=function(t,e){var r=this;if("closed"===this.signalingState)throw new DOMException("The RTCPeerConnection's signalingState is 'closed'.","InvalidStateError");var n=[].slice.call(arguments,1);if(1!==n.length||!n[0].getTracks().find(function(e){return e===t}))throw new DOMException("The adapter.js addTrack polyfill only supports a single  stream which is associated with the specified track.","NotSupportedError");if(this.getSenders().find(function(e){return e.track===t}))throw new DOMException("Track already exists.","InvalidAccessError");this._streams=this._streams||{},this._reverseStreams=this._reverseStreams||{};n=this._streams[e.id];return n?(n.addTrack(t),Promise.resolve().then(function(){r.dispatchEvent(new Event("negotiationneeded"))})):(n=new i.MediaStream([t]),this._streams[e.id]=n,this._reverseStreams[n.id]=e,this.addStream(n)),this.getSenders().find(function(e){return e.track===t})},["createOffer","createAnswer"].forEach(function(e){var n=i.RTCPeerConnection.prototype[e],t=c({},e,function(){var t=this,r=arguments;return arguments.length&&"function"==typeof arguments[0]?n.apply(this,[function(e){e=s(t,e);r[0].apply(null,[e])},function(e){r[1]&&r[1].apply(null,e)},arguments[2]]):n.apply(this,arguments).then(function(e){return s(t,e)})});i.RTCPeerConnection.prototype[e]=t[e]});var o=i.RTCPeerConnection.prototype.setLocalDescription;i.RTCPeerConnection.prototype.setLocalDescription=function(){return arguments.length&&arguments[0].type&&(arguments[0]=(r=this,n=(e=arguments[0]).sdp,Object.keys(r._reverseStreams||[]).forEach(function(e){var t=r._reverseStreams[e],e=r._streams[t.id];n=n.replace(new RegExp(t.id,"g"),e.id)}),new RTCSessionDescription({type:e.type,sdp:n}))),o.apply(this,arguments);var r,e,n};var a=Object.getOwnPropertyDescriptor(i.RTCPeerConnection.prototype,"localDescription");Object.defineProperty(i.RTCPeerConnection.prototype,"localDescription",{get:function(){var e=a.get.apply(this);return""===e.type?e:s(this,e)}}),i.RTCPeerConnection.prototype.removeTrack=function(t){var r=this;if("closed"===this.signalingState)throw new DOMException("The RTCPeerConnection's signalingState is 'closed'.","InvalidStateError");if(!t._pc)throw new DOMException("Argument 1 of RTCPeerConnection.removeTrack does not implement interface RTCRtpSender.","TypeError");if(!(t._pc===this))throw new DOMException("Sender was not created by this connection.","InvalidAccessError");this._streams=this._streams||{};var n=void 0;Object.keys(this._streams).forEach(function(e){r._streams[e].getTracks().find(function(e){return t.track===e})&&(n=r._streams[e])}),n&&(1===n.getTracks().length?this.removeStream(this._reverseStreams[n.id]):n.removeTrack(t.track),this.dispatchEvent(new Event("negotiationneeded")))}}function s(r,e){var n=e.sdp;return Object.keys(r._reverseStreams||[]).forEach(function(e){var t=r._reverseStreams[e],e=r._streams[t.id];n=n.replace(new RegExp(e.id,"g"),t.id)}),new RTCSessionDescription({type:e.type,sdp:n})}},r.shimPeerConnection=function(n,e){!n.RTCPeerConnection&&n.webkitRTCPeerConnection&&(n.RTCPeerConnection=n.webkitRTCPeerConnection);n.RTCPeerConnection&&e.version<53&&["setLocalDescription","setRemoteDescription","addIceCandidate"].forEach(function(e){var t=n.RTCPeerConnection.prototype[e],r=c({},e,function(){return arguments[0]=new("addIceCandidate"===e?n.RTCIceCandidate:n.RTCSessionDescription)(arguments[0]),t.apply(this,arguments)});n.RTCPeerConnection.prototype[e]=r[e]})},r.fixNegotiationNeeded=function(e,r){a.wrapPeerConnectionEvent(e,"negotiationneeded",function(e){var t=e.target;if(!(r.version<72||t.getConfiguration&&"plan-b"===t.getConfiguration().sdpSemantics)||"stable"===t.signalingState)return e})};var a=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("../utils.js"));function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function p(e){e.RTCPeerConnection.prototype.getLocalStreams=function(){var t=this;return this._shimmedLocalStreams=this._shimmedLocalStreams||{},Object.keys(this._shimmedLocalStreams).map(function(e){return t._shimmedLocalStreams[e][0]})};var n=e.RTCPeerConnection.prototype.addTrack;e.RTCPeerConnection.prototype.addTrack=function(e,t){if(!t)return n.apply(this,arguments);this._shimmedLocalStreams=this._shimmedLocalStreams||{};var r=n.apply(this,arguments);return this._shimmedLocalStreams[t.id]?-1===this._shimmedLocalStreams[t.id].indexOf(r)&&this._shimmedLocalStreams[t.id].push(r):this._shimmedLocalStreams[t.id]=[t,r],r};var i=e.RTCPeerConnection.prototype.addStream;e.RTCPeerConnection.prototype.addStream=function(e){var r=this;this._shimmedLocalStreams=this._shimmedLocalStreams||{},e.getTracks().forEach(function(t){if(r.getSenders().find(function(e){return e.track===t}))throw new DOMException("Track already exists.","InvalidAccessError")});var t=this.getSenders();i.apply(this,arguments);var n=this.getSenders().filter(function(e){return-1===t.indexOf(e)});this._shimmedLocalStreams[e.id]=[e].concat(n)};var t=e.RTCPeerConnection.prototype.removeStream;e.RTCPeerConnection.prototype.removeStream=function(e){return this._shimmedLocalStreams=this._shimmedLocalStreams||{},delete this._shimmedLocalStreams[e.id],t.apply(this,arguments)};var o=e.RTCPeerConnection.prototype.removeTrack;e.RTCPeerConnection.prototype.removeTrack=function(r){var n=this;return this._shimmedLocalStreams=this._shimmedLocalStreams||{},r&&Object.keys(this._shimmedLocalStreams).forEach(function(e){var t=n._shimmedLocalStreams[e].indexOf(r);-1!==t&&n._shimmedLocalStreams[e].splice(t,1),1===n._shimmedLocalStreams[e].length&&delete n._shimmedLocalStreams[e]}),o.apply(this,arguments)}}},{"../utils.js":11,"./getdisplaymedia":4,"./getusermedia":5}],4:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.shimGetDisplayMedia=function(o,e){o.navigator.mediaDevices&&"getDisplayMedia"in o.navigator.mediaDevices||o.navigator.mediaDevices&&("function"==typeof e?o.navigator.mediaDevices.getDisplayMedia=function(i){return e(i).then(function(e){var t=i.video&&i.video.width,r=i.video&&i.video.height,n=i.video&&i.video.frameRate;return i.video={mandatory:{chromeMediaSource:"desktop",chromeMediaSourceId:e,maxFrameRate:n||3}},t&&(i.video.mandatory.maxWidth=t),r&&(i.video.mandatory.maxHeight=r),o.navigator.mediaDevices.getUserMedia(i)})}:console.error("shimGetDisplayMedia: getSourceId argument is not a function"))}},{}],5:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r.shimGetUserMedia=function(e,t){var a,n,i,r,s=e&&e.navigator;s.mediaDevices&&(a=function(i){if("object"!==(void 0===i?"undefined":c(i))||i.mandatory||i.optional)return i;var o={};return Object.keys(i).forEach(function(t){var r,n,e;"require"!==t&&"advanced"!==t&&"mediaSource"!==t&&(void 0!==(r="object"===c(i[t])?i[t]:{ideal:i[t]}).exact&&"number"==typeof r.exact&&(r.min=r.max=r.exact),n=function(e,t){return e?e+t.charAt(0).toUpperCase()+t.slice(1):"deviceId"===t?"sourceId":t},void 0!==r.ideal&&(o.optional=o.optional||[],e={},"number"==typeof r.ideal?(e[n("min",t)]=r.ideal,o.optional.push(e),(e={})[n("max",t)]=r.ideal):e[n("",t)]=r.ideal,o.optional.push(e)),void 0!==r.exact&&"number"!=typeof r.exact?(o.mandatory=o.mandatory||{},o.mandatory[n("",t)]=r.exact):["min","max"].forEach(function(e){void 0!==r[e]&&(o.mandatory=o.mandatory||{},o.mandatory[n(e,t)]=r[e])}))}),i.advanced&&(o.optional=(o.optional||[]).concat(i.advanced)),o},n=function(r,n){if(61<=t.version)return n(r);if((r=JSON.parse(JSON.stringify(r)))&&"object"===c(r.audio)&&((e=function(e,t,r){t in e&&!(r in e)&&(e[r]=e[t],delete e[t])})((r=JSON.parse(JSON.stringify(r))).audio,"autoGainControl","googAutoGainControl"),e(r.audio,"noiseSuppression","googNoiseSuppression"),r.audio=a(r.audio)),r&&"object"===c(r.video)){var i=(i=r.video.facingMode)&&("object"===(void 0===i?"undefined":c(i))?i:{ideal:i}),e=t.version<66;if(i&&("user"===i.exact||"environment"===i.exact||"user"===i.ideal||"environment"===i.ideal)&&(!s.mediaDevices.getSupportedConstraints||!s.mediaDevices.getSupportedConstraints().facingMode||e)){delete r.video.facingMode;var o=void 0;if("environment"===i.exact||"environment"===i.ideal?o=["back","rear"]:"user"!==i.exact&&"user"!==i.ideal||(o=["front"]),o)return s.mediaDevices.enumerateDevices().then(function(e){var t=(e=e.filter(function(e){return"videoinput"===e.kind})).find(function(t){return o.some(function(e){return t.label.toLowerCase().includes(e)})});return(t=!t&&e.length&&o.includes("back")?e[e.length-1]:t)&&(r.video.deviceId=i.exact?{exact:t.deviceId}:{ideal:t.deviceId}),r.video=a(r.video),p("chrome: "+JSON.stringify(r)),n(r)})}r.video=a(r.video)}return p("chrome: "+JSON.stringify(r)),n(r)},i=function(e){return 64<=t.version?e:{name:{PermissionDeniedError:"NotAllowedError",PermissionDismissedError:"NotAllowedError",InvalidStateError:"NotAllowedError",DevicesNotFoundError:"NotFoundError",ConstraintNotSatisfiedError:"OverconstrainedError",TrackStartError:"NotReadableError",MediaDeviceFailedDueToShutdown:"NotAllowedError",MediaDeviceKillSwitchOn:"NotAllowedError",TabCaptureError:"AbortError",ScreenCaptureError:"AbortError",DeviceCaptureError:"AbortError"}[e.name]||e.name,message:e.message,constraint:e.constraint||e.constraintName,toString:function(){return this.name+(this.message&&": ")+this.message}}},s.getUserMedia=function(e,t,r){n(e,function(e){s.webkitGetUserMedia(e,t,function(e){r&&r(i(e))})})}.bind(s),s.mediaDevices.getUserMedia&&(r=s.mediaDevices.getUserMedia.bind(s.mediaDevices),s.mediaDevices.getUserMedia=function(e){return n(e,function(t){return r(t).then(function(e){if(t.audio&&!e.getAudioTracks().length||t.video&&!e.getVideoTracks().length)throw e.getTracks().forEach(function(e){e.stop()}),new DOMException("","NotFoundError");return e},function(e){return Promise.reject(i(e))})})}))};var p=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("../utils.js")).log},{"../utils.js":11}],6:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r.shimRTCIceCandidate=function(t){var i;!t.RTCIceCandidate||t.RTCIceCandidate&&"foundation"in t.RTCIceCandidate.prototype||(i=t.RTCIceCandidate,t.RTCIceCandidate=function(e){if("object"===(void 0===e?"undefined":o(e))&&e.candidate&&0===e.candidate.indexOf("a=")&&((e=JSON.parse(JSON.stringify(e))).candidate=e.candidate.substr(2)),e.candidate&&e.candidate.length){var t=new i(e),r=a.default.parseCandidate(e.candidate),n=Object.assign(t,r);return n.toJSON=function(){return{candidate:n.candidate,sdpMid:n.sdpMid,sdpMLineIndex:n.sdpMLineIndex,usernameFragment:n.usernameFragment}},n}return new i(e)},t.RTCIceCandidate.prototype=i.prototype,s.wrapPeerConnectionEvent(t,"icecandidate",function(e){return e.candidate&&Object.defineProperty(e,"candidate",{value:new t.RTCIceCandidate(e.candidate),writable:"false"}),e}))},r.shimMaxMessageSize=function(e,i){var o;e.RTCPeerConnection&&("sctp"in e.RTCPeerConnection.prototype||Object.defineProperty(e.RTCPeerConnection.prototype,"sctp",{get:function(){return void 0===this._sctp?null:this._sctp}}),o=e.RTCPeerConnection.prototype.setRemoteDescription,e.RTCPeerConnection.prototype.setRemoteDescription=function(){var e,t,r,n;return this._sctp=null,"chrome"===i.browser&&76<=i.version&&"plan-b"===this.getConfiguration().sdpSemantics&&Object.defineProperty(this,"sctp",{get:function(){return void 0===this._sctp?null:this._sctp},enumerable:!0,configurable:!0}),function(e){if(!e||!e.sdp)return!1;e=a.default.splitSections(e.sdp);return e.shift(),e.some(function(e){e=a.default.parseMLine(e);return e&&"application"===e.kind&&-1!==e.protocol.indexOf("SCTP")})}(arguments[0])&&(t=function(e){e=e.sdp.match(/mozilla...THIS_IS_SDPARTA-(\d+)/);if(null===e||e.length<2)return-1;e=parseInt(e[1],10);return e!=e?-1:e}(arguments[0]),r=t,n=65536,n=n="firefox"===i.browser?i.version<57?-1===r?16384:2147483637:i.version<60?57===i.version?65535:65536:2147483637:n,t=function(e,t){var r=65536;"firefox"===i.browser&&57===i.version&&(r=65535);e=a.default.matchPrefix(e.sdp,"a=max-message-size:");return 0<e.length?r=parseInt(e[0].substr(19),10):"firefox"===i.browser&&-1!==t&&(r=2147483637),r}(arguments[0],t),e=void 0,e=0===n&&0===t?Number.POSITIVE_INFINITY:0===n||0===t?Math.max(n,t):Math.min(n,t),t={},Object.defineProperty(t,"maxMessageSize",{get:function(){return e}}),this._sctp=t),o.apply(this,arguments)})},r.shimSendThrowTypeError=function(e){var t;function r(t,r){var n=t.send;t.send=function(){var e=arguments[0],e=e.length||e.size||e.byteLength;if("open"===t.readyState&&r.sctp&&e>r.sctp.maxMessageSize)throw new TypeError("Message too large (can send a maximum of "+r.sctp.maxMessageSize+" bytes)");return n.apply(t,arguments)}}e.RTCPeerConnection&&"createDataChannel"in e.RTCPeerConnection.prototype&&(t=e.RTCPeerConnection.prototype.createDataChannel,e.RTCPeerConnection.prototype.createDataChannel=function(){var e=t.apply(this,arguments);return r(e,this),e},s.wrapPeerConnectionEvent(e,"datachannel",function(e){return r(e.channel,e.target),e}))},r.shimConnectionState=function(e){var r;!e.RTCPeerConnection||"connectionState"in e.RTCPeerConnection.prototype||(r=e.RTCPeerConnection.prototype,Object.defineProperty(r,"connectionState",{get:function(){return{completed:"connected",checking:"connecting"}[this.iceConnectionState]||this.iceConnectionState},enumerable:!0,configurable:!0}),Object.defineProperty(r,"onconnectionstatechange",{get:function(){return this._onconnectionstatechange||null},set:function(e){this._onconnectionstatechange&&(this.removeEventListener("connectionstatechange",this._onconnectionstatechange),delete this._onconnectionstatechange),e&&this.addEventListener("connectionstatechange",this._onconnectionstatechange=e)},enumerable:!0,configurable:!0}),["setLocalDescription","setRemoteDescription"].forEach(function(e){var t=r[e];r[e]=function(){return this._connectionstatechangepoly||(this._connectionstatechangepoly=function(e){var t,r=e.target;return r._lastConnectionState!==r.connectionState&&(r._lastConnectionState=r.connectionState,t=new Event("connectionstatechange",e),r.dispatchEvent(t)),e},this.addEventListener("iceconnectionstatechange",this._connectionstatechangepoly)),t.apply(this,arguments)}}))},r.removeExtmapAllowMixed=function(r,e){var n;r.RTCPeerConnection&&("chrome"===e.browser&&71<=e.version||"safari"===e.browser&&605<=e.version||(n=r.RTCPeerConnection.prototype.setRemoteDescription,r.RTCPeerConnection.prototype.setRemoteDescription=function(e){var t;return e&&e.sdp&&-1!==e.sdp.indexOf("\na=extmap-allow-mixed")&&(t=e.sdp.split("\n").filter(function(e){return"a=extmap-allow-mixed"!==e.trim()}).join("\n"),r.RTCSessionDescription&&e instanceof r.RTCSessionDescription?arguments[0]=new r.RTCSessionDescription({type:e.type,sdp:t}):e.sdp=t),n.apply(this,arguments)}))},r.shimAddIceCandidateNullOrEmpty=function(e,t){var r;e.RTCPeerConnection&&e.RTCPeerConnection.prototype&&((r=e.RTCPeerConnection.prototype.addIceCandidate)&&0!==r.length&&(e.RTCPeerConnection.prototype.addIceCandidate=function(){return arguments[0]?("chrome"===t.browser&&t.version<78||"firefox"===t.browser&&t.version<68||"safari"===t.browser)&&arguments[0]&&""===arguments[0].candidate?Promise.resolve():r.apply(this,arguments):(arguments[1]&&arguments[1].apply(null),Promise.resolve())}))},r.shimParameterlessSetLocalDescription=function(e,t){var r;e.RTCPeerConnection&&e.RTCPeerConnection.prototype&&((r=e.RTCPeerConnection.prototype.setLocalDescription)&&0!==r.length&&(e.RTCPeerConnection.prototype.setLocalDescription=function(){var t=this,e=arguments[0]||{};if("object"!==(void 0===e?"undefined":o(e))||e.type&&e.sdp)return r.apply(this,arguments);if(!(e={type:e.type,sdp:e.sdp}).type)switch(this.signalingState){case"stable":case"have-local-offer":case"have-remote-pranswer":e.type="offer";break;default:e.type="answer"}return e.sdp||"offer"!==e.type&&"answer"!==e.type?r.apply(this,[e]):("offer"===e.type?this.createOffer:this.createAnswer).apply(this).then(function(e){return r.apply(t,[e])})}))};var n,i=e("sdp"),a=(n=i)&&n.__esModule?n:{default:n},s=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("./utils"))},{"./utils":11,sdp:12}],7:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.shimGetDisplayMedia=r.shimGetUserMedia=void 0;var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=e("./getusermedia");Object.defineProperty(r,"shimGetUserMedia",{enumerable:!0,get:function(){return n.shimGetUserMedia}});var i=e("./getdisplaymedia");Object.defineProperty(r,"shimGetDisplayMedia",{enumerable:!0,get:function(){return i.shimGetDisplayMedia}}),r.shimOnTrack=function(e){"object"===(void 0===e?"undefined":a(e))&&e.RTCTrackEvent&&"receiver"in e.RTCTrackEvent.prototype&&!("transceiver"in e.RTCTrackEvent.prototype)&&Object.defineProperty(e.RTCTrackEvent.prototype,"transceiver",{get:function(){return{receiver:this.receiver}}})},r.shimPeerConnection=function(n,i){var o,r;"object"===(void 0===n?"undefined":a(n))&&(n.RTCPeerConnection||n.mozRTCPeerConnection)&&(!n.RTCPeerConnection&&n.mozRTCPeerConnection&&(n.RTCPeerConnection=n.mozRTCPeerConnection),i.version<53&&["setLocalDescription","setRemoteDescription","addIceCandidate"].forEach(function(e){var t=n.RTCPeerConnection.prototype[e],r=function(e,t,r){t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r;return e}({},e,function(){return arguments[0]=new("addIceCandidate"===e?n.RTCIceCandidate:n.RTCSessionDescription)(arguments[0]),t.apply(this,arguments)});n.RTCPeerConnection.prototype[e]=r[e]}),o={inboundrtp:"inbound-rtp",outboundrtp:"outbound-rtp",candidatepair:"candidate-pair",localcandidate:"local-candidate",remotecandidate:"remote-candidate"},r=n.RTCPeerConnection.prototype.getStats,n.RTCPeerConnection.prototype.getStats=function(){var e=Array.prototype.slice.call(arguments),t=e[0],n=e[1],e=e[2];return r.apply(this,[t||null]).then(function(r){if(i.version<53&&!n)try{r.forEach(function(e){e.type=o[e.type]||e.type})}catch(e){if("TypeError"!==e.name)throw e;r.forEach(function(e,t){r.set(t,Object.assign({},e,{type:o[e.type]||e.type}))})}return r}).then(n,e)})},r.shimSenderGetStats=function(e){var r,t;"object"===(void 0===e?"undefined":a(e))&&e.RTCPeerConnection&&e.RTCRtpSender&&(e.RTCRtpSender&&"getStats"in e.RTCRtpSender.prototype||((r=e.RTCPeerConnection.prototype.getSenders)&&(e.RTCPeerConnection.prototype.getSenders=function(){var t=this,e=r.apply(this,[]);return e.forEach(function(e){return e._pc=t}),e}),(t=e.RTCPeerConnection.prototype.addTrack)&&(e.RTCPeerConnection.prototype.addTrack=function(){var e=t.apply(this,arguments);return e._pc=this,e}),e.RTCRtpSender.prototype.getStats=function(){return this.track?this._pc.getStats(this.track):Promise.resolve(new Map)}))},r.shimReceiverGetStats=function(e){var r;"object"===(void 0===e?"undefined":a(e))&&e.RTCPeerConnection&&e.RTCRtpSender&&(e.RTCRtpSender&&"getStats"in e.RTCRtpReceiver.prototype||((r=e.RTCPeerConnection.prototype.getReceivers)&&(e.RTCPeerConnection.prototype.getReceivers=function(){var t=this,e=r.apply(this,[]);return e.forEach(function(e){return e._pc=t}),e}),o.wrapPeerConnectionEvent(e,"track",function(e){return e.receiver._pc=e.srcElement,e}),e.RTCRtpReceiver.prototype.getStats=function(){return this._pc.getStats(this.track)}))},r.shimRemoveStream=function(e){!e.RTCPeerConnection||"removeStream"in e.RTCPeerConnection.prototype||(e.RTCPeerConnection.prototype.removeStream=function(t){var r=this;o.deprecated("removeStream","removeTrack"),this.getSenders().forEach(function(e){e.track&&t.getTracks().includes(e.track)&&r.removeTrack(e)})})},r.shimRTCDataChannel=function(e){e.DataChannel&&!e.RTCDataChannel&&(e.RTCDataChannel=e.DataChannel)},r.shimAddTransceiver=function(e){var i;"object"!==(void 0===e?"undefined":a(e))||!e.RTCPeerConnection||(i=e.RTCPeerConnection.prototype.addTransceiver)&&(e.RTCPeerConnection.prototype.addTransceiver=function(){this.setParametersPromises=[];var e=arguments[1],t=e&&"sendEncodings"in e;t&&e.sendEncodings.forEach(function(e){if("rid"in e)if(!/^[a-z0-9]{0,16}$/i.test(e.rid))throw new TypeError("Invalid RID value provided.");if("scaleResolutionDownBy"in e&&!(1<=parseFloat(e.scaleResolutionDownBy)))throw new RangeError("scale_resolution_down_by must be >= 1.0");if("maxFramerate"in e&&!(0<=parseFloat(e.maxFramerate)))throw new RangeError("max_framerate must be >= 0.0")});var r,n=i.apply(this,arguments);return t&&("encodings"in(t=(r=n.sender).getParameters())&&(1!==t.encodings.length||0!==Object.keys(t.encodings[0]).length)||(t.encodings=e.sendEncodings,r.sendEncodings=e.sendEncodings,this.setParametersPromises.push(r.setParameters(t).then(function(){delete r.sendEncodings}).catch(function(){delete r.sendEncodings})))),n})},r.shimGetParameters=function(e){var t;"object"!==(void 0===e?"undefined":a(e))||!e.RTCRtpSender||(t=e.RTCRtpSender.prototype.getParameters)&&(e.RTCRtpSender.prototype.getParameters=function(){var e=t.apply(this,arguments);return"encodings"in e||(e.encodings=[].concat(this.sendEncodings||[{}])),e})},r.shimCreateOffer=function(e){var r;"object"===(void 0===e?"undefined":a(e))&&e.RTCPeerConnection&&(r=e.RTCPeerConnection.prototype.createOffer,e.RTCPeerConnection.prototype.createOffer=function(){var e=this,t=arguments;return this.setParametersPromises&&this.setParametersPromises.length?Promise.all(this.setParametersPromises).then(function(){return r.apply(e,t)}).finally(function(){e.setParametersPromises=[]}):r.apply(this,arguments)})},r.shimCreateAnswer=function(e){var r;"object"===(void 0===e?"undefined":a(e))&&e.RTCPeerConnection&&(r=e.RTCPeerConnection.prototype.createAnswer,e.RTCPeerConnection.prototype.createAnswer=function(){var e=this,t=arguments;return this.setParametersPromises&&this.setParametersPromises.length?Promise.all(this.setParametersPromises).then(function(){return r.apply(e,t)}).finally(function(){e.setParametersPromises=[]}):r.apply(this,arguments)})};var o=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("../utils"))},{"../utils":11,"./getdisplaymedia":8,"./getusermedia":9}],8:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.shimGetDisplayMedia=function(t,r){t.navigator.mediaDevices&&"getDisplayMedia"in t.navigator.mediaDevices||t.navigator.mediaDevices&&(t.navigator.mediaDevices.getDisplayMedia=function(e){if(e&&e.video)return!0===e.video?e.video={mediaSource:r}:e.video.mediaSource=r,t.navigator.mediaDevices.getUserMedia(e);e=new DOMException("getDisplayMedia without video constraints is undefined");return e.name="NotFoundError",e.code=8,Promise.reject(e)})}},{}],9:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r.shimGetUserMedia=function(e,t){var n=e&&e.navigator,e=e&&e.MediaStreamTrack;{var r,i,o,a;n.getUserMedia=function(e,t,r){c.deprecated("navigator.getUserMedia","navigator.mediaDevices.getUserMedia"),n.mediaDevices.getUserMedia(e).then(t,r)},55<t.version&&"autoGainControl"in n.mediaDevices.getSupportedConstraints()||(r=function(e,t,r){t in e&&!(r in e)&&(e[r]=e[t],delete e[t])},i=n.mediaDevices.getUserMedia.bind(n.mediaDevices),n.mediaDevices.getUserMedia=function(e){return"object"===(void 0===e?"undefined":s(e))&&"object"===s(e.audio)&&(e=JSON.parse(JSON.stringify(e)),r(e.audio,"autoGainControl","mozAutoGainControl"),r(e.audio,"noiseSuppression","mozNoiseSuppression")),i(e)},e&&e.prototype.getSettings&&(o=e.prototype.getSettings,e.prototype.getSettings=function(){var e=o.apply(this,arguments);return r(e,"mozAutoGainControl","autoGainControl"),r(e,"mozNoiseSuppression","noiseSuppression"),e}),e&&e.prototype.applyConstraints&&(a=e.prototype.applyConstraints,e.prototype.applyConstraints=function(e){return"audio"===this.kind&&"object"===(void 0===e?"undefined":s(e))&&(e=JSON.parse(JSON.stringify(e)),r(e,"autoGainControl","mozAutoGainControl"),r(e,"noiseSuppression","mozNoiseSuppression")),a.apply(this,[e])}))}};var c=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("../utils"))},{"../utils":11}],10:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};r.shimLocalStreamsAPI=function(e){var o;"object"===(void 0===e?"undefined":c(e))&&e.RTCPeerConnection&&("getLocalStreams"in e.RTCPeerConnection.prototype||(e.RTCPeerConnection.prototype.getLocalStreams=function(){return this._localStreams||(this._localStreams=[]),this._localStreams}),"addStream"in e.RTCPeerConnection.prototype||(o=e.RTCPeerConnection.prototype.addTrack,e.RTCPeerConnection.prototype.addStream=function(t){var r=this;this._localStreams||(this._localStreams=[]),this._localStreams.includes(t)||this._localStreams.push(t),t.getAudioTracks().forEach(function(e){return o.call(r,e,t)}),t.getVideoTracks().forEach(function(e){return o.call(r,e,t)})},e.RTCPeerConnection.prototype.addTrack=function(e){for(var t=this,r=arguments.length,n=Array(1<r?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i];return n&&n.forEach(function(e){t._localStreams?t._localStreams.includes(e)||t._localStreams.push(e):t._localStreams=[e]}),o.apply(this,arguments)}),"removeStream"in e.RTCPeerConnection.prototype||(e.RTCPeerConnection.prototype.removeStream=function(e){var t=this;this._localStreams||(this._localStreams=[]);var r,n=this._localStreams.indexOf(e);-1!==n&&(this._localStreams.splice(n,1),r=e.getTracks(),this.getSenders().forEach(function(e){r.includes(e.track)&&t.removeTrack(e)}))}))},r.shimRemoteStreamsAPI=function(e){var t;"object"===(void 0===e?"undefined":c(e))&&e.RTCPeerConnection&&("getRemoteStreams"in e.RTCPeerConnection.prototype||(e.RTCPeerConnection.prototype.getRemoteStreams=function(){return this._remoteStreams||[]}),"onaddstream"in e.RTCPeerConnection.prototype||(Object.defineProperty(e.RTCPeerConnection.prototype,"onaddstream",{get:function(){return this._onaddstream},set:function(e){var r=this;this._onaddstream&&(this.removeEventListener("addstream",this._onaddstream),this.removeEventListener("track",this._onaddstreampoly)),this.addEventListener("addstream",this._onaddstream=e),this.addEventListener("track",this._onaddstreampoly=function(e){e.streams.forEach(function(e){var t;r._remoteStreams||(r._remoteStreams=[]),r._remoteStreams.includes(e)||(r._remoteStreams.push(e),(t=new Event("addstream")).stream=e,r.dispatchEvent(t))})})}}),t=e.RTCPeerConnection.prototype.setRemoteDescription,e.RTCPeerConnection.prototype.setRemoteDescription=function(){var r=this;return this._onaddstreampoly||this.addEventListener("track",this._onaddstreampoly=function(e){e.streams.forEach(function(e){var t;r._remoteStreams||(r._remoteStreams=[]),0<=r._remoteStreams.indexOf(e)||(r._remoteStreams.push(e),(t=new Event("addstream")).stream=e,r.dispatchEvent(t))})}),t.apply(r,arguments)}))},r.shimCallbacksAPI=function(e){var t,n,i,o,a,s;"object"===(void 0===e?"undefined":c(e))&&e.RTCPeerConnection&&(t=e.RTCPeerConnection.prototype,n=t.createOffer,i=t.createAnswer,o=t.setLocalDescription,a=t.setRemoteDescription,s=t.addIceCandidate,t.createOffer=function(e,t){var r=n.apply(this,[2<=arguments.length?arguments[2]:e]);return t?(r.then(e,t),Promise.resolve()):r},t.createAnswer=function(e,t){var r=i.apply(this,[2<=arguments.length?arguments[2]:e]);return t?(r.then(e,t),Promise.resolve()):r},e=function(e,t,r){e=o.apply(this,[e]);return r?(e.then(t,r),Promise.resolve()):e},t.setLocalDescription=e,e=function(e,t,r){e=a.apply(this,[e]);return r?(e.then(t,r),Promise.resolve()):e},t.setRemoteDescription=e,e=function(e,t,r){e=s.apply(this,[e]);return r?(e.then(t,r),Promise.resolve()):e},t.addIceCandidate=e)},r.shimGetUserMedia=function(e){var n=e&&e.navigator;{var t;n.mediaDevices&&n.mediaDevices.getUserMedia&&(e=n.mediaDevices,t=e.getUserMedia.bind(e),n.mediaDevices.getUserMedia=function(e){return t(i(e))})}!n.getUserMedia&&n.mediaDevices&&n.mediaDevices.getUserMedia&&(n.getUserMedia=function(e,t,r){n.mediaDevices.getUserMedia(e).then(t,r)}.bind(n))},r.shimConstraints=i,r.shimRTCIceServerUrls=function(e){var o;e.RTCPeerConnection&&(o=e.RTCPeerConnection,e.RTCPeerConnection=function(e,t){if(e&&e.iceServers){for(var r=[],n=0;n<e.iceServers.length;n++){var i=e.iceServers[n];!i.hasOwnProperty("urls")&&i.hasOwnProperty("url")?(a.deprecated("RTCIceServer.url","RTCIceServer.urls"),(i=JSON.parse(JSON.stringify(i))).urls=i.url,delete i.url,r.push(i)):r.push(e.iceServers[n])}e.iceServers=r}return new o(e,t)},e.RTCPeerConnection.prototype=o.prototype,"generateCertificate"in o&&Object.defineProperty(e.RTCPeerConnection,"generateCertificate",{get:function(){return o.generateCertificate}}))},r.shimTrackEventTransceiver=function(e){"object"===(void 0===e?"undefined":c(e))&&e.RTCTrackEvent&&"receiver"in e.RTCTrackEvent.prototype&&!("transceiver"in e.RTCTrackEvent.prototype)&&Object.defineProperty(e.RTCTrackEvent.prototype,"transceiver",{get:function(){return{receiver:this.receiver}}})},r.shimCreateOfferLegacy=function(e){var r=e.RTCPeerConnection.prototype.createOffer;e.RTCPeerConnection.prototype.createOffer=function(e){var t;return e&&(void 0!==e.offerToReceiveAudio&&(e.offerToReceiveAudio=!!e.offerToReceiveAudio),t=this.getTransceivers().find(function(e){return"audio"===e.receiver.track.kind}),!1===e.offerToReceiveAudio&&t?"sendrecv"===t.direction?t.setDirection?t.setDirection("sendonly"):t.direction="sendonly":"recvonly"===t.direction&&(t.setDirection?t.setDirection("inactive"):t.direction="inactive"):!0!==e.offerToReceiveAudio||t||this.addTransceiver("audio"),void 0!==e.offerToReceiveVideo&&(e.offerToReceiveVideo=!!e.offerToReceiveVideo),t=this.getTransceivers().find(function(e){return"video"===e.receiver.track.kind}),!1===e.offerToReceiveVideo&&t?"sendrecv"===t.direction?t.setDirection?t.setDirection("sendonly"):t.direction="sendonly":"recvonly"===t.direction&&(t.setDirection?t.setDirection("inactive"):t.direction="inactive"):!0!==e.offerToReceiveVideo||t||this.addTransceiver("video")),r.apply(this,arguments)}},r.shimAudioContext=function(e){"object"!==(void 0===e?"undefined":c(e))||e.AudioContext||(e.AudioContext=e.webkitAudioContext)};var a=function(e){{if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}}(e("../utils"));function i(e){return e&&void 0!==e.video?Object.assign({},e,{video:a.compactObject(e.video)}):e}},{"../utils":11}],11:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};function a(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}r.extractVersion=s,r.wrapPeerConnectionEvent=function(e,n,i){var o,a;e.RTCPeerConnection&&(e=e.RTCPeerConnection.prototype,o=e.addEventListener,e.addEventListener=function(e,t){if(e!==n)return o.apply(this,arguments);function r(e){(e=i(e))&&(t.handleEvent?t.handleEvent(e):t(e))}return this._eventMap=this._eventMap||{},this._eventMap[n]||(this._eventMap[n]=new Map),this._eventMap[n].set(t,r),o.apply(this,[e,r])},a=e.removeEventListener,e.removeEventListener=function(e,t){if(e!==n||!this._eventMap||!this._eventMap[n])return a.apply(this,arguments);if(!this._eventMap[n].has(t))return a.apply(this,arguments);var r=this._eventMap[n].get(t);return this._eventMap[n].delete(t),0===this._eventMap[n].size&&delete this._eventMap[n],0===Object.keys(this._eventMap).length&&delete this._eventMap,a.apply(this,[e,r])},Object.defineProperty(e,"on"+n,{get:function(){return this["_on"+n]},set:function(e){this["_on"+n]&&(this.removeEventListener(n,this["_on"+n]),delete this["_on"+n]),e&&this.addEventListener(n,this["_on"+n]=e)},enumerable:!0,configurable:!0}))},r.disableLog=function(e){return"boolean"==typeof e?(i=e)?"adapter.js logging disabled":"adapter.js logging enabled":new Error("Argument type: "+(void 0===e?"undefined":n(e))+". Please use a boolean.")},r.disableWarnings=function(e){return"boolean"==typeof e?(o=!e,"adapter.js deprecation warnings "+(e?"disabled":"enabled")):new Error("Argument type: "+(void 0===e?"undefined":n(e))+". Please use a boolean.")},r.log=function(){"object"===("undefined"==typeof window?"undefined":n(window))&&(i||"undefined"!=typeof console&&"function"==typeof console.log&&console.log.apply(console,arguments))},r.deprecated=function(e,t){o&&console.warn(e+" is deprecated, please use "+t+" instead.")},r.detectBrowser=function(e){var t={browser:null,version:null};if(void 0===e||!e.navigator)return t.browser="Not a browser.",t;var r=e.navigator;if(r.mozGetUserMedia)t.browser="firefox",t.version=s(r.userAgent,/Firefox\/(\d+)\./,1);else if(r.webkitGetUserMedia||!1===e.isSecureContext&&e.webkitRTCPeerConnection&&!e.RTCIceGatherer)t.browser="chrome",t.version=s(r.userAgent,/Chrom(e|ium)\/(\d+)\./,2);else{if(!e.RTCPeerConnection||!r.userAgent.match(/AppleWebKit\/(\d+)\./))return t.browser="Not a supported browser.",t;t.browser="safari",t.version=s(r.userAgent,/AppleWebKit\/(\d+)\./,1),t.supportsUnifiedPlan=e.RTCRtpTransceiver&&"currentDirection"in e.RTCRtpTransceiver.prototype}return t},r.compactObject=function i(o){if(!c(o))return o;return Object.keys(o).reduce(function(e,t){var r=c(o[t]),n=r?i(o[t]):o[t],r=r&&!Object.keys(n).length;return void 0===n||r?e:Object.assign(e,a({},t,n))},{})},r.walkStats=p,r.filterStats=function(r,t,e){var n=e?"outbound-rtp":"inbound-rtp",i=new Map;if(null===t)return i;var o=[];return r.forEach(function(e){"track"===e.type&&e.trackIdentifier===t.id&&o.push(e)}),o.forEach(function(t){r.forEach(function(e){e.type===n&&e.trackId===t.id&&p(r,e,i)})}),i};var i=!0,o=!0;function s(e,t,r){t=e.match(t);return t&&t.length>=r&&parseInt(t[r],10)}function c(e){return"[object Object]"===Object.prototype.toString.call(e)}function p(t,r,n){r&&!n.has(r.id)&&(n.set(r.id,r),Object.keys(r).forEach(function(e){e.endsWith("Id")?p(t,t.get(r[e]),n):e.endsWith("Ids")&&r[e].forEach(function(e){p(t,t.get(e),n)})}))}},{}],12:[function(e,t,r){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},p={generateIdentifier:function(){return Math.random().toString(36).substr(2,10)}};p.localCName=p.generateIdentifier(),p.splitLines=function(e){return e.trim().split("\n").map(function(e){return e.trim()})},p.splitSections=function(e){return e.split("\nm=").map(function(e,t){return(0<t?"m="+e:e).trim()+"\r\n"})},p.getDescription=function(e){e=p.splitSections(e);return e&&e[0]},p.getMediaSections=function(e){e=p.splitSections(e);return e.shift(),e},p.matchPrefix=function(e,t){return p.splitLines(e).filter(function(e){return 0===e.indexOf(t)})},p.parseCandidate=function(e){for(var t=void 0,r={foundation:(t=(0===e.indexOf("a=candidate:")?e.substring(12):e.substring(10)).split(" "))[0],component:{1:"rtp",2:"rtcp"}[t[1]]||t[1],protocol:t[2].toLowerCase(),priority:parseInt(t[3],10),ip:t[4],address:t[4],port:parseInt(t[5],10),type:t[7]},n=8;n<t.length;n+=2)switch(t[n]){case"raddr":r.relatedAddress=t[n+1];break;case"rport":r.relatedPort=parseInt(t[n+1],10);break;case"tcptype":r.tcpType=t[n+1];break;case"ufrag":r.ufrag=t[n+1],r.usernameFragment=t[n+1];break;default:void 0===r[t[n]]&&(r[t[n]]=t[n+1])}return r},p.writeCandidate=function(e){var t=[];t.push(e.foundation);var r=e.component;"rtp"===r?t.push(1):"rtcp"===r?t.push(2):t.push(r),t.push(e.protocol.toUpperCase()),t.push(e.priority),t.push(e.address||e.ip),t.push(e.port);r=e.type;return t.push("typ"),t.push(r),"host"!==r&&e.relatedAddress&&e.relatedPort&&(t.push("raddr"),t.push(e.relatedAddress),t.push("rport"),t.push(e.relatedPort)),e.tcpType&&"tcp"===e.protocol.toLowerCase()&&(t.push("tcptype"),t.push(e.tcpType)),(e.usernameFragment||e.ufrag)&&(t.push("ufrag"),t.push(e.usernameFragment||e.ufrag)),"candidate:"+t.join(" ")},p.parseIceOptions=function(e){return e.substr(14).split(" ")},p.parseRtpMap=function(e){var t=e.substr(9).split(" "),e={payloadType:parseInt(t.shift(),10)},t=t[0].split("/");return e.name=t[0],e.clockRate=parseInt(t[1],10),e.channels=3===t.length?parseInt(t[2],10):1,e.numChannels=e.channels,e},p.writeRtpMap=function(e){var t=e.payloadType;void 0!==e.preferredPayloadType&&(t=e.preferredPayloadType);var r=e.channels||e.numChannels||1;return"a=rtpmap:"+t+" "+e.name+"/"+e.clockRate+(1!==r?"/"+r:"")+"\r\n"},p.parseExtmap=function(e){e=e.substr(9).split(" ");return{id:parseInt(e[0],10),direction:0<e[0].indexOf("/")?e[0].split("/")[1]:"sendrecv",uri:e[1]}},p.writeExtmap=function(e){return"a=extmap:"+(e.id||e.preferredId)+(e.direction&&"sendrecv"!==e.direction?"/"+e.direction:"")+" "+e.uri+"\r\n"},p.parseFmtp=function(e){for(var t={},r=void 0,n=e.substr(e.indexOf(" ")+1).split(";"),i=0;i<n.length;i++)t[(r=n[i].trim().split("="))[0].trim()]=r[1];return t},p.writeFmtp=function(t){var r,e="",n=t.payloadType;return void 0!==t.preferredPayloadType&&(n=t.preferredPayloadType),t.parameters&&Object.keys(t.parameters).length&&(r=[],Object.keys(t.parameters).forEach(function(e){void 0!==t.parameters[e]?r.push(e+"="+t.parameters[e]):r.push(e)}),e+="a=fmtp:"+n+" "+r.join(";")+"\r\n"),e},p.parseRtcpFb=function(e){e=e.substr(e.indexOf(" ")+1).split(" ");return{type:e.shift(),parameter:e.join(" ")}},p.writeRtcpFb=function(e){var t="",r=e.payloadType;return void 0!==e.preferredPayloadType&&(r=e.preferredPayloadType),e.rtcpFeedback&&e.rtcpFeedback.length&&e.rtcpFeedback.forEach(function(e){t+="a=rtcp-fb:"+r+" "+e.type+(e.parameter&&e.parameter.length?" "+e.parameter:"")+"\r\n"}),t},p.parseSsrcMedia=function(e){var t=e.indexOf(" "),r={ssrc:parseInt(e.substr(7,t-7),10)},n=e.indexOf(":",t);return-1<n?(r.attribute=e.substr(t+1,n-t-1),r.value=e.substr(n+1)):r.attribute=e.substr(t+1),r},p.parseSsrcGroup=function(e){e=e.substr(13).split(" ");return{semantics:e.shift(),ssrcs:e.map(function(e){return parseInt(e,10)})}},p.getMid=function(e){e=p.matchPrefix(e,"a=mid:")[0];if(e)return e.substr(6)},p.parseFingerprint=function(e){e=e.substr(14).split(" ");return{algorithm:e[0].toLowerCase(),value:e[1].toUpperCase()}},p.getDtlsParameters=function(e,t){return{role:"auto",fingerprints:p.matchPrefix(e+t,"a=fingerprint:").map(p.parseFingerprint)}},p.writeDtlsParameters=function(e,t){var r="a=setup:"+t+"\r\n";return e.fingerprints.forEach(function(e){r+="a=fingerprint:"+e.algorithm+" "+e.value+"\r\n"}),r},p.parseCryptoLine=function(e){e=e.substr(9).split(" ");return{tag:parseInt(e[0],10),cryptoSuite:e[1],keyParams:e[2],sessionParams:e.slice(3)}},p.writeCryptoLine=function(e){return"a=crypto:"+e.tag+" "+e.cryptoSuite+" "+("object"===n(e.keyParams)?p.writeCryptoKeyParams(e.keyParams):e.keyParams)+(e.sessionParams?" "+e.sessionParams.join(" "):"")+"\r\n"},p.parseCryptoKeyParams=function(e){if(0!==e.indexOf("inline:"))return null;e=e.substr(7).split("|");return{keyMethod:"inline",keySalt:e[0],lifeTime:e[1],mkiValue:e[2]?e[2].split(":")[0]:void 0,mkiLength:e[2]?e[2].split(":")[1]:void 0}},p.writeCryptoKeyParams=function(e){return e.keyMethod+":"+e.keySalt+(e.lifeTime?"|"+e.lifeTime:"")+(e.mkiValue&&e.mkiLength?"|"+e.mkiValue+":"+e.mkiLength:"")},p.getCryptoParameters=function(e,t){return p.matchPrefix(e+t,"a=crypto:").map(p.parseCryptoLine)},p.getIceParameters=function(e,t){var r=p.matchPrefix(e+t,"a=ice-ufrag:")[0],t=p.matchPrefix(e+t,"a=ice-pwd:")[0];return r&&t?{usernameFragment:r.substr(12),password:t.substr(10)}:null},p.writeIceParameters=function(e){var t="a=ice-ufrag:"+e.usernameFragment+"\r\na=ice-pwd:"+e.password+"\r\n";return e.iceLite&&(t+="a=ice-lite\r\n"),t},p.parseRtpParameters=function(e){for(var t={codecs:[],headerExtensions:[],fecMechanisms:[],rtcp:[]},r=p.splitLines(e)[0].split(" "),n=3;n<r.length;n++){var i=r[n],o=p.matchPrefix(e,"a=rtpmap:"+i+" ")[0];if(o){var a=p.parseRtpMap(o),o=p.matchPrefix(e,"a=fmtp:"+i+" ");switch(a.parameters=o.length?p.parseFmtp(o[0]):{},a.rtcpFeedback=p.matchPrefix(e,"a=rtcp-fb:"+i+" ").map(p.parseRtcpFb),t.codecs.push(a),a.name.toUpperCase()){case"RED":case"ULPFEC":t.fecMechanisms.push(a.name.toUpperCase())}}}return p.matchPrefix(e,"a=extmap:").forEach(function(e){t.headerExtensions.push(p.parseExtmap(e))}),t},p.writeRtpDescription=function(e,t){var r="";r+="m="+e+" ",r+=0<t.codecs.length?"9":"0",r+=" UDP/TLS/RTP/SAVPF ",r+=t.codecs.map(function(e){return void 0!==e.preferredPayloadType?e.preferredPayloadType:e.payloadType}).join(" ")+"\r\n",r+="c=IN IP4 0.0.0.0\r\n",r+="a=rtcp:9 IN IP4 0.0.0.0\r\n",t.codecs.forEach(function(e){r+=p.writeRtpMap(e),r+=p.writeFmtp(e),r+=p.writeRtcpFb(e)});var n=0;return t.codecs.forEach(function(e){e.maxptime>n&&(n=e.maxptime)}),0<n&&(r+="a=maxptime:"+n+"\r\n"),t.headerExtensions&&t.headerExtensions.forEach(function(e){r+=p.writeExtmap(e)}),r},p.parseRtpEncodingParameters=function(e){var t=[],r=p.parseRtpParameters(e),n=-1!==r.fecMechanisms.indexOf("RED"),i=-1!==r.fecMechanisms.indexOf("ULPFEC"),o=p.matchPrefix(e,"a=ssrc:").map(function(e){return p.parseSsrcMedia(e)}).filter(function(e){return"cname"===e.attribute}),a=0<o.length&&o[0].ssrc,s=void 0,o=p.matchPrefix(e,"a=ssrc-group:FID").map(function(e){return e.substr(17).split(" ").map(function(e){return parseInt(e,10)})});0<o.length&&1<o[0].length&&o[0][0]===a&&(s=o[0][1]),r.codecs.forEach(function(e){"RTX"===e.name.toUpperCase()&&e.parameters.apt&&(e={ssrc:a,codecPayloadType:parseInt(e.parameters.apt,10)},a&&s&&(e.rtx={ssrc:s}),t.push(e),n&&((e=JSON.parse(JSON.stringify(e))).fec={ssrc:a,mechanism:i?"red+ulpfec":"red"},t.push(e)))}),0===t.length&&a&&t.push({ssrc:a});var c=p.matchPrefix(e,"b=");return c.length&&(c=0===c[0].indexOf("b=TIAS:")?parseInt(c[0].substr(7),10):0===c[0].indexOf("b=AS:")?1e3*parseInt(c[0].substr(5),10)*.95-16e3:void 0,t.forEach(function(e){e.maxBitrate=c})),t},p.parseRtcpParameters=function(e){var t={},r=p.matchPrefix(e,"a=ssrc:").map(function(e){return p.parseSsrcMedia(e)}).filter(function(e){return"cname"===e.attribute})[0];r&&(t.cname=r.value,t.ssrc=r.ssrc);r=p.matchPrefix(e,"a=rtcp-rsize");t.reducedSize=0<r.length,t.compound=0===r.length;e=p.matchPrefix(e,"a=rtcp-mux");return t.mux=0<e.length,t},p.writeRtcpParameters=function(e){var t="";return e.reducedSize&&(t+="a=rtcp-rsize\r\n"),e.mux&&(t+="a=rtcp-mux\r\n"),void 0!==e.ssrc&&e.cname&&(t+="a=ssrc:"+e.ssrc+" cname:"+e.cname+"\r\n"),t},p.parseMsid=function(e){var t=void 0,r=p.matchPrefix(e,"a=msid:");if(1===r.length)return{stream:(t=r[0].substr(7).split(" "))[0],track:t[1]};e=p.matchPrefix(e,"a=ssrc:").map(function(e){return p.parseSsrcMedia(e)}).filter(function(e){return"msid"===e.attribute});return 0<e.length?{stream:(t=e[0].value.split(" "))[0],track:t[1]}:void 0},p.parseSctpDescription=function(e){var t=p.parseMLine(e),r=p.matchPrefix(e,"a=max-message-size:"),n=void 0;0<r.length&&(n=parseInt(r[0].substr(19),10)),isNaN(n)&&(n=65536);r=p.matchPrefix(e,"a=sctp-port:");if(0<r.length)return{port:parseInt(r[0].substr(12),10),protocol:t.fmt,maxMessageSize:n};e=p.matchPrefix(e,"a=sctpmap:");if(0<e.length){e=e[0].substr(10).split(" ");return{port:parseInt(e[0],10),protocol:e[1],maxMessageSize:n}}},p.writeSctpDescription=function(e,t){var r=[],r="DTLS/SCTP"!==e.protocol?["m="+e.kind+" 9 "+e.protocol+" "+t.protocol+"\r\n","c=IN IP4 0.0.0.0\r\n","a=sctp-port:"+t.port+"\r\n"]:["m="+e.kind+" 9 "+e.protocol+" "+t.port+"\r\n","c=IN IP4 0.0.0.0\r\n","a=sctpmap:"+t.port+" "+t.protocol+" 65535\r\n"];return void 0!==t.maxMessageSize&&r.push("a=max-message-size:"+t.maxMessageSize+"\r\n"),r.join("")},p.generateSessionId=function(){return Math.random().toString().substr(2,21)},p.writeSessionBoilerplate=function(e,t,r){t=void 0!==t?t:2;return"v=0\r\no="+(r||"thisisadapterortc")+" "+(e||p.generateSessionId())+" "+t+" IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\n"},p.getDirection=function(e,t){for(var r=p.splitLines(e),n=0;n<r.length;n++)switch(r[n]){case"a=sendrecv":case"a=sendonly":case"a=recvonly":case"a=inactive":return r[n].substr(2)}return t?p.getDirection(t):"sendrecv"},p.getKind=function(e){return p.splitLines(e)[0].split(" ")[0].substr(2)},p.isRejected=function(e){return"0"===e.split(" ",2)[1]},p.parseMLine=function(e){e=p.splitLines(e)[0].substr(2).split(" ");return{kind:e[0],port:parseInt(e[1],10),protocol:e[2],fmt:e.slice(3).join(" ")}},p.parseOLine=function(e){e=p.matchPrefix(e,"o=")[0].substr(2).split(" ");return{username:e[0],sessionId:e[1],sessionVersion:parseInt(e[2],10),netType:e[3],addressType:e[4],address:e[5]}},p.isValidSDP=function(e){if("string"!=typeof e||0===e.length)return!1;for(var t=p.splitLines(e),r=0;r<t.length;r++)if(t[r].length<2||"="!==t[r].charAt(1))return!1;return!0},"object"===(void 0===t?"undefined":n(t))&&(t.exports=p)},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index dc0898bfc..cfa831354 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -315,7 +315,7 @@ function initPage() {
     }
   }
   if (initJanus) {
-    server = "http://zm-dev:8088/janus";
+    server = "http://" + window.location.hostname + ":8088/janus";
     opaqueId = "streamingtest-"+Janus.randomString(12);
     Janus.init({debug: "all", callback: function() {
       janus = new Janus({
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 89f774ed1..21154d1f6 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -9,6 +9,10 @@ var forceAlmBtn = $j('#forceAlmBtn');
 var table = $j('#eventList');
 var filterQuery = '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId;
 
+var server;
+var janus = null;
+var opaqueId;
+var streaming2;
 /*
 This is the format of the json object sent by bootstrap-table
 
@@ -897,15 +901,78 @@ function initPage() {
   }
 
   if (monitorType != 'WebSite') {
-    if (streamMode == 'single') {
-      statusCmdTimer = setTimeout(statusCmdQuery, 200);
-      setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
-    } else {
-      streamCmdTimer = setTimeout(streamCmdQuery, 200);
-      setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
+    if (streamMode != 'janus') {
+      if (streamMode == 'single') {
+        statusCmdTimer = setTimeout(statusCmdQuery, 200);
+        setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
+      } else {
+        streamCmdTimer = setTimeout(streamCmdQuery, 200);
+        setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
+      }
     }
-
-    if (canStreamNative || (streamMode == 'single')) {
+    if (streamMode == 'janus') {
+    server = "http://" + window.location.hostname + ":8088/janus";
+    opaqueId = "streamingtest-"+Janus.randomString(12);
+    Janus.init({debug: "all", callback: function() {
+      janus = new Janus({
+        server: server,
+        success: function() {
+          janus.attach({
+            plugin: "janus.plugin.streaming",
+            opaqueId: opaqueId,
+            success: function(pluginHandle) {
+              streaming2 = pluginHandle;
+              var body = { "request": "watch", "id":monitorId };
+              streaming2.send({"message": body});
+            },
+            error: function(error) {
+              Janus.error("  -- Error attaching plugin... ", error);
+            },
+            onmessage: function(msg, jsep) {
+              Janus.debug(" ::: Got a message :::");
+              Janus.debug(msg);
+              var result = msg["result"];
+              if(result !== null && result !== undefined) {
+                if(result["status"] !== undefined && result["status"] !== null) {
+                  var status = result["status"];
+                }
+              } else if(msg["error"] !== undefined && msg["error"] !== null) {
+                alert(msg["error"]);
+                stopStream();
+                return;
+              }
+              if(jsep !== undefined && jsep !== null) {
+                Janus.debug("Handling SDP as well...");
+                Janus.debug(jsep);
+                // Offer from the plugin, let's answer
+                streaming2.createAnswer({
+                  jsep: jsep,
+                  // We want recvonly audio/video and, if negotiated, datachannels
+                  media: { audioSend: false, videoSend: false, data: true },
+                  success: function(jsep) {
+                    Janus.debug("Got SDP!");
+                    Janus.debug(jsep);
+                    var body = { "request": "start"};
+                    streaming2.send({"message": body, "jsep": jsep});
+                  },
+                  error: function(error) {
+                    Janus.error("WebRTC error:", error);
+                    alert("WebRTC error... " + JSON.stringify(error));
+                  }
+                });
+              }
+            }, //onmessage function
+            onremotestream: function(stream) {
+              Janus.debug(" ::: Got a remote track :::");
+              Janus.debug(stream);
+              Janus.attachMediaStream(document.getElementById("liveStream" + monitorId), stream);
+              document.getElementById("liveStream" + monitorId).play();
+            }
+          });// attach
+        } //Success functio
+      }); //new Janus
+    }}); //janus.init callback
+    } else if (canStreamNative || (streamMode == 'single')) {
       var streamImg = $j('#imageFeed img');
       if (!streamImg) streamImg = $j('#imageFeed object');
       if (!streamImg) {
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index e0285cbd4..ed1869fab 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -325,7 +325,7 @@ foreach (array_reverse($zones) as $zone) {
       </div>
     </div>
   </div>
-  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/8.1.0/adapter.min.js"></script>
+  <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="<?php echo cache_bust('js/janus.js') ?>"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 6acce1b5c..3128f7767 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -135,7 +135,11 @@ if (isset($_REQUEST['height'])) {
 }
 
 $connkey = generateConnKey();
-$streamMode = getStreamMode();
+if ( $monitor->JanusEnabled() ) {
+    $streamMode = 'janus';
+} else {
+  $streamMode = getStreamMode();
+}
 
 noCacheHeaders();
 xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
@@ -407,4 +411,6 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
 ?>
     </div>
   </div>
+  <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
+  <script src="<?php echo cache_bust('js/janus.js') ?>"></script>
 <?php xhtmlFooter() ?>

From cb46b94ea1c81e1cd62ccc89b5a902d9e8914254 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 12 Jan 2022 00:19:54 -0600
Subject: [PATCH 283/501] Add error handling to libcurl calls to Janus

---
 src/zm_monitor.cpp | 60 ++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f38c7b446..774884454 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1115,15 +1115,12 @@ bool Monitor::connect() {
     //End ONVIF Setup
 #endif
 
-//janus setup.
-    if (janus_enabled) {
-      add_to_janus();
+    //janus setup.
+    if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
+      if (add_to_janus() != 0) {
+        Warning("Failed to add monitor stream to Janus!");
+      }
     }
-//ifdef janus, and if url contains rtsp
-//look for username and password
-//make the initial call, scrape id, then connect to plugin
-//add stream using the same id
-
 
   } else if (!shared_data->valid) {
     Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
@@ -3360,16 +3357,21 @@ int Monitor::add_to_janus() {
   std::string rtsp_username;
   std::string rtsp_password;
   std::string rtsp_path = "rtsp://";
+  std::string janus_id;
   std::size_t pos;
   std::size_t pos2;
+  CURLcode res;
 
   curl = curl_easy_init();
-
+  if(!curl) return -1;
   //parse username and password
   pos = path.find(":", 7);
+  if (pos == std::string::npos) return -1;
   rtsp_username = path.substr(7, pos-7);
 
   pos2 = path.find("@", pos);
+  if (pos2 == std::string::npos) return -1;
+
   rtsp_password = path.substr(pos+1, pos2 - pos - 1);
   rtsp_path += path.substr(pos2 + 1);
 
@@ -3378,9 +3380,12 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
   pos = response.find("\"id\": ");
-  std::string janus_id = response.substr(pos + 6, 16);
+  if (pos == std::string::npos) return -1;
+  janus_id = response.substr(pos + 6, 16);
   response = "";
   endpoint += janus_id;
   postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
@@ -3388,9 +3393,11 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
   pos = response.find("\"id\": ");
-  std::string handle_id = response.substr(pos + 6, 16);
+  if (pos == std::string::npos) return -1;
+  std::string handle_id = response.substr(pos + 6, 16); //TODO: This is an assumption that the string is always 16
   endpoint += "/";
   endpoint += handle_id;
 
@@ -3411,10 +3418,11 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
-  Warning(response.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+  Debug(1,response.c_str());
   curl_easy_cleanup(curl);
-
+  return 0;
 }
 int Monitor::remove_from_janus() {
   //TODO clean this up, add error checking, etc
@@ -3422,8 +3430,10 @@ int Monitor::remove_from_janus() {
   std::string endpoint = "127.0.0.1:8088/janus/";
   std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
   std::size_t pos;
+  CURLcode res;
 
   curl = curl_easy_init();
+  if(!curl) return -1;
 
 
   //Start Janus API init. Need to get a session_id and handle_id
@@ -3431,8 +3441,11 @@ int Monitor::remove_from_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
   pos = response.find("\"id\": ");
+  if (pos == std::string::npos) return -1;
   std::string janus_id = response.substr(pos + 6, 16);
   response = "";
   endpoint += janus_id;
@@ -3441,8 +3454,11 @@ int Monitor::remove_from_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
   pos = response.find("\"id\": ");
+  if (pos == std::string::npos) return -1;
   std::string handle_id = response.substr(pos + 6, 16);
   endpoint += "/";
   endpoint += handle_id;
@@ -3457,8 +3473,10 @@ int Monitor::remove_from_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  curl_easy_perform(curl);
-  Warning(response.c_str());
-  curl_easy_cleanup(curl);
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
 
+  Debug(1, response.c_str());
+  curl_easy_cleanup(curl);
+  return 0;
 }

From 7a5a05fe9428cd95664fc57d2a27bf981e2dbe10 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 12 Jan 2022 01:29:32 -0600
Subject: [PATCH 284/501] Clean up warnings

---
 src/zm_monitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 774884454..3b8c47a25 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3420,7 +3420,7 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
   if (res != CURLE_OK) return -1;
-  Debug(1,response.c_str());
+  Debug(1,"Added stream to Janus: %s", response.c_str());
   curl_easy_cleanup(curl);
   return 0;
 }
@@ -3476,7 +3476,7 @@ int Monitor::remove_from_janus() {
   res = curl_easy_perform(curl);
   if (res != CURLE_OK) return -1;
 
-  Debug(1, response.c_str());
+  Debug(1, "Removed stream from Janus: %s", response.c_str());
   curl_easy_cleanup(curl);
   return 0;
 }

From 84a73bb0078dd7c650a13c81a166452140865b98 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 12 Jan 2022 09:37:48 -0600
Subject: [PATCH 285/501] Add check to prevent tight busy loop if ONVIF setup
 fails

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 3b8c47a25..59dc90ead 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3140,7 +3140,7 @@ int Monitor::PrimeCapture() {
 
 #ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
   //ONVIF Thread
-  if (onvif_event_listener) {
+  if (onvif_event_listener && ONVIF_Healthy) {
     if (!Poller) {
       Poller = zm::make_unique<PollThread>(this);
     } else {

From 134d80a91d65f699d54cbefabddd41545b870b49 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 11:32:08 -0500
Subject: [PATCH 286/501] Replace Requires with BindsTo and add comment
 explaining how to override

---
 distros/ubuntu2004/zoneminder.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distros/ubuntu2004/zoneminder.service b/distros/ubuntu2004/zoneminder.service
index cb2d6791e..6645fea04 100644
--- a/distros/ubuntu2004/zoneminder.service
+++ b/distros/ubuntu2004/zoneminder.service
@@ -5,7 +5,8 @@
 Description=ZoneMinder CCTV recording and surveillance system
 After=network.target mysql.service
 # Remarked out so that it will start ZM on machines that don't have mysql installed
-#Requires=mysql.service
+# Override it by placing an override.conf in /etc/systemd/system/zoneminder.service.d
+#BindsTo=mysql.service
 
 [Service]
 #User=www-data

From c9db5f44a4a210e81e1da69b3c2db2d4f1b3f2e9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 12:05:29 -0500
Subject: [PATCH 287/501] cherry pick  Add check to prevent tight busy loop if
 ONVIF setup fails

---
 src/zm_monitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4feea00fe..958410efe 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1077,7 +1077,7 @@ bool Monitor::connect() {
   //ONVIF Setup
 #ifdef WITH_GSOAP
   ONVIF_Trigger_State = FALSE;
-  if (onvif_event_listener) { //Temporarily using this option to enable the feature
+  if (onvif_event_listener) {
     Debug(1, "Starting ONVIF");
     ONVIF_Healthy = FALSE;
     if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
@@ -3130,7 +3130,7 @@ int Monitor::PrimeCapture() {
 
 #ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
   //ONVIF Thread
-  if (onvif_event_listener) {
+  if (onvif_event_listener  && ONVIF_Healthy) {
     if (!Poller) {
       Poller = zm::make_unique<PollThread>(this);
     } else {

From a9f7b257ea0444f1d5c685bca3188cf3a73d5bd2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 17:16:49 -0500
Subject: [PATCH 288/501] Rough in a queue and a thread into the event to
 process packets.  We do this so that the event creator can get back to
 analysis as fast as possible so as to avoid the packetqueue filling up.

---
 src/zm_event.cpp | 205 +++++++++++++++++++++++++++--------------------
 src/zm_event.h   |  20 +++++
 2 files changed, 138 insertions(+), 87 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 7db8f84f3..f1dce36d3 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -65,7 +65,8 @@ Event::Event(
   last_db_frame(0),
   have_video_keyframe(false),
   //scheme
-  save_jpegs(0)
+  save_jpegs(0),
+  terminate_(false)
 {
   std::string notes;
   createNotes(notes);
@@ -133,98 +134,17 @@ Event::Event(
       );
   id = zmDbDoInsert(sql);
 
-  if (!SetPath(storage)) {
-    // Try another
-    Warning("Failed creating event dir at %s", storage->Path());
 
-    sql = stringtf("SELECT `Id` FROM `Storage` WHERE `Id` != %u", storage->Id());
-    if (monitor->ServerId())
-      sql += stringtf(" AND ServerId=%u", monitor->ServerId());
-
-    storage = nullptr;
-
-    MYSQL_RES *result = zmDbFetch(sql);
-    if (result) {
-      for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) {
-        storage = new Storage(atoi(dbrow[0]));
-        if (SetPath(storage))
-          break;
-        delete storage;
-        storage = nullptr;
-      }  // end foreach row of Storage
-      mysql_free_result(result);
-      result = nullptr;
-    }
-    if (!storage) {
-      Info("No valid local storage area found.  Trying all other areas.");
-      // Try remote
-      sql = "SELECT `Id` FROM `Storage` WHERE ServerId IS NULL";
-      if (monitor->ServerId())
-        sql += stringtf(" OR ServerId != %u", monitor->ServerId());
-
-      result = zmDbFetch(sql);
-      if (result) {
-        for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
-          storage = new Storage(atoi(dbrow[0]));
-          if (SetPath(storage))
-            break;
-          delete storage;
-          storage = nullptr;
-        }  // end foreach row of Storage
-        mysql_free_result(result);
-        result = nullptr;
-      }
-    }
-    if (!storage) {
-      storage = new Storage();
-      Warning("Failed to find a storage area to save events.");
-    }
-    sql = stringtf("UPDATE Events SET StorageId = '%d' WHERE Id=%" PRIu64, storage->Id(), id);
-    zmDbDo(sql);
-  }  // end if ! setPath(Storage)
-  Debug(1, "Using storage area at %s", path.c_str());
-
-  snapshot_file = path + "/snapshot.jpg";
-  alarm_file = path + "/alarm.jpg";
-
-  video_incomplete_path = path + "/" + video_incomplete_file;
-
-  if (monitor->GetOptVideoWriter() != 0) {
-    /* Save as video */
-        
-    videoStore = new VideoStore(
-        video_incomplete_path.c_str(),
-        container.c_str(),
-        monitor->GetVideoStream(),
-        monitor->GetVideoCodecContext(),
-        ( monitor->RecordAudio() ? monitor->GetAudioStream() : nullptr ),
-        ( monitor->RecordAudio() ? monitor->GetAudioCodecContext() : nullptr ),
-        monitor );
-
-    if ( !videoStore->open() ) {
-      Warning("Failed to open videostore, turning on jpegs");
-      delete videoStore;
-      videoStore = nullptr;
-      if ( ! ( save_jpegs & 1 ) ) {
-        save_jpegs |= 1; // Turn on jpeg storage
-        sql = stringtf("UPDATE Events SET SaveJpegs=%d WHERE Id=%" PRIu64, save_jpegs, id);
-        zmDbDo(sql);
-      }
-    } else {
-      std::string codec = videoStore->get_codec();
-      video_file = stringtf("%" PRIu64 "-%s.%s.%s", id, "video", codec.c_str(), container.c_str());
-      video_path = path + "/" + video_file;
-      Debug(1, "Video file is %s", video_file.c_str());
-    }
-  }  // end if GetOptVideoWriter
-  if (storage != monitor->getStorage())
-    delete storage;
+  thread_ = std::thread(&Event::Run, this);
 }
 
 Event::~Event() {
-  // We close the videowriter first, because if we finish the event, we might try to view the file, but we aren't done writing it yet.
+
+  Stop();
+  if (thread_.joinable()) thread_.join();
 
   /* Close the video file */
+  // We close the videowriter first, because if we finish the event, we might try to view the file, but we aren't done writing it yet.
   if (videoStore != nullptr) {
     Debug(4, "Deleting video store");
     delete videoStore;
@@ -377,6 +297,12 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
 }  // void Event::updateNotes(const StringSetMap &newNoteSetMap)
 
 void Event::AddPacket(const std::shared_ptr<ZMPacket>&packet) {
+  std::unique_lock<std::mutex> lck(packet_queue_mutex);
+  packet_queue.push(packet);
+  packet_queue_condition.notify_one();
+}
+
+void Event::AddPacket_(const std::shared_ptr<ZMPacket>&packet) {
   have_video_keyframe = have_video_keyframe || 
     ( ( packet->codec_type == AVMEDIA_TYPE_VIDEO ) && 
       ( packet->keyframe || monitor->GetOptVideoWriter() == Monitor::ENCODE) );
@@ -655,3 +581,108 @@ bool Event::SetPath(Storage *storage) {
   }  // deep storage or not
   return true;
 }  // end bool Event::SetPath
+
+void Event::Run() {
+  Storage *storage = monitor->getStorage();
+  if (!SetPath(storage)) {
+    // Try another
+    Warning("Failed creating event dir at %s", storage->Path());
+
+    std::string sql = stringtf("SELECT `Id` FROM `Storage` WHERE `Id` != %u", storage->Id());
+    if (monitor->ServerId())
+      sql += stringtf(" AND ServerId=%u", monitor->ServerId());
+
+    storage = nullptr;
+
+    MYSQL_RES *result = zmDbFetch(sql);
+    if (result) {
+      for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) {
+        storage = new Storage(atoi(dbrow[0]));
+        if (SetPath(storage))
+          break;
+        delete storage;
+        storage = nullptr;
+      }  // end foreach row of Storage
+      mysql_free_result(result);
+      result = nullptr;
+    }
+    if (!storage) {
+      Info("No valid local storage area found.  Trying all other areas.");
+      // Try remote
+      sql = "SELECT `Id` FROM `Storage` WHERE ServerId IS NULL";
+      if (monitor->ServerId())
+        sql += stringtf(" OR ServerId != %u", monitor->ServerId());
+
+      result = zmDbFetch(sql);
+      if (result) {
+        for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+          storage = new Storage(atoi(dbrow[0]));
+          if (SetPath(storage))
+            break;
+          delete storage;
+          storage = nullptr;
+        }  // end foreach row of Storage
+        mysql_free_result(result);
+        result = nullptr;
+      }
+    }
+    if (!storage) {
+      storage = new Storage();
+      Warning("Failed to find a storage area to save events.");
+    }
+    sql = stringtf("UPDATE Events SET StorageId = '%d' WHERE Id=%" PRIu64, storage->Id(), id);
+    zmDbDo(sql);
+  }  // end if ! setPath(Storage)
+  Debug(1, "Using storage area at %s", path.c_str());
+
+  snapshot_file = path + "/snapshot.jpg";
+  alarm_file = path + "/alarm.jpg";
+
+  video_incomplete_path = path + "/" + video_incomplete_file;
+
+  if (monitor->GetOptVideoWriter() != 0) {
+    /* Save as video */
+        
+    videoStore = new VideoStore(
+        video_incomplete_path.c_str(),
+        container.c_str(),
+        monitor->GetVideoStream(),
+        monitor->GetVideoCodecContext(),
+        ( monitor->RecordAudio() ? monitor->GetAudioStream() : nullptr ),
+        ( monitor->RecordAudio() ? monitor->GetAudioCodecContext() : nullptr ),
+        monitor );
+
+    if ( !videoStore->open() ) {
+      Warning("Failed to open videostore, turning on jpegs");
+      delete videoStore;
+      videoStore = nullptr;
+      if ( ! ( save_jpegs & 1 ) ) {
+        save_jpegs |= 1; // Turn on jpeg storage
+        zmDbDo(stringtf("UPDATE Events SET SaveJpegs=%d WHERE Id=%" PRIu64, save_jpegs, id));
+      }
+    } else {
+      std::string codec = videoStore->get_codec();
+      video_file = stringtf("%" PRIu64 "-%s.%s.%s", id, "video", codec.c_str(), container.c_str());
+      video_path = path + "/" + video_file;
+      Debug(1, "Video file is %s", video_file.c_str());
+    }
+  }  // end if GetOptVideoWriter
+  if (storage != monitor->getStorage())
+    delete storage;
+
+
+  std::unique_lock<std::mutex> lck(packet_queue_mutex);
+
+  // The idea is to process the queue no matter what so that all packets get processed.
+  // We only break if the queue is empty
+  while (true) {
+    if (!packet_queue.empty()) {
+      this->AddPacket_(packet_queue.front());
+      packet_queue.pop();
+    } else {
+      if (terminate_ or zm_terminate)
+        break;
+      packet_queue_condition.wait(lck);
+    }
+  }
+}
diff --git a/src/zm_event.h b/src/zm_event.h
index 4fb5c7469..447bdeafc 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -22,14 +22,21 @@
 
 #include "zm_config.h"
 #include "zm_define.h"
+#include "zm_packet.h"
 #include "zm_storage.h"
 #include "zm_time.h"
 #include "zm_utils.h"
 #include "zm_zone.h"
 
+#include <atomic>
+#include <condition_variable>
 #include <map>
+#include <memory>
+#include <mutex>
 #include <queue>
 #include <set>
+#include <thread>
+
 
 class EventStream;
 class Frame;
@@ -98,6 +105,15 @@ class Event {
 
     void createNotes(std::string &notes);
 
+    std::queue<std::shared_ptr<ZMPacket>> packet_queue;
+    std::mutex packet_queue_mutex;
+    std::condition_variable packet_queue_condition;
+
+    void Run();
+
+    std::atomic<bool> terminate_;
+    std::thread thread_;
+
  public:
     static bool OpenFrameSocket(int);
     static bool ValidateFrameSocket(int);
@@ -118,6 +134,7 @@ class Event {
     SystemTimePoint EndTime() const { return end_time; }
 
     void AddPacket(const std::shared_ptr<ZMPacket> &p);
+    void AddPacket_(const std::shared_ptr<ZMPacket> &p);
     bool WritePacket(const std::shared_ptr<ZMPacket> &p);
     bool SendFrameImage(const Image *image, bool alarm_frame=false);
     bool WriteFrameImage(Image *image, SystemTimePoint timestamp, const char *event_file, bool alarm_frame = false) const;
@@ -130,6 +147,9 @@ class Event {
                 int score = 0,
                 Image *alarm_image = nullptr);
 
+    void Stop() { terminate_ = true; }
+    bool Stopped() const { return terminate_; }
+
  private:
     void WriteDbFrames();
     bool SetPath(Storage *storage);

From 8d061750242b35dc4429ed5cb69771d9cf83d301 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 23:07:48 -0500
Subject: [PATCH 289/501] Rework to use ZoneMinder::Monitor class.  Simplify
 loadMonitors and get rid of loadMonitor.  Add in ServerId change handling.

---
 scripts/zmtrigger.pl.in | 62 ++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 83fcf29f5..94f59e001 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -42,6 +42,7 @@ use constant SELECT_TIMEOUT => 0.25;
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
+use ZoneMinder::Monitor;
 use ZoneMinder::Trigger::Channel::Inet;
 use ZoneMinder::Trigger::Channel::Unix;
 use ZoneMinder::Trigger::Channel::Serial;
@@ -203,14 +204,10 @@ while (!$zm_terminate) {
   # Check for alarms that might have happened
   my @out_messages;
   foreach my $monitor ( values %monitors ) {
-    if ($$monitor{Function} eq 'None') {
-      $monitor_reload_time = 0;
-      next;
-    }
-
-    if (!zmMemVerify($monitor)) {
+    if (!$monitor->connect()) {
       # Our attempt to verify the memory handle failed. We should reload the monitors.
       # Don't need to zmMemInvalidate because the monitor reload will do it.
+      Debug("Failed connect, putting on reloads");
       push @needsReload, $monitor;
       next;
     }
@@ -249,6 +246,7 @@ while (!$zm_terminate) {
     }
     $monitor->{LastState} = $state;
     $monitor->{LastEvent} = $last_event;
+    $monitor->disconnect();
   } # end foreach monitor
 
   foreach my $connection ( @out_connections ) {
@@ -298,15 +296,22 @@ while (!$zm_terminate) {
 
   # Reload all monitors from the dB every MONITOR_RELOAD_INTERVAL
   if ( (time() - $monitor_reload_time) > MONITOR_RELOAD_INTERVAL ) {
-    foreach my $monitor ( values(%monitors) ) {
-      zmMemInvalidate( $monitor ); # Free up any used memory handle
-    }
     loadMonitors();
     @needsReload = (); # We just reloaded all monitors so no need reload a specific monitor
   # If we have NOT just reloaded all monitors, reload a specific monitor if its shared mem changed
-  } elsif ( @needsReload ) { 
-    foreach my $monitor ( @needsReload ) {
-      loadMonitor($monitor);
+  } elsif (@needsReload) { 
+    foreach my $monitor (@needsReload) {
+      $monitor = $monitors{$monitor->Id()} = ZoneMinder::Monitor->find_one(Id=>$monitor->Id());
+      if ( $$monitor{Function} eq 'None' ) {
+        delete $monitors{$monitor->Id()};
+      } elsif ( $Config{ZM_SERVER_ID} and ($$monitor{ServerId} != $Config{ZM_SERVER_ID})) {
+        delete $monitors{$monitor->Id()};
+      } else {
+        if ($monitor->connect()) {
+          $monitor->{LastState} = zmGetMonitorState($monitor);
+          $monitor->{LastEvent} = zmGetLastEvent($monitor);
+        }
+      }
     }
     @needsReload = ();
   }
@@ -317,40 +322,21 @@ while (!$zm_terminate) {
 Info('Trigger daemon exiting');
 exit;
 
-sub loadMonitor {
-  my $monitor = shift;
-
-  Debug('Loading monitor '.$monitor);
-  zmMemInvalidate($monitor);
-
-  if ( zmMemVerify($monitor) ) { # This will re-init shared memory
-    $monitor->{LastState} = zmGetMonitorState($monitor);
-    $monitor->{LastEvent} = zmGetLastEvent($monitor);
-  }
-} # end sub loadMonitor
-
 sub loadMonitors {
   $monitor_reload_time = time();
 
-  my %new_monitors = ();
+  %monitors = ();
 
-  my $sql = 'SELECT * FROM `Monitors`
-    WHERE find_in_set( `Function`, \'Modect,Mocord,Nodect,Record\' )'.
-    ( $Config{ZM_SERVER_ID} ? ' AND `ServerId`=?' : '' )
-    ;
-  my $sth = $dbh->prepare_cached( $sql )
-    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
-    or Fatal( "Can't execute: ".$sth->errstr() );
-
-  while ( my $monitor = $sth->fetchrow_hashref() ) {
-    if ( zmMemVerify($monitor) ) { # This will re-init shared memory
+  foreach my $monitor ( ZoneMinder::Monitor->find(
+    Function=>['Modect','Mocord','Nodect','Record'],
+    ($Config{ZM_SERVER_ID} ? (ServerId=>$Config{ZM_SERVER_ID}) : ()),
+  )) {
+    if ($monitor->connect()) { # This will re-init shared memory
       $monitor->{LastState} = zmGetMonitorState($monitor);
       $monitor->{LastEvent} = zmGetLastEvent($monitor);
     }
-    $new_monitors{$monitor->{Id}} = $monitor;
+    $monitors{$monitor->{Id}} = $monitor;
   } # end while fetchrow
-  %monitors = %new_monitors;
 } # end sub loadMonitors
 
 sub handleMessage {

From e4693c251c598d92be0c54f54e8b41e69893fdb2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 23:08:29 -0500
Subject: [PATCH 290/501] add backticks around field names because some like
 Function are reserved

---
 scripts/ZoneMinder/lib/ZoneMinder/Object.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
index e54bb15ce..d64ee7e8a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
@@ -639,9 +639,9 @@ $log->debug("Have array for $k $$search{$k}") if DEBUG_ALL;
 						
 						if ( ! ( $db_field =~ /\?/ ) ) {
 							if ( @{$$search{$k}} != 1 ) {
-								push @where, $db_field .' IN ('.join(',', map {'?'} @{$$search{$k}} ) . ')';
+								push @where, '`'.$db_field .'` IN ('.join(',', map {'?'} @{$$search{$k}} ) . ')';
 							} else {
-								push @where, $db_field.'=?';
+								push @where, '`'.$db_field.'`=?';
 							} # end if
 						} else {
 $log->debug("Have question ? for $k $$search{$k} $db_field") if DEBUG_ALL;
@@ -656,10 +656,10 @@ $log->debug("Have question ? for $k $$search{$k} $db_field") if DEBUG_ALL;
 						foreach my $p_k ( keys %{$$search{$k}} ) {
 							my $v = $$search{$k}{$p_k};
 							if ( ref $v eq 'ARRAY' ) {
-								push @where, $db_field.' IN ('.join(',', map {'?'} @{$v} ) . ')';
+								push @where, '`'.$db_field.'` IN ('.join(',', map {'?'} @{$v} ) . ')';
 								push @values, $p_k, @{$v};
 							} else {
-								push @where, $db_field.'=?';
+								push @where, '`'.$db_field.'`=?';
 								push @values, $p_k, $v;
 							} # end if
 						} # end foreach p_k
@@ -667,7 +667,7 @@ $log->debug("Have question ? for $k $$search{$k} $db_field") if DEBUG_ALL;
 						push @where, $db_field.' IS NULL';
 					} else {
 						if ( ! ( $db_field =~ /\?/ ) ) {
-							push @where, $db_field .'=?';
+							push @where, '`'.$db_field .'`=?';
 						} else {
 							push @where, $db_field;
 						}

From 3d042284857a69496b5404089546458494386b7e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 23:10:17 -0500
Subject: [PATCH 291/501] rework ::Analyse.  The state engine will only go into
 alarm on actual motion, not on a skipped frame.  TRIGGERS and ONVIF events
 will immediately create events.

---
 src/zm_monitor.cpp | 78 ++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 958410efe..587c49f33 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1870,11 +1870,18 @@ bool Monitor::Analyse() {
       score += 9;
       Debug(1, "Triggered on ONVIF");
       if (!event) {
+        Event::StringSet noteSet;
+        noteSet.insert("ONVIF2");
+        noteSetMap[MOTION_CAUSE] = noteSet;
+
+        event = openEvent(snap, "ONVIF", noteSetMap);
         cause += "ONVIF";
+      } else {
+        event->addNote(MOTION_CAUSE, "ONVIF2");
+// Add to cause
       }
-      Event::StringSet noteSet;
-      noteSet.insert("ONVIF2");
-      noteSetMap[MOTION_CAUSE] = noteSet;
+      // Regardless of previous state, we go to ALARM
+      shared_data->state = state = ALARM;
       //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
       if (!ONVIF_Closes_Event && state == ALARM)
         ONVIF_Trigger_State = FALSE;
@@ -1886,11 +1893,16 @@ bool Monitor::Analyse() {
       score += trigger_data->trigger_score;
       Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
       if (!event) {
-        cause += trigger_data->trigger_cause;
+        Event::StringSet noteSet;
+        noteSet.insert(trigger_data->trigger_text);
+        noteSetMap[trigger_data->trigger_cause] = noteSet;
+        event = openEvent(snap, trigger_data->trigger_cause, noteSetMap);
+        Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
+      } else {
+        event->addNote(trigger_data->trigger_cause, trigger_data->trigger_text);
+        // Need to know if we should end the previous and start a new one, or just add the data
       }
-      Event::StringSet noteSet;
-      noteSet.insert(trigger_data->trigger_text);
-      noteSetMap[trigger_data->trigger_cause] = noteSet;
+      shared_data->state = state = ALARM;
     }  // end if trigger_on
 
     // FIXME this snap might not be the one that caused the signal change.  Need to store that in the packet.
@@ -1967,8 +1979,6 @@ bool Monitor::Analyse() {
           }  // end while ! decoded
         }  // end if decoding enabled
 
-        SystemTimePoint timestamp = snap->timestamp;
-
         if (Active() and (function == MODECT or function == MOCORD)) {
           Debug(3, "signal and active and modect");
           Event::StringSet zoneSet;
@@ -1990,7 +2000,7 @@ bool Monitor::Analyse() {
             } else if (!(analysis_image_count % (motion_frame_skip+1))) {
               Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
               // Get new score.
-              int motion_score = DetectMotion(*(snap->image), zoneSet);
+              snap->score = DetectMotion(*(snap->image), zoneSet);
 
               // lets construct alarm cause. It will contain cause + names of zones alarmed
               snap->zone_stats.reserve(zones.size());
@@ -2004,11 +2014,11 @@ bool Monitor::Analyse() {
                 }
               }
               Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
-                  score, last_motion_score, motion_score);
+                  score, last_motion_score, snap->score);
               motion_frame_count += 1;
-              last_motion_score = motion_score;
+              last_motion_score = snap->score;
 
-              if (motion_score) {
+              if (snap->score) {
                 if (cause.length()) cause += ", ";
                 cause += MOTION_CAUSE+std::string(":")+snap->alarm_cause;
                 noteSetMap[MOTION_CAUSE] = zoneSet;
@@ -2019,7 +2029,7 @@ bool Monitor::Analyse() {
           } else {
             Debug(1, "no image so skipping motion detection");
           }  // end if has image
-          score += last_motion_score;
+//score += last_motion_score;
         } else {
           Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
               Active(), enabled, shared_data->active,
@@ -2032,17 +2042,17 @@ bool Monitor::Analyse() {
           if (event) {
             Debug(2, "Have event %" PRIu64 " in record", event->Id());
 
-            if (section_length != Seconds(0) && (timestamp - event->StartTime() >= section_length)
+            if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)
                 && ((function == MOCORD && event_close_mode != CLOSE_TIME)
                     || (function == RECORD && event_close_mode == CLOSE_TIME)
-                    || std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()) % section_length == Seconds(0))) {
+                    || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
               Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
                    name.c_str(),
                    image_count,
                    event->Id(),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()).count()),
+                   static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
                    static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - event->StartTime()).count()),
+                   static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
                    static_cast<int64>(Seconds(section_length).count()));
               closeEvent();
             }  // end if section_length
@@ -2060,13 +2070,14 @@ bool Monitor::Analyse() {
           } // end if ! event
         } // end if RECORDING
 
-        if (score and (function != MONITOR)) {
+        if ((snap->score > 0) and (function != MONITOR)) {
           if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
             // If we should end then previous continuous event and start a new non-continuous event
             if (event && event->Frames()
                 && !event->AlarmFrames()
                 && (event_close_mode == CLOSE_ALARM)
-                && ((timestamp - event->StartTime()) >= min_section_length)
+                // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
+                && ((snap->timestamp - event->StartTime()) >= min_section_length)
                 && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
               Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
                   name.c_str(), image_count, event->Id());
@@ -2078,7 +2089,7 @@ bool Monitor::Analyse() {
                     Event::PreAlarmCount(), pre_event_count,
                     event->Frames(),
                     event->AlarmFrames(),
-                    static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - event->StartTime()).count()),
+                    static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
                     static_cast<int64>(Seconds(min_section_length).count()),
                     (event_close_mode == CLOSE_ALARM));
             }
@@ -2088,12 +2099,10 @@ bool Monitor::Analyse() {
 
               if (!event) {
                 event = openEvent(snap, cause, noteSetMap);
-                shared_data->state = state = ALARM;
                 Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
-              } else {
-                shared_data->state = state = ALARM;
               }  // end if no event, so start it
-              if ( alarm_frame_count ) {
+              shared_data->state = state = ALARM;
+              if (alarm_frame_count) {
                 Debug(1, "alarm frame count so SavePreAlarmFrames");
                 event->SavePreAlarmFrames();
               }
@@ -2115,13 +2124,13 @@ bool Monitor::Analyse() {
             Debug(1, "Was in TAPE, going into ALARM");
           } else {
             Debug(1, "Staying in %s", State_Strings[state].c_str());
-
           }
           if (state == ALARM) {
             last_alarm_count = analysis_image_count; 
           } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
-        } else { // no score?
+        } else if (!score) { // no snap->score?
           alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
+
           if (state == ALARM) {
             Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
             shared_data->state = state = ALERT;
@@ -2129,7 +2138,7 @@ bool Monitor::Analyse() {
             if (
                 ((analysis_image_count - last_alarm_count) > post_event_count)
                 &&
-               ((timestamp - event->StartTime()) >= min_section_length)) {
+               ((snap->timestamp - event->StartTime()) >= min_section_length)) {
               Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                   name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
               if (
@@ -2156,7 +2165,7 @@ bool Monitor::Analyse() {
                   analysis_image_count,
                   last_alarm_count,
                   post_event_count,
-                  static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()).count()),
+                  static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
                   static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
                   static_cast<int64>(Seconds(min_section_length).count()));
           }
@@ -2164,7 +2173,8 @@ bool Monitor::Analyse() {
             Event::EmptyPreAlarmFrames();
         } // end if score or not
 
-        snap->score = score;
+        if (score > snap->score)
+          snap->score = score;
 
         if (state == PREALARM) {
           // Generate analysis images if necessary
@@ -2181,7 +2191,7 @@ bool Monitor::Analyse() {
           } // end if image.
 
           // incremement pre alarm image count
-          Event::AddPreAlarmFrame(snap->image, timestamp, score, nullptr);
+          Event::AddPreAlarmFrame(snap->image, snap->timestamp, score, nullptr);
         } else if (state == ALARM) {
           if (snap->image) {
             for (const Zone &zone : zones) {
@@ -2198,12 +2208,12 @@ bool Monitor::Analyse() {
           if (event) {
             if (noteSetMap.size() > 0)
               event->updateNotes(noteSetMap);
-            if (section_length != Seconds(0) && (timestamp - event->StartTime() >= section_length)) {
+            if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)) {
               Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
                       name.c_str(), analysis_image_count, event->Id(),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()).count()),
+                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
                       static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(timestamp - GetVideoWriterStartTime()).count()),
+                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - GetVideoWriterStartTime()).count()),
                       static_cast<int64>(Seconds(section_length).count()));
               closeEvent();
               event = openEvent(snap, cause, noteSetMap);

From f764cfbc329612d7dee4a822ab2af8d557f2a911 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 12 Jan 2022 23:11:19 -0500
Subject: [PATCH 292/501] Fix deadlock on deleting event. Cannot race for the
 lock, joining will do the job

---
 src/zm_event.cpp | 19 ++++++++++++++-----
 src/zm_event.h   |  5 ++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index f1dce36d3..e14c1a343 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -134,14 +134,19 @@ Event::Event(
       );
   id = zmDbDoInsert(sql);
 
-
   thread_ = std::thread(&Event::Run, this);
 }
 
 Event::~Event() {
-
+  Debug(1, "Deleting event, calling stop");
   Stop();
-  if (thread_.joinable()) thread_.join();
+  if (thread_.joinable()) {
+    // Should be.  Issuing the stop and then getting the lock
+    Debug(1, "Joinable");
+    thread_.join();
+  } else {
+    Debug(1, "Not Joinable");
+  }
 
   /* Close the video file */
   // We close the videowriter first, because if we finish the event, we might try to view the file, but we aren't done writing it yet.
@@ -670,19 +675,23 @@ void Event::Run() {
   if (storage != monitor->getStorage())
     delete storage;
 
-
   std::unique_lock<std::mutex> lck(packet_queue_mutex);
 
   // The idea is to process the queue no matter what so that all packets get processed.
   // We only break if the queue is empty
   while (true) {
     if (!packet_queue.empty()) {
+      Debug(1, "adding packet");
       this->AddPacket_(packet_queue.front());
       packet_queue.pop();
     } else {
-      if (terminate_ or zm_terminate)
+      if (terminate_ or zm_terminate) {
+Debug(1, "terminating");
         break;
+      }
+Debug(1, "waiting");
       packet_queue_condition.wait(lck);
+Debug(1, "wakeing");
     }
   }
 }
diff --git a/src/zm_event.h b/src/zm_event.h
index 447bdeafc..be6d922de 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -147,7 +147,10 @@ class Event {
                 int score = 0,
                 Image *alarm_image = nullptr);
 
-    void Stop() { terminate_ = true; }
+    void Stop() {
+      terminate_ = true;
+      packet_queue_condition.notify_all();
+    }
     bool Stopped() const { return terminate_; }
 
  private:

From 2beffeb1b433aa159ca2c20203d55400ab4d46ef Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 12 Jan 2022 22:46:26 -0600
Subject: [PATCH 293/501] Add Janus to Cycle view. Remove debug Alert()
 messages

---
 src/zm_monitor.cpp                      |  6 ++-
 web/skins/classic/views/cycle.php       |  2 +
 web/skins/classic/views/js/cycle.js     | 65 +++++++++++++++++++++++++
 web/skins/classic/views/js/cycle.js.php |  3 +-
 web/skins/classic/views/js/montage.js   |  4 +-
 web/skins/classic/views/js/watch.js     |  4 +-
 6 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4b136e1aa..a612e84c3 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1117,12 +1117,13 @@ bool Monitor::connect() {
     //End ONVIF Setup
 #endif
 
-    //janus setup.
+#if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
       if (add_to_janus() != 0) {
         Warning("Failed to add monitor stream to Janus!");
       }
     }
+#endif
 
   } else if (!shared_data->valid) {
     Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
@@ -3206,10 +3207,11 @@ int Monitor::Close() {
     soap = nullptr;
   }  //End ONVIF
 #endif
-  //Janus Teardown
+#if HAVE_LIBCURL  //Janus Teardown
     if (janus_enabled && (purpose == CAPTURE)) {
       remove_from_janus();
     }
+#endif
 
   packetqueue.clear();
   if (audio_fifo) {
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index b9f779c50..279d9bba5 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -192,4 +192,6 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
         </div>
       </div>
     </div>
+<script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
+<script src="<?php echo cache_bust('js/janus.js') ?>"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 767fad475..401e36760 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -1,3 +1,6 @@
+var server;
+var janus = null;
+var streaming2;
 var intervalId;
 var pauseBtn = $j('#pauseBtn');
 var playBtn = $j('#playBtn');
@@ -46,6 +49,68 @@ function initCycle() {
   intervalId = setInterval(nextCycleView, cycleRefreshTimeout);
   var scale = $j('#scale').val();
   if ( scale == '0' || scale == 'auto' ) changeScale();
+
+  if (monitorData[monIdx].janusEnabled) {
+    server = "http://" + window.location.hostname + ":8088/janus";
+    opaqueId = "streamingtest-"+Janus.randomString(12);
+    Janus.init({debug: "all", callback: function() {
+      janus = new Janus({
+        server: server,
+        success: function() {
+          janus.attach({
+            plugin: "janus.plugin.streaming",
+            opaqueId: opaqueId,
+            success: function(pluginHandle) {
+              streaming2 = pluginHandle;
+              var body = { "request": "watch", "id":monitorData[monIdx].id };
+              streaming2.send({"message": body});
+            },
+            error: function(error) {
+              Janus.error("  -- Error attaching plugin... ", error);
+            },
+            onmessage: function(msg, jsep) {
+              Janus.debug(" ::: Got a message :::");
+              Janus.debug(msg);
+              var result = msg["result"];
+              if(result !== null && result !== undefined) {
+                if(result["status"] !== undefined && result["status"] !== null) {
+                  var status = result["status"];
+                }
+              } else if(msg["error"] !== undefined && msg["error"] !== null) {
+                Janus.debug(msg["error"]);
+                return;
+              }
+              if(jsep !== undefined && jsep !== null) {
+                Janus.debug("Handling SDP as well...");
+                Janus.debug(jsep);
+                // Offer from the plugin, let's answer
+                streaming2.createAnswer({
+                  jsep: jsep,
+                  // We want recvonly audio/video and, if negotiated, datachannels
+                  media: { audioSend: false, videoSend: false, data: true },
+                  success: function(jsep) {
+                    Janus.debug("Got SDP!");
+                    Janus.debug(jsep);
+                    var body = { "request": "start"};
+                    streaming2.send({"message": body, "jsep": jsep});
+                  },
+                  error: function(error) {
+                    Janus.error("WebRTC error:", error);
+                  }
+                });
+              }
+            }, //onmessage function
+            onremotestream: function(stream) {
+              Janus.debug(" ::: Got a remote track :::");
+              Janus.debug(stream);
+              Janus.attachMediaStream(document.getElementById("liveStream" + monitorData[monIdx].id), stream);
+              document.getElementById("liveStream" + monitorData[monIdx].id).play();
+            }
+          });// attach
+        } //Success functio
+      }); //new Janus
+    }}); //janus.init callback
+  } //if janus
 }
 
 function changeSize() {
diff --git a/web/skins/classic/views/js/cycle.js.php b/web/skins/classic/views/js/cycle.js.php
index 7bcd4497c..201deea76 100644
--- a/web/skins/classic/views/js/cycle.js.php
+++ b/web/skins/classic/views/js/cycle.js.php
@@ -20,7 +20,8 @@ monitorData[monitorData.length] = {
   'url': '<?php echo $monitor->UrlToIndex() ?>',
   'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
   'type': '<?php echo $monitor->Type() ?>',
-  'refresh': '<?php echo $monitor->Refresh() ?>'
+  'refresh': '<?php echo $monitor->Refresh() ?>',
+  'janusEnabled': <?php echo $monitor->JanusEnabled() ?>
 };
 <?php
 } // end foreach monitor
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index cfa831354..d02fb63f8 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -373,8 +373,7 @@ function attachVideo(janus, i) {
               var status = result["status"];
             }
           } else if(msg["error"] !== undefined && msg["error"] !== null) {
-            alert(msg["error"]);
-            stopStream();
+            Janus.error(msg["error"]);
             return;
           }
           if(jsep !== undefined && jsep !== null) {
@@ -393,7 +392,6 @@ function attachVideo(janus, i) {
               },
               error: function(error) {
                 Janus.error("WebRTC error:", error);
-                alert("WebRTC error... " + JSON.stringify(error));
               }
             });
           }
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 21154d1f6..f3ea6385f 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -937,8 +937,7 @@ function initPage() {
                   var status = result["status"];
                 }
               } else if(msg["error"] !== undefined && msg["error"] !== null) {
-                alert(msg["error"]);
-                stopStream();
+                Janus.error(msg["error"]);
                 return;
               }
               if(jsep !== undefined && jsep !== null) {
@@ -957,7 +956,6 @@ function initPage() {
                   },
                   error: function(error) {
                     Janus.error("WebRTC error:", error);
-                    alert("WebRTC error... " + JSON.stringify(error));
                   }
                 });
               }

From 3dad3a5200dc62844fbb6d12c3421ae5482283d3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 13 Jan 2022 09:37:54 -0500
Subject: [PATCH 294/501] update description to reflect that zmupdate.pl now
 does all the things it will someday do.  Meantion how -c works better.  When
 in interactive mode, check once and print out the result instead of
 daemonising. Fix formatting osf usage

---
 scripts/zmupdate.pl.in | 51 ++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 0253fadc2..095218940 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -2,7 +2,7 @@
 #
 # ==========================================================================
 #
-# ZoneMinder Update Script, $Date$, $Revision$
+# ZoneMinder Update Script
 # Copyright (C) 2001-2008 Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -31,29 +31,29 @@ zmupdate.pl -c,--check | -f,--freshen | -v<version>,--version=<version> [-u <dbu
 
 =head1 DESCRIPTION
 
-This script just checks what the most recent release of ZoneMinder is
-at the the moment. It will eventually be responsible for applying and
-configuring upgrades etc, including on the fly upgrades.
+This script checks what the most recent release of ZoneMinder is
+at the the moment by downloading https://update.zoneminder.com/version.txt.
+It can also apply and configure upgrades etc, including on the fly upgrades.
 
 =head1 OPTIONS
 
--c, --check                      - Check for updated versions of ZoneMinder
--f, --freshen                    - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
---migrate-events                 - Update database structures as per USE_DEEP_STORAGE setting.
--v <version>, --version=<version> - Force upgrade to the current version from <version>
--u <dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
--p <dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
--s, --super                      - Use system maintenance account on debian based systems instead of unprivileged account
--d <dir>, --dir=<dir>              - Directory containing update files if not in default build location
--interactive                     - interact with the user
--nointeractive                   - do not interact with the user
+ -c, --check                       - Check for updated versions of ZoneMinder. 
+                                     If not interactive zmupdate.pl will stay running, checking every hour.
+                                     If interactive will try once, print out result and quit.
+ -f, --freshen                     - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
+ --migrate-events                  - Update database structures as per USE_DEEP_STORAGE setting.
+ -v <version>, --version=<version> - Force upgrade to the current version from <version>
+ -u <dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
+ -p <dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
+ -s, --super                       - Use system maintenance account on debian based systems instead of unprivileged account
+ -d <dir>, --dir=<dir>             - Directory containing update files if not in default build location
+ -interactive                      - interact with the user
+ -nointeractive                    - do not interact with the user
 
 =cut
 use strict;
 use bytes;
 use version;
-use Crypt::Eksblowfish::Bcrypt;
-use Data::Entropy::Algorithms qw(rand_bits);
 
 # ==========================================================================
 #
@@ -122,9 +122,8 @@ GetOptions(
     ) or pod2usage(-exitstatus => -1);
 
 my $dbh = zmDbConnect(undef, { mysql_multi_statements=>1 } );
-if ( !$dbh ) {
-  die "Unable to connect to db\n";
-}
+die "Unable to connect to db\n" if !$dbh;
+
 $Config{ZM_DB_USER} = $dbUser;
 $Config{ZM_DB_PASS} = $dbPass;
 # we escape dbpass with single quotes so that $ in the password has no effect, but dbpass could have a ' in it.
@@ -181,6 +180,7 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
 
         Info('Got version: '.$lastVersion);
 
+
         my $lv_sql = 'UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_VERSION\'';
         my $lv_sth = $dbh->prepare_cached($lv_sql) or die("Can't prepare '$lv_sql': ".$dbh->errstr());
         my $lv_res = $lv_sth->execute($lastVersion) or die("Can't execute: ".$lv_sth->errstr());
@@ -190,6 +190,11 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
         my $lc_sth = $dbh->prepare_cached($lc_sql) or die("Can't prepare '$lc_sql': ".$dbh->errstr());
         my $lc_res = $lc_sth->execute($lastCheck) or die("Can't execute: ".$lc_sth->errstr());
         $lc_sth->finish();
+        if ($interactive) {
+print("Hello");
+          print("Latest version $lastVersion, our version " . ZM_VERSION."\n");
+          exit(0);
+        }
       } else {
         Error('Error check failed: \''.$res->status_line().'\'');
       }
@@ -1044,14 +1049,16 @@ sub patchDB {
 } # end sub patchDB
 
 sub migratePasswords {
-  print ("Migratings passwords, if any...\n");
+  use Crypt::Eksblowfish::Bcrypt;
+  use Data::Entropy::Algorithms qw(rand_bits);
+  print("Migratings passwords, if any...\n");
   my $sql = 'SELECT * FROM `Users`';
   my $sth = $dbh->prepare_cached($sql) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or die("Can't execute: ".$sth->errstr());
-  while( my $user = $sth->fetchrow_hashref() ) {
+  while ( my $user = $sth->fetchrow_hashref() ) {
     my $scheme = substr($user->{Password}, 0, 1);
     if ($scheme eq '*') {
-      print ('-->'.$user->{Username}." password will be migrated\n");
+      print('-->'.$user->{Username}." password will be migrated\n");
       my $salt = Crypt::Eksblowfish::Bcrypt::en_base64(rand_bits(16*8));
       my $settings = '$2a$10$'.$salt;
       my $pass_hash = Crypt::Eksblowfish::Bcrypt::bcrypt($user->{Password},$settings);

From 3ec6c7e32fc17e2025966ba5efe3655b9630a6cf Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 13 Jan 2022 09:54:36 -0500
Subject: [PATCH 295/501] Fix behaviour of update check to support interactive
 mode. Use zmDbDo functions to simplify code.  When interactive print out
 lastVersion, latestVersion and currentVersion

---
 scripts/zmupdate.pl.in | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 095218940..9ad5a1a02 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -52,6 +52,7 @@ It can also apply and configure upgrades etc, including on the fly upgrades.
 
 =cut
 use strict;
+use warnings;
 use bytes;
 use version;
 
@@ -143,8 +144,10 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
   pod2usage(-exitstatus => -1);
 }
 
-if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
-  print('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
+if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) {
+  if (!$interactive) {
+    Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
+  }
 
   my $currVersion = $Config{ZM_DYN_CURR_VERSION};
   my $lastVersion = $Config{ZM_DYN_LAST_VERSION};
@@ -152,16 +155,14 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
 
   if ( !$currVersion ) {
     $currVersion = $Config{ZM_VERSION};
-
-    my $sql = "update Config set Value = ? where Name = 'ZM_DYN_CURR_VERSION'";
-    my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
-    my $res = $sth->execute($currVersion) or die("Can't execute: ".$sth->errstr());
-    $sth->finish();
+    zmDbDo("UPDATE `Config` SET `Value` = ? WHERE `Name` = 'ZM_DYN_CURR_VERSION'", $currVersion);
   }
 
   while ( 1 ) {
     my $now = time();
-    if ( !$lastVersion || !$lastCheck || (($now-$lastCheck) > CHECK_INTERVAL) ) {
+    if ( !$interactive and $lastVersion and $lastCheck and (($now-$lastCheck) <= CHECK_INTERVAL) ) {
+      Debug("Not checking for updates since we already have less than " . CHECK_INTERVAL . " seconds ago.");
+    } else {
       Info('Checking for updates');
 
       use LWP::UserAgent;
@@ -174,25 +175,16 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
       my $res = $ua->request($req);
 
       if ( $res->is_success ) {
-        $lastVersion = $res->content;
-        chomp($lastVersion);
+        my $latestVersion = $res->content;
+        chomp($latestVersion);
         $lastCheck = $now;
 
-        Info('Got version: '.$lastVersion);
+        Info('Got version: '.$latestVersion);
 
-
-        my $lv_sql = 'UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_VERSION\'';
-        my $lv_sth = $dbh->prepare_cached($lv_sql) or die("Can't prepare '$lv_sql': ".$dbh->errstr());
-        my $lv_res = $lv_sth->execute($lastVersion) or die("Can't execute: ".$lv_sth->errstr());
-        $lv_sth->finish();
-
-        my $lc_sql = 'UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_CHECK\'';
-        my $lc_sth = $dbh->prepare_cached($lc_sql) or die("Can't prepare '$lc_sql': ".$dbh->errstr());
-        my $lc_res = $lc_sth->execute($lastCheck) or die("Can't execute: ".$lc_sth->errstr());
-        $lc_sth->finish();
+        zmDbDo('UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_VERSION\'', $latestVersion);
+        zmDbDo('UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_CHECK\'', $lastCheck);
         if ($interactive) {
-print("Hello");
-          print("Latest version $lastVersion, our version " . ZM_VERSION."\n");
+          print("Last version $lastVersion, Latest version $latestVersion, our version " . ZM_VERSION."\n");
           exit(0);
         }
       } else {

From 58bd09d83d674e5920c3fe781087035bf814fe6a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 13 Jan 2022 09:54:47 -0500
Subject: [PATCH 296/501] Fix debug output from zmDbDo

---
 dep/RtspServer                                | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dep/RtspServer b/dep/RtspServer
index 1b40f1661..cd7fd49be 160000
--- a/dep/RtspServer
+++ b/dep/RtspServer
@@ -1 +1 @@
-Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f
+Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 35d2dc6fa..ae1259814 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -273,6 +273,9 @@ sub zmDbDo {
 	if ( ! defined $rows ) {
 		$sql =~ s/\?/'%s'/;
 		Error(sprintf("Failed $sql :", @_).$dbh->errstr());
+  } elsif ( ZoneMinder::Logger::logLevel() > INFO ) {
+		$sql =~ s/\?/'%s'/;
+		Debug(sprintf("Succeeded $sql : $rows rows affected", @_));
 	}
   return $rows;
 }

From 9b8ca69203f9407c5dd13d17212074c9ff3cfa7b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 13 Jan 2022 10:21:32 -0500
Subject: [PATCH 297/501] default interactive to whether we have stdio.  So now
 when running from console it will default to interactive and when running
 from zmdc.pl will be non-interactive.  Do check regardless of ZM_UPDATE_CHECK
 setting.

---
 scripts/zmupdate.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 9ad5a1a02..d096c70b5 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -96,7 +96,7 @@ my $use_log = (($> == 0) || ($> == $web_uid));
 logInit( toFile=>$use_log?DEBUG:NOLOG );
 logSetSignal();
 
-my $interactive = 1;
+my $interactive = -t STDERR; # interactive if we have IO
 my $check = 0;
 my $freshen = 0;
 my $rename = 0;
@@ -144,7 +144,7 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
   pod2usage(-exitstatus => -1);
 }
 
-if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) {
+if ($check) {
   if (!$interactive) {
     Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
   }

From 7c1ba721aa66b91cfff19193b6b62b81075b9480 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 13 Jan 2022 22:14:14 -0500
Subject: [PATCH 298/501] Preface Debug with ZM

---
 web/includes/csrf/csrf-magic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index b102c565a..10d200240 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -348,7 +348,7 @@ return false;
             return $value === csrf_hash($_COOKIE[$n], $time);
         case 'key':
             if (!$GLOBALS['csrf']['key']) {
-		    Debug("Checking key: no key set"  );
+		    ZM\Debug("Checking key: no key set"  );
 		    return false;
 	    }
  #Debug("Checking sid: $value === " . csrf_hash($GLOBALS['csrf']['key'], $time) );

From 9240a93ef501658fb1869433437bdfb4730629fb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 14:09:18 -0500
Subject: [PATCH 299/501] Revert my idea of having ONVIF and TRIGGER code
 start/end events.  Move code to tst for Ready()  up above ONVIF and TRIGGER
 code.  When waiting for decode, junk the idea of locking in the packetqueue. 
 Since waiting releases the lock, we should be ok waiting and notifying in the
 packet.  (I know there was a time when I felt this was necessary and I think
 it had to do with the deinterlacing case, but I've simplified that code too).

---
 src/zm_monitor.cpp | 128 ++++++++++++++++++++++++---------------------
 1 file changed, 67 insertions(+), 61 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index d5865a842..bc7ee0484 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1839,6 +1839,12 @@ bool Monitor::Analyse() {
     packetqueue.increment_it(analysis_it);
     return false;
   }
+  // Ready means that we have captured the warmup # of frames
+  if (!Ready()) {
+    Debug(3, "Not ready?");
+    delete packet_lock;
+    return false;
+  }
 
   // signal is set by capture
   bool signal = shared_data->signal;
@@ -1853,54 +1859,36 @@ bool Monitor::Analyse() {
   // if we have been told to be OFF, then we are off and don't do any processing.
   if (trigger_data->trigger_state != TriggerState::TRIGGER_OFF) {
     Debug(4, "Trigger not OFF state is (%d)", int(trigger_data->trigger_state));
-    // Ready means that we have captured the warmup # of frames
-    if (!Ready()) {
-      Debug(3, "Not ready?");
-      delete packet_lock;
-      return false;
-    }
 
     int score = 0;
     std::string cause;
     Event::StringSetMap noteSetMap;
 
 #ifdef WITH_GSOAP
-    if (ONVIF_Trigger_State) {
-      score += 9;
-      Debug(1, "Triggered on ONVIF");
-      if (!event) {
+    if (onvif_event_listener  && ONVIF_Healthy) {
+      if (ONVIF_Trigger_State) {
+        score += 9;
+        Debug(1, "Triggered on ONVIF");
         Event::StringSet noteSet;
         noteSet.insert("ONVIF2");
         noteSetMap[MOTION_CAUSE] = noteSet;
-
-        event = openEvent(snap, "ONVIF", noteSetMap);
         cause += "ONVIF";
-      } else {
-        event->addNote(MOTION_CAUSE, "ONVIF2");
-// Add to cause
-      }
-      // Regardless of previous state, we go to ALARM
-      shared_data->state = state = ALARM;
-      //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
-      if (!ONVIF_Closes_Event && state == ALARM)
-        ONVIF_Trigger_State = FALSE;
-    }  // end ONVIF_Trigger
+        //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
+        if (!ONVIF_Closes_Event && state == ALARM)
+          ONVIF_Trigger_State = FALSE;
+      }  // end ONVIF_Trigger
+    }  // end if (onvif_event_listener  && ONVIF_Healthy)
 #endif
 
-    // Specifically told to be on.  Setting the score here will trigger the alarm.
+    // Specifically told to be on.  Setting the score here is not enough to trigger the alarm. Must jump directly to ALARM
     if (trigger_data->trigger_state == TriggerState::TRIGGER_ON) {
       score += trigger_data->trigger_score;
       Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
-      if (!event) {
-        Event::StringSet noteSet;
-        noteSet.insert(trigger_data->trigger_text);
-        noteSetMap[trigger_data->trigger_cause] = noteSet;
-        event = openEvent(snap, trigger_data->trigger_cause, noteSetMap);
-        Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
-      } else {
-        event->addNote(trigger_data->trigger_cause, trigger_data->trigger_text);
-        // Need to know if we should end the previous and start a new one, or just add the data
-      }
+      if (!cause.empty()) cause += ", ";
+      cause += trigger_data->trigger_cause;
+      Event::StringSet noteSet;
+      noteSet.insert(trigger_data->trigger_text);
+      noteSetMap[trigger_data->trigger_cause] = noteSet;
       shared_data->state = state = ALARM;
     }  // end if trigger_on
 
@@ -1968,14 +1956,21 @@ bool Monitor::Analyse() {
 
         /* try to stay behind the decoder. */
         if (decoding_enabled) {
-          if (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
+          while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
+            // decoder thread might be waiting on the lock for this packet.
+            // So we need to relinquish the lock and wait.  Waiting automatically relinquishes the lock
+            // So... 
             Debug(1, "Waiting for decode");
-            packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
-            packetqueue.wait();
-            // Everything may have changed, just return and start again.  This needs to be more RAII
-            return true;
+            packet_lock->wait();
+            //packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
+            //packetqueue.wait();
+            ////packet_lock->lock();
           }  // end while ! decoded
+          if (zm_terminate or analysis_thread->Stopped()) {
+            delete packet_lock;
+            return false;
+          }
         }  // end if decoding enabled
 
         if (Active() and (function == MODECT or function == MOCORD)) {
@@ -1990,7 +1985,6 @@ bool Monitor::Analyse() {
           }
 
           if (snap->image) {
-
             // decoder may not have been able to provide an image
             if (!ref_image.Buffer()) {
               Debug(1, "Assigning instead of Detecting");
@@ -2024,8 +2018,9 @@ bool Monitor::Analyse() {
 
               if (snap->score) {
                 if (cause.length()) cause += ", ";
-                cause += MOTION_CAUSE+std::string(":")+snap->alarm_cause;
+                cause += MOTION_CAUSE + std::string(":") + snap->alarm_cause;
                 noteSetMap[MOTION_CAUSE] = zoneSet;
+                score += snap->score;
               } // end if motion_score
             } else {
               Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
@@ -2069,13 +2064,15 @@ bool Monitor::Analyse() {
             Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
                 name.c_str(), analysis_image_count, event->Id());
             /* To prevent cancelling out an existing alert\prealarm\alarm state */
+            // This ignores current score status.  This should all come after the state machine calculations
             if (state == IDLE) {
               shared_data->state = state = TAPE;
             }
           } // end if ! event
         } // end if RECORDING
 
-        if ((snap->score > 0) and (function != MONITOR)) {
+        // If motion detecting, score will be > 0 on motion, but if skipping frames, might not be. So also test snap->score
+        if ((score > 0) or ((snap->score > 0) and (function != MONITOR))) {
           if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
             // If we should end then previous continuous event and start a new non-continuous event
             if (event && event->Frames()
@@ -2133,8 +2130,8 @@ bool Monitor::Analyse() {
           if (state == ALARM) {
             last_alarm_count = analysis_image_count; 
           } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
-        } else if (!score and snap->score == 0) { // snap->score means -1 which means didn't do motion detection so don't do state transition
-          Debug(1, "!score");
+        } else if (!score and (snap->score == 0)) { // snap->score means -1 which means didn't do motion detection so don't do state transition
+          Debug(1, "!score %s", State_Strings[state].c_str());
           alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
 
           if (state == ALARM) {
@@ -2238,17 +2235,17 @@ bool Monitor::Analyse() {
   // In the case where people have pre-alarm frames, the web ui will generate the frame images
   // from the mp4. So no one will notice anyways.
   if (snap->image and (videowriter == PASSTHROUGH)) {
-   if (!savejpegs) {
-     Debug(1, "Deleting image data for %d", snap->image_index);
-     // Don't need raw images anymore
-     delete snap->image;
-     snap->image = nullptr;
-   }
-   if (snap->analysis_image and !(savejpegs & 2)) {
-     Debug(1, "Deleting analysis image data for %d", snap->image_index);
-     delete snap->analysis_image;
-     snap->analysis_image = nullptr;
-   }
+    if (!savejpegs) {
+      Debug(1, "Deleting image data for %d", snap->image_index);
+      // Don't need raw images anymore
+      delete snap->image;
+      snap->image = nullptr;
+    }
+    if (snap->analysis_image and !(savejpegs & 2)) {
+      Debug(1, "Deleting analysis image data for %d", snap->image_index);
+      delete snap->analysis_image;
+      snap->analysis_image = nullptr;
+    }
   }
 
   packetqueue.clearPackets(snap);
@@ -2571,7 +2568,8 @@ bool Monitor::Decode() {
   std::shared_ptr<ZMPacket> packet = packet_lock->packet_;
   if (packet->codec_type != AVMEDIA_TYPE_VIDEO) {
     Debug(4, "Not video");
-    packetqueue.unlock(packet_lock);
+    //packetqueue.unlock(packet_lock);
+    delete packet_lock;
     return true; // Don't need decode
   }
 
@@ -2677,24 +2675,31 @@ bool Monitor::Decode() {
         capture_image->Deinterlace_Blend();
       } else if (deinterlacing_value == 4) {
         while (!zm_terminate) {
+          // ICON FIXME SHould we not clone decoder_it?
           ZMLockedPacket *deinterlace_packet_lock = packetqueue.get_packet(decoder_it);
           if (!deinterlace_packet_lock) {
-            packetqueue.unlock(packet_lock);
+            delete packet_lock;
+            //packetqueue.unlock(packet_lock);
             return false;
           }
           if (deinterlace_packet_lock->packet_->codec_type == packet->codec_type) {
             capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
-            packetqueue.unlock(deinterlace_packet_lock);
+            delete deinterlace_packet_lock;
+            //packetqueue.unlock(deinterlace_packet_lock);
             break;
           }
-          packetqueue.unlock(deinterlace_packet_lock);
+          delete deinterlace_packet_lock;
+          //packetqueue.unlock(deinterlace_packet_lock);
           packetqueue.increment_it(decoder_it);
         }
-        if (zm_terminate) return false;
+        if (zm_terminate) {
+          delete packet_lock;
+          return false;
+        }
       } else if (deinterlacing_value == 5) {
         capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
       }
-    }
+    } // end if deinterlacing_value
 
     if (orientation != ROTATE_0) {
       Debug(3, "Doing rotation");
@@ -2731,7 +2736,8 @@ bool Monitor::Decode() {
   shared_data->signal = (capture_image and signal_check_points) ? CheckSignal(capture_image) : true;
   shared_data->last_write_index = index;
   shared_data->last_write_time = std::chrono::system_clock::to_time_t(packet->timestamp);
-  packetqueue.unlock(packet_lock);
+  delete packet_lock;
+  //packetqueue.unlock(packet_lock);
   return true;
 }  // end bool Monitor::Decode()
 

From 8b99b15b41b56e56d66ad37f48fc8616d64d3c77 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 14:17:07 -0500
Subject: [PATCH 300/501] Use a scope to shorten the lock on event_lock

---
 src/zm_monitor.cpp | 702 +++++++++++++++++++++++----------------------
 1 file changed, 352 insertions(+), 350 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index bc7ee0484..e8b1bb1c0 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1853,384 +1853,386 @@ bool Monitor::Analyse() {
   Debug(3, "Motion detection is enabled signal(%d) signal_change(%d) trigger state(%s) image index %d",
       signal, signal_change, TriggerState_Strings[trigger_data->trigger_state].c_str(), snap->image_index);
 
-  // Need to guard around event creation/deletion from Reload()
-  std::lock_guard<std::mutex> lck(event_mutex);
+  { // scope for event lock
+    // Need to guard around event creation/deletion from Reload()
+    std::lock_guard<std::mutex> lck(event_mutex);
 
-  // if we have been told to be OFF, then we are off and don't do any processing.
-  if (trigger_data->trigger_state != TriggerState::TRIGGER_OFF) {
-    Debug(4, "Trigger not OFF state is (%d)", int(trigger_data->trigger_state));
+    // if we have been told to be OFF, then we are off and don't do any processing.
+    if (trigger_data->trigger_state != TriggerState::TRIGGER_OFF) {
+      Debug(4, "Trigger not OFF state is (%d)", int(trigger_data->trigger_state));
 
-    int score = 0;
-    std::string cause;
-    Event::StringSetMap noteSetMap;
+      int score = 0;
+      std::string cause;
+      Event::StringSetMap noteSetMap;
 
 #ifdef WITH_GSOAP
-    if (onvif_event_listener  && ONVIF_Healthy) {
-      if (ONVIF_Trigger_State) {
-        score += 9;
-        Debug(1, "Triggered on ONVIF");
-        Event::StringSet noteSet;
-        noteSet.insert("ONVIF2");
-        noteSetMap[MOTION_CAUSE] = noteSet;
-        cause += "ONVIF";
-        //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
-        if (!ONVIF_Closes_Event && state == ALARM)
-          ONVIF_Trigger_State = FALSE;
-      }  // end ONVIF_Trigger
-    }  // end if (onvif_event_listener  && ONVIF_Healthy)
+      if (onvif_event_listener  && ONVIF_Healthy) {
+        if (ONVIF_Trigger_State) {
+          score += 9;
+          Debug(1, "Triggered on ONVIF");
+          Event::StringSet noteSet;
+          noteSet.insert("ONVIF2");
+          noteSetMap[MOTION_CAUSE] = noteSet;
+          cause += "ONVIF";
+          //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
+          if (!ONVIF_Closes_Event && state == ALARM)
+            ONVIF_Trigger_State = FALSE;
+        }  // end ONVIF_Trigger
+      }  // end if (onvif_event_listener  && ONVIF_Healthy)
 #endif
 
-    // Specifically told to be on.  Setting the score here is not enough to trigger the alarm. Must jump directly to ALARM
-    if (trigger_data->trigger_state == TriggerState::TRIGGER_ON) {
-      score += trigger_data->trigger_score;
-      Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
-      if (!cause.empty()) cause += ", ";
-      cause += trigger_data->trigger_cause;
-      Event::StringSet noteSet;
-      noteSet.insert(trigger_data->trigger_text);
-      noteSetMap[trigger_data->trigger_cause] = noteSet;
-      shared_data->state = state = ALARM;
-    }  // end if trigger_on
+      // Specifically told to be on.  Setting the score here is not enough to trigger the alarm. Must jump directly to ALARM
+      if (trigger_data->trigger_state == TriggerState::TRIGGER_ON) {
+        score += trigger_data->trigger_score;
+        Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
+        if (!cause.empty()) cause += ", ";
+        cause += trigger_data->trigger_cause;
+        Event::StringSet noteSet;
+        noteSet.insert(trigger_data->trigger_text);
+        noteSetMap[trigger_data->trigger_cause] = noteSet;
+        shared_data->state = state = ALARM;
+      }  // end if trigger_on
 
-    // FIXME this snap might not be the one that caused the signal change.  Need to store that in the packet.
-    if (signal_change) {
-      Debug(2, "Signal change, new signal is %d", signal);
-      if (!signal) {
-        if (event) {
-          event->addNote(SIGNAL_CAUSE, "Lost");
-          Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
-          closeEvent();
+      // FIXME this snap might not be the one that caused the signal change.  Need to store that in the packet.
+      if (signal_change) {
+        Debug(2, "Signal change, new signal is %d", signal);
+        if (!signal) {
+          if (event) {
+            event->addNote(SIGNAL_CAUSE, "Lost");
+            Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
+            closeEvent();
+          }
+        } else if (function == MOCORD or function == RECORD) {
+          if (!event) {
+            if (!cause.empty()) cause += ", ";
+            cause += SIGNAL_CAUSE + std::string(": Reacquired");
+          } else {
+            event->addNote(SIGNAL_CAUSE, "Reacquired");
+          }
+          if (snap->image)
+            ref_image.Assign(*(snap->image));
         }
-      } else if (function == MOCORD or function == RECORD) {
-        if (!event) {
-          if (!cause.empty()) cause += ", ";
-          cause += SIGNAL_CAUSE + std::string(": Reacquired");
-        } else {
-          event->addNote(SIGNAL_CAUSE, "Reacquired");
-        }
-        if (snap->image)
-          ref_image.Assign(*(snap->image));
-      }
-      shared_data->state = state = IDLE;
-      shared_data->active = signal;
-    }  // end if signal change
+        shared_data->state = state = IDLE;
+        shared_data->active = signal;
+      }  // end if signal change
 
-    if (signal) {
-      if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
-        // Check to see if linked monitors are triggering.
-        if (n_linked_monitors > 0) {
-          Debug(1, "Checking linked monitors");
-          // FIXME improve logic here
-          bool first_link = true;
-          Event::StringSet noteSet;
-          for (int i = 0; i < n_linked_monitors; i++) {
-            // TODO: Shouldn't we try to connect?
-            if (linked_monitors[i]->isConnected()) {
-              Debug(1, "Linked monitor %d %s is connected",
-                  linked_monitors[i]->Id(), linked_monitors[i]->Name());
-              if (linked_monitors[i]->hasAlarmed()) {
-                Debug(1, "Linked monitor %d %s is alarmed",
+      if (signal) {
+        if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
+          // Check to see if linked monitors are triggering.
+          if (n_linked_monitors > 0) {
+            Debug(1, "Checking linked monitors");
+            // FIXME improve logic here
+            bool first_link = true;
+            Event::StringSet noteSet;
+            for (int i = 0; i < n_linked_monitors; i++) {
+              // TODO: Shouldn't we try to connect?
+              if (linked_monitors[i]->isConnected()) {
+                Debug(1, "Linked monitor %d %s is connected",
                     linked_monitors[i]->Id(), linked_monitors[i]->Name());
-                if (!event) {
-                  if (first_link) {
-                    if (cause.length())
-                      cause += ", ";
-                    cause += LINKED_CAUSE;
-                    first_link = false;
+                if (linked_monitors[i]->hasAlarmed()) {
+                  Debug(1, "Linked monitor %d %s is alarmed",
+                      linked_monitors[i]->Id(), linked_monitors[i]->Name());
+                  if (!event) {
+                    if (first_link) {
+                      if (cause.length())
+                        cause += ", ";
+                      cause += LINKED_CAUSE;
+                      first_link = false;
+                    }
+                  }
+                  noteSet.insert(linked_monitors[i]->Name());
+                  score += linked_monitors[i]->lastFrameScore(); // 50;
+                } else {
+                  Debug(1, "Linked monitor %d %s is not alarmed",
+                      linked_monitors[i]->Id(), linked_monitors[i]->Name());
+                }
+              } else {
+                Debug(1, "Linked monitor %d %d is not connected. Connecting.", i, linked_monitors[i]->Id());
+                linked_monitors[i]->connect();
+              }
+            } // end foreach linked_monitor
+            if (noteSet.size() > 0)
+              noteSetMap[LINKED_CAUSE] = noteSet;
+          } // end if linked_monitors
+
+          /* try to stay behind the decoder. */
+          if (decoding_enabled) {
+            while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
+              // Need to wait for the decoder thread.
+              // decoder thread might be waiting on the lock for this packet.
+              // So we need to relinquish the lock and wait.  Waiting automatically relinquishes the lock
+              // So... 
+              Debug(1, "Waiting for decode");
+              packet_lock->wait();
+              //packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
+              //packetqueue.wait();
+              ////packet_lock->lock();
+            }  // end while ! decoded
+            if (zm_terminate or analysis_thread->Stopped()) {
+              delete packet_lock;
+              return false;
+            }
+          }  // end if decoding enabled
+
+          if (Active() and (function == MODECT or function == MOCORD)) {
+            Debug(3, "signal and active and modect");
+            Event::StringSet zoneSet;
+
+            if (analysis_fps_limit) {
+              double capture_fps = get_capture_fps();
+              motion_frame_skip = capture_fps / analysis_fps_limit;
+              Debug(1, "Recalculating motion_frame_skip (%d) = capture_fps(%f) / analysis_fps(%f)",
+                  motion_frame_skip, capture_fps, analysis_fps_limit);
+            }
+
+            if (snap->image) {
+              // decoder may not have been able to provide an image
+              if (!ref_image.Buffer()) {
+                Debug(1, "Assigning instead of Detecting");
+                ref_image.Assign(*(snap->image));
+                alarm_image.Assign(*(snap->image));
+              } else if (!(analysis_image_count % (motion_frame_skip+1))) {
+                Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
+                // Get new score.
+                snap->score = DetectMotion(*(snap->image), zoneSet);
+
+                if (!snap->analysis_image)
+                  snap->analysis_image = new Image(*(snap->image));
+                // lets construct alarm cause. It will contain cause + names of zones alarmed
+                snap->zone_stats.reserve(zones.size());
+                for (const Zone &zone : zones) {
+                  const ZoneStats &stats = zone.GetStats();
+                  stats.DumpToLog("After detect motion");
+                  snap->zone_stats.push_back(stats);
+                  if (zone.Alarmed()) {
+                    if (!snap->alarm_cause.empty()) snap->alarm_cause += ",";
+                    snap->alarm_cause += std::string(zone.Label());
+                    if (zone.AlarmImage())
+                      snap->analysis_image->Overlay(*(zone.AlarmImage()));
                   }
                 }
-                noteSet.insert(linked_monitors[i]->Name());
-                score += linked_monitors[i]->lastFrameScore(); // 50;
+                alarm_image.Assign(*(snap->analysis_image));
+                Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
+                    score, last_motion_score, snap->score);
+                motion_frame_count += 1;
+                last_motion_score = snap->score;
+
+                if (snap->score) {
+                  if (cause.length()) cause += ", ";
+                  cause += MOTION_CAUSE + std::string(":") + snap->alarm_cause;
+                  noteSetMap[MOTION_CAUSE] = zoneSet;
+                  score += snap->score;
+                } // end if motion_score
               } else {
-                Debug(1, "Linked monitor %d %s is not alarmed",
-                    linked_monitors[i]->Id(), linked_monitors[i]->Name());
+                Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
+                alarm_image.Assign(*(snap->image));
               }
             } else {
-              Debug(1, "Linked monitor %d %d is not connected. Connecting.", i, linked_monitors[i]->Id());
-              linked_monitors[i]->connect();
-            }
-          } // end foreach linked_monitor
-          if (noteSet.size() > 0)
-            noteSetMap[LINKED_CAUSE] = noteSet;
-        } // end if linked_monitors
-
-        /* try to stay behind the decoder. */
-        if (decoding_enabled) {
-          while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
-            // Need to wait for the decoder thread.
-            // decoder thread might be waiting on the lock for this packet.
-            // So we need to relinquish the lock and wait.  Waiting automatically relinquishes the lock
-            // So... 
-            Debug(1, "Waiting for decode");
-            packet_lock->wait();
-            //packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
-            //packetqueue.wait();
-            ////packet_lock->lock();
-          }  // end while ! decoded
-          if (zm_terminate or analysis_thread->Stopped()) {
-            delete packet_lock;
-            return false;
-          }
-        }  // end if decoding enabled
-
-        if (Active() and (function == MODECT or function == MOCORD)) {
-          Debug(3, "signal and active and modect");
-          Event::StringSet zoneSet;
-
-          if (analysis_fps_limit) {
-            double capture_fps = get_capture_fps();
-            motion_frame_skip = capture_fps / analysis_fps_limit;
-            Debug(1, "Recalculating motion_frame_skip (%d) = capture_fps(%f) / analysis_fps(%f)",
-                motion_frame_skip, capture_fps, analysis_fps_limit);
-          }
-
-          if (snap->image) {
-            // decoder may not have been able to provide an image
-            if (!ref_image.Buffer()) {
-              Debug(1, "Assigning instead of Detecting");
-              ref_image.Assign(*(snap->image));
-              alarm_image.Assign(*(snap->image));
-            } else if (!(analysis_image_count % (motion_frame_skip+1))) {
-              Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
-              // Get new score.
-              snap->score = DetectMotion(*(snap->image), zoneSet);
-
-              if (!snap->analysis_image)
-                snap->analysis_image = new Image(*(snap->image));
-              // lets construct alarm cause. It will contain cause + names of zones alarmed
-              snap->zone_stats.reserve(zones.size());
-              for (const Zone &zone : zones) {
-                const ZoneStats &stats = zone.GetStats();
-                stats.DumpToLog("After detect motion");
-                snap->zone_stats.push_back(stats);
-                if (zone.Alarmed()) {
-                  if (!snap->alarm_cause.empty()) snap->alarm_cause += ",";
-                  snap->alarm_cause += std::string(zone.Label());
-                  if (zone.AlarmImage())
-                    snap->analysis_image->Overlay(*(zone.AlarmImage()));
-                }
-              }
-              alarm_image.Assign(*(snap->analysis_image));
-              Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
-                  score, last_motion_score, snap->score);
-              motion_frame_count += 1;
-              last_motion_score = snap->score;
-
-              if (snap->score) {
-                if (cause.length()) cause += ", ";
-                cause += MOTION_CAUSE + std::string(":") + snap->alarm_cause;
-                noteSetMap[MOTION_CAUSE] = zoneSet;
-                score += snap->score;
-              } // end if motion_score
-            } else {
-              Debug(1, "Skipped motion detection last motion score was %d", last_motion_score);
-              alarm_image.Assign(*(snap->image));
-            }
+              Debug(1, "no image so skipping motion detection");
+            }  // end if has image
+  //score += last_motion_score;
           } else {
-            Debug(1, "no image so skipping motion detection");
-          }  // end if has image
-//score += last_motion_score;
-        } else {
-          Debug(1, "Not Active(%d) enabled %d shared->active %d doing motion detection: %d",
-              Active(), enabled, shared_data->active,
-              (function == MODECT or function == MOCORD)
-              );
-        } // end if active and doing motion detection
+            Debug(1, "Not Active(%d) enabled %d shared->active %d doing motion detection: %d",
+                Active(), enabled, shared_data->active,
+                (function == MODECT or function == MOCORD)
+                );
+          } // end if active and doing motion detection
 
-        if (function == RECORD or function == MOCORD) {
-          // If doing record, check to see if we need to close the event or not.
-          if (event) {
-            Debug(2, "Have event %" PRIu64 " in record", event->Id());
+          if (function == RECORD or function == MOCORD) {
+            // If doing record, check to see if we need to close the event or not.
+            if (event) {
+              Debug(2, "Have event %" PRIu64 " in record", event->Id());
 
-            if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)
-                && ((function == MOCORD && event_close_mode != CLOSE_TIME)
-                    || (function == RECORD && event_close_mode == CLOSE_TIME)
-                    || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
-              Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
-                   name.c_str(),
-                   image_count,
-                   event->Id(),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
-                   static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
-                   static_cast<int64>(Seconds(section_length).count()));
-              closeEvent();
-            }  // end if section_length
-          }  // end if event
-
-          if (!event) {
-            event = openEvent(snap, cause.empty() ? "Continuous" : cause, noteSetMap);
-
-            Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
-                name.c_str(), analysis_image_count, event->Id());
-            /* To prevent cancelling out an existing alert\prealarm\alarm state */
-            // This ignores current score status.  This should all come after the state machine calculations
-            if (state == IDLE) {
-              shared_data->state = state = TAPE;
-            }
-          } // end if ! event
-        } // end if RECORDING
-
-        // If motion detecting, score will be > 0 on motion, but if skipping frames, might not be. So also test snap->score
-        if ((score > 0) or ((snap->score > 0) and (function != MONITOR))) {
-          if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
-            // If we should end then previous continuous event and start a new non-continuous event
-            if (event && event->Frames()
-                && !event->AlarmFrames()
-                && (event_close_mode == CLOSE_ALARM)
-                // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
-                && ((snap->timestamp - event->StartTime()) >= min_section_length)
-                && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
-              Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
-                  name.c_str(), image_count, event->Id());
-              closeEvent();
-            } else if (event) {
-              // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
-              Debug(3,
-                    "pre_alarm_count in event %d of %d, event frames %d, alarm frames %d event length %" PRIi64 " >=? %" PRIi64 " min close mode is ALARM? %d",
-                    Event::PreAlarmCount(), pre_event_count,
-                    event->Frames(),
-                    event->AlarmFrames(),
-                    static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
-                    static_cast<int64>(Seconds(min_section_length).count()),
-                    (event_close_mode == CLOSE_ALARM));
-            }
-            if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
-              Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
-                  name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
-
-              if (!event) {
-                event = openEvent(snap, cause, noteSetMap);
-                Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
-              }  // end if no event, so start it
-              shared_data->state = state = ALARM;
-              if (alarm_frame_count) {
-                Debug(1, "alarm frame count so SavePreAlarmFrames");
-                event->SavePreAlarmFrames();
-              }
-            } else if (state != PREALARM) {
-              Info("%s: %03d - Gone into prealarm state", name.c_str(), analysis_image_count);
-              shared_data->state = state = PREALARM;
-            }
-          } else if (state == ALERT) {
-            alert_to_alarm_frame_count--;
-            Info("%s: %03d - Alarmed frame while in alert state. Consecutive alarmed frames left to return to alarm state: %03d",
-                name.c_str(), analysis_image_count, alert_to_alarm_frame_count);
-            if (alert_to_alarm_frame_count == 0) {
-              Info("%s: %03d - Gone back into alarm state", name.c_str(), analysis_image_count);
-              shared_data->state = state = ALARM;
-            }
-          } else if (state == TAPE) {
-            // Already recording, but IDLE so switch to ALARM
-            shared_data->state = state = ALARM;
-            Debug(1, "Was in TAPE, going into ALARM");
-          } else {
-            Debug(1, "Staying in %s", State_Strings[state].c_str());
-          }
-          if (state == ALARM) {
-            last_alarm_count = analysis_image_count; 
-          } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
-        } else if (!score and (snap->score == 0)) { // snap->score means -1 which means didn't do motion detection so don't do state transition
-          Debug(1, "!score %s", State_Strings[state].c_str());
-          alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
-
-          if (state == ALARM) {
-            Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
-            shared_data->state = state = ALERT;
-          } else if (state == ALERT) {
-            if (
-                ((analysis_image_count - last_alarm_count) > post_event_count)
-                &&
-               ((snap->timestamp - event->StartTime()) >= min_section_length)) {
-              Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
-                  name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
-              if (
-                  (function != RECORD && function != MOCORD)
-                  ||
-                  (event_close_mode == CLOSE_ALARM || event_close_mode==CLOSE_IDLE)
-                  ) {
-                shared_data->state = state = IDLE;
-                Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
-                    name.c_str(), analysis_image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
+              if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)
+                  && ((function == MOCORD && event_close_mode != CLOSE_TIME)
+                      || (function == RECORD && event_close_mode == CLOSE_TIME)
+                      || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
+                Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
+                     name.c_str(),
+                     image_count,
+                     event->Id(),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
+                     static_cast<int64>(Seconds(section_length).count()));
                 closeEvent();
-              } else {
+              }  // end if section_length
+            }  // end if event
+
+            if (!event) {
+              event = openEvent(snap, cause.empty() ? "Continuous" : cause, noteSetMap);
+
+              Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
+                  name.c_str(), analysis_image_count, event->Id());
+              /* To prevent cancelling out an existing alert\prealarm\alarm state */
+              // This ignores current score status.  This should all come after the state machine calculations
+              if (state == IDLE) {
                 shared_data->state = state = TAPE;
               }
+            } // end if ! event
+          } // end if RECORDING
+
+          // If motion detecting, score will be > 0 on motion, but if skipping frames, might not be. So also test snap->score
+          if ((score > 0) or ((snap->score > 0) and (function != MONITOR))) {
+            if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
+              // If we should end then previous continuous event and start a new non-continuous event
+              if (event && event->Frames()
+                  && !event->AlarmFrames()
+                  && (event_close_mode == CLOSE_ALARM)
+                  // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
+                  && ((snap->timestamp - event->StartTime()) >= min_section_length)
+                  && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
+                Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
+                    name.c_str(), image_count, event->Id());
+                closeEvent();
+              } else if (event) {
+                // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
+                Debug(3,
+                      "pre_alarm_count in event %d of %d, event frames %d, alarm frames %d event length %" PRIi64 " >=? %" PRIi64 " min close mode is ALARM? %d",
+                      Event::PreAlarmCount(), pre_event_count,
+                      event->Frames(),
+                      event->AlarmFrames(),
+                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
+                      static_cast<int64>(Seconds(min_section_length).count()),
+                      (event_close_mode == CLOSE_ALARM));
+              }
+              if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
+                Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
+                    name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
+
+                if (!event) {
+                  event = openEvent(snap, cause, noteSetMap);
+                  Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
+                }  // end if no event, so start it
+                shared_data->state = state = ALARM;
+                if (alarm_frame_count) {
+                  Debug(1, "alarm frame count so SavePreAlarmFrames");
+                  event->SavePreAlarmFrames();
+                }
+              } else if (state != PREALARM) {
+                Info("%s: %03d - Gone into prealarm state", name.c_str(), analysis_image_count);
+                shared_data->state = state = PREALARM;
+              }
+            } else if (state == ALERT) {
+              alert_to_alarm_frame_count--;
+              Info("%s: %03d - Alarmed frame while in alert state. Consecutive alarmed frames left to return to alarm state: %03d",
+                  name.c_str(), analysis_image_count, alert_to_alarm_frame_count);
+              if (alert_to_alarm_frame_count == 0) {
+                Info("%s: %03d - Gone back into alarm state", name.c_str(), analysis_image_count);
+                shared_data->state = state = ALARM;
+              }
+            } else if (state == TAPE) {
+              // Already recording, but IDLE so switch to ALARM
+              shared_data->state = state = ALARM;
+              Debug(1, "Was in TAPE, going into ALARM");
+            } else {
+              Debug(1, "Staying in %s", State_Strings[state].c_str());
             }
-          } else if (state == PREALARM) {
-            // Back to IDLE
-            shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
-          } else {
-            Debug(1,
-                  "State %d %s because analysis_image_count(%d)-last_alarm_count(%d) > post_event_count(%d) and timestamp.tv_sec(%" PRIi64 ") - recording.tv_src(%" PRIi64 ") >= min_section_length(%" PRIi64 ")",
-                  state,
-                  State_Strings[state].c_str(),
-                  analysis_image_count,
-                  last_alarm_count,
-                  post_event_count,
-                  static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
-                  static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
-                  static_cast<int64>(Seconds(min_section_length).count()));
-          }
-          if (Event::PreAlarmCount())
-            Event::EmptyPreAlarmFrames();
-        } // end if score or not
+            if (state == ALARM) {
+              last_alarm_count = analysis_image_count; 
+            } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
+          } else if (!score and (snap->score == 0)) { // snap->score means -1 which means didn't do motion detection so don't do state transition
+            Debug(1, "!score %s", State_Strings[state].c_str());
+            alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
 
-        if (score > snap->score)
-          snap->score = score;
+            if (state == ALARM) {
+              Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
+              shared_data->state = state = ALERT;
+            } else if (state == ALERT) {
+              if (
+                  ((analysis_image_count - last_alarm_count) > post_event_count)
+                  &&
+                 ((snap->timestamp - event->StartTime()) >= min_section_length)) {
+                Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
+                    name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
+                if (
+                    (function != RECORD && function != MOCORD)
+                    ||
+                    (event_close_mode == CLOSE_ALARM || event_close_mode==CLOSE_IDLE)
+                    ) {
+                  shared_data->state = state = IDLE;
+                  Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
+                      name.c_str(), analysis_image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
+                  closeEvent();
+                } else {
+                  shared_data->state = state = TAPE;
+                }
+              }
+            } else if (state == PREALARM) {
+              // Back to IDLE
+              shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
+            } else {
+              Debug(1,
+                    "State %d %s because analysis_image_count(%d)-last_alarm_count(%d) > post_event_count(%d) and timestamp.tv_sec(%" PRIi64 ") - recording.tv_src(%" PRIi64 ") >= min_section_length(%" PRIi64 ")",
+                    state,
+                    State_Strings[state].c_str(),
+                    analysis_image_count,
+                    last_alarm_count,
+                    post_event_count,
+                    static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
+                    static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
+                    static_cast<int64>(Seconds(min_section_length).count()));
+            }
+            if (Event::PreAlarmCount())
+              Event::EmptyPreAlarmFrames();
+          } // end if score or not
 
-        if (state == PREALARM) {
-          // incremement pre alarm image count
-          Event::AddPreAlarmFrame(snap->image, snap->timestamp, score, nullptr);
-        } else if (state == ALARM) {
-          if (event) {
-            if (noteSetMap.size() > 0)
+          if (score > snap->score)
+            snap->score = score;
+
+          if (state == PREALARM) {
+            // incremement pre alarm image count
+            Event::AddPreAlarmFrame(snap->image, snap->timestamp, score, nullptr);
+          } else if (state == ALARM) {
+            if (event) {
+              if (noteSetMap.size() > 0)
+                event->updateNotes(noteSetMap);
+              if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)) {
+                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
+                        name.c_str(), analysis_image_count, event->Id(),
+                        static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
+                        static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
+                        static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - GetVideoWriterStartTime()).count()),
+                        static_cast<int64>(Seconds(section_length).count()));
+                closeEvent();
+                event = openEvent(snap, cause, noteSetMap);
+              }
+            } else {
+              Error("ALARM but no event");
+            }
+          } else if (state == ALERT) {
+            // Alert means this frame has no motion, but we were alarmed and are still recording.
+            if ((noteSetMap.size() > 0) and event)
               event->updateNotes(noteSetMap);
-            if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)) {
-              Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
-                      name.c_str(), analysis_image_count, event->Id(),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - GetVideoWriterStartTime()).count()),
-                      static_cast<int64>(Seconds(section_length).count()));
-              closeEvent();
-              event = openEvent(snap, cause, noteSetMap);
+          } else if (state == TAPE) {
+            // bulk frame code moved to event.
+          } // end if state machine
+
+          if ((function == MODECT or function == MOCORD) and snap->image) {
+            if (!ref_image.Buffer()) {
+              Debug(1, "Assigning");
+              ref_image.Assign(*(snap->image));
+            } else {
+              Debug(1, "Blending");
+              ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
+              Debug(1, "Done Blending");
             }
-          } else {
-            Error("ALARM but no event");
           }
-        } else if (state == ALERT) {
-          // Alert means this frame has no motion, but we were alarmed and are still recording.
-          if ((noteSetMap.size() > 0) and event)
-            event->updateNotes(noteSetMap);
-        } else if (state == TAPE) {
-          // bulk frame code moved to event.
-        } // end if state machine
+          last_signal = signal;
+        } // end if videostream
+      } // end if signal
+      shared_data->last_frame_score = score;
+    } else {
+      Debug(3, "trigger == off");
+      if (event) {
+        Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id());
+        closeEvent();
+      }
+      shared_data->state = state = IDLE;
+    } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
 
-        if ((function == MODECT or function == MOCORD) and snap->image) {
-          if (!ref_image.Buffer()) {
-            Debug(1, "Assigning");
-            ref_image.Assign(*(snap->image));
-          } else {
-            Debug(1, "Blending");
-            ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
-            Debug(1, "Done Blending");
-          }
-        }
-        last_signal = signal;
-      } // end if videostream
-    } // end if signal
-    shared_data->last_frame_score = score;
-  } else {
-    Debug(3, "trigger == off");
-    if (event) {
-      Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id());
-      closeEvent();
-    }
-    shared_data->state = state = IDLE;
-  } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
-
-  if (event) event->AddPacket(snap);
+    if (event) event->AddPacket(snap);
+  } // end scope for event_lock
 
   // In the case where people have pre-alarm frames, the web ui will generate the frame images
   // from the mp4. So no one will notice anyways.

From eb59b4de7f920236520724598afd26e8eb503415 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 14:20:17 -0500
Subject: [PATCH 301/501] Clear out dead code

---
 src/zm_event.h | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/zm_event.h b/src/zm_event.h
index be6d922de..74955d23f 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -178,18 +178,6 @@ class Event {
       return pre_alarm_count;
     }
     static void EmptyPreAlarmFrames() {
-#if 0
-      while ( pre_alarm_count > 0 ) {
-				int i = pre_alarm_count - 1;
-				delete pre_alarm_data[i].image;
-				pre_alarm_data[i].image = nullptr;
-				if ( pre_alarm_data[i].alarm_frame ) {
-					delete pre_alarm_data[i].alarm_frame;
-					pre_alarm_data[i].alarm_frame = nullptr;
-				}
-				pre_alarm_count--;
-			}
-#endif
       pre_alarm_count = 0;
     }
     static void AddPreAlarmFrame(
@@ -198,28 +186,10 @@ class Event {
         int score=0,
         Image *alarm_frame=nullptr
         ) {
-#if 0
-      pre_alarm_data[pre_alarm_count].image = new Image(*image);
-      pre_alarm_data[pre_alarm_count].timestamp = timestamp;
-      pre_alarm_data[pre_alarm_count].score = score;
-      if ( alarm_frame ) {
-        pre_alarm_data[pre_alarm_count].alarm_frame = new Image(*alarm_frame);
-      }
-#endif
       pre_alarm_count++;
     }
     void SavePreAlarmFrames() {
-#if 0
-      for ( int i = 0; i < pre_alarm_count; i++ ) {
-        AddFrame(
-						pre_alarm_data[i].image,
-						pre_alarm_data[i].timestamp,
-						pre_alarm_data[i].score,
-						pre_alarm_data[i].alarm_frame);
-			}
-#endif
       EmptyPreAlarmFrames();
     }
 };
-
 #endif // ZM_EVENT_H

From 1fe4bbedc0e2e810ec5d036e73d00e9766975636 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 14:35:16 -0500
Subject: [PATCH 302/501] use min_section_length instead of 0 when testing
 minimumm section length.  Use event->Duration instead of
 snap-event->StartTime because this snap will not be included in the event.
 This results in events of 29.59 seconds instead of 30 seconds.

---
 src/zm_monitor.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e8b1bb1c0..4a707889f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2043,7 +2043,7 @@ bool Monitor::Analyse() {
             if (event) {
               Debug(2, "Have event %" PRIu64 " in record", event->Id());
 
-              if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)
+              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)
                   && ((function == MOCORD && event_close_mode != CLOSE_TIME)
                       || (function == RECORD && event_close_mode == CLOSE_TIME)
                       || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
@@ -2080,7 +2080,7 @@ bool Monitor::Analyse() {
                   && !event->AlarmFrames()
                   && (event_close_mode == CLOSE_ALARM)
                   // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
-                  && ((snap->timestamp - event->StartTime()) >= min_section_length)
+                  && (event->Duration() >= min_section_length)
                   && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
                 Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
                     name.c_str(), image_count, event->Id());
@@ -2092,7 +2092,7 @@ bool Monitor::Analyse() {
                       Event::PreAlarmCount(), pre_event_count,
                       event->Frames(),
                       event->AlarmFrames(),
-                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
+                      static_cast<int64>(std::chrono::duration_cast<Seconds>(event->Duration()).count()),
                       static_cast<int64>(Seconds(min_section_length).count()),
                       (event_close_mode == CLOSE_ALARM));
               }
@@ -2142,7 +2142,7 @@ bool Monitor::Analyse() {
               if (
                   ((analysis_image_count - last_alarm_count) > post_event_count)
                   &&
-                 ((snap->timestamp - event->StartTime()) >= min_section_length)) {
+                 (event->Duration() >= min_section_length)) {
                 Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                     name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
                 if (
@@ -2187,12 +2187,12 @@ bool Monitor::Analyse() {
             if (event) {
               if (noteSetMap.size() > 0)
                 event->updateNotes(noteSetMap);
-              if (section_length != Seconds(0) && (snap->timestamp - event->StartTime() >= section_length)) {
+              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)) {
                 Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
                         name.c_str(), analysis_image_count, event->Id(),
                         static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
-                        static_cast<int64>(std::chrono::duration_cast<Seconds>(GetVideoWriterStartTime().time_since_epoch()).count()),
-                        static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - GetVideoWriterStartTime()).count()),
+                        static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
+                        static_cast<int64>(std::chrono::duration_cast<Seconds>(event->Duration()).count()),
                         static_cast<int64>(Seconds(section_length).count()));
                 closeEvent();
                 event = openEvent(snap, cause, noteSetMap);

From a4b0aa442a655337c808bde8d0dcabcc0b82851f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 14:35:26 -0500
Subject: [PATCH 303/501] Introduce event->Duration()

---
 src/zm_event.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_event.h b/src/zm_event.h
index 74955d23f..31a23fad4 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -132,6 +132,7 @@ class Event {
 
     SystemTimePoint StartTime() const { return start_time; }
     SystemTimePoint EndTime() const { return end_time; }
+    TimePoint::duration Duration() const { return end_time - start_time; };
 
     void AddPacket(const std::shared_ptr<ZMPacket> &p);
     void AddPacket_(const std::shared_ptr<ZMPacket> &p);

From 3296e142644e6d6aae0dde02b18a6576088d6622 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 15:19:28 -0500
Subject: [PATCH 304/501] Move RECORD/MOCORD length close code after the state
 machine.  If the state machine has taken action, this code likely won't
 trigger, but the way it was before it could ignore current state.  Plus I
 think it logically keeps relevant logic closer together. Must use
 packetqueue.unlock after decoding as analysis might be waiting in the
 packetqueue. Doing this will do both notifies. Disable de-interlacing for
 decoding style monitors.

---
 src/zm_monitor.cpp | 76 ++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4a707889f..96d082f71 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2038,39 +2038,6 @@ bool Monitor::Analyse() {
                 );
           } // end if active and doing motion detection
 
-          if (function == RECORD or function == MOCORD) {
-            // If doing record, check to see if we need to close the event or not.
-            if (event) {
-              Debug(2, "Have event %" PRIu64 " in record", event->Id());
-
-              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)
-                  && ((function == MOCORD && event_close_mode != CLOSE_TIME)
-                      || (function == RECORD && event_close_mode == CLOSE_TIME)
-                      || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
-                Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
-                     name.c_str(),
-                     image_count,
-                     event->Id(),
-                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
-                     static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
-                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
-                     static_cast<int64>(Seconds(section_length).count()));
-                closeEvent();
-              }  // end if section_length
-            }  // end if event
-
-            if (!event) {
-              event = openEvent(snap, cause.empty() ? "Continuous" : cause, noteSetMap);
-
-              Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
-                  name.c_str(), analysis_image_count, event->Id());
-              /* To prevent cancelling out an existing alert\prealarm\alarm state */
-              // This ignores current score status.  This should all come after the state machine calculations
-              if (state == IDLE) {
-                shared_data->state = state = TAPE;
-              }
-            } // end if ! event
-          } // end if RECORDING
 
           // If motion detecting, score will be > 0 on motion, but if skipping frames, might not be. So also test snap->score
           if ((score > 0) or ((snap->score > 0) and (function != MONITOR))) {
@@ -2208,6 +2175,40 @@ bool Monitor::Analyse() {
             // bulk frame code moved to event.
           } // end if state machine
 
+          if (function == RECORD or function == MOCORD) {
+            // If doing record, check to see if we need to close the event or not.
+            if (event) {
+              Debug(2, "Have event %" PRIu64 " in record", event->Id());
+
+              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)
+                  && ((function == MOCORD && event_close_mode != CLOSE_TIME)
+                      || (function == RECORD && event_close_mode == CLOSE_TIME)
+                      || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
+                Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
+                     name.c_str(),
+                     image_count,
+                     event->Id(),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
+                     static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp - event->StartTime()).count()),
+                     static_cast<int64>(Seconds(section_length).count()));
+                closeEvent();
+              }  // end if section_length
+            }  // end if event
+
+            if (!event) {
+              event = openEvent(snap, cause.empty() ? "Continuous" : cause, noteSetMap);
+
+              Info("%s: %03d - Opened new event %" PRIu64 ", continuous section start",
+                  name.c_str(), analysis_image_count, event->Id());
+              /* To prevent cancelling out an existing alert\prealarm\alarm state */
+              // This ignores current score status.  This should all come after the state machine calculations
+              if (state == IDLE) {
+                shared_data->state = state = TAPE;
+              }
+            } // end if ! event
+          } // end if RECORDING
+
           if ((function == MODECT or function == MOCORD) and snap->image) {
             if (!ref_image.Buffer()) {
               Debug(1, "Assigning");
@@ -2685,7 +2686,11 @@ bool Monitor::Decode() {
             return false;
           }
           if (deinterlace_packet_lock->packet_->codec_type == packet->codec_type) {
-            capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
+            if (!deinterlace_packet_lock->packet_->image) {
+              Error("Can't de-interlace when we have to decode.  De-Interlacing should only be useful on old low res local cams");
+            } else {
+              capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
+            }
             delete deinterlace_packet_lock;
             //packetqueue.unlock(deinterlace_packet_lock);
             break;
@@ -2738,8 +2743,7 @@ bool Monitor::Decode() {
   shared_data->signal = (capture_image and signal_check_points) ? CheckSignal(capture_image) : true;
   shared_data->last_write_index = index;
   shared_data->last_write_time = std::chrono::system_clock::to_time_t(packet->timestamp);
-  delete packet_lock;
-  //packetqueue.unlock(packet_lock);
+  packetqueue.unlock(packet_lock);
   return true;
 }  // end bool Monitor::Decode()
 

From aba387f20255cbc8766056d793899c3cafb9a5fa Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 16:31:52 -0500
Subject: [PATCH 305/501] Fix !== which should be >=

---
 src/zm_monitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 96d082f71..18f72f6b3 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2154,7 +2154,7 @@ bool Monitor::Analyse() {
             if (event) {
               if (noteSetMap.size() > 0)
                 event->updateNotes(noteSetMap);
-              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)) {
+              if (section_length >= Seconds(min_section_length) && (event->Duration() >= section_length)) {
                 Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64,
                         name.c_str(), analysis_image_count, event->Id(),
                         static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
@@ -2180,7 +2180,7 @@ bool Monitor::Analyse() {
             if (event) {
               Debug(2, "Have event %" PRIu64 " in record", event->Id());
 
-              if (section_length != Seconds(min_section_length) && (event->Duration() >= section_length)
+              if (section_length >= Seconds(min_section_length) && (event->Duration() >= section_length)
                   && ((function == MOCORD && event_close_mode != CLOSE_TIME)
                       || (function == RECORD && event_close_mode == CLOSE_TIME)
                       || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {

From 8d757d37a6a85f6b8eeef4b5fa47d02bdc927f0e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 14 Jan 2022 16:43:59 -0500
Subject: [PATCH 306/501] fix eslint

---
 web/skins/classic/views/js/cycle.js   |  17 ++--
 web/skins/classic/views/js/montage.js | 102 +++++++++++------------
 web/skins/classic/views/js/watch.js   | 115 +++++++++++++-------------
 3 files changed, 118 insertions(+), 116 deletions(-)

diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 401e36760..670671faa 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -62,7 +62,7 @@ function initCycle() {
             opaqueId: opaqueId,
             success: function(pluginHandle) {
               streaming2 = pluginHandle;
-              var body = { "request": "watch", "id":monitorData[monIdx].id };
+              var body = {"request": "watch", "id": monitorData[monIdx].id};
               streaming2.send({"message": body});
             },
             error: function(error) {
@@ -72,26 +72,27 @@ function initCycle() {
               Janus.debug(" ::: Got a message :::");
               Janus.debug(msg);
               var result = msg["result"];
-              if(result !== null && result !== undefined) {
-                if(result["status"] !== undefined && result["status"] !== null) {
-                  var status = result["status"];
+              if (result !== null && result !== undefined) {
+                if (result["status"] !== undefined && result["status"] !== null) {
+                  const status = result["status"];
+                  console.log(status);
                 }
-              } else if(msg["error"] !== undefined && msg["error"] !== null) {
+              } else if (msg["error"] !== undefined && msg["error"] !== null) {
                 Janus.debug(msg["error"]);
                 return;
               }
-              if(jsep !== undefined && jsep !== null) {
+              if (jsep !== undefined && jsep !== null) {
                 Janus.debug("Handling SDP as well...");
                 Janus.debug(jsep);
                 // Offer from the plugin, let's answer
                 streaming2.createAnswer({
                   jsep: jsep,
                   // We want recvonly audio/video and, if negotiated, datachannels
-                  media: { audioSend: false, videoSend: false, data: true },
+                  media: {audioSend: false, videoSend: false, data: true},
                   success: function(jsep) {
                     Janus.debug("Got SDP!");
                     Janus.debug(jsep);
-                    var body = { "request": "start"};
+                    var body = {"request": "start"};
                     streaming2.send({"message": body, "jsep": jsep});
                   },
                   error: function(error) {
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index d02fb63f8..369f23e8f 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -307,7 +307,7 @@ function initPage() {
     $j("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
   }
   var initJanus = false;
-  var streamingMonitors = [];
+  //var streamingMonitors = [];
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
     if (monitorData[i].janusEnabled) {
       initJanus = true;
@@ -353,57 +353,57 @@ function watchFullscreen() {
 }
 
 function attachVideo(janus, i) {
-      janus.attach({
-        plugin: "janus.plugin.streaming",
-        opaqueId:"streamingtest-"+Janus.randomString(12),
-        success: function(pluginHandle) {
-          janusMonitors[i].streaming = pluginHandle;
-          var body = { "request": "watch", "id":parseInt(janusMonitors[i].id) };
-          janusMonitors[i].streaming.send({"message": body});
-        },
-        error: function(error) {
-          Janus.error("  -- Error attaching plugin... ", error);
-        },
-        onmessage: function(msg, jsep) {
-          Janus.debug(" ::: Got a message :::");
-          Janus.debug(msg);
-          var result = msg["result"];
-          if(result !== null && result !== undefined) {
-            if(result["status"] !== undefined && result["status"] !== null) {
-              var status = result["status"];
-            }
-          } else if(msg["error"] !== undefined && msg["error"] !== null) {
-            Janus.error(msg["error"]);
-            return;
-          }
-          if(jsep !== undefined && jsep !== null) {
-            Janus.debug("Handling SDP as well...");
-            Janus.debug(jsep);
-            // Offer from the plugin, let's answer
-            janusMonitors[i].streaming.createAnswer({
-              jsep: jsep,
-              // We want recvonly audio/video and, if negotiated, datachannels
-              media: { audioSend: false, videoSend: false, data: true },
-              success: function(jsep) {
-                Janus.debug("Got SDP!");
-                Janus.debug(jsep);
-                var body = { "request": "start"};
-                janusMonitors[i].streaming.send({"message": body, "jsep": jsep});
-              },
-              error: function(error) {
-                Janus.error("WebRTC error:", error);
-              }
-            });
-          }
-        }, //onmessage function
-        onremotestream: function(ourstream) {
-          Janus.debug(" ::: Got a remote track :::");
-          Janus.debug(ourstream);
-          Janus.attachMediaStream(document.getElementById("liveStream" + janusMonitors[i].id), ourstream);
-          document.getElementById("liveStream" + janusMonitors[i].id).play()
+  janus.attach({
+    plugin: "janus.plugin.streaming",
+    opaqueId: "streamingtest-"+Janus.randomString(12),
+    success: function(pluginHandle) {
+      janusMonitors[i].streaming = pluginHandle;
+      var body = {"request": "watch", "id": parseInt(janusMonitors[i].id)};
+      janusMonitors[i].streaming.send({"message": body});
+    },
+    error: function(error) {
+      Janus.error("  -- Error attaching plugin... ", error);
+    },
+    onmessage: function(msg, jsep) {
+      Janus.debug(" ::: Got a message :::");
+      Janus.debug(msg);
+      var result = msg["result"];
+      if (result !== null && result !== undefined) {
+        if (result["status"] !== undefined && result["status"] !== null) {
+          const status = result["status"];
+          console.log(status);
         }
-      });// attach
-
+      } else if (msg["error"] !== undefined && msg["error"] !== null) {
+        Janus.error(msg["error"]);
+        return;
+      }
+      if (jsep !== undefined && jsep !== null) {
+        Janus.debug("Handling SDP as well...");
+        Janus.debug(jsep);
+        // Offer from the plugin, let's answer
+        janusMonitors[i].streaming.createAnswer({
+          jsep: jsep,
+          // We want recvonly audio/video and, if negotiated, datachannels
+          media: {audioSend: false, videoSend: false, data: true},
+          success: function(jsep) {
+            Janus.debug("Got SDP!");
+            Janus.debug(jsep);
+            var body = {"request": "start"};
+            janusMonitors[i].streaming.send({"message": body, "jsep": jsep});
+          },
+          error: function(error) {
+            Janus.error("WebRTC error:", error);
+          }
+        });
+      }
+    }, //onmessage function
+    onremotestream: function(ourstream) {
+      Janus.debug(" ::: Got a remote track :::");
+      Janus.debug(ourstream);
+      Janus.attachMediaStream(document.getElementById("liveStream" + janusMonitors[i].id), ourstream);
+      document.getElementById("liveStream" + janusMonitors[i].id).play();
+    }
+  });// attach
 }
 // Kick everything off
 $j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index f3ea6385f..13d54928a 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -911,65 +911,66 @@ function initPage() {
       }
     }
     if (streamMode == 'janus') {
-    server = "http://" + window.location.hostname + ":8088/janus";
-    opaqueId = "streamingtest-"+Janus.randomString(12);
-    Janus.init({debug: "all", callback: function() {
-      janus = new Janus({
-        server: server,
-        success: function() {
-          janus.attach({
-            plugin: "janus.plugin.streaming",
-            opaqueId: opaqueId,
-            success: function(pluginHandle) {
-              streaming2 = pluginHandle;
-              var body = { "request": "watch", "id":monitorId };
-              streaming2.send({"message": body});
-            },
-            error: function(error) {
-              Janus.error("  -- Error attaching plugin... ", error);
-            },
-            onmessage: function(msg, jsep) {
-              Janus.debug(" ::: Got a message :::");
-              Janus.debug(msg);
-              var result = msg["result"];
-              if(result !== null && result !== undefined) {
-                if(result["status"] !== undefined && result["status"] !== null) {
-                  var status = result["status"];
-                }
-              } else if(msg["error"] !== undefined && msg["error"] !== null) {
-                Janus.error(msg["error"]);
-                return;
-              }
-              if(jsep !== undefined && jsep !== null) {
-                Janus.debug("Handling SDP as well...");
-                Janus.debug(jsep);
-                // Offer from the plugin, let's answer
-                streaming2.createAnswer({
-                  jsep: jsep,
-                  // We want recvonly audio/video and, if negotiated, datachannels
-                  media: { audioSend: false, videoSend: false, data: true },
-                  success: function(jsep) {
-                    Janus.debug("Got SDP!");
-                    Janus.debug(jsep);
-                    var body = { "request": "start"};
-                    streaming2.send({"message": body, "jsep": jsep});
-                  },
-                  error: function(error) {
-                    Janus.error("WebRTC error:", error);
+      server = "http://" + window.location.hostname + ":8088/janus";
+      opaqueId = "streamingtest-"+Janus.randomString(12);
+      Janus.init({debug: "all", callback: function() {
+        janus = new Janus({
+          server: server,
+          success: function() {
+            janus.attach({
+              plugin: "janus.plugin.streaming",
+              opaqueId: opaqueId,
+              success: function(pluginHandle) {
+                streaming2 = pluginHandle;
+                var body = {"request": "watch", "id": monitorId};
+                streaming2.send({"message": body});
+              },
+              error: function(error) {
+                Janus.error("  -- Error attaching plugin... ", error);
+              },
+              onmessage: function(msg, jsep) {
+                Janus.debug(" ::: Got a message :::");
+                Janus.debug(msg);
+                var result = msg["result"];
+                if (result !== null && result !== undefined) {
+                  if (result["status"] !== undefined && result["status"] !== null) {
+                    var status = result["status"];
+                    console.log(status);
                   }
-                });
+                } else if (msg["error"] !== undefined && msg["error"] !== null) {
+                  Janus.error(msg["error"]);
+                  return;
+                }
+                if (jsep !== undefined && jsep !== null) {
+                  Janus.debug("Handling SDP as well...");
+                  Janus.debug(jsep);
+                  // Offer from the plugin, let's answer
+                  streaming2.createAnswer({
+                    jsep: jsep,
+                    // We want recvonly audio/video and, if negotiated, datachannels
+                    media: {audioSend: false, videoSend: false, data: true},
+                    success: function(jsep) {
+                      Janus.debug("Got SDP!");
+                      Janus.debug(jsep);
+                      var body = {"request": "start"};
+                      streaming2.send({"message": body, "jsep": jsep});
+                    },
+                    error: function(error) {
+                      Janus.error("WebRTC error:", error);
+                    }
+                  });
+                }
+              }, //onmessage function
+              onremotestream: function(stream) {
+                Janus.debug(" ::: Got a remote track :::");
+                Janus.debug(stream);
+                Janus.attachMediaStream(document.getElementById("liveStream" + monitorId), stream);
+                document.getElementById("liveStream" + monitorId).play();
               }
-            }, //onmessage function
-            onremotestream: function(stream) {
-              Janus.debug(" ::: Got a remote track :::");
-              Janus.debug(stream);
-              Janus.attachMediaStream(document.getElementById("liveStream" + monitorId), stream);
-              document.getElementById("liveStream" + monitorId).play();
-            }
-          });// attach
-        } //Success functio
-      }); //new Janus
-    }}); //janus.init callback
+            }); // attach
+          } //Success functio
+        }); //new Janus
+      }}); //janus.init callback
     } else if (canStreamNative || (streamMode == 'single')) {
       var streamImg = $j('#imageFeed img');
       if (!streamImg) streamImg = $j('#imageFeed object');

From 59056b41038aaf2f3bbe2445ec54ae232e1b22ad Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Fri, 14 Jan 2022 23:14:43 -0600
Subject: [PATCH 307/501] Refactor Montage view js -- Janus in MonitorStream

---
 web/js/MonitorStream.js               |  79 ++++++++++++++++++++
 web/skins/classic/views/js/montage.js | 101 +++-----------------------
 2 files changed, 88 insertions(+), 92 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index ef4d6db41..aaf5ac8fb 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -1,3 +1,5 @@
+var janus = null;
+var streaming = [];
 
 function MonitorStream(monitorData) {
   this.id = monitorData.id;
@@ -8,6 +10,7 @@ function MonitorStream(monitorData) {
   this.url_to_zms = monitorData.url_to_zms;
   this.width = monitorData.width;
   this.height = monitorData.height;
+  this.janusEnabled = monitorData.janusEnabled;
   this.scale = 100;
   this.status = null;
   this.alarmState = STATE_IDLE;
@@ -80,6 +83,17 @@ function MonitorStream(monitorData) {
     const stream = this.getElement();
     if (!stream) return;
 
+    if (this.janusEnabled) {
+      var id = parseInt(this.id);
+      var server = "http://" + window.location.hostname + ":8088/janus";
+      if (janus == null) {
+        Janus.init({debug: "all", callback: function() {
+          janus = new Janus({server: server}); //new Janus
+        }});
+      }
+      attachVideo(id);
+      return;
+    }
     if (!stream.src) {
       // Website Monitors won't have an img tag
       console.log('No src for #liveStream'+this.id);
@@ -287,3 +301,68 @@ function MonitorStream(monitorData) {
     this.streamCmdReq(this.streamCmdParms);
   };
 } // end function MonitorStream
+
+async function attachVideo(id) {
+  await waitUntil(() => janus.isConnected() )
+  janus.attach({
+    plugin: "janus.plugin.streaming",
+    opaqueId: "streamingtest-"+Janus.randomString(12),
+    success: function(pluginHandle) {
+      streaming[id] = pluginHandle;
+      var body = { "request": "watch", "id": id};
+      streaming[id].send({"message": body});
+    },
+    error: function(error) {
+      Janus.error("  -- Error attaching plugin... ", error);
+    },
+    onmessage: function(msg, jsep) {
+      Janus.debug(" ::: Got a message :::");
+      Janus.debug(msg);
+      var result = msg["result"];
+      if(result !== null && result !== undefined) {
+        if(result["status"] !== undefined && result["status"] !== null) {
+          var status = result["status"];
+          Janus.debug(status);
+        }
+      } else if(msg["error"] !== undefined && msg["error"] !== null) {
+        return;
+      }
+      if(jsep !== undefined && jsep !== null) {
+        Janus.debug("Handling SDP as well...");
+        Janus.debug(jsep);
+        // Offer from the plugin, let's answer
+        streaming[id].createAnswer({
+          jsep: jsep,
+          // We want recvonly audio/video and, if negotiated, datachannels
+          media: { audioSend: false, videoSend: false, data: true },
+          success: function(jsep) {
+            Janus.debug("Got SDP!");
+            Janus.debug(jsep);
+            var body = { "request": "start"};
+            streaming[id].send({"message": body, "jsep": jsep});
+          },
+          error: function(error) {
+            Janus.error("WebRTC error:", error);
+          }
+        });
+      }
+    }, //onmessage function
+    onremotestream: function(ourstream) {
+      Janus.debug(" ::: Got a remote track :::");
+      Janus.debug(ourstream);
+      Janus.attachMediaStream(document.getElementById("liveStream" + id), ourstream);
+    }
+  }); // janus.attach
+} //function attachVideo
+
+const waitUntil = (condition) => {
+  return new Promise((resolve) => {
+    let interval = setInterval(() => {
+      if (!condition()) {
+        return;
+      }
+      clearInterval(interval);
+      resolve();
+    }, 100);
+  });
+}
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 369f23e8f..f6da7fbac 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -1,9 +1,3 @@
-var server;
-var janus = null;
-var opaqueId;
-var globalCount = 0;
-var streamingList = [];
-var janusMonitors = [];
 /**
  * called when the layoutControl select element is changed, or the page
  * is rendered
@@ -306,43 +300,19 @@ function initPage() {
     $j("#flipMontageHeader").slideToggle("fast");
     $j("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
   }
-  var initJanus = false;
-  //var streamingMonitors = [];
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
-    if (monitorData[i].janusEnabled) {
-      initJanus = true;
-      janusMonitors.push(monitorData[i]);
-    }
-  }
-  if (initJanus) {
-    server = "http://" + window.location.hostname + ":8088/janus";
-    opaqueId = "streamingtest-"+Janus.randomString(12);
-    Janus.init({debug: "all", callback: function() {
-      janus = new Janus({
-        server: server,
-        success: function() {
-          for ( var i = 0, length = janusMonitors.length; i < length; i++ ) {
-            attachVideo(janus, i);
-          }
-        }
-      });
-    }});
-  }
-  for ( var i = 0, length = monitorData.length; i < length; i++ ) {
-    if (!monitorData[i].janusEnabled) {
-      monitors[i] = new MonitorStream(monitorData[i]);
+    monitors[i] = new MonitorStream(monitorData[i]);
 
-      // Start the fps and status updates. give a random delay so that we don't assault the server
-      var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
-      console.log("delay: " + delay);
-      monitors[i].start(delay);
+    // Start the fps and status updates. give a random delay so that we don't assault the server
+    var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    console.log("delay: " + delay);
+    monitors[i].start(delay);
 
-      var interval = monitors[i].refresh;
-      if ( monitors[i].type == 'WebSite' && interval > 0 ) {
-        setInterval(reloadWebSite, interval*1000, i);
-      }
-      monitors[i].setup_onclick();
+    var interval = monitors[i].refresh;
+    if ( monitors[i].type == 'WebSite' && interval > 0 ) {
+      setInterval(reloadWebSite, interval*1000, i);
     }
+    monitors[i].setup_onclick();
   }
   selectLayout('#zmMontageLayout');
 }
@@ -352,58 +322,5 @@ function watchFullscreen() {
   openFullscreen(content);
 }
 
-function attachVideo(janus, i) {
-  janus.attach({
-    plugin: "janus.plugin.streaming",
-    opaqueId: "streamingtest-"+Janus.randomString(12),
-    success: function(pluginHandle) {
-      janusMonitors[i].streaming = pluginHandle;
-      var body = {"request": "watch", "id": parseInt(janusMonitors[i].id)};
-      janusMonitors[i].streaming.send({"message": body});
-    },
-    error: function(error) {
-      Janus.error("  -- Error attaching plugin... ", error);
-    },
-    onmessage: function(msg, jsep) {
-      Janus.debug(" ::: Got a message :::");
-      Janus.debug(msg);
-      var result = msg["result"];
-      if (result !== null && result !== undefined) {
-        if (result["status"] !== undefined && result["status"] !== null) {
-          const status = result["status"];
-          console.log(status);
-        }
-      } else if (msg["error"] !== undefined && msg["error"] !== null) {
-        Janus.error(msg["error"]);
-        return;
-      }
-      if (jsep !== undefined && jsep !== null) {
-        Janus.debug("Handling SDP as well...");
-        Janus.debug(jsep);
-        // Offer from the plugin, let's answer
-        janusMonitors[i].streaming.createAnswer({
-          jsep: jsep,
-          // We want recvonly audio/video and, if negotiated, datachannels
-          media: {audioSend: false, videoSend: false, data: true},
-          success: function(jsep) {
-            Janus.debug("Got SDP!");
-            Janus.debug(jsep);
-            var body = {"request": "start"};
-            janusMonitors[i].streaming.send({"message": body, "jsep": jsep});
-          },
-          error: function(error) {
-            Janus.error("WebRTC error:", error);
-          }
-        });
-      }
-    }, //onmessage function
-    onremotestream: function(ourstream) {
-      Janus.debug(" ::: Got a remote track :::");
-      Janus.debug(ourstream);
-      Janus.attachMediaStream(document.getElementById("liveStream" + janusMonitors[i].id), ourstream);
-      document.getElementById("liveStream" + janusMonitors[i].id).play();
-    }
-  });// attach
-}
 // Kick everything off
 $j(document).ready(initPage);

From 4cd085e0852d29a5606bda6215665b5ca6df8f26 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 15 Jan 2022 17:18:55 -0500
Subject: [PATCH 308/501] Bump eslint to ECMA2017

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0bb050ad1..16cbb37ba 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,7 +3,7 @@
 module.exports = {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2017": true,
   },
   "extends": ["google"],
   "overrides": [{

From 1891002c65e6e19a59604e06b11c7573901a8672 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 15 Jan 2022 17:19:10 -0500
Subject: [PATCH 309/501] Remove Freenode from the badges.

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2249f1752..da96b3e60 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ ZoneMinder
 [![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
 [![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 [![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
-[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)
 
 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 

From 5f17cb6e9a8c65611eb1b3589a1d9b43f51be26e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 15 Jan 2022 17:19:30 -0500
Subject: [PATCH 310/501] Debug the size returned as compared to the file size

---
 src/zm_eventstream.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 927c3b3aa..54f6b60d8 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -1126,7 +1126,8 @@ bool EventStream::send_file(const std::string &filepath) {
   } else {
     Debug(1, "Failed to sendfile?");
   }
-  Warning("Unable to send raw frame %ld: %s rc %d", curr_frame_id, strerror(errno), rc);
+  Warning("Unable to send raw frame %ld: %s rc %d != %d",
+      curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
 #endif
 
   static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];

From 688f505f28b218a071a7534813a6a447eba2da27 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sun, 16 Jan 2022 19:44:52 -0600
Subject: [PATCH 311/501] Adds better error handling, changes expected location
 of janus.js

---
 src/zm_monitor.cpp                  | 29 ++++++++++++++++++++---------
 web/skins/classic/views/cycle.php   |  2 +-
 web/skins/classic/views/montage.php |  2 +-
 web/skins/classic/views/watch.php   |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index e638ed8c8..15a812f83 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1100,12 +1100,13 @@ bool Monitor::connect() {
       set_credentials(soap);
       Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
       if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
-        Warning("Couldn't create subscription!");
+        Error("Couldn't create subscription! %s, %s", soap_fault_string(soap), soap_fault_detail(soap));
       } else {
         //Empty the stored messages
         set_credentials(soap);
-        if (proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) {
-          Warning("Couldn't do initial event pull! %s", response.SubscriptionReference.Address);
+        if ((proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) &&
+            ( soap->error != SOAP_EOF)) { //SOAP_EOF could indicate no messages to pull.
+          Error("Couldn't do initial event pull! Error %i %s, %s", soap->error, soap_fault_string(soap), soap_fault_detail(soap));
         } else {
           Debug(1, "Good Initial ONVIF Pull");
           ONVIF_Healthy = TRUE;
@@ -1120,7 +1121,9 @@ bool Monitor::connect() {
 #if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
       if (add_to_janus() != 0) {
-        Warning("Failed to add monitor stream to Janus!");
+        if (add_to_janus() != 0) {
+          Warning("Failed to add monitor stream to Janus!");
+        }
       }
     }
 #endif
@@ -1794,8 +1797,10 @@ bool Monitor::Poll() {
     set_credentials(soap);
     int result = proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse);
     if (result != SOAP_OK) {
-      if (result != -1) //Ignore the timeout error
-        Warning("Failed to get ONVIF messages! %i", result);
+      if (result != SOAP_EOF) { //Ignore the timeout error
+        Error("Failed to get ONVIF messages! %s", soap_fault_string(soap));
+        ONVIF_Healthy = FALSE;
+      }
     } else {
       Debug(1, "Got Good Response! %i", result);
       for (auto msg : tev__PullMessagesResponse.wsnt__NotificationMessage) {
@@ -1814,6 +1819,7 @@ bool Monitor::Poll() {
             if (!ONVIF_Trigger_State) {
               Debug(1,"Triggered Event");
               ONVIF_Trigger_State = TRUE;
+              std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep
             }
           } else {
             Debug(1, "Triggered off ONVIF");
@@ -1826,6 +1832,8 @@ bool Monitor::Poll() {
         }
       }
     }
+  } else {
+    std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep to avoid the busy loop.
   }
 #endif
   return TRUE;
@@ -2109,11 +2117,14 @@ bool Monitor::Analyse() {
               Debug(1, "Staying in %s", State_Strings[state].c_str());
             }
             if (state == ALARM) {
-              last_alarm_count = analysis_image_count; 
+              last_alarm_count = analysis_image_count;
             } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
-          } else if (!score and (snap->score == 0)) { // snap->score means -1 which means didn't do motion detection so don't do state transition
+
+          // snap->score -1 means didn't do motion detection so don't do state transition
+          // In Nodect, we may still have a triggered event, so need this code to run to end the event.
+          } else if (!score and ((snap->score == 0) or (function == NODECT))) {
             Debug(1, "!score %s", State_Strings[state].c_str());
-            alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
+            alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count
 
             if (state == ALARM) {
               Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 279d9bba5..ee9e03d4f 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -193,5 +193,5 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
       </div>
     </div>
 <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
-<script src="<?php echo cache_bust('js/janus.js') ?>"></script>
+<script src="/javascript/janus/janus.js"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index ed1869fab..bb99916dd 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -326,6 +326,6 @@ foreach (array_reverse($zones) as $zone) {
     </div>
   </div>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
-  <script src="<?php echo cache_bust('js/janus.js') ?>"></script>
+  <script src="/javascript/janus/janus.js"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 3128f7767..f47bd1ccb 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -412,5 +412,5 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
     </div>
   </div>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
-  <script src="<?php echo cache_bust('js/janus.js') ?>"></script>
+  <script src="/javascript/janus/janus.js"></script>
 <?php xhtmlFooter() ?>

From 5026008482aecf59b6f1760bff4e7641fa72f4e7 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sun, 16 Jan 2022 19:55:53 -0600
Subject: [PATCH 312/501] Changes due to janus packaging

---
 misc/zoneminder.service.in |    4 +-
 web/js/janus.js            | 3649 ------------------------------------
 2 files changed, 2 insertions(+), 3651 deletions(-)
 delete mode 100644 web/js/janus.js

diff --git a/misc/zoneminder.service.in b/misc/zoneminder.service.in
index d1cfb36a0..21be2e433 100644
--- a/misc/zoneminder.service.in
+++ b/misc/zoneminder.service.in
@@ -3,8 +3,8 @@
 
 [Unit]
 Description=ZoneMinder CCTV recording and security system
-After=network.target mysqld.service httpd.service
-Requires=mysqld.service httpd.service
+After=network.target mysqld.service httpd.service janus.service
+Requires=mysqld.service httpd.service janus.service
 
 [Service]
 User=@WEB_USER@
diff --git a/web/js/janus.js b/web/js/janus.js
deleted file mode 100644
index 177bcf2f7..000000000
--- a/web/js/janus.js
+++ /dev/null
@@ -1,3649 +0,0 @@
-"use strict";
-
-/*
-	The MIT License (MIT)
-
-	Copyright (c) 2016 Meetecho
-
-	Permission is hereby granted, free of charge, to any person obtaining
-	a copy of this software and associated documentation files (the "Software"),
-	to deal in the Software without restriction, including without limitation
-	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the
-	Software is furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included
-	in all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-	THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-	OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-	OTHER DEALINGS IN THE SOFTWARE.
- */
-
-// List of sessions
-Janus.sessions = {};
-
-Janus.isExtensionEnabled = function() {
-	if(navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia) {
-		// No need for the extension, getDisplayMedia is supported
-		return true;
-	}
-	if(window.navigator.userAgent.match('Chrome')) {
-		var chromever = parseInt(window.navigator.userAgent.match(/Chrome\/(.*) /)[1], 10);
-		var maxver = 33;
-		if(window.navigator.userAgent.match('Linux'))
-			maxver = 35;	// "known" crash in chrome 34 and 35 on linux
-		if(chromever >= 26 && chromever <= maxver) {
-			// Older versions of Chrome don't support this extension-based approach, so lie
-			return true;
-		}
-		return Janus.extension.isInstalled();
-	} else {
-		// Firefox and others, no need for the extension (but this doesn't mean it will work)
-		return true;
-	}
-};
-
-var defaultExtension = {
-	// Screensharing Chrome Extension ID
-	extensionId: 'hapfgfdkleiggjjpfpenajgdnfckjpaj',
-	isInstalled: function() { return document.querySelector('#janus-extension-installed') !== null; },
-	getScreen: function (callback) {
-		var pending = window.setTimeout(function () {
-			var error = new Error('NavigatorUserMediaError');
-			error.name = 'The required Chrome extension is not installed: click <a href="#">here</a> to install it. (NOTE: this will need you to refresh the page)';
-			return callback(error);
-		}, 1000);
-		this.cache[pending] = callback;
-		window.postMessage({ type: 'janusGetScreen', id: pending }, '*');
-	},
-	init: function () {
-		var cache = {};
-		this.cache = cache;
-		// Wait for events from the Chrome Extension
-		window.addEventListener('message', function (event) {
-			if(event.origin != window.location.origin)
-				return;
-			if(event.data.type == 'janusGotScreen' && cache[event.data.id]) {
-				var callback = cache[event.data.id];
-				delete cache[event.data.id];
-
-				if (event.data.sourceId === '') {
-					// user canceled
-					var error = new Error('NavigatorUserMediaError');
-					error.name = 'You cancelled the request for permission, giving up...';
-					callback(error);
-				} else {
-					callback(null, event.data.sourceId);
-				}
-			} else if (event.data.type == 'janusGetScreenPending') {
-				console.log('clearing ', event.data.id);
-				window.clearTimeout(event.data.id);
-			}
-		});
-	}
-};
-
-Janus.useDefaultDependencies = function (deps) {
-	var f = (deps && deps.fetch) || fetch;
-	var p = (deps && deps.Promise) || Promise;
-	var socketCls = (deps && deps.WebSocket) || WebSocket;
-
-	return {
-		newWebSocket: function(server, proto) { return new socketCls(server, proto); },
-		extension: (deps && deps.extension) || defaultExtension,
-		isArray: function(arr) { return Array.isArray(arr); },
-		webRTCAdapter: (deps && deps.adapter) || adapter,
-		httpAPICall: function(url, options) {
-			var fetchOptions = {
-				method: options.verb,
-				headers: {
-					'Accept': 'application/json, text/plain, */*'
-				},
-				cache: 'no-cache'
-			};
-			if(options.verb === "POST") {
-				fetchOptions.headers['Content-Type'] = 'application/json';
-			}
-			if(options.withCredentials !== undefined) {
-				fetchOptions.credentials = options.withCredentials === true ? 'include' : (options.withCredentials ? options.withCredentials : 'omit');
-			}
-			if(options.body) {
-				fetchOptions.body = JSON.stringify(options.body);
-			}
-
-			var fetching = f(url, fetchOptions).catch(function(error) {
-				return p.reject({message: 'Probably a network error, is the server down?', error: error});
-			});
-
-			/*
-			 * fetch() does not natively support timeouts.
-			 * Work around this by starting a timeout manually, and racing it agains the fetch() to see which thing resolves first.
-			 */
-
-			if(options.timeout) {
-				var timeout = new p(function(resolve, reject) {
-					var timerId = setTimeout(function() {
-						clearTimeout(timerId);
-						return reject({message: 'Request timed out', timeout: options.timeout});
-					}, options.timeout);
-				});
-				fetching = p.race([fetching, timeout]);
-			}
-
-			fetching.then(function(response) {
-				if(response.ok) {
-					if(typeof(options.success) === typeof(Janus.noop)) {
-						return response.json().then(function(parsed) {
-							try {
-								options.success(parsed);
-							} catch(error) {
-								Janus.error('Unhandled httpAPICall success callback error', error);
-							}
-						}, function(error) {
-							return p.reject({message: 'Failed to parse response body', error: error, response: response});
-						});
-					}
-				}
-				else {
-					return p.reject({message: 'API call failed', response: response});
-				}
-			}).catch(function(error) {
-				if(typeof(options.error) === typeof(Janus.noop)) {
-					options.error(error.message || '<< internal error >>', error);
-				}
-			});
-
-			return fetching;
-		}
-	}
-};
-
-Janus.useOldDependencies = function (deps) {
-	var jq = (deps && deps.jQuery) || jQuery;
-	var socketCls = (deps && deps.WebSocket) || WebSocket;
-	return {
-		newWebSocket: function(server, proto) { return new socketCls(server, proto); },
-		isArray: function(arr) { return jq.isArray(arr); },
-		extension: (deps && deps.extension) || defaultExtension,
-		webRTCAdapter: (deps && deps.adapter) || adapter,
-		httpAPICall: function(url, options) {
-			var payload = options.body !== undefined ? {
-				contentType: 'application/json',
-				data: JSON.stringify(options.body)
-			} : {};
-			var credentials = options.withCredentials !== undefined ? {xhrFields: {withCredentials: options.withCredentials}} : {};
-
-			return jq.ajax(jq.extend(payload, credentials, {
-				url: url,
-				type: options.verb,
-				cache: false,
-				dataType: 'json',
-				async: options.async,
-				timeout: options.timeout,
-				success: function(result) {
-					if(typeof(options.success) === typeof(Janus.noop)) {
-						options.success(result);
-					}
-				},
-				error: function(xhr, status, err) {
-					if(typeof(options.error) === typeof(Janus.noop)) {
-						options.error(status, err);
-					}
-				}
-			}));
-		}
-	};
-};
-
-Janus.noop = function() {};
-
-Janus.dataChanDefaultLabel = "JanusDataChannel";
-
-// Note: in the future we may want to change this, e.g., as was
-// attempted in https://github.com/meetecho/janus-gateway/issues/1670
-Janus.endOfCandidates = null;
-
-// Stop all tracks from a given stream
-Janus.stopAllTracks = function(stream) {
-	try {
-		// Try a MediaStreamTrack.stop() for each track
-		var tracks = stream.getTracks();
-		for(var mst of tracks) {
-			Janus.log(mst);
-			if(mst) {
-				mst.stop();
-			}
-		}
-	} catch(e) {
-		// Do nothing if this fails
-	}
-}
-
-// Initialization
-Janus.init = function(options) {
-	options = options || {};
-	options.callback = (typeof options.callback == "function") ? options.callback : Janus.noop;
-	if(Janus.initDone) {
-		// Already initialized
-		options.callback();
-	} else {
-		if(typeof console.log == "undefined") {
-			console.log = function() {};
-		}
-		// Console logging (all debugging disabled by default)
-		Janus.trace = Janus.noop;
-		Janus.debug = Janus.noop;
-		Janus.vdebug = Janus.noop;
-		Janus.log = Janus.noop;
-		Janus.warn = Janus.noop;
-		Janus.error = Janus.noop;
-		if(options.debug === true || options.debug === "all") {
-			// Enable all debugging levels
-			Janus.trace = console.trace.bind(console);
-			Janus.debug = console.debug.bind(console);
-			Janus.vdebug = console.debug.bind(console);
-			Janus.log = console.log.bind(console);
-			Janus.warn = console.warn.bind(console);
-			Janus.error = console.error.bind(console);
-		} else if(Array.isArray(options.debug)) {
-			for(var d of options.debug) {
-				switch(d) {
-					case "trace":
-						Janus.trace = console.trace.bind(console);
-						break;
-					case "debug":
-						Janus.debug = console.debug.bind(console);
-						break;
-					case "vdebug":
-						Janus.vdebug = console.debug.bind(console);
-						break;
-					case "log":
-						Janus.log = console.log.bind(console);
-						break;
-					case "warn":
-						Janus.warn = console.warn.bind(console);
-						break;
-					case "error":
-						Janus.error = console.error.bind(console);
-						break;
-					default:
-						console.error("Unknown debugging option '" + d + "' (supported: 'trace', 'debug', 'vdebug', 'log', warn', 'error')");
-						break;
-				}
-			}
-		}
-		Janus.log("Initializing library");
-
-		var usedDependencies = options.dependencies || Janus.useDefaultDependencies();
-		Janus.isArray = usedDependencies.isArray;
-		Janus.webRTCAdapter = usedDependencies.webRTCAdapter;
-		Janus.httpAPICall = usedDependencies.httpAPICall;
-		Janus.newWebSocket = usedDependencies.newWebSocket;
-		Janus.extension = usedDependencies.extension;
-		Janus.extension.init();
-
-		// Helper method to enumerate devices
-		Janus.listDevices = function(callback, config) {
-			callback = (typeof callback == "function") ? callback : Janus.noop;
-			if (config == null) config = { audio: true, video: true };
-			if(Janus.isGetUserMediaAvailable()) {
-				navigator.mediaDevices.getUserMedia(config)
-				.then(function(stream) {
-					navigator.mediaDevices.enumerateDevices().then(function(devices) {
-						Janus.debug(devices);
-						callback(devices);
-						// Get rid of the now useless stream
-						Janus.stopAllTracks(stream)
-					});
-				})
-				.catch(function(err) {
-					Janus.error(err);
-					callback([]);
-				});
-			} else {
-				Janus.warn("navigator.mediaDevices unavailable");
-				callback([]);
-			}
-		};
-		// Helper methods to attach/reattach a stream to a video element (previously part of adapter.js)
-		Janus.attachMediaStream = function(element, stream) {
-			try {
-				element.srcObject = stream;
-			} catch (e) {
-				try {
-					element.src = URL.createObjectURL(stream);
-				} catch (e) {
-					Janus.error("Error attaching stream to element");
-				}
-			}
-		};
-		Janus.reattachMediaStream = function(to, from) {
-			try {
-				to.srcObject = from.srcObject;
-			} catch (e) {
-				try {
-					to.src = from.src;
-				} catch (e) {
-					Janus.error("Error reattaching stream to element");
-				}
-			}
-		};
-		// Detect tab close: make sure we don't loose existing onbeforeunload handlers
-		// (note: for iOS we need to subscribe to a different event, 'pagehide', see
-		// https://gist.github.com/thehunmonkgroup/6bee8941a49b86be31a787fe8f4b8cfe)
-		var iOS = ['iPad', 'iPhone', 'iPod'].indexOf(navigator.platform) >= 0;
-		var eventName = iOS ? 'pagehide' : 'beforeunload';
-		var oldOBF = window["on" + eventName];
-		window.addEventListener(eventName, function() {
-			Janus.log("Closing window");
-			for(var s in Janus.sessions) {
-				if(Janus.sessions[s] && Janus.sessions[s].destroyOnUnload) {
-					Janus.log("Destroying session " + s);
-					Janus.sessions[s].destroy({unload: true, notifyDestroyed: false});
-				}
-			}
-			if(oldOBF && typeof oldOBF == "function") {
-				oldOBF();
-			}
-		});
-		// If this is a Safari Technology Preview, check if VP8 is supported
-		Janus.safariVp8 = false;
-		if(Janus.webRTCAdapter.browserDetails.browser === 'safari' &&
-				Janus.webRTCAdapter.browserDetails.version >= 605) {
-			// Let's see if RTCRtpSender.getCapabilities() is there
-			if(RTCRtpSender && RTCRtpSender.getCapabilities && RTCRtpSender.getCapabilities("video") &&
-					RTCRtpSender.getCapabilities("video").codecs && RTCRtpSender.getCapabilities("video").codecs.length) {
-				for(var codec of RTCRtpSender.getCapabilities("video").codecs) {
-					if(codec && codec.mimeType && codec.mimeType.toLowerCase() === "video/vp8") {
-						Janus.safariVp8 = true;
-						break;
-					}
-				}
-				if(Janus.safariVp8) {
-					Janus.log("This version of Safari supports VP8");
-				} else {
-					Janus.warn("This version of Safari does NOT support VP8: if you're using a Technology Preview, " +
-						"try enabling the 'WebRTC VP8 codec' setting in the 'Experimental Features' Develop menu");
-				}
-			} else {
-				// We do it in a very ugly way, as there's no alternative...
-				// We create a PeerConnection to see if VP8 is in an offer
-				var testpc = new RTCPeerConnection({});
-				testpc.createOffer({offerToReceiveVideo: true}).then(function(offer) {
-					Janus.safariVp8 = offer.sdp.indexOf("VP8") !== -1;
-					if(Janus.safariVp8) {
-						Janus.log("This version of Safari supports VP8");
-					} else {
-						Janus.warn("This version of Safari does NOT support VP8: if you're using a Technology Preview, " +
-							"try enabling the 'WebRTC VP8 codec' setting in the 'Experimental Features' Develop menu");
-					}
-					testpc.close();
-					testpc = null;
-				});
-			}
-		}
-		// Check if this browser supports Unified Plan and transceivers
-		// Based on https://codepen.io/anon/pen/ZqLwWV?editors=0010
-		Janus.unifiedPlan = false;
-		if(Janus.webRTCAdapter.browserDetails.browser === 'firefox' &&
-				Janus.webRTCAdapter.browserDetails.version >= 59) {
-			// Firefox definitely does, starting from version 59
-			Janus.unifiedPlan = true;
-		} else if(Janus.webRTCAdapter.browserDetails.browser === 'chrome' &&
-				Janus.webRTCAdapter.browserDetails.version >= 72) {
-			// Chrome does, but it's only usable from version 72 on
-			Janus.unifiedPlan = true;
-		} else if(!window.RTCRtpTransceiver || !('currentDirection' in RTCRtpTransceiver.prototype)) {
-			// Safari supports addTransceiver() but not Unified Plan when
-			// currentDirection is not defined (see codepen above).
-			Janus.unifiedPlan = false;
-		} else {
-			// Check if addTransceiver() throws an exception
-			var tempPc = new RTCPeerConnection();
-			try {
-				tempPc.addTransceiver('audio');
-				Janus.unifiedPlan = true;
-			} catch (e) {}
-			tempPc.close();
-		}
-		Janus.initDone = true;
-		options.callback();
-	}
-};
-
-// Helper method to check whether WebRTC is supported by this browser
-Janus.isWebrtcSupported = function() {
-	return !!window.RTCPeerConnection;
-};
-// Helper method to check whether devices can be accessed by this browser (e.g., not possible via plain HTTP)
-Janus.isGetUserMediaAvailable = function() {
-	return navigator.mediaDevices && navigator.mediaDevices.getUserMedia;
-};
-
-// Helper method to create random identifiers (e.g., transaction)
-Janus.randomString = function(len) {
-	var charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-	var randomString = '';
-	for (var i = 0; i < len; i++) {
-		var randomPoz = Math.floor(Math.random() * charSet.length);
-		randomString += charSet.substring(randomPoz,randomPoz+1);
-	}
-	return randomString;
-};
-
-function Janus(gatewayCallbacks) {
-	gatewayCallbacks = gatewayCallbacks || {};
-	gatewayCallbacks.success = (typeof gatewayCallbacks.success == "function") ? gatewayCallbacks.success : Janus.noop;
-	gatewayCallbacks.error = (typeof gatewayCallbacks.error == "function") ? gatewayCallbacks.error : Janus.noop;
-	gatewayCallbacks.destroyed = (typeof gatewayCallbacks.destroyed == "function") ? gatewayCallbacks.destroyed : Janus.noop;
-	if(!Janus.initDone) {
-		gatewayCallbacks.error("Library not initialized");
-		return {};
-	}
-	if(!Janus.isWebrtcSupported()) {
-		gatewayCallbacks.error("WebRTC not supported by this browser");
-		return {};
-	}
-	Janus.log("Library initialized: " + Janus.initDone);
-	if(!gatewayCallbacks.server) {
-		gatewayCallbacks.error("Invalid server url");
-		return {};
-	}
-	var websockets = false;
-	var ws = null;
-	var wsHandlers = {};
-	var wsKeepaliveTimeoutId = null;
-	var servers = null;
-	var serversIndex = 0;
-	var server = gatewayCallbacks.server;
-	if(Janus.isArray(server)) {
-		Janus.log("Multiple servers provided (" + server.length + "), will use the first that works");
-		server = null;
-		servers = gatewayCallbacks.server;
-		Janus.debug(servers);
-	} else {
-		if(server.indexOf("ws") === 0) {
-			websockets = true;
-			Janus.log("Using WebSockets to contact Janus: " + server);
-		} else {
-			websockets = false;
-			Janus.log("Using REST API to contact Janus: " + server);
-		}
-	}
-	var iceServers = gatewayCallbacks.iceServers || [{urls: "stun:stun.l.google.com:19302"}];
-	var iceTransportPolicy = gatewayCallbacks.iceTransportPolicy;
-	var bundlePolicy = gatewayCallbacks.bundlePolicy;
-	// Whether IPv6 candidates should be gathered
-	var ipv6Support = (gatewayCallbacks.ipv6 === true);
-	// Whether we should enable the withCredentials flag for XHR requests
-	var withCredentials = false;
-	if(gatewayCallbacks.withCredentials !== undefined && gatewayCallbacks.withCredentials !== null)
-		withCredentials = gatewayCallbacks.withCredentials === true;
-	// Optional max events
-	var maxev = 10;
-	if(gatewayCallbacks.max_poll_events !== undefined && gatewayCallbacks.max_poll_events !== null)
-		maxev = gatewayCallbacks.max_poll_events;
-	if(maxev < 1)
-		maxev = 1;
-	// Token to use (only if the token based authentication mechanism is enabled)
-	var token = null;
-	if(gatewayCallbacks.token !== undefined && gatewayCallbacks.token !== null)
-		token = gatewayCallbacks.token;
-	// API secret to use (only if the shared API secret is enabled)
-	var apisecret = null;
-	if(gatewayCallbacks.apisecret !== undefined && gatewayCallbacks.apisecret !== null)
-		apisecret = gatewayCallbacks.apisecret;
-	// Whether we should destroy this session when onbeforeunload is called
-	this.destroyOnUnload = true;
-	if(gatewayCallbacks.destroyOnUnload !== undefined && gatewayCallbacks.destroyOnUnload !== null)
-		this.destroyOnUnload = (gatewayCallbacks.destroyOnUnload === true);
-	// Some timeout-related values
-	var keepAlivePeriod = 25000;
-	if(gatewayCallbacks.keepAlivePeriod !== undefined && gatewayCallbacks.keepAlivePeriod !== null)
-		keepAlivePeriod = gatewayCallbacks.keepAlivePeriod;
-	if(isNaN(keepAlivePeriod))
-		keepAlivePeriod = 25000;
-	var longPollTimeout = 60000;
-	if(gatewayCallbacks.longPollTimeout !== undefined && gatewayCallbacks.longPollTimeout !== null)
-		longPollTimeout = gatewayCallbacks.longPollTimeout;
-	if(isNaN(longPollTimeout))
-		longPollTimeout = 60000;
-
-	// overrides for default maxBitrate values for simulcasting
-	function getMaxBitrates(simulcastMaxBitrates) {
-		var maxBitrates = {
-			high: 900000,
-			medium: 300000,
-			low: 100000,
-		};
-
-		if (simulcastMaxBitrates !== undefined && simulcastMaxBitrates !== null) {
-			if (simulcastMaxBitrates.high)
-				maxBitrates.high = simulcastMaxBitrates.high;
-			if (simulcastMaxBitrates.medium)
-				maxBitrates.medium = simulcastMaxBitrates.medium;
-			if (simulcastMaxBitrates.low)
-				maxBitrates.low = simulcastMaxBitrates.low;
-		}
-
-		return maxBitrates;
-	}
-
-	var connected = false;
-	var sessionId = null;
-	var pluginHandles = {};
-	var that = this;
-	var retries = 0;
-	var transactions = {};
-	createSession(gatewayCallbacks);
-
-	// Public methods
-	this.getServer = function() { return server; };
-	this.isConnected = function() { return connected; };
-	this.reconnect = function(callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		callbacks["reconnect"] = true;
-		createSession(callbacks);
-	};
-	this.getSessionId = function() { return sessionId; };
-	this.getInfo = function(callbacks) { getInfo(callbacks); };
-	this.destroy = function(callbacks) { destroySession(callbacks); };
-	this.attach = function(callbacks) { createHandle(callbacks); };
-
-	function eventHandler() {
-		if(sessionId == null)
-			return;
-		Janus.debug('Long poll...');
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			return;
-		}
-		var longpoll = server + "/" + sessionId + "?rid=" + new Date().getTime();
-		if(maxev)
-			longpoll = longpoll + "&maxev=" + maxev;
-		if(token)
-			longpoll = longpoll + "&token=" + encodeURIComponent(token);
-		if(apisecret)
-			longpoll = longpoll + "&apisecret=" + encodeURIComponent(apisecret);
-		Janus.httpAPICall(longpoll, {
-			verb: 'GET',
-			withCredentials: withCredentials,
-			success: handleEvent,
-			timeout: longPollTimeout,
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);
-				retries++;
-				if(retries > 3) {
-					// Did we just lose the server? :-(
-					connected = false;
-					gatewayCallbacks.error("Lost connection to the server (is it down?)");
-					return;
-				}
-				eventHandler();
-			}
-		});
-	}
-
-	// Private event handler: this will trigger plugin callbacks, if set
-	function handleEvent(json, skipTimeout) {
-		retries = 0;
-		if(!websockets && sessionId !== undefined && sessionId !== null && skipTimeout !== true)
-			eventHandler();
-		if(!websockets && Janus.isArray(json)) {
-			// We got an array: it means we passed a maxev > 1, iterate on all objects
-			for(var i=0; i<json.length; i++) {
-				handleEvent(json[i], true);
-			}
-			return;
-		}
-		if(json["janus"] === "keepalive") {
-			// Nothing happened
-			Janus.vdebug("Got a keepalive on session " + sessionId);
-			return;
-		} else if(json["janus"] === "server_info") {
-			// Just info on the Janus instance
-			Janus.debug("Got info on the Janus instance");
-			Janus.debug(json);
-			const transaction = json["transaction"];
-			if(transaction) {
-				const reportSuccess = transactions[transaction];
-				if(reportSuccess)
-					reportSuccess(json);
-				delete transactions[transaction];
-			}
-			return;
-		} else if(json["janus"] === "ack") {
-			// Just an ack, we can probably ignore
-			Janus.debug("Got an ack on session " + sessionId);
-			Janus.debug(json);
-			const transaction = json["transaction"];
-			if(transaction) {
-				const reportSuccess = transactions[transaction];
-				if(reportSuccess)
-					reportSuccess(json);
-				delete transactions[transaction];
-			}
-			return;
-		} else if(json["janus"] === "success") {
-			// Success!
-			Janus.debug("Got a success on session " + sessionId);
-			Janus.debug(json);
-			const transaction = json["transaction"];
-			if(transaction) {
-				const reportSuccess = transactions[transaction];
-				if(reportSuccess)
-					reportSuccess(json);
-				delete transactions[transaction];
-			}
-			return;
-		} else if(json["janus"] === "trickle") {
-			// We got a trickle candidate from Janus
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.debug("This handle is not attached to this session");
-				return;
-			}
-			var candidate = json["candidate"];
-			Janus.debug("Got a trickled candidate on session " + sessionId);
-			Janus.debug(candidate);
-			var config = pluginHandle.webrtcStuff;
-			if(config.pc && config.remoteSdp) {
-				// Add candidate right now
-				Janus.debug("Adding remote candidate:", candidate);
-				if(!candidate || candidate.completed === true) {
-					// end-of-candidates
-					config.pc.addIceCandidate(Janus.endOfCandidates);
-				} else {
-					// New candidate
-					config.pc.addIceCandidate(candidate);
-				}
-			} else {
-				// We didn't do setRemoteDescription (trickle got here before the offer?)
-				Janus.debug("We didn't do setRemoteDescription (trickle got here before the offer?), caching candidate");
-				if(!config.candidates)
-					config.candidates = [];
-				config.candidates.push(candidate);
-				Janus.debug(config.candidates);
-			}
-		} else if(json["janus"] === "webrtcup") {
-			// The PeerConnection with the server is up! Notify this
-			Janus.debug("Got a webrtcup event on session " + sessionId);
-			Janus.debug(json);
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.debug("This handle is not attached to this session");
-				return;
-			}
-			pluginHandle.webrtcState(true);
-			return;
-		} else if(json["janus"] === "hangup") {
-			// A plugin asked the core to hangup a PeerConnection on one of our handles
-			Janus.debug("Got a hangup event on session " + sessionId);
-			Janus.debug(json);
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.debug("This handle is not attached to this session");
-				return;
-			}
-			pluginHandle.webrtcState(false, json["reason"]);
-			pluginHandle.hangup();
-		} else if(json["janus"] === "detached") {
-			// A plugin asked the core to detach one of our handles
-			Janus.debug("Got a detached event on session " + sessionId);
-			Janus.debug(json);
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				// Don't warn here because destroyHandle causes this situation.
-				return;
-			}
-			pluginHandle.ondetached();
-			pluginHandle.detach();
-		} else if(json["janus"] === "media") {
-			// Media started/stopped flowing
-			Janus.debug("Got a media event on session " + sessionId);
-			Janus.debug(json);
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.debug("This handle is not attached to this session");
-				return;
-			}
-			pluginHandle.mediaState(json["type"], json["receiving"]);
-		} else if(json["janus"] === "slowlink") {
-			Janus.debug("Got a slowlink event on session " + sessionId);
-			Janus.debug(json);
-			// Trouble uplink or downlink
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.debug("This handle is not attached to this session");
-				return;
-			}
-			pluginHandle.slowLink(json["uplink"], json["lost"]);
-		} else if(json["janus"] === "error") {
-			// Oops, something wrong happened
-			Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-			Janus.debug(json);
-			var transaction = json["transaction"];
-			if(transaction) {
-				var reportSuccess = transactions[transaction];
-				if(reportSuccess) {
-					reportSuccess(json);
-				}
-				delete transactions[transaction];
-			}
-			return;
-		} else if(json["janus"] === "event") {
-			Janus.debug("Got a plugin event on session " + sessionId);
-			Janus.debug(json);
-			const sender = json["sender"];
-			if(!sender) {
-				Janus.warn("Missing sender...");
-				return;
-			}
-			var plugindata = json["plugindata"];
-			if(!plugindata) {
-				Janus.warn("Missing plugindata...");
-				return;
-			}
-			Janus.debug("  -- Event is coming from " + sender + " (" + plugindata["plugin"] + ")");
-			var data = plugindata["data"];
-			Janus.debug(data);
-			const pluginHandle = pluginHandles[sender];
-			if(!pluginHandle) {
-				Janus.warn("This handle is not attached to this session");
-				return;
-			}
-			var jsep = json["jsep"];
-			if(jsep) {
-				Janus.debug("Handling SDP as well...");
-				Janus.debug(jsep);
-			}
-			var callback = pluginHandle.onmessage;
-			if(callback) {
-				Janus.debug("Notifying application...");
-				// Send to callback specified when attaching plugin handle
-				callback(data, jsep);
-			} else {
-				// Send to generic callback (?)
-				Janus.debug("No provided notification callback");
-			}
-		} else if(json["janus"] === "timeout") {
-			Janus.error("Timeout on session " + sessionId);
-			Janus.debug(json);
-			if (websockets) {
-				ws.close(3504, "Gateway timeout");
-			}
-			return;
-		} else {
-			Janus.warn("Unknown message/event  '" + json["janus"] + "' on session " + sessionId);
-			Janus.debug(json);
-		}
-	}
-
-	// Private helper to send keep-alive messages on WebSockets
-	function keepAlive() {
-		if(!server || !websockets || !connected)
-			return;
-		wsKeepaliveTimeoutId = setTimeout(keepAlive, keepAlivePeriod);
-		var request = { "janus": "keepalive", "session_id": sessionId, "transaction": Janus.randomString(12) };
-		if(token)
-			request["token"] = token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		ws.send(JSON.stringify(request));
-	}
-
-	// Private method to create a session
-	function createSession(callbacks) {
-		var transaction = Janus.randomString(12);
-		var request = { "janus": "create", "transaction": transaction };
-		if(callbacks["reconnect"]) {
-			// We're reconnecting, claim the session
-			connected = false;
-			request["janus"] = "claim";
-			request["session_id"] = sessionId;
-			// If we were using websockets, ignore the old connection
-			if(ws) {
-				ws.onopen = null;
-				ws.onerror = null;
-				ws.onclose = null;
-				if(wsKeepaliveTimeoutId) {
-					clearTimeout(wsKeepaliveTimeoutId);
-					wsKeepaliveTimeoutId = null;
-				}
-			}
-		}
-		if(token)
-			request["token"] = token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(!server && Janus.isArray(servers)) {
-			// We still need to find a working server from the list we were given
-			server = servers[serversIndex];
-			if(server.indexOf("ws") === 0) {
-				websockets = true;
-				Janus.log("Server #" + (serversIndex+1) + ": trying WebSockets to contact Janus (" + server + ")");
-			} else {
-				websockets = false;
-				Janus.log("Server #" + (serversIndex+1) + ": trying REST API to contact Janus (" + server + ")");
-			}
-		}
-		if(websockets) {
-			ws = Janus.newWebSocket(server, 'janus-protocol');
-			wsHandlers = {
-				'error': function() {
-					Janus.error("Error connecting to the Janus WebSockets server... " + server);
-					if (Janus.isArray(servers) && !callbacks["reconnect"]) {
-						serversIndex++;
-						if (serversIndex === servers.length) {
-							// We tried all the servers the user gave us and they all failed
-							callbacks.error("Error connecting to any of the provided Janus servers: Is the server down?");
-							return;
-						}
-						// Let's try the next server
-						server = null;
-						setTimeout(function() {
-							createSession(callbacks);
-						}, 200);
-						return;
-					}
-					callbacks.error("Error connecting to the Janus WebSockets server: Is the server down?");
-				},
-
-				'open': function() {
-					// We need to be notified about the success
-					transactions[transaction] = function(json) {
-						Janus.debug(json);
-						if (json["janus"] !== "success") {
-							Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-							callbacks.error(json["error"].reason);
-							return;
-						}
-						wsKeepaliveTimeoutId = setTimeout(keepAlive, keepAlivePeriod);
-						connected = true;
-						sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
-						if(callbacks["reconnect"]) {
-							Janus.log("Claimed session: " + sessionId);
-						} else {
-							Janus.log("Created session: " + sessionId);
-						}
-						Janus.sessions[sessionId] = that;
-						callbacks.success();
-					};
-					ws.send(JSON.stringify(request));
-				},
-
-				'message': function(event) {
-					handleEvent(JSON.parse(event.data));
-				},
-
-				'close': function() {
-					if (!server || !connected) {
-						return;
-					}
-					connected = false;
-					// FIXME What if this is called when the page is closed?
-					gatewayCallbacks.error("Lost connection to the server (is it down?)");
-				}
-			};
-
-			for(var eventName in wsHandlers) {
-				ws.addEventListener(eventName, wsHandlers[eventName]);
-			}
-
-			return;
-		}
-		Janus.httpAPICall(server, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.debug(json);
-				if(json["janus"] !== "success") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-					callbacks.error(json["error"].reason);
-					return;
-				}
-				connected = true;
-				sessionId = json["session_id"] ? json["session_id"] : json.data["id"];
-				if(callbacks["reconnect"]) {
-					Janus.log("Claimed session: " + sessionId);
-				} else {
-					Janus.log("Created session: " + sessionId);
-				}
-				Janus.sessions[sessionId] = that;
-				eventHandler();
-				callbacks.success();
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				if(Janus.isArray(servers) && !callbacks["reconnect"]) {
-					serversIndex++;
-					if(serversIndex === servers.length) {
-						// We tried all the servers the user gave us and they all failed
-						callbacks.error("Error connecting to any of the provided Janus servers: Is the server down?");
-						return;
-					}
-					// Let's try the next server
-					server = null;
-					setTimeout(function() { createSession(callbacks); }, 200);
-					return;
-				}
-				if(errorThrown === "")
-					callbacks.error(textStatus + ": Is the server down?");
-				else
-					callbacks.error(textStatus + ": " + errorThrown);
-			}
-		});
-	}
-
-	// Private method to get info on the server
-	function getInfo(callbacks) {
-		callbacks = callbacks || {};
-		// FIXME This method triggers a success even when we fail
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		Janus.log("Getting info on Janus instance");
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			callbacks.error("Is the server down? (connected=false)");
-			return;
-		}
-		// We just need to send an "info" request
-		var transaction = Janus.randomString(12);
-		var request = { "janus": "info", "transaction": transaction };
-		if(token)
-			request["token"] = token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(websockets) {
-			transactions[transaction] = function(json) {
-				Janus.log("Server info:");
-				Janus.debug(json);
-				if(json["janus"] !== "server_info") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-				}
-				callbacks.success(json);
-			}
-			ws.send(JSON.stringify(request));
-			return;
-		}
-		Janus.httpAPICall(server, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.log("Server info:");
-				Janus.debug(json);
-				if(json["janus"] !== "server_info") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-				}
-				callbacks.success(json);
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				if(errorThrown === "")
-					callbacks.error(textStatus + ": Is the server down?");
-				else
-					callbacks.error(textStatus + ": " + errorThrown);
-			}
-		});
-	}
-
-	// Private method to destroy a session
-	function destroySession(callbacks) {
-		callbacks = callbacks || {};
-		// FIXME This method triggers a success even when we fail
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		var unload = (callbacks.unload === true);
-		var notifyDestroyed = true;
-		if(callbacks.notifyDestroyed !== undefined && callbacks.notifyDestroyed !== null)
-			notifyDestroyed = (callbacks.notifyDestroyed === true);
-		var cleanupHandles = (callbacks.cleanupHandles === true);
-		Janus.log("Destroying session " + sessionId + " (unload=" + unload + ")");
-		if(!sessionId) {
-			Janus.warn("No session to destroy");
-			callbacks.success();
-			if(notifyDestroyed)
-				gatewayCallbacks.destroyed();
-			return;
-		}
-		if(cleanupHandles) {
-			for(var handleId in pluginHandles)
-				destroyHandle(handleId, { noRequest: true });
-		}
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			sessionId = null;
-			callbacks.success();
-			return;
-		}
-		// No need to destroy all handles first, Janus will do that itself
-		var request = { "janus": "destroy", "transaction": Janus.randomString(12) };
-		if(token)
-			request["token"] = token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(unload) {
-			// We're unloading the page: use sendBeacon for HTTP instead,
-			// or just close the WebSocket connection if we're using that
-			if(websockets) {
-				ws.onclose = null;
-				ws.close();
-				ws = null;
-			} else {
-				navigator.sendBeacon(server + "/" + sessionId, JSON.stringify(request));
-			}
-			Janus.log("Destroyed session:");
-			sessionId = null;
-			connected = false;
-			callbacks.success();
-			if(notifyDestroyed)
-				gatewayCallbacks.destroyed();
-			return;
-		}
-		if(websockets) {
-			request["session_id"] = sessionId;
-
-			var unbindWebSocket = function() {
-				for(var eventName in wsHandlers) {
-					ws.removeEventListener(eventName, wsHandlers[eventName]);
-				}
-				ws.removeEventListener('message', onUnbindMessage);
-				ws.removeEventListener('error', onUnbindError);
-				if(wsKeepaliveTimeoutId) {
-					clearTimeout(wsKeepaliveTimeoutId);
-				}
-				ws.close();
-			};
-
-			var onUnbindMessage = function(event){
-				var data = JSON.parse(event.data);
-				if(data.session_id == request.session_id && data.transaction == request.transaction) {
-					unbindWebSocket();
-					callbacks.success();
-					if(notifyDestroyed)
-						gatewayCallbacks.destroyed();
-				}
-			};
-			var onUnbindError = function() {
-				unbindWebSocket();
-				callbacks.error("Failed to destroy the server: Is the server down?");
-				if(notifyDestroyed)
-					gatewayCallbacks.destroyed();
-			};
-
-			ws.addEventListener('message', onUnbindMessage);
-			ws.addEventListener('error', onUnbindError);
-
-			if (ws.readyState === 1) {
-				ws.send(JSON.stringify(request));
-			} else {
-				onUnbindError();
-			}
-
-			return;
-		}
-		Janus.httpAPICall(server + "/" + sessionId, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.log("Destroyed session:");
-				Janus.debug(json);
-				sessionId = null;
-				connected = false;
-				if(json["janus"] !== "success") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-				}
-				callbacks.success();
-				if(notifyDestroyed)
-					gatewayCallbacks.destroyed();
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				// Reset everything anyway
-				sessionId = null;
-				connected = false;
-				callbacks.success();
-				if(notifyDestroyed)
-					gatewayCallbacks.destroyed();
-			}
-		});
-	}
-
-	// Private method to create a plugin handle
-	function createHandle(callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		callbacks.dataChannelOptions = callbacks.dataChannelOptions || { ordered: true };
-		callbacks.consentDialog = (typeof callbacks.consentDialog == "function") ? callbacks.consentDialog : Janus.noop;
-		callbacks.iceState = (typeof callbacks.iceState == "function") ? callbacks.iceState : Janus.noop;
-		callbacks.mediaState = (typeof callbacks.mediaState == "function") ? callbacks.mediaState : Janus.noop;
-		callbacks.webrtcState = (typeof callbacks.webrtcState == "function") ? callbacks.webrtcState : Janus.noop;
-		callbacks.slowLink = (typeof callbacks.slowLink == "function") ? callbacks.slowLink : Janus.noop;
-		callbacks.onmessage = (typeof callbacks.onmessage == "function") ? callbacks.onmessage : Janus.noop;
-		callbacks.onlocalstream = (typeof callbacks.onlocalstream == "function") ? callbacks.onlocalstream : Janus.noop;
-		callbacks.onremotestream = (typeof callbacks.onremotestream == "function") ? callbacks.onremotestream : Janus.noop;
-		callbacks.ondata = (typeof callbacks.ondata == "function") ? callbacks.ondata : Janus.noop;
-		callbacks.ondataopen = (typeof callbacks.ondataopen == "function") ? callbacks.ondataopen : Janus.noop;
-		callbacks.oncleanup = (typeof callbacks.oncleanup == "function") ? callbacks.oncleanup : Janus.noop;
-		callbacks.ondetached = (typeof callbacks.ondetached == "function") ? callbacks.ondetached : Janus.noop;
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			callbacks.error("Is the server down? (connected=false)");
-			return;
-		}
-		var plugin = callbacks.plugin;
-		if(!plugin) {
-			Janus.error("Invalid plugin");
-			callbacks.error("Invalid plugin");
-			return;
-		}
-		var opaqueId = callbacks.opaqueId;
-		var loopIndex = callbacks.loopIndex;
-		var handleToken = callbacks.token ? callbacks.token : token;
-		var transaction = Janus.randomString(12);
-		var request = { "janus": "attach", "plugin": plugin, "opaque_id": opaqueId, "loop_index": loopIndex, "transaction": transaction };
-		if(handleToken)
-			request["token"] = handleToken;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(websockets) {
-			transactions[transaction] = function(json) {
-				Janus.debug(json);
-				if(json["janus"] !== "success") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-					callbacks.error("Ooops: " + json["error"].code + " " + json["error"].reason);
-					return;
-				}
-				var handleId = json.data["id"];
-				Janus.log("Created handle: " + handleId);
-				var pluginHandle =
-					{
-						session : that,
-						plugin : plugin,
-						id : handleId,
-						token : handleToken,
-						detached : false,
-						webrtcStuff : {
-							started : false,
-							myStream : null,
-							streamExternal : false,
-							remoteStream : null,
-							mySdp : null,
-							mediaConstraints : null,
-							pc : null,
-							dataChannelOptions: callbacks.dataChannelOptions,
-							dataChannel : {},
-							dtmfSender : null,
-							trickle : true,
-							iceDone : false,
-							volume : {
-								value : null,
-								timer : null
-							},
-							bitrate : {
-								value : null,
-								bsnow : null,
-								bsbefore : null,
-								tsnow : null,
-								tsbefore : null,
-								timer : null
-							}
-						},
-						getId : function() { return handleId; },
-						getPlugin : function() { return plugin; },
-						getVolume : function() { return getVolume(handleId, true); },
-						getRemoteVolume : function() { return getVolume(handleId, true); },
-						getLocalVolume : function() { return getVolume(handleId, false); },
-						isAudioMuted : function() { return isMuted(handleId, false); },
-						muteAudio : function() { return mute(handleId, false, true); },
-						unmuteAudio : function() { return mute(handleId, false, false); },
-						isVideoMuted : function() { return isMuted(handleId, true); },
-						muteVideo : function() { return mute(handleId, true, true); },
-						unmuteVideo : function() { return mute(handleId, true, false); },
-						getBitrate : function() { return getBitrate(handleId); },
-						send : function(callbacks) { sendMessage(handleId, callbacks); },
-						data : function(callbacks) { sendData(handleId, callbacks); },
-						dtmf : function(callbacks) { sendDtmf(handleId, callbacks); },
-						consentDialog : callbacks.consentDialog,
-						iceState : callbacks.iceState,
-						mediaState : callbacks.mediaState,
-						webrtcState : callbacks.webrtcState,
-						slowLink : callbacks.slowLink,
-						onmessage : callbacks.onmessage,
-						createOffer : function(callbacks) { prepareWebrtc(handleId, true, callbacks); },
-						createAnswer : function(callbacks) { prepareWebrtc(handleId, false, callbacks); },
-						handleRemoteJsep : function(callbacks) { prepareWebrtcPeer(handleId, callbacks); },
-						onlocalstream : callbacks.onlocalstream,
-						onremotestream : callbacks.onremotestream,
-						ondata : callbacks.ondata,
-						ondataopen : callbacks.ondataopen,
-						oncleanup : callbacks.oncleanup,
-						ondetached : callbacks.ondetached,
-						hangup : function(sendRequest) { cleanupWebrtc(handleId, sendRequest === true); },
-						detach : function(callbacks) { destroyHandle(handleId, callbacks); }
-					};
-				pluginHandles[handleId] = pluginHandle;
-				callbacks.success(pluginHandle);
-			};
-			request["session_id"] = sessionId;
-			ws.send(JSON.stringify(request));
-			return;
-		}
-		Janus.httpAPICall(server + "/" + sessionId, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.debug(json);
-				if(json["janus"] !== "success") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-					callbacks.error("Ooops: " + json["error"].code + " " + json["error"].reason);
-					return;
-				}
-				var handleId = json.data["id"];
-				Janus.log("Created handle: " + handleId);
-				var pluginHandle =
-					{
-						session : that,
-						plugin : plugin,
-						id : handleId,
-						token : handleToken,
-						detached : false,
-						webrtcStuff : {
-							started : false,
-							myStream : null,
-							streamExternal : false,
-							remoteStream : null,
-							mySdp : null,
-							mediaConstraints : null,
-							pc : null,
-							dataChannelOptions: callbacks.dataChannelOptions,
-							dataChannel : {},
-							dtmfSender : null,
-							trickle : true,
-							iceDone : false,
-							volume : {
-								value : null,
-								timer : null
-							},
-							bitrate : {
-								value : null,
-								bsnow : null,
-								bsbefore : null,
-								tsnow : null,
-								tsbefore : null,
-								timer : null
-							}
-						},
-						getId : function() { return handleId; },
-						getPlugin : function() { return plugin; },
-						getVolume : function() { return getVolume(handleId, true); },
-						getRemoteVolume : function() { return getVolume(handleId, true); },
-						getLocalVolume : function() { return getVolume(handleId, false); },
-						isAudioMuted : function() { return isMuted(handleId, false); },
-						muteAudio : function() { return mute(handleId, false, true); },
-						unmuteAudio : function() { return mute(handleId, false, false); },
-						isVideoMuted : function() { return isMuted(handleId, true); },
-						muteVideo : function() { return mute(handleId, true, true); },
-						unmuteVideo : function() { return mute(handleId, true, false); },
-						getBitrate : function() { return getBitrate(handleId); },
-						send : function(callbacks) { sendMessage(handleId, callbacks); },
-						data : function(callbacks) { sendData(handleId, callbacks); },
-						dtmf : function(callbacks) { sendDtmf(handleId, callbacks); },
-						consentDialog : callbacks.consentDialog,
-						iceState : callbacks.iceState,
-						mediaState : callbacks.mediaState,
-						webrtcState : callbacks.webrtcState,
-						slowLink : callbacks.slowLink,
-						onmessage : callbacks.onmessage,
-						createOffer : function(callbacks) { prepareWebrtc(handleId, true, callbacks); },
-						createAnswer : function(callbacks) { prepareWebrtc(handleId, false, callbacks); },
-						handleRemoteJsep : function(callbacks) { prepareWebrtcPeer(handleId, callbacks); },
-						onlocalstream : callbacks.onlocalstream,
-						onremotestream : callbacks.onremotestream,
-						ondata : callbacks.ondata,
-						ondataopen : callbacks.ondataopen,
-						oncleanup : callbacks.oncleanup,
-						ondetached : callbacks.ondetached,
-						hangup : function(sendRequest) { cleanupWebrtc(handleId, sendRequest === true); },
-						detach : function(callbacks) { destroyHandle(handleId, callbacks); }
-					}
-				pluginHandles[handleId] = pluginHandle;
-				callbacks.success(pluginHandle);
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				if(errorThrown === "")
-					callbacks.error(textStatus + ": Is the server down?");
-				else
-					callbacks.error(textStatus + ": " + errorThrown);
-			}
-		});
-	}
-
-	// Private method to send a message
-	function sendMessage(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			callbacks.error("Is the server down? (connected=false)");
-			return;
-		}
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var message = callbacks.message;
-		var jsep = callbacks.jsep;
-		var transaction = Janus.randomString(12);
-		var request = { "janus": "message", "body": message, "transaction": transaction };
-		if(pluginHandle.token)
-			request["token"] = pluginHandle.token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(jsep) {
-			request.jsep = {
-				type: jsep.type,
-				sdp: jsep.sdp
-			};
-			if(jsep.e2ee)
-				request.jsep.e2ee = true;
-			if(jsep.rid_order === "hml" || jsep.rid_order === "lmh")
-				request.jsep.rid_order = jsep.rid_order;
-			if(jsep.force_relay)
-				request.jsep.force_relay = true;
-		}
-		Janus.debug("Sending message to plugin (handle=" + handleId + "):");
-		Janus.debug(request);
-		if(websockets) {
-			request["session_id"] = sessionId;
-			request["handle_id"] = handleId;
-			transactions[transaction] = function(json) {
-				Janus.debug("Message sent!");
-				Janus.debug(json);
-				if(json["janus"] === "success") {
-					// We got a success, must have been a synchronous transaction
-					var plugindata = json["plugindata"];
-					if(!plugindata) {
-						Janus.warn("Request succeeded, but missing plugindata...");
-						callbacks.success();
-						return;
-					}
-					Janus.log("Synchronous transaction successful (" + plugindata["plugin"] + ")");
-					var data = plugindata["data"];
-					Janus.debug(data);
-					callbacks.success(data);
-					return;
-				} else if(json["janus"] !== "ack") {
-					// Not a success and not an ack, must be an error
-					if(json["error"]) {
-						Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-						callbacks.error(json["error"].code + " " + json["error"].reason);
-					} else {
-						Janus.error("Unknown error");	// FIXME
-						callbacks.error("Unknown error");
-					}
-					return;
-				}
-				// If we got here, the plugin decided to handle the request asynchronously
-				callbacks.success();
-			};
-			ws.send(JSON.stringify(request));
-			return;
-		}
-		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.debug("Message sent!");
-				Janus.debug(json);
-				if(json["janus"] === "success") {
-					// We got a success, must have been a synchronous transaction
-					var plugindata = json["plugindata"];
-					if(!plugindata) {
-						Janus.warn("Request succeeded, but missing plugindata...");
-						callbacks.success();
-						return;
-					}
-					Janus.log("Synchronous transaction successful (" + plugindata["plugin"] + ")");
-					var data = plugindata["data"];
-					Janus.debug(data);
-					callbacks.success(data);
-					return;
-				} else if(json["janus"] !== "ack") {
-					// Not a success and not an ack, must be an error
-					if(json["error"]) {
-						Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-						callbacks.error(json["error"].code + " " + json["error"].reason);
-					} else {
-						Janus.error("Unknown error");	// FIXME
-						callbacks.error("Unknown error");
-					}
-					return;
-				}
-				// If we got here, the plugin decided to handle the request asynchronously
-				callbacks.success();
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				callbacks.error(textStatus + ": " + errorThrown);
-			}
-		});
-	}
-
-	// Private method to send a trickle candidate
-	function sendTrickleCandidate(handleId, candidate) {
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			return;
-		}
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return;
-		}
-		var request = { "janus": "trickle", "candidate": candidate, "transaction": Janus.randomString(12) };
-		if(pluginHandle.token)
-			request["token"] = pluginHandle.token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		Janus.vdebug("Sending trickle candidate (handle=" + handleId + "):");
-		Janus.vdebug(request);
-		if(websockets) {
-			request["session_id"] = sessionId;
-			request["handle_id"] = handleId;
-			ws.send(JSON.stringify(request));
-			return;
-		}
-		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.vdebug("Candidate sent!");
-				Janus.vdebug(json);
-				if(json["janus"] !== "ack") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-					return;
-				}
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-			}
-		});
-	}
-
-	// Private method to create a data channel
-	function createDataChannel(handleId, dclabel, dcprotocol, incoming, pendingData) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(!config.pc) {
-			Janus.warn("Invalid PeerConnection");
-			return;
-		}
-		var onDataChannelMessage = function(event) {
-			Janus.log('Received message on data channel:', event);
-			var label = event.target.label;
-			pluginHandle.ondata(event.data, label);
-		};
-		var onDataChannelStateChange = function(event) {
-			Janus.log('Received state change on data channel:', event);
-			var label = event.target.label;
-			var protocol = event.target.protocol;
-			var dcState = config.dataChannel[label] ? config.dataChannel[label].readyState : "null";
-			Janus.log('State change on <' + label + '> data channel: ' + dcState);
-			if(dcState === 'open') {
-				// Any pending messages to send?
-				if(config.dataChannel[label].pending && config.dataChannel[label].pending.length > 0) {
-					Janus.log("Sending pending messages on <" + label + ">:", config.dataChannel[label].pending.length);
-					for(var data of config.dataChannel[label].pending) {
-						Janus.log("Sending data on data channel <" + label + ">");
-						Janus.debug(data);
-						config.dataChannel[label].send(data);
-					}
-					config.dataChannel[label].pending = [];
-				}
-				// Notify the open data channel
-				pluginHandle.ondataopen(label, protocol);
-			}
-		};
-		var onDataChannelError = function(error) {
-			Janus.error('Got error on data channel:', error);
-			// TODO
-		};
-		if(!incoming) {
-			// FIXME Add options (ordered, maxRetransmits, etc.)
-			var dcoptions = config.dataChannelOptions;
-			if(dcprotocol)
-				dcoptions.protocol = dcprotocol;
-			config.dataChannel[dclabel] = config.pc.createDataChannel(dclabel, dcoptions);
-		} else {
-			// The channel was created by Janus
-			config.dataChannel[dclabel] = incoming;
-		}
-		config.dataChannel[dclabel].onmessage = onDataChannelMessage;
-		config.dataChannel[dclabel].onopen = onDataChannelStateChange;
-		config.dataChannel[dclabel].onclose = onDataChannelStateChange;
-		config.dataChannel[dclabel].onerror = onDataChannelError;
-		config.dataChannel[dclabel].pending = [];
-		if(pendingData)
-			config.dataChannel[dclabel].pending.push(pendingData);
-	}
-
-	// Private method to send a data channel message
-	function sendData(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		var data = callbacks.text || callbacks.data;
-		if(!data) {
-			Janus.warn("Invalid data");
-			callbacks.error("Invalid data");
-			return;
-		}
-		var label = callbacks.label ? callbacks.label : Janus.dataChanDefaultLabel;
-		if(!config.dataChannel[label]) {
-			// Create new data channel and wait for it to open
-			createDataChannel(handleId, label, callbacks.protocol, false, data, callbacks.protocol);
-			callbacks.success();
-			return;
-		}
-		if(config.dataChannel[label].readyState !== "open") {
-			config.dataChannel[label].pending.push(data);
-			callbacks.success();
-			return;
-		}
-		Janus.log("Sending data on data channel <" + label + ">");
-		Janus.debug(data);
-		config.dataChannel[label].send(data);
-		callbacks.success();
-	}
-
-	// Private method to send a DTMF tone
-	function sendDtmf(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(!config.dtmfSender) {
-			// Create the DTMF sender the proper way, if possible
-			if(config.pc) {
-				var senders = config.pc.getSenders();
-				var audioSender = senders.find(function(sender) {
-					return sender.track && sender.track.kind === 'audio';
-				});
-				if(!audioSender) {
-					Janus.warn("Invalid DTMF configuration (no audio track)");
-					callbacks.error("Invalid DTMF configuration (no audio track)");
-					return;
-				}
-				config.dtmfSender = audioSender.dtmf;
-				if(config.dtmfSender) {
-					Janus.log("Created DTMF Sender");
-					config.dtmfSender.ontonechange = function(tone) { Janus.debug("Sent DTMF tone: " + tone.tone); };
-				}
-			}
-			if(!config.dtmfSender) {
-				Janus.warn("Invalid DTMF configuration");
-				callbacks.error("Invalid DTMF configuration");
-				return;
-			}
-		}
-		var dtmf = callbacks.dtmf;
-		if(!dtmf) {
-			Janus.warn("Invalid DTMF parameters");
-			callbacks.error("Invalid DTMF parameters");
-			return;
-		}
-		var tones = dtmf.tones;
-		if(!tones) {
-			Janus.warn("Invalid DTMF string");
-			callbacks.error("Invalid DTMF string");
-			return;
-		}
-		var duration = (typeof dtmf.duration === 'number') ? dtmf.duration : 500; // We choose 500ms as the default duration for a tone
-		var gap = (typeof dtmf.gap === 'number') ? dtmf.gap : 50; // We choose 50ms as the default gap between tones
-		Janus.debug("Sending DTMF string " + tones + " (duration " + duration + "ms, gap " + gap + "ms)");
-		config.dtmfSender.insertDTMF(tones, duration, gap);
-		callbacks.success();
-	}
-
-	// Private method to destroy a plugin handle
-	function destroyHandle(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		var noRequest = (callbacks.noRequest === true);
-		Janus.log("Destroying handle " + handleId + " (only-locally=" + noRequest + ")");
-		cleanupWebrtc(handleId);
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || pluginHandle.detached) {
-			// Plugin was already detached by Janus, calling detach again will return a handle not found error, so just exit here
-			delete pluginHandles[handleId];
-			callbacks.success();
-			return;
-		}
-		pluginHandle.detached = true;
-		if(noRequest) {
-			// We're only removing the handle locally
-			delete pluginHandles[handleId];
-			callbacks.success();
-			return;
-		}
-		if(!connected) {
-			Janus.warn("Is the server down? (connected=false)");
-			callbacks.error("Is the server down? (connected=false)");
-			return;
-		}
-		var request = { "janus": "detach", "transaction": Janus.randomString(12) };
-		if(pluginHandle.token)
-			request["token"] = pluginHandle.token;
-		if(apisecret)
-			request["apisecret"] = apisecret;
-		if(websockets) {
-			request["session_id"] = sessionId;
-			request["handle_id"] = handleId;
-			ws.send(JSON.stringify(request));
-			delete pluginHandles[handleId];
-			callbacks.success();
-			return;
-		}
-		Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
-			verb: 'POST',
-			withCredentials: withCredentials,
-			body: request,
-			success: function(json) {
-				Janus.log("Destroyed handle:");
-				Janus.debug(json);
-				if(json["janus"] !== "success") {
-					Janus.error("Ooops: " + json["error"].code + " " + json["error"].reason);	// FIXME
-				}
-				delete pluginHandles[handleId];
-				callbacks.success();
-			},
-			error: function(textStatus, errorThrown) {
-				Janus.error(textStatus + ":", errorThrown);	// FIXME
-				// We cleanup anyway
-				delete pluginHandles[handleId];
-				callbacks.success();
-			}
-		});
-	}
-
-	// WebRTC stuff
-	function streamsDone(handleId, jsep, media, callbacks, stream) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			// Close all tracks if the given stream has been created internally
-			if(!callbacks.stream) {
-				Janus.stopAllTracks(stream);
-			}
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		Janus.debug("streamsDone:", stream);
-		if(stream) {
-			Janus.debug("  -- Audio tracks:", stream.getAudioTracks());
-			Janus.debug("  -- Video tracks:", stream.getVideoTracks());
-		}
-		// We're now capturing the new stream: check if we're updating or if it's a new thing
-		var addTracks = false;
-		if(!config.myStream || !media.update || (config.streamExternal && !media.replaceAudio && !media.replaceVideo)) {
-			config.myStream = stream;
-			addTracks = true;
-		} else {
-			// We only need to update the existing stream
-			if(((!media.update && isAudioSendEnabled(media)) || (media.update && (media.addAudio || media.replaceAudio))) &&
-					stream.getAudioTracks() && stream.getAudioTracks().length) {
-				config.myStream.addTrack(stream.getAudioTracks()[0]);
-				if(Janus.unifiedPlan) {
-					// Use Transceivers
-					Janus.log((media.replaceAudio ? "Replacing" : "Adding") + " audio track:", stream.getAudioTracks()[0]);
-					var audioTransceiver = null;
-					const transceivers = config.pc.getTransceivers();
-					if(transceivers && transceivers.length > 0) {
-						for(const t of transceivers) {
-							if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
-									(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
-								audioTransceiver = t;
-								break;
-							}
-						}
-					}
-					if(audioTransceiver && audioTransceiver.sender) {
-						audioTransceiver.sender.replaceTrack(stream.getAudioTracks()[0]);
-					} else {
-						config.pc.addTrack(stream.getAudioTracks()[0], stream);
-					}
-				} else {
-					Janus.log((media.replaceAudio ? "Replacing" : "Adding") + " audio track:", stream.getAudioTracks()[0]);
-					config.pc.addTrack(stream.getAudioTracks()[0], stream);
-				}
-			}
-			if(((!media.update && isVideoSendEnabled(media)) || (media.update && (media.addVideo || media.replaceVideo))) &&
-					stream.getVideoTracks() && stream.getVideoTracks().length) {
-				config.myStream.addTrack(stream.getVideoTracks()[0]);
-				if(Janus.unifiedPlan) {
-					// Use Transceivers
-					Janus.log((media.replaceVideo ? "Replacing" : "Adding") + " video track:", stream.getVideoTracks()[0]);
-					var videoTransceiver = null;
-					const transceivers = config.pc.getTransceivers();
-					if(transceivers && transceivers.length > 0) {
-						for(const t of transceivers) {
-							if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
-									(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
-								videoTransceiver = t;
-								break;
-							}
-						}
-					}
-					if(videoTransceiver && videoTransceiver.sender) {
-						videoTransceiver.sender.replaceTrack(stream.getVideoTracks()[0]);
-					} else {
-						config.pc.addTrack(stream.getVideoTracks()[0], stream);
-					}
-				} else {
-					Janus.log((media.replaceVideo ? "Replacing" : "Adding") + " video track:", stream.getVideoTracks()[0]);
-					config.pc.addTrack(stream.getVideoTracks()[0], stream);
-				}
-			}
-		}
-		// If we still need to create a PeerConnection, let's do that
-		if(!config.pc) {
-			var pc_config = {"iceServers": iceServers, "iceTransportPolicy": iceTransportPolicy, "bundlePolicy": bundlePolicy};
-			if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
-				// For Chrome versions before 72, we force a plan-b semantic, and unified-plan otherwise
-				pc_config["sdpSemantics"] = (Janus.webRTCAdapter.browserDetails.version < 72) ? "plan-b" : "unified-plan";
-			}
-			var pc_constraints = {
-				"optional": [{"DtlsSrtpKeyAgreement": true}]
-			};
-			if(ipv6Support) {
-				pc_constraints.optional.push({"googIPv6":true});
-			}
-			// Any custom constraint to add?
-			if(callbacks.rtcConstraints && typeof callbacks.rtcConstraints === 'object') {
-				Janus.debug("Adding custom PeerConnection constraints:", callbacks.rtcConstraints);
-				for(var i in callbacks.rtcConstraints) {
-					pc_constraints.optional.push(callbacks.rtcConstraints[i]);
-				}
-			}
-			if(Janus.webRTCAdapter.browserDetails.browser === "edge") {
-				// This is Edge, enable BUNDLE explicitly
-				pc_config.bundlePolicy = "max-bundle";
-			}
-			// Check if a sender or receiver transform has been provided
-			if(RTCRtpSender && (RTCRtpSender.prototype.createEncodedStreams ||
-					(RTCRtpSender.prototype.createEncodedAudioStreams &&
-					RTCRtpSender.prototype.createEncodedVideoStreams)) &&
-					(callbacks.senderTransforms || callbacks.receiverTransforms)) {
-				config.senderTransforms = callbacks.senderTransforms;
-				config.receiverTransforms = callbacks.receiverTransforms;
-				pc_config["forceEncodedAudioInsertableStreams"] = true;
-				pc_config["forceEncodedVideoInsertableStreams"] = true;
-				pc_config["encodedInsertableStreams"] = true;
-			}
-			Janus.log("Creating PeerConnection");
-			Janus.debug(pc_constraints);
-			config.pc = new RTCPeerConnection(pc_config, pc_constraints);
-			Janus.debug(config.pc);
-			if(config.pc.getStats) {	// FIXME
-				config.volume = {};
-				config.bitrate.value = "0 kbits/sec";
-			}
-			Janus.log("Preparing local SDP and gathering candidates (trickle=" + config.trickle + ")");
-			config.pc.oniceconnectionstatechange = function() {
-				if(config.pc)
-					pluginHandle.iceState(config.pc.iceConnectionState);
-			};
-			config.pc.onicecandidate = function(event) {
-				if (!event.candidate ||
-						(Janus.webRTCAdapter.browserDetails.browser === 'edge' && event.candidate.candidate.indexOf('endOfCandidates') > 0)) {
-					Janus.log("End of candidates.");
-					config.iceDone = true;
-					if(config.trickle === true) {
-						// Notify end of candidates
-						sendTrickleCandidate(handleId, {"completed": true});
-					} else {
-						// No trickle, time to send the complete SDP (including all candidates)
-						sendSDP(handleId, callbacks);
-					}
-				} else {
-					// JSON.stringify doesn't work on some WebRTC objects anymore
-					// See https://code.google.com/p/chromium/issues/detail?id=467366
-					var candidate = {
-						"candidate": event.candidate.candidate,
-						"sdpMid": event.candidate.sdpMid,
-						"sdpMLineIndex": event.candidate.sdpMLineIndex
-					};
-					if(config.trickle === true) {
-						// Send candidate
-						sendTrickleCandidate(handleId, candidate);
-					}
-				}
-			};
-			config.pc.ontrack = function(event) {
-				Janus.log("Handling Remote Track");
-				Janus.debug(event);
-				if(!event.streams)
-					return;
-				config.remoteStream = event.streams[0];
-				pluginHandle.onremotestream(config.remoteStream);
-				if(event.track.onended)
-					return;
-				if(config.receiverTransforms) {
-					var receiverStreams = null;
-					if(RTCRtpSender.prototype.createEncodedStreams) {
-						receiverStreams = event.receiver.createEncodedStreams();
-					} else if(RTCRtpSender.prototype.createAudioEncodedStreams || RTCRtpSender.prototype.createEncodedVideoStreams) {
-						if(event.track.kind === "audio" && config.receiverTransforms["audio"]) {
-							receiverStreams = event.receiver.createEncodedAudioStreams();
-						} else if(event.track.kind === "video" && config.receiverTransforms["video"]) {
-							receiverStreams = event.receiver.createEncodedVideoStreams();
-						}
-					}
-					if(receiverStreams) {
-						console.log(receiverStreams);
-						if(receiverStreams.readableStream && receiverStreams.writableStream) {
-							receiverStreams.readableStream
-								.pipeThrough(config.receiverTransforms[event.track.kind])
-								.pipeTo(receiverStreams.writableStream);
-						} else if(receiverStreams.readable && receiverStreams.writable) {
-							receiverStreams.readable
-								.pipeThrough(config.receiverTransforms[event.track.kind])
-								.pipeTo(receiverStreams.writable);
-						}
-					}
-				}
-				var trackMutedTimeoutId = null;
-				Janus.log("Adding onended callback to track:", event.track);
-				event.track.onended = function(ev) {
-					Janus.log("Remote track removed:", ev);
-					if(config.remoteStream) {
-						clearTimeout(trackMutedTimeoutId);
-						config.remoteStream.removeTrack(ev.target);
-						pluginHandle.onremotestream(config.remoteStream);
-					}
-				};
-				event.track.onmute = function(ev) {
-					Janus.log("Remote track muted:", ev);
-					if(config.remoteStream && trackMutedTimeoutId == null) {
-						trackMutedTimeoutId = setTimeout(function() {
-							Janus.log("Removing remote track");
-							if (config.remoteStream) {
-								config.remoteStream.removeTrack(ev.target);
-								pluginHandle.onremotestream(config.remoteStream);
-							}
-							trackMutedTimeoutId = null;
-						// Chrome seems to raise mute events only at multiples of 834ms;
-						// we set the timeout to three times this value (rounded to 840ms)
-						}, 3 * 840);
-					}
-				};
-				event.track.onunmute = function(ev) {
-					Janus.log("Remote track flowing again:", ev);
-					if(trackMutedTimeoutId != null) {
-						clearTimeout(trackMutedTimeoutId);
-						trackMutedTimeoutId = null;
-					} else {
-						try {
-							config.remoteStream.addTrack(ev.target);
-							pluginHandle.onremotestream(config.remoteStream);
-						} catch(e) {
-							Janus.error(e);
-						}
-					}
-				};
-			};
-		}
-		if(addTracks && stream) {
-			Janus.log('Adding local stream');
-			var simulcast2 = (callbacks.simulcast2 === true);
-			stream.getTracks().forEach(function(track) {
-				Janus.log('Adding local track:', track);
-				var sender = null;
-				if(!simulcast2 || track.kind === 'audio') {
-					sender = config.pc.addTrack(track, stream);
-				} else {
-					Janus.log('Enabling rid-based simulcasting:', track);
-					var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
-					var tr = config.pc.addTransceiver(track, {
-						direction: "sendrecv",
-						streams: [stream],
-						sendEncodings: callbacks.sendEncodings || [
-							{ rid: "h", active: true, maxBitrate: maxBitrates.high },
-							{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2 },
-							{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4 }
-						]
-					});
-					if(tr)
-						sender = tr.sender;
-				}
-				// Check if insertable streams are involved
-				if(sender && config.senderTransforms) {
-					var senderStreams = null;
-					if(RTCRtpSender.prototype.createEncodedStreams) {
-						senderStreams = sender.createEncodedStreams();
-					} else if(RTCRtpSender.prototype.createAudioEncodedStreams || RTCRtpSender.prototype.createEncodedVideoStreams) {
-						if(sender.track.kind === "audio" && config.senderTransforms["audio"]) {
-							senderStreams = sender.createEncodedAudioStreams();
-						} else if(sender.track.kind === "video" && config.senderTransforms["video"]) {
-							senderStreams = sender.createEncodedVideoStreams();
-						}
-					}
-					if(senderStreams) {
-						console.log(senderStreams);
-						if(senderStreams.readableStream && senderStreams.writableStream) {
-							senderStreams.readableStream
-								.pipeThrough(config.senderTransforms[sender.track.kind])
-								.pipeTo(senderStreams.writableStream);
-						} else if(senderStreams.readable && senderStreams.writable) {
-							senderStreams.readable
-								.pipeThrough(config.senderTransforms[sender.track.kind])
-								.pipeTo(senderStreams.writable);
-						}
-					}
-				}
-			});
-		}
-		// Any data channel to create?
-		if(isDataEnabled(media) && !config.dataChannel[Janus.dataChanDefaultLabel]) {
-			Janus.log("Creating default data channel");
-			createDataChannel(handleId, Janus.dataChanDefaultLabel, null, false);
-			config.pc.ondatachannel = function(event) {
-				Janus.log("Data channel created by Janus:", event);
-				createDataChannel(handleId, event.channel.label, event.channel.protocol, event.channel);
-			};
-		}
-		// If there's a new local stream, let's notify the application
-		if(config.myStream) {
-			pluginHandle.onlocalstream(config.myStream);
-		}
-		// Create offer/answer now
-		if(!jsep) {
-			createOffer(handleId, media, callbacks);
-		} else {
-			config.pc.setRemoteDescription(jsep)
-				.then(function() {
-					Janus.log("Remote description accepted!");
-					config.remoteSdp = jsep.sdp;
-					// Any trickle candidate we cached?
-					if(config.candidates && config.candidates.length > 0) {
-						for(var i = 0; i< config.candidates.length; i++) {
-							var candidate = config.candidates[i];
-							Janus.debug("Adding remote candidate:", candidate);
-							if(!candidate || candidate.completed === true) {
-								// end-of-candidates
-								config.pc.addIceCandidate(Janus.endOfCandidates);
-							} else {
-								// New candidate
-								config.pc.addIceCandidate(candidate);
-							}
-						}
-						config.candidates = [];
-					}
-					// Create the answer now
-					createAnswer(handleId, media, callbacks);
-				}, callbacks.error);
-		}
-	}
-
-	function prepareWebrtc(handleId, offer, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : webrtcError;
-		var jsep = callbacks.jsep;
-		if(offer && jsep) {
-			Janus.error("Provided a JSEP to a createOffer");
-			callbacks.error("Provided a JSEP to a createOffer");
-			return;
-		} else if(!offer && (!jsep || !jsep.type || !jsep.sdp)) {
-			Janus.error("A valid JSEP is required for createAnswer");
-			callbacks.error("A valid JSEP is required for createAnswer");
-			return;
-		}
-		/* Check that callbacks.media is a (not null) Object */
-		callbacks.media = (typeof callbacks.media === 'object' && callbacks.media) ? callbacks.media : { audio: true, video: true };
-		var media = callbacks.media;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		config.trickle = isTrickleEnabled(callbacks.trickle);
-		// Are we updating a session?
-		if(!config.pc) {
-			// Nope, new PeerConnection
-			media.update = false;
-			media.keepAudio = false;
-			media.keepVideo = false;
-		} else {
-			Janus.log("Updating existing media session");
-			media.update = true;
-			// Check if there's anything to add/remove/replace, or if we
-			// can go directly to preparing the new SDP offer or answer
-			if(callbacks.stream) {
-				// External stream: is this the same as the one we were using before?
-				if(callbacks.stream !== config.myStream) {
-					Janus.log("Renegotiation involves a new external stream");
-				}
-			} else {
-				// Check if there are changes on audio
-				if(media.addAudio) {
-					media.keepAudio = false;
-					media.replaceAudio = false;
-					media.removeAudio = false;
-					media.audioSend = true;
-					if(config.myStream && config.myStream.getAudioTracks() && config.myStream.getAudioTracks().length) {
-						Janus.error("Can't add audio stream, there already is one");
-						callbacks.error("Can't add audio stream, there already is one");
-						return;
-					}
-				} else if(media.removeAudio) {
-					media.keepAudio = false;
-					media.replaceAudio = false;
-					media.addAudio = false;
-					media.audioSend = false;
-				} else if(media.replaceAudio) {
-					media.keepAudio = false;
-					media.addAudio = false;
-					media.removeAudio = false;
-					media.audioSend = true;
-				}
-				if(!config.myStream) {
-					// No media stream: if we were asked to replace, it's actually an "add"
-					if(media.replaceAudio) {
-						media.keepAudio = false;
-						media.replaceAudio = false;
-						media.addAudio = true;
-						media.audioSend = true;
-					}
-					if(isAudioSendEnabled(media)) {
-						media.keepAudio = false;
-						media.addAudio = true;
-					}
-				} else {
-					if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
-						// No audio track: if we were asked to replace, it's actually an "add"
-						if(media.replaceAudio) {
-							media.keepAudio = false;
-							media.replaceAudio = false;
-							media.addAudio = true;
-							media.audioSend = true;
-						}
-						if(isAudioSendEnabled(media)) {
-							media.keepAudio = false;
-							media.addAudio = true;
-						}
-					} else {
-						// We have an audio track: should we keep it as it is?
-						if(isAudioSendEnabled(media) &&
-								!media.removeAudio && !media.replaceAudio) {
-							media.keepAudio = true;
-						}
-					}
-				}
-				// Check if there are changes on video
-				if(media.addVideo) {
-					media.keepVideo = false;
-					media.replaceVideo = false;
-					media.removeVideo = false;
-					media.videoSend = true;
-					if(config.myStream && config.myStream.getVideoTracks() && config.myStream.getVideoTracks().length) {
-						Janus.error("Can't add video stream, there already is one");
-						callbacks.error("Can't add video stream, there already is one");
-						return;
-					}
-				} else if(media.removeVideo) {
-					media.keepVideo = false;
-					media.replaceVideo = false;
-					media.addVideo = false;
-					media.videoSend = false;
-				} else if(media.replaceVideo) {
-					media.keepVideo = false;
-					media.addVideo = false;
-					media.removeVideo = false;
-					media.videoSend = true;
-				}
-				if(!config.myStream) {
-					// No media stream: if we were asked to replace, it's actually an "add"
-					if(media.replaceVideo) {
-						media.keepVideo = false;
-						media.replaceVideo = false;
-						media.addVideo = true;
-						media.videoSend = true;
-					}
-					if(isVideoSendEnabled(media)) {
-						media.keepVideo = false;
-						media.addVideo = true;
-					}
-				} else {
-					if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
-						// No video track: if we were asked to replace, it's actually an "add"
-						if(media.replaceVideo) {
-							media.keepVideo = false;
-							media.replaceVideo = false;
-							media.addVideo = true;
-							media.videoSend = true;
-						}
-						if(isVideoSendEnabled(media)) {
-							media.keepVideo = false;
-							media.addVideo = true;
-						}
-					} else {
-						// We have a video track: should we keep it as it is?
-						if(isVideoSendEnabled(media) && !media.removeVideo && !media.replaceVideo) {
-							media.keepVideo = true;
-						}
-					}
-				}
-				// Data channels can only be added
-				if(media.addData) {
-					media.data = true;
-				}
-			}
-			// If we're updating and keeping all tracks, let's skip the getUserMedia part
-			if((isAudioSendEnabled(media) && media.keepAudio) &&
-					(isVideoSendEnabled(media) && media.keepVideo)) {
-				pluginHandle.consentDialog(false);
-				streamsDone(handleId, jsep, media, callbacks, config.myStream);
-				return;
-			}
-		}
-		// If we're updating, check if we need to remove/replace one of the tracks
-		if(media.update && (!config.streamExternal || (config.streamExternal && (media.replaceAudio || media.replaceVideo)))) {
-			if(media.removeAudio || media.replaceAudio) {
-				if(config.myStream && config.myStream.getAudioTracks() && config.myStream.getAudioTracks().length) {
-					var at = config.myStream.getAudioTracks()[0];
-					Janus.log("Removing audio track:", at);
-					config.myStream.removeTrack(at);
-					try {
-						at.stop();
-					} catch(e) {}
-				}
-				if(config.pc.getSenders() && config.pc.getSenders().length) {
-					var ra = true;
-					if(media.replaceAudio && Janus.unifiedPlan) {
-						// We can use replaceTrack
-						ra = false;
-					}
-					if(ra) {
-						for(var asnd of config.pc.getSenders()) {
-							if(asnd && asnd.track && asnd.track.kind === "audio") {
-								Janus.log("Removing audio sender:", asnd);
-								config.pc.removeTrack(asnd);
-							}
-						}
-					}
-				}
-			}
-			if(media.removeVideo || media.replaceVideo) {
-				if(config.myStream && config.myStream.getVideoTracks() && config.myStream.getVideoTracks().length) {
-					var vt = config.myStream.getVideoTracks()[0];
-					Janus.log("Removing video track:", vt);
-					config.myStream.removeTrack(vt);
-					try {
-						vt.stop();
-					} catch(e) {}
-				}
-				if(config.pc.getSenders() && config.pc.getSenders().length) {
-					var rv = true;
-					if(media.replaceVideo && Janus.unifiedPlan) {
-						// We can use replaceTrack
-						rv = false;
-					}
-					if(rv) {
-						for(var vsnd of config.pc.getSenders()) {
-							if(vsnd && vsnd.track && vsnd.track.kind === "video") {
-								Janus.log("Removing video sender:", vsnd);
-								config.pc.removeTrack(vsnd);
-							}
-						}
-					}
-				}
-			}
-		}
-		// Was a MediaStream object passed, or do we need to take care of that?
-		if(callbacks.stream) {
-			var stream = callbacks.stream;
-			Janus.log("MediaStream provided by the application");
-			Janus.debug(stream);
-			// If this is an update, let's check if we need to release the previous stream
-			if(media.update && config.myStream && config.myStream !== callbacks.stream && !config.streamExternal && !media.replaceAudio && !media.replaceVideo) {
-				// We're replacing a stream we captured ourselves with an external one
-				Janus.stopAllTracks(config.myStream);
-				config.myStream = null;
-			}
-			// Skip the getUserMedia part
-			config.streamExternal = true;
-			pluginHandle.consentDialog(false);
-			streamsDone(handleId, jsep, media, callbacks, stream);
-			return;
-		}
-		if(isAudioSendEnabled(media) || isVideoSendEnabled(media)) {
-			if(!Janus.isGetUserMediaAvailable()) {
-				callbacks.error("getUserMedia not available");
-				return;
-			}
-			var constraints = { mandatory: {}, optional: []};
-			pluginHandle.consentDialog(true);
-			var audioSupport = isAudioSendEnabled(media);
-			if(audioSupport && media && typeof media.audio === 'object')
-				audioSupport = media.audio;
-			var videoSupport = isVideoSendEnabled(media);
-			if(videoSupport && media) {
-				var simulcast = (callbacks.simulcast === true);
-				var simulcast2 = (callbacks.simulcast2 === true);
-				if((simulcast || simulcast2) && !jsep && !media.video)
-					media.video = "hires";
-				if(media.video && media.video != 'screen' && media.video != 'window') {
-					if(typeof media.video === 'object') {
-						videoSupport = media.video;
-					} else {
-						var width = 0;
-						var height = 0;
-						if(media.video === 'lowres') {
-							// Small resolution, 4:3
-							height = 240;
-							width = 320;
-						} else if(media.video === 'lowres-16:9') {
-							// Small resolution, 16:9
-							height = 180;
-							width = 320;
-						} else if(media.video === 'hires' || media.video === 'hires-16:9' || media.video === 'hdres') {
-							// High(HD) resolution is only 16:9
-							height = 720;
-							width = 1280;
-						} else if(media.video === 'fhdres') {
-							// Full HD resolution is only 16:9
-							height = 1080;
-							width = 1920;
-						} else if(media.video === '4kres') {
-							// 4K resolution is only 16:9
-							height = 2160;
-							width = 3840;
-						} else if(media.video === 'stdres') {
-							// Normal resolution, 4:3
-							height = 480;
-							width = 640;
-						} else if(media.video === 'stdres-16:9') {
-							// Normal resolution, 16:9
-							height = 360;
-							width = 640;
-						} else {
-							Janus.log("Default video setting is stdres 4:3");
-							height = 480;
-							width = 640;
-						}
-						Janus.log("Adding media constraint:", media.video);
-						videoSupport = {
-							'height': {'ideal': height},
-							'width': {'ideal': width}
-						};
-						Janus.log("Adding video constraint:", videoSupport);
-					}
-				} else if(media.video === 'screen' || media.video === 'window') {
-					if(navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia) {
-						// The new experimental getDisplayMedia API is available, let's use that
-						// https://groups.google.com/forum/#!topic/discuss-webrtc/Uf0SrR4uxzk
-						// https://webrtchacks.com/chrome-screensharing-getdisplaymedia/
-						constraints.video = {};
-						if(media.screenshareFrameRate) {
-							constraints.video.frameRate = media.screenshareFrameRate;
-						}
-						if(media.screenshareHeight) {
-							constraints.video.height = media.screenshareHeight;
-						}
-						if(media.screenshareWidth) {
-							constraints.video.width = media.screenshareWidth;
-						}
-						constraints.audio = media.captureDesktopAudio;
-						navigator.mediaDevices.getDisplayMedia(constraints)
-							.then(function(stream) {
-								pluginHandle.consentDialog(false);
-								if(isAudioSendEnabled(media) && !media.keepAudio) {
-									navigator.mediaDevices.getUserMedia({ audio: true, video: false })
-									.then(function (audioStream) {
-										stream.addTrack(audioStream.getAudioTracks()[0]);
-										streamsDone(handleId, jsep, media, callbacks, stream);
-									})
-								} else {
-									streamsDone(handleId, jsep, media, callbacks, stream);
-								}
-							}, function (error) {
-								pluginHandle.consentDialog(false);
-								callbacks.error(error);
-							});
-						return;
-					}
-					// We're going to try and use the extension for Chrome 34+, the old approach
-					// for older versions of Chrome, or the experimental support in Firefox 33+
-					const callbackUserMedia = function(error, stream) {
-						pluginHandle.consentDialog(false);
-						if(error) {
-							callbacks.error(error);
-						} else {
-							streamsDone(handleId, jsep, media, callbacks, stream);
-						}
-					}
-					const getScreenMedia = function(constraints, gsmCallback, useAudio) {
-						Janus.log("Adding media constraint (screen capture)");
-						Janus.debug(constraints);
-						navigator.mediaDevices.getUserMedia(constraints)
-							.then(function(stream) {
-								if(useAudio) {
-									navigator.mediaDevices.getUserMedia({ audio: true, video: false })
-									.then(function (audioStream) {
-										stream.addTrack(audioStream.getAudioTracks()[0]);
-										gsmCallback(null, stream);
-									})
-								} else {
-									gsmCallback(null, stream);
-								}
-							})
-							.catch(function(error) { pluginHandle.consentDialog(false); gsmCallback(error); });
-					}
-					if(Janus.webRTCAdapter.browserDetails.browser === 'chrome') {
-						var chromever = Janus.webRTCAdapter.browserDetails.version;
-						var maxver = 33;
-						if(window.navigator.userAgent.match('Linux'))
-							maxver = 35;	// "known" crash in chrome 34 and 35 on linux
-						if(chromever >= 26 && chromever <= maxver) {
-							// Chrome 26->33 requires some awkward chrome://flags manipulation
-							constraints = {
-								video: {
-									mandatory: {
-										googLeakyBucket: true,
-										maxWidth: window.screen.width,
-										maxHeight: window.screen.height,
-										minFrameRate: media.screenshareFrameRate,
-										maxFrameRate: media.screenshareFrameRate,
-										chromeMediaSource: 'screen'
-									}
-								},
-								audio: isAudioSendEnabled(media) && !media.keepAudio
-							};
-							getScreenMedia(constraints, callbackUserMedia);
-						} else {
-							// Chrome 34+ requires an extension
-							Janus.extension.getScreen(function (error, sourceId) {
-								if (error) {
-									pluginHandle.consentDialog(false);
-									return callbacks.error(error);
-								}
-								constraints = {
-									audio: false,
-									video: {
-										mandatory: {
-											chromeMediaSource: 'desktop',
-											maxWidth: window.screen.width,
-											maxHeight: window.screen.height,
-											minFrameRate: media.screenshareFrameRate,
-											maxFrameRate: media.screenshareFrameRate,
-										},
-										optional: [
-											{googLeakyBucket: true},
-											{googTemporalLayeredScreencast: true}
-										]
-									}
-								};
-								constraints.video.mandatory.chromeMediaSourceId = sourceId;
-								getScreenMedia(constraints, callbackUserMedia,
-									isAudioSendEnabled(media) && !media.keepAudio);
-							});
-						}
-					} else if(Janus.webRTCAdapter.browserDetails.browser === 'firefox') {
-						if(Janus.webRTCAdapter.browserDetails.version >= 33) {
-							// Firefox 33+ has experimental support for screen sharing
-							constraints = {
-								video: {
-									mozMediaSource: media.video,
-									mediaSource: media.video
-								},
-								audio: isAudioSendEnabled(media) && !media.keepAudio
-							};
-							getScreenMedia(constraints, function (err, stream) {
-								callbackUserMedia(err, stream);
-								// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1045810
-								if (!err) {
-									var lastTime = stream.currentTime;
-									var polly = window.setInterval(function () {
-										if(!stream)
-											window.clearInterval(polly);
-										if(stream.currentTime == lastTime) {
-											window.clearInterval(polly);
-											if(stream.onended) {
-												stream.onended();
-											}
-										}
-										lastTime = stream.currentTime;
-									}, 500);
-								}
-							});
-						} else {
-							var error = new Error('NavigatorUserMediaError');
-							error.name = 'Your version of Firefox does not support screen sharing, please install Firefox 33 (or more recent versions)';
-							pluginHandle.consentDialog(false);
-							callbacks.error(error);
-							return;
-						}
-					}
-					return;
-				}
-			}
-			// If we got here, we're not screensharing
-			if(!media || media.video !== 'screen') {
-				// Check whether all media sources are actually available or not
-				navigator.mediaDevices.enumerateDevices().then(function(devices) {
-					var audioExist = devices.some(function(device) {
-						return device.kind === 'audioinput';
-					}),
-					videoExist = isScreenSendEnabled(media) || devices.some(function(device) {
-						return device.kind === 'videoinput';
-					});
-
-					// Check whether a missing device is really a problem
-					var audioSend = isAudioSendEnabled(media);
-					var videoSend = isVideoSendEnabled(media);
-					var needAudioDevice = isAudioSendRequired(media);
-					var needVideoDevice = isVideoSendRequired(media);
-					if(audioSend || videoSend || needAudioDevice || needVideoDevice) {
-						// We need to send either audio or video
-						var haveAudioDevice = audioSend ? audioExist : false;
-						var haveVideoDevice = videoSend ? videoExist : false;
-						if(!haveAudioDevice && !haveVideoDevice) {
-							// FIXME Should we really give up, or just assume recvonly for both?
-							pluginHandle.consentDialog(false);
-							callbacks.error('No capture device found');
-							return false;
-						} else if(!haveAudioDevice && needAudioDevice) {
-							pluginHandle.consentDialog(false);
-							callbacks.error('Audio capture is required, but no capture device found');
-							return false;
-						} else if(!haveVideoDevice && needVideoDevice) {
-							pluginHandle.consentDialog(false);
-							callbacks.error('Video capture is required, but no capture device found');
-							return false;
-						}
-					}
-
-					var gumConstraints = {
-						audio: (audioExist && !media.keepAudio) ? audioSupport : false,
-						video: (videoExist && !media.keepVideo) ? videoSupport : false
-					};
-					Janus.debug("getUserMedia constraints", gumConstraints);
-					if (!gumConstraints.audio && !gumConstraints.video) {
-						pluginHandle.consentDialog(false);
-						streamsDone(handleId, jsep, media, callbacks, stream);
-					} else {
-						navigator.mediaDevices.getUserMedia(gumConstraints)
-							.then(function(stream) {
-								pluginHandle.consentDialog(false);
-								streamsDone(handleId, jsep, media, callbacks, stream);
-							}).catch(function(error) {
-								pluginHandle.consentDialog(false);
-								callbacks.error({code: error.code, name: error.name, message: error.message});
-							});
-					}
-				})
-				.catch(function(error) {
-					pluginHandle.consentDialog(false);
-					callbacks.error(error);
-				});
-			}
-		} else {
-			// No need to do a getUserMedia, create offer/answer right away
-			streamsDone(handleId, jsep, media, callbacks);
-		}
-	}
-
-	function prepareWebrtcPeer(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : webrtcError;
-		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
-		var jsep = callbacks.jsep;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(jsep) {
-			if(!config.pc) {
-				Janus.warn("Wait, no PeerConnection?? if this is an answer, use createAnswer and not handleRemoteJsep");
-				callbacks.error("No PeerConnection: if this is an answer, use createAnswer and not handleRemoteJsep");
-				return;
-			}
-			callbacks.customizeSdp(jsep);
-			config.pc.setRemoteDescription(jsep)
-				.then(function() {
-					Janus.log("Remote description accepted!");
-					config.remoteSdp = jsep.sdp;
-					// Any trickle candidate we cached?
-					if(config.candidates && config.candidates.length > 0) {
-						for(var i = 0; i< config.candidates.length; i++) {
-							var candidate = config.candidates[i];
-							Janus.debug("Adding remote candidate:", candidate);
-							if(!candidate || candidate.completed === true) {
-								// end-of-candidates
-								config.pc.addIceCandidate(Janus.endOfCandidates);
-							} else {
-								// New candidate
-								config.pc.addIceCandidate(candidate);
-							}
-						}
-						config.candidates = [];
-					}
-					// Done
-					callbacks.success();
-				}, callbacks.error);
-		} else {
-			callbacks.error("Invalid JSEP");
-		}
-	}
-
-	function createOffer(handleId, media, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		var simulcast = (callbacks.simulcast === true);
-		if(!simulcast) {
-			Janus.log("Creating offer (iceDone=" + config.iceDone + ")");
-		} else {
-			Janus.log("Creating offer (iceDone=" + config.iceDone + ", simulcast=" + simulcast + ")");
-		}
-		// https://code.google.com/p/webrtc/issues/detail?id=3508
-		var mediaConstraints = {};
-		if(Janus.unifiedPlan) {
-			// We can use Transceivers
-			var audioTransceiver = null, videoTransceiver = null;
-			var transceivers = config.pc.getTransceivers();
-			if(transceivers && transceivers.length > 0) {
-				for(var t of transceivers) {
-					if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
-							(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
-						if(!audioTransceiver) {
-							audioTransceiver = t;
-						}
-						continue;
-					}
-					if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
-							(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
-						if(!videoTransceiver) {
-							videoTransceiver = t;
-						}
-						continue;
-					}
-				}
-			}
-			// Handle audio (and related changes, if any)
-			var audioSend = isAudioSendEnabled(media);
-			var audioRecv = isAudioRecvEnabled(media);
-			if(!audioSend && !audioRecv) {
-				// Audio disabled: have we removed it?
-				if(media.removeAudio && audioTransceiver) {
-					if (audioTransceiver.setDirection) {
-						audioTransceiver.setDirection("inactive");
-					} else {
-						audioTransceiver.direction = "inactive";
-					}
-					Janus.log("Setting audio transceiver to inactive:", audioTransceiver);
-				}
-			} else {
-				// Take care of audio m-line
-				if(audioSend && audioRecv) {
-					if(audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("sendrecv");
-						} else {
-							audioTransceiver.direction = "sendrecv";
-						}
-						Janus.log("Setting audio transceiver to sendrecv:", audioTransceiver);
-					}
-				} else if(audioSend && !audioRecv) {
-					if(audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("sendonly");
-						} else {
-							audioTransceiver.direction = "sendonly";
-						}
-						Janus.log("Setting audio transceiver to sendonly:", audioTransceiver);
-					}
-				} else if(!audioSend && audioRecv) {
-					if(audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("recvonly");
-						} else {
-							audioTransceiver.direction = "recvonly";
-						}
-						Janus.log("Setting audio transceiver to recvonly:", audioTransceiver);
-					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						audioTransceiver = config.pc.addTransceiver("audio", { direction: "recvonly" });
-						Janus.log("Adding recvonly audio transceiver:", audioTransceiver);
-					}
-				}
-			}
-			// Handle video (and related changes, if any)
-			var videoSend = isVideoSendEnabled(media);
-			var videoRecv = isVideoRecvEnabled(media);
-			if(!videoSend && !videoRecv) {
-				// Video disabled: have we removed it?
-				if(media.removeVideo && videoTransceiver) {
-					if (videoTransceiver.setDirection) {
-						videoTransceiver.setDirection("inactive");
-					} else {
-						videoTransceiver.direction = "inactive";
-					}
-					Janus.log("Setting video transceiver to inactive:", videoTransceiver);
-				}
-			} else {
-				// Take care of video m-line
-				if(videoSend && videoRecv) {
-					if(videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("sendrecv");
-						} else {
-							videoTransceiver.direction = "sendrecv";
-						}
-						Janus.log("Setting video transceiver to sendrecv:", videoTransceiver);
-					}
-				} else if(videoSend && !videoRecv) {
-					if(videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("sendonly");
-						} else {
-							videoTransceiver.direction = "sendonly";
-						}
-						Janus.log("Setting video transceiver to sendonly:", videoTransceiver);
-					}
-				} else if(!videoSend && videoRecv) {
-					if(videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("recvonly");
-						} else {
-							videoTransceiver.direction = "recvonly";
-						}
-						Janus.log("Setting video transceiver to recvonly:", videoTransceiver);
-					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						videoTransceiver = config.pc.addTransceiver("video", { direction: "recvonly" });
-						Janus.log("Adding recvonly video transceiver:", videoTransceiver);
-					}
-				}
-			}
-		} else {
-			mediaConstraints["offerToReceiveAudio"] = isAudioRecvEnabled(media);
-			mediaConstraints["offerToReceiveVideo"] = isVideoRecvEnabled(media);
-		}
-		var iceRestart = (callbacks.iceRestart === true);
-		if(iceRestart) {
-			mediaConstraints["iceRestart"] = true;
-		}
-		Janus.debug(mediaConstraints);
-		// Check if this is Firefox and we've been asked to do simulcasting
-		var sendVideo = isVideoSendEnabled(media);
-		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
-			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
-			Janus.log("Enabling Simulcasting for Firefox (RID)");
-			var sender = config.pc.getSenders().find(function(s) {return s.track && s.track.kind === "video"});
-			if(sender) {
-				var parameters = sender.getParameters();
-				if(!parameters) {
-					parameters = {};
-				}
-				var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
-				parameters.encodings = callbacks.sendEncodings || [
-					{ rid: "h", active: true, maxBitrate: maxBitrates.high },
-					{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2 },
-					{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4 }
-				];
-				sender.setParameters(parameters);
-			}
-		}
-		config.pc.createOffer(mediaConstraints)
-			.then(function(offer) {
-				Janus.debug(offer);
-				// JSON.stringify doesn't work on some WebRTC objects anymore
-				// See https://code.google.com/p/chromium/issues/detail?id=467366
-				var jsep = {
-					"type": offer.type,
-					"sdp": offer.sdp
-				};
-				callbacks.customizeSdp(jsep);
-				offer.sdp = jsep.sdp;
-				Janus.log("Setting local description");
-				if(sendVideo && simulcast) {
-					// This SDP munging only works with Chrome (Safari STP may support it too)
-					if(Janus.webRTCAdapter.browserDetails.browser === "chrome" ||
-							Janus.webRTCAdapter.browserDetails.browser === "safari") {
-						Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
-						offer.sdp = mungeSdpForSimulcasting(offer.sdp);
-					} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
-						Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
-					}
-				}
-				config.mySdp = {
-					type: "offer",
-					sdp: offer.sdp
-				};
-				config.pc.setLocalDescription(offer)
-					.catch(callbacks.error);
-				config.mediaConstraints = mediaConstraints;
-				if(!config.iceDone && !config.trickle) {
-					// Don't do anything until we have all candidates
-					Janus.log("Waiting for all candidates...");
-					return;
-				}
-				// If transforms are present, notify Janus that the media is end-to-end encrypted
-				if(config.senderTransforms || config.receiverTransforms) {
-					offer["e2ee"] = true;
-				}
-				callbacks.success(offer);
-			}, callbacks.error);
-	}
-
-	function createAnswer(handleId, media, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		callbacks.customizeSdp = (typeof callbacks.customizeSdp == "function") ? callbacks.customizeSdp : Janus.noop;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			callbacks.error("Invalid handle");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		var simulcast = (callbacks.simulcast === true);
-		if(!simulcast) {
-			Janus.log("Creating answer (iceDone=" + config.iceDone + ")");
-		} else {
-			Janus.log("Creating answer (iceDone=" + config.iceDone + ", simulcast=" + simulcast + ")");
-		}
-		var mediaConstraints = null;
-		if(Janus.unifiedPlan) {
-			// We can use Transceivers
-			mediaConstraints = {};
-			var audioTransceiver = null, videoTransceiver = null;
-			var transceivers = config.pc.getTransceivers();
-			if(transceivers && transceivers.length > 0) {
-				for(var t of transceivers) {
-					if((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
-							(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
-						if(!audioTransceiver)
-							audioTransceiver = t;
-						continue;
-					}
-					if((t.sender && t.sender.track && t.sender.track.kind === "video") ||
-							(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
-						if(!videoTransceiver)
-							videoTransceiver = t;
-						continue;
-					}
-				}
-			}
-			// Handle audio (and related changes, if any)
-			var audioSend = isAudioSendEnabled(media);
-			var audioRecv = isAudioRecvEnabled(media);
-			if(!audioSend && !audioRecv) {
-				// Audio disabled: have we removed it?
-				if(media.removeAudio && audioTransceiver) {
-					try {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("inactive");
-						} else {
-							audioTransceiver.direction = "inactive";
-						}
-						Janus.log("Setting audio transceiver to inactive:", audioTransceiver);
-					} catch(e) {
-						Janus.error(e);
-					}
-				}
-			} else {
-				// Take care of audio m-line
-				if(audioSend && audioRecv) {
-					if(audioTransceiver) {
-						try {
-							if (audioTransceiver.setDirection) {
-								audioTransceiver.setDirection("sendrecv");
-							} else {
-								audioTransceiver.direction = "sendrecv";
-							}
-							Janus.log("Setting audio transceiver to sendrecv:", audioTransceiver);
-						} catch(e) {
-							Janus.error(e);
-						}
-					}
-				} else if(audioSend && !audioRecv) {
-					try {
-						if(audioTransceiver) {
-							if (audioTransceiver.setDirection) {
-								audioTransceiver.setDirection("sendonly");
-							} else {
-								audioTransceiver.direction = "sendonly";
-							}
-							Janus.log("Setting audio transceiver to sendonly:", audioTransceiver);
-						}
-					} catch(e) {
-						Janus.error(e);
-					}
-				} else if(!audioSend && audioRecv) {
-					if(audioTransceiver) {
-						try {
-							if (audioTransceiver.setDirection) {
-								audioTransceiver.setDirection("recvonly");
-							} else {
-								audioTransceiver.direction = "recvonly";
-							}
-							Janus.log("Setting audio transceiver to recvonly:", audioTransceiver);
-						} catch(e) {
-							Janus.error(e);
-						}
-					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						audioTransceiver = config.pc.addTransceiver("audio", { direction: "recvonly" });
-						Janus.log("Adding recvonly audio transceiver:", audioTransceiver);
-					}
-				}
-			}
-			// Handle video (and related changes, if any)
-			var videoSend = isVideoSendEnabled(media);
-			var videoRecv = isVideoRecvEnabled(media);
-			if(!videoSend && !videoRecv) {
-				// Video disabled: have we removed it?
-				if(media.removeVideo && videoTransceiver) {
-					try {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("inactive");
-						} else {
-							videoTransceiver.direction = "inactive";
-						}
-						Janus.log("Setting video transceiver to inactive:", videoTransceiver);
-					} catch(e) {
-						Janus.error(e);
-					}
-				}
-			} else {
-				// Take care of video m-line
-				if(videoSend && videoRecv) {
-					if(videoTransceiver) {
-						try {
-							if (videoTransceiver.setDirection) {
-								videoTransceiver.setDirection("sendrecv");
-							} else {
-								videoTransceiver.direction = "sendrecv";
-							}
-							Janus.log("Setting video transceiver to sendrecv:", videoTransceiver);
-						} catch(e) {
-							Janus.error(e);
-						}
-					}
-				} else if(videoSend && !videoRecv) {
-					if(videoTransceiver) {
-						try {
-							if (videoTransceiver.setDirection) {
-								videoTransceiver.setDirection("sendonly");
-							} else {
-								videoTransceiver.direction = "sendonly";
-							}
-							Janus.log("Setting video transceiver to sendonly:", videoTransceiver);
-						} catch(e) {
-							Janus.error(e);
-						}
-					}
-				} else if(!videoSend && videoRecv) {
-					if(videoTransceiver) {
-						try {
-							if (videoTransceiver.setDirection) {
-								videoTransceiver.setDirection("recvonly");
-							} else {
-								videoTransceiver.direction = "recvonly";
-							}
-							Janus.log("Setting video transceiver to recvonly:", videoTransceiver);
-						} catch(e) {
-							Janus.error(e);
-						}
-					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						videoTransceiver = config.pc.addTransceiver("video", { direction: "recvonly" });
-						Janus.log("Adding recvonly video transceiver:", videoTransceiver);
-					}
-				}
-			}
-		} else {
-			if(Janus.webRTCAdapter.browserDetails.browser === "firefox" || Janus.webRTCAdapter.browserDetails.browser === "edge") {
-				mediaConstraints = {
-					offerToReceiveAudio: isAudioRecvEnabled(media),
-					offerToReceiveVideo: isVideoRecvEnabled(media)
-				};
-			} else {
-				mediaConstraints = {
-					mandatory: {
-						OfferToReceiveAudio: isAudioRecvEnabled(media),
-						OfferToReceiveVideo: isVideoRecvEnabled(media)
-					}
-				};
-			}
-		}
-		Janus.debug(mediaConstraints);
-		// Check if this is Firefox and we've been asked to do simulcasting
-		var sendVideo = isVideoSendEnabled(media);
-		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
-			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
-			Janus.log("Enabling Simulcasting for Firefox (RID)");
-			var sender = config.pc.getSenders()[1];
-			Janus.log(sender);
-			var parameters = sender.getParameters();
-			Janus.log(parameters);
-
-			var maxBitrates = getMaxBitrates(callbacks.simulcastMaxBitrates);
-			sender.setParameters({encodings: callbacks.sendEncodings || [
-				{ rid: "h", active: true, maxBitrate: maxBitrates.high },
-				{ rid: "m", active: true, maxBitrate: maxBitrates.medium, scaleResolutionDownBy: 2},
-				{ rid: "l", active: true, maxBitrate: maxBitrates.low, scaleResolutionDownBy: 4}
-			]});
-		}
-		config.pc.createAnswer(mediaConstraints)
-			.then(function(answer) {
-				Janus.debug(answer);
-				// JSON.stringify doesn't work on some WebRTC objects anymore
-				// See https://code.google.com/p/chromium/issues/detail?id=467366
-				var jsep = {
-					"type": answer.type,
-					"sdp": answer.sdp
-				};
-				callbacks.customizeSdp(jsep);
-				answer.sdp = jsep.sdp;
-				Janus.log("Setting local description");
-				if(sendVideo && simulcast) {
-					// This SDP munging only works with Chrome
-					if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
-						// FIXME Apparently trying to simulcast when answering breaks video in Chrome...
-						//~ Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
-						//~ answer.sdp = mungeSdpForSimulcasting(answer.sdp);
-						Janus.warn("simulcast=true, but this is an answer, and video breaks in Chrome if we enable it");
-					} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
-						Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
-					}
-				}
-				config.mySdp = {
-					type: "answer",
-					sdp: answer.sdp
-				};
-				config.pc.setLocalDescription(answer)
-					.catch(callbacks.error);
-				config.mediaConstraints = mediaConstraints;
-				if(!config.iceDone && !config.trickle) {
-					// Don't do anything until we have all candidates
-					Janus.log("Waiting for all candidates...");
-					return;
-				}
-				// If transforms are present, notify Janus that the media is end-to-end encrypted
-				if(config.senderTransforms || config.receiverTransforms) {
-					answer["e2ee"] = true;
-				}
-				callbacks.success(answer);
-			}, callbacks.error);
-	}
-
-	function sendSDP(handleId, callbacks) {
-		callbacks = callbacks || {};
-		callbacks.success = (typeof callbacks.success == "function") ? callbacks.success : Janus.noop;
-		callbacks.error = (typeof callbacks.error == "function") ? callbacks.error : Janus.noop;
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle, not sending anything");
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		Janus.log("Sending offer/answer SDP...");
-		if(!config.mySdp) {
-			Janus.warn("Local SDP instance is invalid, not sending anything...");
-			return;
-		}
-		config.mySdp = {
-			"type": config.pc.localDescription.type,
-			"sdp": config.pc.localDescription.sdp
-		};
-		if(config.trickle === false)
-			config.mySdp["trickle"] = false;
-		Janus.debug(callbacks);
-		config.sdpSent = true;
-		callbacks.success(config.mySdp);
-	}
-
-	function getVolume(handleId, remote) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return 0;
-		}
-		var stream = remote ? "remote" : "local";
-		var config = pluginHandle.webrtcStuff;
-		if(!config.volume[stream])
-			config.volume[stream] = { value: 0 };
-		// Start getting the volume, if audioLevel in getStats is supported (apparently
-		// they're only available in Chrome/Safari right now: https://webrtc-stats.callstats.io/)
-		if(config.pc.getStats && (Janus.webRTCAdapter.browserDetails.browser === "chrome" ||
-				Janus.webRTCAdapter.browserDetails.browser === "safari")) {
-			if(remote && !config.remoteStream) {
-				Janus.warn("Remote stream unavailable");
-				return 0;
-			} else if(!remote && !config.myStream) {
-				Janus.warn("Local stream unavailable");
-				return 0;
-			}
-			if(!config.volume[stream].timer) {
-				Janus.log("Starting " + stream + " volume monitor");
-				config.volume[stream].timer = setInterval(function() {
-					config.pc.getStats()
-						.then(function(stats) {
-							stats.forEach(function (res) {
-								if(!res || res.kind !== "audio")
-									return;
-								if((remote && !res.remoteSource) || (!remote && res.type !== "media-source"))
-									return;
-								config.volume[stream].value = (res.audioLevel ? res.audioLevel : 0);
-							});
-						});
-				}, 200);
-				return 0;	// We don't have a volume to return yet
-			}
-			return config.volume[stream].value;
-		} else {
-			// audioInputLevel and audioOutputLevel seem only available in Chrome? audioLevel
-			// seems to be available on Chrome and Firefox, but they don't seem to work
-			Janus.warn("Getting the " + stream + " volume unsupported by browser");
-			return 0;
-		}
-	}
-
-	function isMuted(handleId, video) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return true;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(!config.pc) {
-			Janus.warn("Invalid PeerConnection");
-			return true;
-		}
-		if(!config.myStream) {
-			Janus.warn("Invalid local MediaStream");
-			return true;
-		}
-		if(video) {
-			// Check video track
-			if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
-				Janus.warn("No video track");
-				return true;
-			}
-			return !config.myStream.getVideoTracks()[0].enabled;
-		} else {
-			// Check audio track
-			if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
-				Janus.warn("No audio track");
-				return true;
-			}
-			return !config.myStream.getAudioTracks()[0].enabled;
-		}
-	}
-
-	function mute(handleId, video, mute) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return false;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(!config.pc) {
-			Janus.warn("Invalid PeerConnection");
-			return false;
-		}
-		if(!config.myStream) {
-			Janus.warn("Invalid local MediaStream");
-			return false;
-		}
-		if(video) {
-			// Mute/unmute video track
-			if(!config.myStream.getVideoTracks() || config.myStream.getVideoTracks().length === 0) {
-				Janus.warn("No video track");
-				return false;
-			}
-			config.myStream.getVideoTracks()[0].enabled = !mute;
-			return true;
-		} else {
-			// Mute/unmute audio track
-			if(!config.myStream.getAudioTracks() || config.myStream.getAudioTracks().length === 0) {
-				Janus.warn("No audio track");
-				return false;
-			}
-			config.myStream.getAudioTracks()[0].enabled = !mute;
-			return true;
-		}
-	}
-
-	function getBitrate(handleId) {
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle || !pluginHandle.webrtcStuff) {
-			Janus.warn("Invalid handle");
-			return "Invalid handle";
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(!config.pc)
-			return "Invalid PeerConnection";
-		// Start getting the bitrate, if getStats is supported
-		if(config.pc.getStats) {
-			if(!config.bitrate.timer) {
-				Janus.log("Starting bitrate timer (via getStats)");
-				config.bitrate.timer = setInterval(function() {
-					config.pc.getStats()
-						.then(function(stats) {
-							stats.forEach(function (res) {
-								if(!res)
-									return;
-								var inStats = false;
-								// Check if these are statistics on incoming media
-								if((res.mediaType === "video" || res.id.toLowerCase().indexOf("video") > -1) &&
-										res.type === "inbound-rtp" && res.id.indexOf("rtcp") < 0) {
-									// New stats
-									inStats = true;
-								} else if(res.type == 'ssrc' && res.bytesReceived &&
-										(res.googCodecName === "VP8" || res.googCodecName === "")) {
-									// Older Chromer versions
-									inStats = true;
-								}
-								// Parse stats now
-								if(inStats) {
-									config.bitrate.bsnow = res.bytesReceived;
-									config.bitrate.tsnow = res.timestamp;
-									if(config.bitrate.bsbefore === null || config.bitrate.tsbefore === null) {
-										// Skip this round
-										config.bitrate.bsbefore = config.bitrate.bsnow;
-										config.bitrate.tsbefore = config.bitrate.tsnow;
-									} else {
-										// Calculate bitrate
-										var timePassed = config.bitrate.tsnow - config.bitrate.tsbefore;
-										if(Janus.webRTCAdapter.browserDetails.browser === "safari")
-											timePassed = timePassed/1000;	// Apparently the timestamp is in microseconds, in Safari
-										var bitRate = Math.round((config.bitrate.bsnow - config.bitrate.bsbefore) * 8 / timePassed);
-										if(Janus.webRTCAdapter.browserDetails.browser === "safari")
-											bitRate = parseInt(bitRate/1000);
-										config.bitrate.value = bitRate + ' kbits/sec';
-										//~ Janus.log("Estimated bitrate is " + config.bitrate.value);
-										config.bitrate.bsbefore = config.bitrate.bsnow;
-										config.bitrate.tsbefore = config.bitrate.tsnow;
-									}
-								}
-							});
-						});
-				}, 1000);
-				return "0 kbits/sec";	// We don't have a bitrate value yet
-			}
-			return config.bitrate.value;
-		} else {
-			Janus.warn("Getting the video bitrate unsupported by browser");
-			return "Feature unsupported by browser";
-		}
-	}
-
-	function webrtcError(error) {
-		Janus.error("WebRTC error:", error);
-	}
-
-	function cleanupWebrtc(handleId, hangupRequest) {
-		Janus.log("Cleaning WebRTC stuff");
-		var pluginHandle = pluginHandles[handleId];
-		if(!pluginHandle) {
-			// Nothing to clean
-			return;
-		}
-		var config = pluginHandle.webrtcStuff;
-		if(config) {
-			if(hangupRequest === true) {
-				// Send a hangup request (we don't really care about the response)
-				var request = { "janus": "hangup", "transaction": Janus.randomString(12) };
-				if(pluginHandle.token)
-					request["token"] = pluginHandle.token;
-				if(apisecret)
-					request["apisecret"] = apisecret;
-				Janus.debug("Sending hangup request (handle=" + handleId + "):");
-				Janus.debug(request);
-				if(websockets) {
-					request["session_id"] = sessionId;
-					request["handle_id"] = handleId;
-					ws.send(JSON.stringify(request));
-				} else {
-					Janus.httpAPICall(server + "/" + sessionId + "/" + handleId, {
-						verb: 'POST',
-						withCredentials: withCredentials,
-						body: request
-					});
-				}
-			}
-			// Cleanup stack
-			config.remoteStream = null;
-			if(config.volume) {
-				if(config.volume["local"] && config.volume["local"].timer)
-					clearInterval(config.volume["local"].timer);
-				if(config.volume["remote"] && config.volume["remote"].timer)
-					clearInterval(config.volume["remote"].timer);
-			}
-			config.volume = {};
-			if(config.bitrate.timer)
-				clearInterval(config.bitrate.timer);
-			config.bitrate.timer = null;
-			config.bitrate.bsnow = null;
-			config.bitrate.bsbefore = null;
-			config.bitrate.tsnow = null;
-			config.bitrate.tsbefore = null;
-			config.bitrate.value = null;
-			if(!config.streamExternal && config.myStream) {
-				Janus.log("Stopping local stream tracks");
-				Janus.stopAllTracks(config.myStream);
-			}
-			config.streamExternal = false;
-			config.myStream = null;
-			// Close PeerConnection
-			try {
-				config.pc.close();
-			} catch(e) {
-				// Do nothing
-			}
-			config.pc = null;
-			config.candidates = null;
-			config.mySdp = null;
-			config.remoteSdp = null;
-			config.iceDone = false;
-			config.dataChannel = {};
-			config.dtmfSender = null;
-			config.senderTransforms = null;
-			config.receiverTransforms = null;
-		}
-		pluginHandle.oncleanup();
-	}
-
-	// Helper method to munge an SDP to enable simulcasting (Chrome only)
-	function mungeSdpForSimulcasting(sdp) {
-		// Let's munge the SDP to add the attributes for enabling simulcasting
-		// (based on https://gist.github.com/ggarber/a19b4c33510028b9c657)
-		var lines = sdp.split("\r\n");
-		var video = false;
-		var ssrc = [ -1 ], ssrc_fid = [ -1 ];
-		var cname = null, msid = null, mslabel = null, label = null;
-		var insertAt = -1;
-		for(let i=0; i<lines.length; i++) {
-			const mline = lines[i].match(/m=(\w+) */);
-			if(mline) {
-				const medium = mline[1];
-				if(medium === "video") {
-					// New video m-line: make sure it's the first one
-					if(ssrc[0] < 0) {
-						video = true;
-					} else {
-						// We're done, let's add the new attributes here
-						insertAt = i;
-						break;
-					}
-				} else {
-					// New non-video m-line: do we have what we were looking for?
-					if(ssrc[0] > -1) {
-						// We're done, let's add the new attributes here
-						insertAt = i;
-						break;
-					}
-				}
-				continue;
-			}
-			if(!video)
-				continue;
-			var sim = lines[i].match(/a=ssrc-group:SIM (\d+) (\d+) (\d+)/);
-			if(sim) {
-				Janus.warn("The SDP already contains a SIM attribute, munging will be skipped");
-				return sdp;
-			}
-			var fid = lines[i].match(/a=ssrc-group:FID (\d+) (\d+)/);
-			if(fid) {
-				ssrc[0] = fid[1];
-				ssrc_fid[0] = fid[2];
-				lines.splice(i, 1); i--;
-				continue;
-			}
-			if(ssrc[0]) {
-				var match = lines[i].match('a=ssrc:' + ssrc[0] + ' cname:(.+)')
-				if(match) {
-					cname = match[1];
-				}
-				match = lines[i].match('a=ssrc:' + ssrc[0] + ' msid:(.+)')
-				if(match) {
-					msid = match[1];
-				}
-				match = lines[i].match('a=ssrc:' + ssrc[0] + ' mslabel:(.+)')
-				if(match) {
-					mslabel = match[1];
-				}
-				match = lines[i].match('a=ssrc:' + ssrc[0] + ' label:(.+)')
-				if(match) {
-					label = match[1];
-				}
-				if(lines[i].indexOf('a=ssrc:' + ssrc_fid[0]) === 0) {
-					lines.splice(i, 1); i--;
-					continue;
-				}
-				if(lines[i].indexOf('a=ssrc:' + ssrc[0]) === 0) {
-					lines.splice(i, 1); i--;
-					continue;
-				}
-			}
-			if(lines[i].length == 0) {
-				lines.splice(i, 1); i--;
-				continue;
-			}
-		}
-		if(ssrc[0] < 0) {
-			// Couldn't find a FID attribute, let's just take the first video SSRC we find
-			insertAt = -1;
-			video = false;
-			for(let i=0; i<lines.length; i++) {
-				const mline = lines[i].match(/m=(\w+) */);
-				if(mline) {
-					const medium = mline[1];
-					if(medium === "video") {
-						// New video m-line: make sure it's the first one
-						if(ssrc[0] < 0) {
-							video = true;
-						} else {
-							// We're done, let's add the new attributes here
-							insertAt = i;
-							break;
-						}
-					} else {
-						// New non-video m-line: do we have what we were looking for?
-						if(ssrc[0] > -1) {
-							// We're done, let's add the new attributes here
-							insertAt = i;
-							break;
-						}
-					}
-					continue;
-				}
-				if(!video)
-					continue;
-				if(ssrc[0] < 0) {
-					var value = lines[i].match(/a=ssrc:(\d+)/);
-					if(value) {
-						ssrc[0] = value[1];
-						lines.splice(i, 1); i--;
-						continue;
-					}
-				} else {
-					let match = lines[i].match('a=ssrc:' + ssrc[0] + ' cname:(.+)')
-					if(match) {
-						cname = match[1];
-					}
-					match = lines[i].match('a=ssrc:' + ssrc[0] + ' msid:(.+)')
-					if(match) {
-						msid = match[1];
-					}
-					match = lines[i].match('a=ssrc:' + ssrc[0] + ' mslabel:(.+)')
-					if(match) {
-						mslabel = match[1];
-					}
-					match = lines[i].match('a=ssrc:' + ssrc[0] + ' label:(.+)')
-					if(match) {
-						label = match[1];
-					}
-					if(lines[i].indexOf('a=ssrc:' + ssrc_fid[0]) === 0) {
-						lines.splice(i, 1); i--;
-						continue;
-					}
-					if(lines[i].indexOf('a=ssrc:' + ssrc[0]) === 0) {
-						lines.splice(i, 1); i--;
-						continue;
-					}
-				}
-				if(lines[i].length === 0) {
-					lines.splice(i, 1); i--;
-					continue;
-				}
-			}
-		}
-		if(ssrc[0] < 0) {
-			// Still nothing, let's just return the SDP we were asked to munge
-			Janus.warn("Couldn't find the video SSRC, simulcasting NOT enabled");
-			return sdp;
-		}
-		if(insertAt < 0) {
-			// Append at the end
-			insertAt = lines.length;
-		}
-		// Generate a couple of SSRCs (for retransmissions too)
-		// Note: should we check if there are conflicts, here?
-		ssrc[1] = Math.floor(Math.random()*0xFFFFFFFF);
-		ssrc[2] = Math.floor(Math.random()*0xFFFFFFFF);
-		ssrc_fid[1] = Math.floor(Math.random()*0xFFFFFFFF);
-		ssrc_fid[2] = Math.floor(Math.random()*0xFFFFFFFF);
-		// Add attributes to the SDP
-		for(var i=0; i<ssrc.length; i++) {
-			if(cname) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' cname:' + cname);
-				insertAt++;
-			}
-			if(msid) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' msid:' + msid);
-				insertAt++;
-			}
-			if(mslabel) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' mslabel:' + mslabel);
-				insertAt++;
-			}
-			if(label) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc[i] + ' label:' + label);
-				insertAt++;
-			}
-			// Add the same info for the retransmission SSRC
-			if(cname) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' cname:' + cname);
-				insertAt++;
-			}
-			if(msid) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' msid:' + msid);
-				insertAt++;
-			}
-			if(mslabel) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' mslabel:' + mslabel);
-				insertAt++;
-			}
-			if(label) {
-				lines.splice(insertAt, 0, 'a=ssrc:' + ssrc_fid[i] + ' label:' + label);
-				insertAt++;
-			}
-		}
-		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[2] + ' ' + ssrc_fid[2]);
-		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[1] + ' ' + ssrc_fid[1]);
-		lines.splice(insertAt, 0, 'a=ssrc-group:FID ' + ssrc[0] + ' ' + ssrc_fid[0]);
-		lines.splice(insertAt, 0, 'a=ssrc-group:SIM ' + ssrc[0] + ' ' + ssrc[1] + ' ' + ssrc[2]);
-		sdp = lines.join("\r\n");
-		if(!sdp.endsWith("\r\n"))
-			sdp += "\r\n";
-		return sdp;
-	}
-
-	// Helper methods to parse a media object
-	function isAudioSendEnabled(media) {
-		Janus.debug("isAudioSendEnabled:", media);
-		if(!media)
-			return true;	// Default
-		if(media.audio === false)
-			return false;	// Generic audio has precedence
-		if(media.audioSend === undefined || media.audioSend === null)
-			return true;	// Default
-		return (media.audioSend === true);
-	}
-
-	function isAudioSendRequired(media) {
-		Janus.debug("isAudioSendRequired:", media);
-		if(!media)
-			return false;	// Default
-		if(media.audio === false || media.audioSend === false)
-			return false;	// If we're not asking to capture audio, it's not required
-		if(media.failIfNoAudio === undefined || media.failIfNoAudio === null)
-			return false;	// Default
-		return (media.failIfNoAudio === true);
-	}
-
-	function isAudioRecvEnabled(media) {
-		Janus.debug("isAudioRecvEnabled:", media);
-		if(!media)
-			return true;	// Default
-		if(media.audio === false)
-			return false;	// Generic audio has precedence
-		if(media.audioRecv === undefined || media.audioRecv === null)
-			return true;	// Default
-		return (media.audioRecv === true);
-	}
-
-	function isVideoSendEnabled(media) {
-		Janus.debug("isVideoSendEnabled:", media);
-		if(!media)
-			return true;	// Default
-		if(media.video === false)
-			return false;	// Generic video has precedence
-		if(media.videoSend === undefined || media.videoSend === null)
-			return true;	// Default
-		return (media.videoSend === true);
-	}
-
-	function isVideoSendRequired(media) {
-		Janus.debug("isVideoSendRequired:", media);
-		if(!media)
-			return false;	// Default
-		if(media.video === false || media.videoSend === false)
-			return false;	// If we're not asking to capture video, it's not required
-		if(media.failIfNoVideo === undefined || media.failIfNoVideo === null)
-			return false;	// Default
-		return (media.failIfNoVideo === true);
-	}
-
-	function isVideoRecvEnabled(media) {
-		Janus.debug("isVideoRecvEnabled:", media);
-		if(!media)
-			return true;	// Default
-		if(media.video === false)
-			return false;	// Generic video has precedence
-		if(media.videoRecv === undefined || media.videoRecv === null)
-			return true;	// Default
-		return (media.videoRecv === true);
-	}
-
-	function isScreenSendEnabled(media) {
-		Janus.debug("isScreenSendEnabled:", media);
-		if (!media)
-			return false;
-		if (typeof media.video !== 'object' || typeof media.video.mandatory !== 'object')
-			return false;
-		var constraints = media.video.mandatory;
-		if (constraints.chromeMediaSource)
-			return constraints.chromeMediaSource === 'desktop' || constraints.chromeMediaSource === 'screen';
-		else if (constraints.mozMediaSource)
-			return constraints.mozMediaSource === 'window' || constraints.mozMediaSource === 'screen';
-		else if (constraints.mediaSource)
-			return constraints.mediaSource === 'window' || constraints.mediaSource === 'screen';
-		return false;
-	}
-
-	function isDataEnabled(media) {
-		Janus.debug("isDataEnabled:", media);
-		if(Janus.webRTCAdapter.browserDetails.browser === "edge") {
-			Janus.warn("Edge doesn't support data channels yet");
-			return false;
-		}
-		if(media === undefined || media === null)
-			return false;	// Default
-		return (media.data === true);
-	}
-
-	function isTrickleEnabled(trickle) {
-		Janus.debug("isTrickleEnabled:", trickle);
-		return (trickle === false) ? false : true;
-	}
-}

From 08b3277aa8499d701d61448ad87bde924bc652de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 17 Jan 2022 14:09:27 -0500
Subject: [PATCH 313/501] bump version for janus

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 0d189dc9c..33996f755 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.7
+Version: 1.37.8
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index 199e8f7a3..21b6230a1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.7
+1.37.8

From 4374a6e70ee0607fc22d997ccdeb12d9e813f3db Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 17 Jan 2022 14:35:59 -0500
Subject: [PATCH 314/501] Bump versions of eslint to latest

---
 .github/workflows/ci-eslint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-eslint.yml b/.github/workflows/ci-eslint.yml
index 7a5c4337f..dce24c367 100644
--- a/.github/workflows/ci-eslint.yml
+++ b/.github/workflows/ci-eslint.yml
@@ -16,6 +16,6 @@ jobs:
         with:
           submodules: recursive
       - name: Install ESLint
-        run: npm install eslint@5.12.0 eslint-config-google@0.11.0 eslint-plugin-html@5.0.0 eslint-plugin-php-markup@0.2.5
+        run: npm install eslint@8.7.0 eslint-config-google@0.14.0 eslint-plugin-html@6.2.0 eslint-plugin-php-markup@6.0.0
       - name: Run ESLint
         run: npx eslint --ext .php,.js .

From 32a5dcbda995c432d3decd2d77470a16ba9853f6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 17 Jan 2022 14:52:43 -0500
Subject: [PATCH 315/501] ignore janus for eslint

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index 91b0fd196..2e2fdd39a 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -13,6 +13,7 @@ web/skins/classic/js/jquery.js
 web/skins/classic/js/moment.js
 web/skins/classic/js/video.js
 web/tools/mootools
+web/js/janus.js
 
 # Cannot be parsed as JS
 web/skins/classic/includes/export_functions.php

From 24c2efeb00005d06492bffe34e296cc18bbbaa62 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 17 Jan 2022 16:19:27 -0500
Subject: [PATCH 316/501] fix eslint

---
 web/js/MonitorStream.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index aaf5ac8fb..5a0dd7e25 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -303,13 +303,13 @@ function MonitorStream(monitorData) {
 } // end function MonitorStream
 
 async function attachVideo(id) {
-  await waitUntil(() => janus.isConnected() )
+  await waitUntil(() => janus.isConnected() );
   janus.attach({
     plugin: "janus.plugin.streaming",
     opaqueId: "streamingtest-"+Janus.randomString(12),
     success: function(pluginHandle) {
       streaming[id] = pluginHandle;
-      var body = { "request": "watch", "id": id};
+      var body = {"request": "watch", "id": id};
       streaming[id].send({"message": body});
     },
     error: function(error) {
@@ -319,26 +319,26 @@ async function attachVideo(id) {
       Janus.debug(" ::: Got a message :::");
       Janus.debug(msg);
       var result = msg["result"];
-      if(result !== null && result !== undefined) {
-        if(result["status"] !== undefined && result["status"] !== null) {
+      if (result !== null && result !== undefined) {
+        if (result["status"] !== undefined && result["status"] !== null) {
           var status = result["status"];
           Janus.debug(status);
         }
-      } else if(msg["error"] !== undefined && msg["error"] !== null) {
+      } else if (msg["error"] !== undefined && msg["error"] !== null) {
         return;
       }
-      if(jsep !== undefined && jsep !== null) {
+      if (jsep !== undefined && jsep !== null) {
         Janus.debug("Handling SDP as well...");
         Janus.debug(jsep);
         // Offer from the plugin, let's answer
         streaming[id].createAnswer({
           jsep: jsep,
           // We want recvonly audio/video and, if negotiated, datachannels
-          media: { audioSend: false, videoSend: false, data: true },
+          media: {audioSend: false, videoSend: false, data: true},
           success: function(jsep) {
             Janus.debug("Got SDP!");
             Janus.debug(jsep);
-            var body = { "request": "start"};
+            var body = {"request": "start"};
             streaming[id].send({"message": body, "jsep": jsep});
           },
           error: function(error) {
@@ -357,7 +357,7 @@ async function attachVideo(id) {
 
 const waitUntil = (condition) => {
   return new Promise((resolve) => {
-    let interval = setInterval(() => {
+    const interval = setInterval(() => {
       if (!condition()) {
         return;
       }
@@ -365,4 +365,4 @@ const waitUntil = (condition) => {
       resolve();
     }, 100);
   });
-}
+};

From 90492d332c57df7345013eefcc1ac8d008fbd5e5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 10:39:24 -0500
Subject: [PATCH 317/501] Put back to brand 3.0 of upstream

---
 web/api/app/Plugin/Crud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index 0bd63fb46..14292374c 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
+Subproject commit 14292374ccf1328f2d5db20897bd06f99ba4d938

From 0c055edb5e3dbe430bb77e68d9fd646df7721cd0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 12:20:19 -0500
Subject: [PATCH 318/501] I think in all my changes I got rid of the code that
 opens events on Alarm.

---
 src/zm_monitor.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 15a812f83..aea0c0000 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2087,16 +2087,8 @@ bool Monitor::Analyse() {
               if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
                 Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
                     name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
-
-                if (!event) {
-                  event = openEvent(snap, cause, noteSetMap);
-                  Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
-                }  // end if no event, so start it
                 shared_data->state = state = ALARM;
-                if (alarm_frame_count) {
-                  Debug(1, "alarm frame count so SavePreAlarmFrames");
-                  event->SavePreAlarmFrames();
-                }
+
               } else if (state != PREALARM) {
                 Info("%s: %03d - Gone into prealarm state", name.c_str(), analysis_image_count);
                 shared_data->state = state = PREALARM;
@@ -2189,7 +2181,14 @@ bool Monitor::Analyse() {
                 event = openEvent(snap, cause, noteSetMap);
               }
             } else {
-              Error("ALARM but no event");
+              if (!event) {
+                event = openEvent(snap, cause, noteSetMap);
+                Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
+              }  // end if no event, so start it
+              if (alarm_frame_count) {
+                Debug(1, "alarm frame count so SavePreAlarmFrames");
+                event->SavePreAlarmFrames();
+              }
             }
           } else if (state == ALERT) {
             // Alert means this frame has no motion, but we were alarmed and are still recording.

From 3241fa59c5eb3834add68e537e90b69d985ef9d4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 12:52:21 -0500
Subject: [PATCH 319/501] Don't redirect if there was an error so that we
 display it

---
 web/includes/actions/monitor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 2d900433a..7ec354179 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -324,7 +324,8 @@ if ($action == 'save') {
     // really should thump zmwatch and maybe zmtrigger too.
     //daemonControl( 'restart', 'zmwatch.pl' );
   } // end if restart
-  $redirect = '?view=console';
+  if (!$error_message)
+    $redirect = '?view=console';
 } else {
   ZM\Warning("Unknown action $action in Monitor");
 } // end if action == Delete

From d2d9721c4e6ead2edbfab8c8acdbf5a87c2d11a1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 13:43:56 -0500
Subject: [PATCH 320/501] spacing, remove redundant debug

---
 src/zm_eventstream.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 54f6b60d8..28a0e50d6 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -1096,35 +1096,33 @@ void EventStream::runStream() {
 bool EventStream::send_file(const std::string &filepath) {
   FILE *fdj = nullptr;
   fdj = fopen(filepath.c_str(), "rb");
-  if ( !fdj ) {
+  if (!fdj) {
     Error("Can't open %s: %s", filepath.c_str(), strerror(errno));
     std::string error_message = stringtf("Can't open %s: %s", filepath.c_str(), strerror(errno));
     return sendTextFrame(error_message.c_str());
   }
 #if HAVE_SENDFILE
   static struct stat filestat;
-  if ( fstat(fileno(fdj), &filestat) < 0 ) {
+  if (fstat(fileno(fdj), &filestat) < 0) {
     fclose(fdj); /* Close the file handle */
     Error("Failed getting information about file %s: %s", filepath.c_str(), strerror(errno));
     return false;
   }
-  if ( !filestat.st_size ) {
+  if (!filestat.st_size) {
     fclose(fdj); /* Close the file handle */
     Info("File size is zero. Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size) ) {
+  if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size)) {
     fclose(fdj); /* Close the file handle */
     Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
     return false;
   }
   int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
-  if ( rc == (int)filestat.st_size ) {
+  if (rc == (int)filestat.st_size) {
     // Success
     fclose(fdj); /* Close the file handle */
     return true;
-  } else {
-    Debug(1, "Failed to sendfile?");
   }
   Warning("Unable to send raw frame %ld: %s rc %d != %d",
       curr_frame_id, strerror(errno), rc, (int)filestat.st_size);

From 13ee39b1e9fb8b4103acb0a71e71d71b13031c4b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 13:44:21 -0500
Subject: [PATCH 321/501] Log errors talking to Janus. Log if janus is turned
 on but not compiled in

---
 src/zm_monitor.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index aea0c0000..454e7068c 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1126,6 +1126,9 @@ bool Monitor::connect() {
         }
       }
     }
+#else
+    if (janus_enabled)
+      Error("zmc not compiled with LIBCURL. Janus support not built in!");
 #endif
 
   } else if (!shared_data->valid) {
@@ -3390,7 +3393,10 @@ int Monitor::add_to_janus() {
   CURLcode res;
 
   curl = curl_easy_init();
-  if(!curl) return -1;
+  if (!curl) {
+    Error("Failed to init curl");
+    return -1;
+  }
   //parse username and password
   pos = path.find(":", 7);
   if (pos == std::string::npos) return -1;
@@ -3408,7 +3414,11 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
+  if (res != CURLE_OK) {
+    Error("Failed to curl_easy_perform getting session/handle id");
+    curl_easy_cleanup(curl);
+    return -1;
+  }
 
   pos = response.find("\"id\": ");
   if (pos == std::string::npos) return -1;
@@ -3421,7 +3431,11 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
+  if (res != CURLE_OK) {
+    Error("Failed to curl_easy_perform attaching");
+    curl_easy_cleanup(curl);
+    return -1;
+  }
   pos = response.find("\"id\": ");
   if (pos == std::string::npos) return -1;
   std::string handle_id = response.substr(pos + 6, 16); //TODO: This is an assumption that the string is always 16
@@ -3446,7 +3460,11 @@ int Monitor::add_to_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
+  if (res != CURLE_OK) {
+    Error("Failed to curl_easy_perform adding rtsp stream");
+    curl_easy_cleanup(curl);
+    return -1;
+  }
   Debug(1,"Added stream to Janus: %s", response.c_str());
   curl_easy_cleanup(curl);
   return 0;

From 388735e94288c65914f8ed60eb007fab987b759b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 14:30:10 -0500
Subject: [PATCH 322/501] Fix relating auth_hash causing repeated reloads. If
 https, then assume a reverse proxy setup to janus. If video feed is not an
 img, log it and return

---
 web/js/MonitorStream.js | 47 +++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 5a0dd7e25..54669a964 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -47,6 +47,11 @@ function MonitorStream(monitorData) {
     this.scale = newscale;
 
     const oldSrc = img.getAttribute('src');
+    if (!oldSrc) {
+      console.log("No src on img?!");
+      console.log(img);
+      return;
+    }
     let newSrc = '';
 
     img.setAttribute('src', '');
@@ -85,7 +90,14 @@ function MonitorStream(monitorData) {
 
     if (this.janusEnabled) {
       var id = parseInt(this.id);
-      var server = "http://" + window.location.hostname + ":8088/janus";
+      var server;
+      if (window.location.protocol=='https:') {
+        // Assume reverse proxy setup for now
+        server = "https://" + window.location.hostname + "/janus";
+      } else {
+        server = "http://" + window.location.hostname + ":8088/janus";
+      }
+
       if (janus == null) {
         Janus.init({debug: "all", callback: function() {
           janus = new Janus({server: server}); //new Janus
@@ -178,11 +190,16 @@ function MonitorStream(monitorData) {
   this.getStreamCmdResponse = function(respObj, respText) {
     var stream = $j('#liveStream'+this.id)[0];
 
-    if ( ! stream ) {
+    if (!stream) {
       console.log('No live stream');
       return;
     }
 
+    //watchdogOk('stream');
+    if (streamCmdTimer) {
+      streamCmdTimer = clearTimeout(streamCmdTimer);
+    }
+
     if ( respObj.result == 'Ok' ) {
       if ( respObj.status ) {
         this.status = respObj.status;
@@ -202,13 +219,25 @@ function MonitorStream(monitorData) {
           !COMPACT_MONTAGE) &&
           (this.type != 'WebSite')
         ) {
-          var fpsValue = $j('#fpsValue'+this.id);
-          var stateValue = $j('#stateValue'+this.id);
-          var monitorState = $j('#monitorState'+this.id);
+          const viewingFPSValue = $j('#vewingFPSValue'+this.id);
+          const captureFPSValue = $j('#captureFPSValue'+this.id);
+          const analysisFPSValue = $j('#analysisFPSValue'+this.id);
 
-          if ( fpsValue.length ) fpsValue.text(this.status.fps);
-          if ( stateValue.length ) stateValue.text(stateStrings[this.alarmState]);
-          if ( monitorState.length ) this.setStateClass(monitorState, stateClass);
+          const stateValue = $j('#stateValue'+this.id);
+          const monitorState = $j('#monitorState'+this.id);
+
+          if (viewingFPSValue.length && (viewingFPSValue.text != this.status.fps)) {
+            viewingFPSValue.text(this.status.fps);
+          }
+          if (analysisFPSValue.length && (analysisFPSValue.text != this.status.analysisfps)) {
+            analysisFPSValue.text(this.status.analysisfps);
+          }
+          if (captureFPSValue.length && (captureFPSValue.text != this.status.capturefps)) {
+            captureFPSValue.text(this.status.capturefps);
+          }
+
+          if (stateValue.length) stateValue.text(stateStrings[this.alarmState]);
+          if (monitorState.length) this.setStateClass(monitorState, stateClass);
         }
 
         this.setStateClass($j('#monitor'+this.id), stateClass);
@@ -238,7 +267,7 @@ function MonitorStream(monitorData) {
           }
         }
         if (this.status.auth) {
-          if (this.status.auth != auth_hash) {
+          if (this.status.auth != this.auth_hash) {
             // Try to reload the image stream.
             if (stream) {
               const oldsrc = stream.src;

From d00aaa11e9231e0d6d96adde5e327307e61ab6f2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 18 Jan 2022 23:01:24 -0500
Subject: [PATCH 323/501] default JanusEnabled to 0 so that we can turn it off

---
 web/includes/actions/monitor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 7ec354179..e0f695d44 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -89,6 +89,7 @@ if ($action == 'save') {
       'ModectDuringPTZ' =>  0,
       'Enabled' => 0,
       'DecodingEnabled' => 0,
+      'JanusEnabled' => 0,
       'Exif' => 0,
       'RTSPDescribe' => 0,
       'V4LMultiBuffer'  => '',

From fb832e7d1bd13b645fed9bd26c994d2fa5278788 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 19 Jan 2022 00:14:52 -0600
Subject: [PATCH 324/501] Adds janus_enable_audio, a switch to try to enable
 audio in live stream viewing.

---
 db/zm_create.sql.in                   |  1 +
 db/zm_update-1.37.9.sql               | 18 ++++++++++++++++++
 src/zm_monitor.cpp                    |  9 ++++++---
 src/zm_monitor.h                      | 13 +++++++++++++
 web/ajax/modals/function.php          | 10 ++++++++++
 web/includes/Monitor.php              |  1 +
 web/includes/actions/monitor.php      |  1 +
 web/lang/en_gb.php                    |  5 +++++
 web/skins/classic/views/js/monitor.js | 15 +++++++++++++++
 web/skins/classic/views/monitor.php   | 10 ++++++++++
 10 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 db/zm_update-1.37.9.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 06d2ab385..db72cb58d 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -456,6 +456,7 @@ CREATE TABLE `Monitors` (
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
   `JanusEnabled` BOOLEAN NOT NULL default false,
+  `JanusAudioEnabled` BOOLEAN NOT NULL default false,
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
   `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '',
diff --git a/db/zm_update-1.37.9.sql b/db/zm_update-1.37.9.sql
new file mode 100644
index 000000000..be7d2a9ec
--- /dev/null
+++ b/db/zm_update-1.37.9.sql
@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have JanusEnabled
+--
+
+SELECT 'Checking for JanusAudioEnabled in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'JanusAudioEnabled'
+  ) > 0,
+"SELECT 'Column JanusAudioEnabled already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `JanusAudioEnabled` BOOLEAN NOT NULL default false AFTER `JanusEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 454e7068c..1733dd24d 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -77,7 +77,7 @@ struct Namespace namespaces[] =
 // This is the official SQL (and ordering of the fields) to load a Monitor.
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
-"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, `JanusEnabled`,"
+"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, `JanusEnabled`, `JanusAudioEnabled`,"
 "`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
 "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
 "`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
@@ -307,6 +307,7 @@ Monitor::Monitor()
   enabled(false),
   decoding_enabled(false),
   janus_enabled(false),
+  janus_audio_enabled(false),
   //protocol
   //method
   //options
@@ -447,7 +448,7 @@ Monitor::Monitor()
 
 /*
   std::string load_monitor_sql =
- "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, JanusEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
+ "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, JanusEnabled, JanusAudioEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
  "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
  "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
  "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
@@ -501,6 +502,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
   // See below after save_jpegs for a recalculation of decoding_enabled
   janus_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
+  janus_audio_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
 
   ReloadLinkedMonitors(dbrow[col]); col++;
   event_start_command = dbrow[col] ? dbrow[col] : ""; col++;
@@ -1121,7 +1123,7 @@ bool Monitor::connect() {
 #if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
       if (add_to_janus() != 0) {
-        if (add_to_janus() != 0) {
+        if (add_to_janus() != 0) { //The initial attempt may fail. This is a temporary workaround.
           Warning("Failed to add monitor stream to Janus!");
         }
       }
@@ -3453,6 +3455,7 @@ int Monitor::add_to_janus() {
   postData += rtsp_password;
   postData += "\", \"id\" : ";
   postData += std::to_string(id);
+  if (janus_audio_enabled)  postData += ", \"audio\" : true";
   postData += ", \"video\" : true}}";
 
   curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 0d63816e9..94c37affb 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -269,6 +269,7 @@ protected:
   bool            enabled;            // Whether the monitor is enabled or asleep
   bool            decoding_enabled;   // Whether the monitor will decode h264/h265 packets
   bool            janus_enabled;      // Whether we set the h264/h265 stream up on janus
+  bool            janus_audio_enabled;      // Whether we tell Janus to try to include audio.
 
   std::string protocol;
   std::string method;
@@ -511,6 +512,18 @@ public:
   inline bool DecodingEnabled() const {
     return decoding_enabled;
   }
+  bool JanusEnabled() {
+    return janus_enabled;
+  }
+  bool JanusAudioEnabled() {
+    return janus_audio_enabled;
+  }
+  bool OnvifEnabled() {
+    return onvif_event_listener;
+  }
+  bool OnvifHealthy() {
+    return ONVIF_Healthy;
+  }
   inline const char *EventPrefix() const { return event_prefix.c_str(); }
   inline bool Ready() const {
     if ( image_count >= ready_count ) {
diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php
index b23bbb649..c47664c4b 100644
--- a/web/ajax/modals/function.php
+++ b/web/ajax/modals/function.php
@@ -79,6 +79,16 @@ if ( !canEdit('Monitors') ) return;
   }
 ?>
 
+        </div>
+        <div class="form-group" id="FunctionJanusAudioEnabled">
+          <label for="newJanusAudioEnabled"><?php echo translate('Janus Audio Enabled') ?></label>
+          <input type="checkbox" name="newJanusAudioEnabled" id="newJanusAudioEnabled" value="1"/>
+<?php
+  if ( isset($OLANG['FUNCTION_JANUS_AUDIO_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_JANUS_AUDIO_ENABLED']['Help'].'</div>';
+  }
+?>
+
         </div>
       </div>
       <div class="modal-footer">
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 199e9a9c2..c8fa6ebb1 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -56,6 +56,7 @@ class Monitor extends ZM_Object {
     'Enabled'   => array('type'=>'boolean','default'=>1),
     'DecodingEnabled'   => array('type'=>'boolean','default'=>1),
     'JanusEnabled'   => array('type'=>'boolean','default'=>0),
+    'JanusAudioEnabled'   => array('type'=>'boolean','default'=>0),
     'LinkedMonitors' => array('type'=>'set', 'default'=>null),
     'Triggers'  =>  array('type'=>'set','default'=>''),
     'EventStartCommand' => '',
diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index e0f695d44..b1f5dff2e 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -90,6 +90,7 @@ if ($action == 'save') {
       'Enabled' => 0,
       'DecodingEnabled' => 0,
       'JanusEnabled' => 0,
+      'JanusAudioEnabled' => 0,
       'Exif' => 0,
       'RTSPDescribe' => 0,
       'V4LMultiBuffer'  => '',
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index b7556ffe0..623d55571 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -1179,6 +1179,11 @@ $OLANG = array(
       Attempt to use Janus streaming server for h264/h265 live view. Experimental, but allows
       for significantly better performance.'
   ),
+  'FUNCTION_JANUS_AUDIO_ENABLED' => array(
+    'Help' => '
+      Attempt to enable audio in the Janus stream. Has no effect for cameras without audio support,
+      but can prevent a stream playing if your camera sends an audio format unsupported by the browser.'
+  ),
   'ImageBufferCount' => array(
     'Help' => '
     Number of raw images available in /dev/shm. Currently should be set in the 3-5 range.  Used for live viewing.'
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 38d685367..62c0c6514 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -260,6 +260,21 @@ function initPage() {
     window.location.assign('?view=console');
   });
 
+  //manage the Janus audio check
+  if (document.getElementsByName("newMonitor[JanusEnabled]")[0].checked) {
+    document.getElementById("FunctionJanusAudioEnabled").hidden = false;
+  } else {
+    document.getElementById("FunctionJanusAudioEnabled").hidden = true;
+  }
+
+  document.getElementsByName("newMonitor[JanusEnabled]")[0].addEventListener('change', function() {
+    if (this.checked) {
+      document.getElementById("FunctionJanusAudioEnabled").hidden = false;
+    } else {
+      document.getElementById("FunctionJanusAudioEnabled").hidden = true;
+    }
+  });
+
   if ( ZM_OPT_USE_GEOLOCATION ) {
     if ( window.L ) {
       var form = document.getElementById('contentForm');
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index f129315bc..6756c239b 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -584,6 +584,16 @@ if (count($available_monitor_ids)) {
   if ( isset($OLANG['FUNCTION_JANUS_ENABLED']) ) {
     echo '<div class="form-text">'.$OLANG['FUNCTION_JANUS_ENABLED']['Help'].'</div>';
   }
+?>
+          </td>
+        </tr>
+  <tr id="FunctionJanusAudioEnabled">
+          <td class="text-right pr-3"><?php echo translate('Janus Live Stream Audio') ?></td>
+          <td><input type="checkbox" name="newMonitor[JanusAudioEnabled]" value="1"<?php echo $monitor->JanusAudioEnabled() ? ' checked="checked"' : '' ?>/>
+<?php
+  if ( isset($OLANG['FUNCTION_JANUS_AUDIO_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_JANUS_AUDIO_ENABLED']['Help'].'</div>';
+  }
 ?>
           </td>
         </tr>

From 04cfe372f83fbb70c56d7ff68674f327b80fda17 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 19 Jan 2022 00:56:36 -0600
Subject: [PATCH 325/501] Wrap public access function in Gsoap ifdef to remove
 build warning

---
 src/zm_monitor.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 94c37affb..898349eb3 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -521,9 +521,11 @@ public:
   bool OnvifEnabled() {
     return onvif_event_listener;
   }
+#ifdef WITH_GSOAP
   bool OnvifHealthy() {
     return ONVIF_Healthy;
   }
+#endif
   inline const char *EventPrefix() const { return event_prefix.c_str(); }
   inline bool Ready() const {
     if ( image_count >= ready_count ) {

From ebcb3abf2efaca3e65cffa6acb5224f43cfa7da0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 19 Jan 2022 09:33:30 -0500
Subject: [PATCH 326/501] image_count is only relevant to capture.  decode and
 analysis should use packet->image_index for indexing into image_buffer, etc.

---
 src/zm_monitor.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 1733dd24d..f5d225d66 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2076,7 +2076,7 @@ bool Monitor::Analyse() {
                   && (event->Duration() >= min_section_length)
                   && ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count - 1))) {
                 Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
-                    name.c_str(), image_count, event->Id());
+                    name.c_str(), snap->image_index, event->Id());
                 closeEvent();
               } else if (event) {
                 // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
@@ -2091,7 +2091,7 @@ bool Monitor::Analyse() {
               }
               if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
                 Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
-                    name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
+                    name.c_str(), snap->image_index, Event::PreAlarmCount(), alarm_frame_count, cause.c_str());
                 shared_data->state = state = ALARM;
 
               } else if (state != PREALARM) {
@@ -2214,7 +2214,7 @@ bool Monitor::Analyse() {
                       || std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0))) {
                 Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
                      name.c_str(),
-                     image_count,
+                     snap->image_index,
                      event->Id(),
                      static_cast<int64>(std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()).count()),
                      static_cast<int64>(std::chrono::duration_cast<Seconds>(event->StartTime().time_since_epoch()).count()),
@@ -2558,8 +2558,6 @@ int Monitor::Capture() {
       } else {
         Debug(4, "Not Queueing audio packet");
       }
-      // Don't update last_write_index because that is used for live streaming
-      //shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
       return 1;
     } else {
       Debug(1, "Unknown codec type %d", packet->codec_type);
@@ -2690,7 +2688,7 @@ bool Monitor::Decode() {
   }  // end if need_decoding
 
   Image* capture_image = nullptr;
-  unsigned int index = image_count % image_buffer_count;
+  unsigned int index = packet->image_index % image_buffer_count;
 
   if (packet->image) {
     capture_image = packet->image;

From 062cde54a0c8139832aa4368eb75ddfae7aaa151 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 19 Jan 2022 10:45:38 -0500
Subject: [PATCH 327/501] Bump version for janus audio

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 33996f755..16b8efb7e 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.8
+Version: 1.37.9
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index 21b6230a1..938adc6f6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.8
+1.37.9

From 05043a37b1a35bc7f2a6ca34c58b54148fcc76bf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 19 Jan 2022 12:27:16 -0500
Subject: [PATCH 328/501] include image index in debug

---
 src/zm_monitorstream.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index f9e91d94b..a6232a23e 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -727,12 +727,12 @@ void MonitorStream::runStream() {
               (monitor->GetFunction() == Monitor::MOCORD || monitor->GetFunction() == Monitor::MODECT)) {
               Debug(1, "Sending analysis image");
             send_image = monitor->GetAlarmImage();
-            if ( !send_image ) {
+            if (!send_image) {
               Debug(1, "Falling back");
               send_image = monitor->image_buffer[index];
             }
           } else {
-             Debug(1, "Sending regular image");
+            Debug(1, "Sending regular image index %d", index);
             send_image = monitor->image_buffer[index];
           }
 

From dec440ead1ba8b4b3c3baf17543e7ccd56e901d5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 19 Jan 2022 15:01:37 -0500
Subject: [PATCH 329/501] Unset holdbuffer so that when we connect, we reset
 the shm buffer pointer.  cleanup initializers in Image

---
 src/zm_image.cpp   | 37 +++++++++++++++++++------------------
 src/zm_image.h     |  4 +++-
 src/zm_monitor.cpp |  1 +
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 1c58130cc..a4aad8b61 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -114,22 +114,23 @@ Image::Image() :
     delta8_argb(&std_delta8_argb),
     delta8_abgr(&std_delta8_abgr),
     delta8_gray8(&std_delta8_gray8),
-    blend(&std_blend)
+    blend(&std_blend),
+    width(0),
+    linesize(0),
+    height(0),
+    pixels(0),
+    colours(0),
+    padding(0),
+    size(0),
+    subpixelorder(0),
+    allocation(0),
+    buffer(nullptr),
+    buffertype(ZM_BUFTYPE_DONTFREE),
+    holdbuffer(0)
 {
-  if ( !initialised )
+  if (!initialised)
     Initialise();
-  width = 0;
-  linesize = 0;
-  height = 0;
-  padding = 0;
-  pixels = 0;
-  colours = 0;
-  subpixelorder = 0;
-  size = 0;
-  allocation = 0;
-  buffer = 0;
-  buffertype = ZM_BUFTYPE_DONTFREE;
-  holdbuffer = 0;
+  // Update blend to fast function determined by Initialise, I'm sure this can be improve.
   blend = fptr_blend;
 }
 
@@ -158,15 +159,15 @@ Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint
   colours(p_colours),
   padding(p_padding),
   subpixelorder(p_subpixelorder),
-  buffer(p_buffer) {
+  buffer(p_buffer),
+  holdbuffer(0)
+{
 
   if (!initialised)
     Initialise();
   pixels = width * height;
   linesize = p_width * p_colours;
   size = linesize * height + padding;
-  buffer = nullptr;
-  holdbuffer = 0;
   if (p_buffer) {
     allocation = size;
     buffertype = ZM_BUFTYPE_DONTFREE;
@@ -174,7 +175,7 @@ Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint
   } else {
     AllocImgBuffer(size);
   }
-  if (!subpixelorder and colours>1) {
+  if (!subpixelorder and (colours>1)) {
     // Default to RGBA when no subpixelorder is specified.
     subpixelorder = ZM_SUBPIX_ORDER_RGBA;
   }
diff --git a/src/zm_image.h b/src/zm_image.h
index 74e5931eb..8bcb92c4c 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -145,11 +145,13 @@ class Image {
     explicit Image(const AVFrame *frame);
 
     ~Image();
+
     static void Initialise();
     static void Deinitialise();
 
     inline void DumpImgBuffer() {
-      DumpBuffer(buffer, buffertype);
+      if (buffertype != ZM_BUFTYPE_DONTFREE)
+        DumpBuffer(buffer, buffertype);
       buffertype = ZM_BUFTYPE_DONTFREE;
       buffer = nullptr;
       allocation = 0;
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f5d225d66..2179197e8 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1153,6 +1153,7 @@ bool Monitor::disconnect() {
   }
 
   if (purpose == CAPTURE) {
+    alarm_image.HoldBuffer(false); /* Allow to reset buffer */
     if (unlink(mem_file.c_str()) < 0) {
       Warning("Can't unlink '%s': %s", mem_file.c_str(), strerror(errno));
     }

From db866fa668c19e6ecaf6a4ee06200deefef25a15 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 09:46:38 -0500
Subject: [PATCH 330/501] Implement zm_setcookie to simplify setting cookies,
 set samesite, deal with older php etc. Use it.

---
 web/includes/Group.php              |  2 +-
 web/includes/session.php            | 17 +++++++++++++++++
 web/index.php                       | 17 ++---------------
 web/skins/classic/views/montage.php |  9 +--------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/web/includes/Group.php b/web/includes/Group.php
index 34db0e869..93c20fc70 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -25,7 +25,7 @@ class Group extends ZM_Object {
       if ( isset($_COOKIE['zmGroup']) ) {
         if ( $this->{'Id'} == $_COOKIE['zmGroup'] ) {
           unset($_COOKIE['zmGroup']);
-          setcookie('zmGroup', '', time()-3600*24*2);
+          zm_setcookie('zmGroup', '');
         }
       }
     }
diff --git a/web/includes/session.php b/web/includes/session.php
index 0190f9897..6e9c17670 100644
--- a/web/includes/session.php
+++ b/web/includes/session.php
@@ -1,4 +1,21 @@
 <?php
+
+// Wrapper around setcookie that auto-sets samesite, and deals with older versions of php
+function zm_setcookie($cookie, $value, $options=array()) {
+  if (!isset($options['expires'])) {
+    $options['expires'] = time()+3600*24*30*12*10; // 10 years?!
+  }
+  if (!isset($options['samesite'])) {
+    $options['samesite'] = 'Strict';
+  }
+
+  if (version_compare(phpversion(), '7.3.0', '>=')) {
+    setcookie($cookie, $value, $options);
+  } else {
+    setcookie($cookie, $value, $options['expires'], '/; samesite=strict');
+  }
+}
+
 // ZM session start function support timestamp management
 function zm_session_start() {
 
diff --git a/web/index.php b/web/index.php
index b3df502f6..5ace8e9b6 100644
--- a/web/index.php
+++ b/web/index.php
@@ -139,11 +139,6 @@ $skinBase[] = $skin;
 
 zm_session_start();
 
-$cookie_options = array(
-  'expires'=>time()+3600*24*30*12*10,
-  'samesite' => 'Strict',
-);
-
 if (
   !isset($_SESSION['skin']) ||
   isset($_REQUEST['skin']) ||
@@ -151,11 +146,7 @@ if (
   ($_COOKIE['zmSkin'] != $skin)
 ) {
   $_SESSION['skin'] = $skin;
-	if (version_compare(phpversion(), '7.3.0', '>=')) {
-	setcookie('zmSkin', $skin, $cookie_options);
-	} else {
-	setcookie('zmSkin', $skin, $cookie_options['expires'], '/; samesite=strict');
-	}
+	zm_setcookie('zmSkin', $skin);
 }
 
 if (
@@ -165,11 +156,7 @@ if (
   ($_COOKIE['zmCSS'] != $css)
 ) {
   $_SESSION['css'] = $css;
-	if (version_compare(phpversion(), '7.3.0', '>=')) {
-    setcookie('zmCSS', $css, $cookie_options);
-	} else {
-	  setcookie('zmCSS', $css, $cookie_options['expires'], '/; samesite=strict');
-	}
+  zm_setcookie('zmCSS', $css);
 }
 
 # Running is global but only do the daemonCheck if it is actually needed
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index bb99916dd..a96e8a88e 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -307,14 +307,7 @@ foreach (array_reverse($zones) as $zone) {
             </div>
 <?php
   if ((!ZM_WEB_COMPACT_MONTAGE) && ($monitor->Type() != 'WebSite')) {
-?>
-            <div id="monitorState<?php echo $monitor->Id() ?>" class="monitorState idle">
-              <?php echo translate('State') ?>:
-              <span id="stateValue<?php echo $monitor->Id() ?>"></span>
-              &nbsp;-&nbsp;
-              <span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
-            </div>
-<?php
+    echo $monitor->getMonitorStateHTML();
   }
 ?>
           </div>

From a57206ef5493b5cfabbaf09caecfe9ebb333b8ea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 09:47:36 -0500
Subject: [PATCH 331/501] Implement getMonitorStateHTML to synchronize it
 between montage and live view, cycle etc. Reuseable code.  Also the structure
 is required by MonitorStream.js

---
 web/includes/Monitor.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index c8fa6ebb1..09d4657a8 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -719,5 +719,27 @@ class Monitor extends ZM_Object {
     }
     return $this->{'Manufacturer'};
   }
+  function getMonitorStateHTML() {
+    $html = '
+<div id="monitorStatus'.$this->Id().'" class="monitorStatus">
+  <div id="monitorState'.$this->Id().'" class="monitorState">
+    <span>'.translate('State').':<span id="stateValue'.$this->Id().'"></span></span>
+    <span id="viewingFPS'.$this->Id().'" title="'.translate('Viewing FPS').'"><span id="viewingFPSValue'.$this->Id().'"></span> fps</span>
+    <span id="captureFPS'.$this->Id().'" title="'.translate('Capturing FPS').'"><span id="captureFPSValue'.$this->Id().'"></span> fps</span>
+';
+    if ( $this->Function() == 'Modect' or $this->Function() == 'Mocord' ) {
+      $html .= '<span id="analysisFPS'.$this->Id().'" title="'.translate('Analysis FPS').'"><span id="analysisFPSValue'.$this->Id().'"></span> fps</span>
+      ';
+    }
+    $html .= '
+    <span id="rate'.$this->Id().'" class="hidden">'.translate('Rate').': <span id="rateValue'.$this->Id().'"></span>x</span>
+    <span id="delay'.$this->Id().'" class="hidden">'.translate('Delay').': <span id="delayValue'.$this->Id().'"></span>s</span>
+    <span id="level'.$this->Id().'" class="hidden">'.translate('Buffer').': <span id="levelValue'.$this->Id().'"></span>%</span>
+    <span id="zoom'.$this->Id().'">'. translate('Zoom').': <span id="zoomValue'.$this->Id().'"></span>x</span>
+  </div>
+</div>
+';
+    return $html;
+  }
 } // end class Monitor
 ?>

From 9395b7e47c27199d2bc4c88fecff8756af110747 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 09:47:53 -0500
Subject: [PATCH 332/501] Use net zm_setcookie

---
 web/includes/actions/bandwidth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/actions/bandwidth.php b/web/includes/actions/bandwidth.php
index c5fafa1c9..ac6bd407f 100644
--- a/web/includes/actions/bandwidth.php
+++ b/web/includes/actions/bandwidth.php
@@ -21,7 +21,7 @@
 
 if ( $action == 'bandwidth' && isset($_REQUEST['newBandwidth']) ) {
   $_COOKIE['zmBandwidth'] = validStr($_REQUEST['newBandwidth']);
-  setcookie('zmBandwidth', validStr($_REQUEST['newBandwidth']), time()+3600*24*30*12*10);
+  zm_setcookie('zmBandwidth', validStr($_REQUEST['newBandwidth']));
   $refreshParent = true;
   $view = 'none';
   $closePopup = true;

From 3cd6fbdc12d0ec056683e8aaf2350c0bde495418 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 09:48:02 -0500
Subject: [PATCH 333/501] Use net zm_setcookie

---
 web/includes/actions/groups.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/actions/groups.php b/web/includes/actions/groups.php
index 8e4522187..bc431998e 100644
--- a/web/includes/actions/groups.php
+++ b/web/includes/actions/groups.php
@@ -21,9 +21,9 @@
 // Group view actions
 if ( ($action == 'setgroup') && canView('Groups')) {
   if ( !empty($_REQUEST['gid']) ) {
-    setcookie('zmGroup', validInt($_REQUEST['gid']), time()+3600*24*30*12*10);
+    zm_setcookie('zmGroup', validInt($_REQUEST['gid']));
   } else {
-    setcookie('zmGroup', '', time()-3600*24*2);
+    zm_setcookie('zmGroup', '', time()-3600*24*2);
   }
   $refreshParent = true;
   return;

From 4bf55b1af196fc777d95c4d6c42976c9005c46c7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 09:48:09 -0500
Subject: [PATCH 334/501] Use net zm_setcookie

---
 web/includes/actions/montage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/actions/montage.php b/web/includes/actions/montage.php
index cd9a41aaf..a5306a33b 100644
--- a/web/includes/actions/montage.php
+++ b/web/includes/actions/montage.php
@@ -38,7 +38,7 @@ if ( isset($_REQUEST['object']) ) {
       $Layout->save();
       zm_session_start();
       $_SESSION['zmMontageLayout'] = $Layout->Id();
-      setcookie('zmMontageLayout', $Layout->Id(), 1);
+      zm_setcookie('zmMontageLayout', $Layout->Id());
       session_write_close();
       $redirect = '?view=montage';
     } // end if save

From 22b63377528404c7115f27c7e18a3a042b9fa9db Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:47:28 -0500
Subject: [PATCH 335/501] Merge code from watch.js.  Add an ajaxQueue. Link up
 buttons from UI

---
 web/js/MonitorStream.js | 368 ++++++++++++++++++++++++++++------------
 1 file changed, 264 insertions(+), 104 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 54669a964..17f43c4b9 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -13,15 +13,22 @@ function MonitorStream(monitorData) {
   this.janusEnabled = monitorData.janusEnabled;
   this.scale = 100;
   this.status = null;
-  this.alarmState = STATE_IDLE;
   this.lastAlarmState = STATE_IDLE;
+  this.streamCmdTimer = null;
   this.streamCmdParms = {
     view: 'request',
     request: 'stream',
     connkey: this.connKey
   };
+  this.ajaxQueue = null;
   this.type = monitorData.type;
   this.refresh = monitorData.refresh;
+
+  this.buttons = {}; // index by name
+  this.setButton = function(name, element) {
+    this.buttons.name = element;
+  };
+
   this.element = null;
   this.getElement = function() {
     if (this.element) return this.element;
@@ -36,7 +43,7 @@ function MonitorStream(monitorData) {
   this.show = function() {
     const stream = this.getElement();
     if (!stream.src) {
-      stream.src = this.url_to_zms+"&mode=single&scale=100&connkey="+this.connKey;
+      stream.src = this.url_to_zms+"&mode=single&scale=100&connkey="+this.connKey+this.auth_relay;
     }
   };
 
@@ -48,7 +55,7 @@ function MonitorStream(monitorData) {
 
     const oldSrc = img.getAttribute('src');
     if (!oldSrc) {
-      console.log("No src on img?!");
+      console.log('No src on img?!');
       console.log(img);
       return;
     }
@@ -58,13 +65,10 @@ function MonitorStream(monitorData) {
     console.log("Scaling to: " + newscale);
 
     if (newscale == '0' || newscale == 'auto') {
-      let bottomElement = document.getElementById('replayStatus');
-      if (!bottomElement) {
-        bottomElement = document.getElementById('monitorState');
-      }
+      const bottomElement = document.getElementById('monitorState'+this.id);
       var newSize = scaleToFit(this.width, this.height, $j(img), $j(bottomElement));
 
-      console.log(newSize);
+      //console.log(newSize);
       newWidth = newSize.width;
       newHeight = newSize.height;
       autoScale = parseInt(newSize.autoScale);
@@ -83,11 +87,8 @@ function MonitorStream(monitorData) {
     }
     img.setAttribute('src', newSrc);
   };
-  this.start = function(delay) {
-    // Step 1 make sure we are streaming instead of a static image
-    const stream = this.getElement();
-    if (!stream) return;
 
+  this.start = function(delay) {
     if (this.janusEnabled) {
       var id = parseInt(this.id);
       var server;
@@ -106,47 +107,46 @@ function MonitorStream(monitorData) {
       attachVideo(id);
       return;
     }
+
+    const stream = this.getElement();
+    if (!stream) return;
     if (!stream.src) {
-      // Website Monitors won't have an img tag
+      // Website Monitors won't have an img tag, neither will video
       console.log('No src for #liveStream'+this.id);
       console.log(stream);
       return;
     }
+    // Step 1 make sure we are streaming instead of a static image
     src = stream.src.replace(/mode=single/i, 'mode=jpeg');
-    if ( -1 == src.search('connkey') ) {
+    if (-1 == src.search('connkey')) {
       src += '&connkey='+this.connKey;
     }
-    if ( stream.src != src ) {
+    if (stream.src != src) {
       console.log("Setting to streaming: " + src);
       stream.src = '';
       stream.src = src;
     }
-    setTimeout(this.streamCmdQuery.bind(this), delay);
+    setTimeout(this.statusQuery.bind(this), delay);
   };
+
   this.stop = function() {
     if ( 0 ) {
-      var stream = $j('#liveStream'+this.id)[0];
-      if ( ! stream ) {
-        console.log('No live stream');
-        return;
-      }
+      const stream = this.getElement();
+      if (!stream) return;
       src = stream.src.replace(/mode=jpeg/i, 'mode=single');
-      if ( stream.src != src ) {
+      if (stream.src != src) {
         console.log("Setting to stopped");
         stream.src = '';
         stream.src = src;
       }
     }
-    this.streamCmdParms.command = CMD_STOP;
-    this.streamCmdReq(this.streamCmdParms);
+    this.streamCommand(CMD_STOP);
   };
   this.pause = function() {
-    this.streamCmdParms.command = CMD_PAUSE;
-    this.streamCmdReq(this.streamCmdParms);
+    this.streamCommand(CMD_PAUSE);
   };
   this.play = function() {
-    this.streamCmdParms.command = CMD_PLAY;
-    this.streamCmdReq(this.streamCmdParms);
+    this.streamCommand(CMD_PLAY);
   };
 
   this.eventHandler = function(event) {
@@ -154,77 +154,142 @@ function MonitorStream(monitorData) {
   };
 
   this.onclick = function(evt) {
-    var el = evt.currentTarget;
-    var id = el.getAttribute("data-monitor-id");
-    var url = '?view=watch&mid='+id;
-    evt.preventDefault();
-    window.location.assign(url);
+    console.log('onclick');
   };
 
-  this.setup_onclick = function() {
-    var el = document.getElementById('imageFeed'+this.id);
-    if ( el ) el.addEventListener('click', this.onclick, false);
+  this.setup_onclick = function(func) {
+    this.onclick = func;
+    const el = this.getElement();
+    if (!el) return;
+    el.addEventListener('click', this.onclick, false);
   };
+
   this.disable_onclick = function() {
-    document.getElementById('imageFeed'+this.id).removeEventListener('click', this.onclick );
+    const el = this.getElement();
+    if (!el) return;
+    el.removeEventListener('click', this.onclick);
+  };
+
+  this.onpause = function() {
+    console.log('onpause');
+  };
+  this.setup_onpause = function(func) {
+    this.onpause = func;
+  };
+  this.onplay = null;
+  this.setup_onplay = function(func) {
+    this.onplay = func;
   };
 
   this.setStateClass = function(jobj, stateClass) {
-    if ( !jobj ) {
+    if (!jobj) {
+      console.log("No obj in setStateClass");
       return;
     }
-    if ( !jobj.hasClass( stateClass ) ) {
-      if ( stateClass != 'alarm' ) jobj.removeClass('alarm');
-      if ( stateClass != 'alert' ) jobj.removeClass('alert');
-      if ( stateClass != 'idle' ) jobj.removeClass('idle');
+    if (!jobj.hasClass(stateClass)) {
+      if (stateClass != 'alarm') jobj.removeClass('alarm');
+      if (stateClass != 'alert') jobj.removeClass('alert');
+      if (stateClass != 'idle') jobj.removeClass('idle');
 
       jobj.addClass(stateClass);
     }
   };
 
+  this.setAlarmState = function(alarmState) {
+    var stateClass = '';
+    if (alarmState == STATE_ALARM) {
+      stateClass = 'alarm';
+    } else if (alarmState == STATE_ALERT) {
+      stateClass = 'alert';
+    }
+
+    const stateValue = $j('#stateValue'+this.id);
+    if (stateValue.length) {
+      stateValue.text(stateStrings[alarmState]);
+      if (stateClass) {
+        stateValue.addClass(stateClass);
+      } else {
+        stateValue.removeClass();
+      }
+    } else {
+      console.log("No statevalue");
+    }
+    //const monitorState = $j('#monitorState'+this.id);
+    //if (monitorState.length) this.setStateClass(monitorState, stateClass);
+
+    const isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
+    const wasAlarmed = ( this.lastAlarmState == STATE_ALARM || this.lastAlarmState == STATE_ALERT );
+
+    const newAlarm = ( isAlarmed && !wasAlarmed );
+    const oldAlarm = ( !isAlarmed && wasAlarmed );
+
+    if (newAlarm) {
+      if (SOUND_ON_ALARM) {
+        // Enable the alarm sound
+        if (!msieVer) {
+          $j('#alarmSound').removeClass('hidden');
+        } else {
+          $j('#MediaPlayer').trigger('play');
+        }
+      }
+      if (POPUP_ON_ALARM) {
+        window.focus();
+      }
+      if (this.onalarm) {
+        this.onalarm();
+      }
+    }
+    if (oldAlarm) { // done with an event do a refresh
+      if (SOUND_ON_ALARM) {
+        // Disable alarm sound
+        if (!msieVer) {
+          $j('#alarmSound').addClass('hidden');
+        } else {
+          $j('#MediaPlayer').trigger('pause');
+        }
+      }
+      if (this.onalarm) {
+        this.onalarm();
+      }
+    }
+    this.lastAlarmState = alarmState;
+  }; // end function setAlarmState( currentAlarmState )
+
+  this.onalarm = null;
+  this.setup_onalarm = function(func) {
+    this.onalarm = func;
+  };
+
   this.onFailure = function(jqxhr, textStatus, error) {
+    // Assuming temporary problem, retry in a bit.
     setTimeout(this.streamCmdQuery.bind(this), 1000*statusRefreshTimeout);
     logAjaxFail(jqxhr, textStatus, error);
   };
 
   this.getStreamCmdResponse = function(respObj, respText) {
-    var stream = $j('#liveStream'+this.id)[0];
-
+    var stream = this.getElement();
     if (!stream) {
-      console.log('No live stream');
       return;
     }
 
     //watchdogOk('stream');
-    if (streamCmdTimer) {
-      streamCmdTimer = clearTimeout(streamCmdTimer);
+    if (this.streamCmdTimer) {
+      this.streamCmdTimer = clearTimeout(this.streamCmdTimer);
     }
 
-    if ( respObj.result == 'Ok' ) {
-      if ( respObj.status ) {
-        this.status = respObj.status;
-        this.alarmState = this.status.state;
-
-        var stateClass = '';
-        if ( this.alarmState == STATE_ALARM ) {
-          stateClass = 'alarm';
-        } else if ( this.alarmState == STATE_ALERT ) {
-          stateClass = 'alert';
-        } else {
-          stateClass = 'idle';
-        }
+    if (respObj.result == 'Ok') {
+      if (respObj.status) {
+        const streamStatus = this.status = respObj.status;
 
         if ( (
           (typeof COMPACT_MONTAGE === 'undefined') ||
           !COMPACT_MONTAGE) &&
           (this.type != 'WebSite')
         ) {
-          const viewingFPSValue = $j('#vewingFPSValue'+this.id);
+          const viewingFPSValue = $j('#viewingFPSValue'+this.id);
           const captureFPSValue = $j('#captureFPSValue'+this.id);
           const analysisFPSValue = $j('#analysisFPSValue'+this.id);
 
-          const stateValue = $j('#stateValue'+this.id);
-          const monitorState = $j('#monitorState'+this.id);
 
           if (viewingFPSValue.length && (viewingFPSValue.text != this.status.fps)) {
             viewingFPSValue.text(this.status.fps);
@@ -236,40 +301,104 @@ function MonitorStream(monitorData) {
             captureFPSValue.text(this.status.capturefps);
           }
 
-          if (stateValue.length) stateValue.text(stateStrings[this.alarmState]);
-          if (monitorState.length) this.setStateClass(monitorState, stateClass);
-        }
-
-        this.setStateClass($j('#monitor'+this.id), stateClass);
-
-        /*Stream could be an applet so can't use moo tools*/
-        //stream.parentNode().className = stateClass;
-
-        var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT );
-        var wasAlarmed = ( this.lastAlarmState == STATE_ALARM || this.lastAlarmState == STATE_ALERT );
-
-        var newAlarm = ( isAlarmed && !wasAlarmed );
-        var oldAlarm = ( !isAlarmed && wasAlarmed );
-
-        if (newAlarm) {
-          if (false && SOUND_ON_ALARM) {
-            // Enable the alarm sound
-            $j('#alarmSound').removeClass('hidden');
+          const levelValue = $j('#levelValue');
+          if (levelValue.length) {
+            levelValue.text(this.status.level);
+            var newClass = 'ok';
+            if (this.status.level > 95) {
+              newClass = 'alarm';
+            } else if (this.status.level > 80) {
+              newClass = 'alert';
+            }
+            levelValue.removeClass();
+            levelValue.addClass(newClass);
           }
-          if ((typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM) {
-            windowToFront();
+
+          const delayString = secsToTime(this.status.delay);
+
+          if (this.status.paused == true) {
+            $j('#modeValue'+this.id).text('Paused');
+            $j('#rate'+this.id).addClass('hidden');
+            $j('#delayValue'+this.id).text(delayString);
+            $j('#delay'+this.id).removeClass('hidden');
+            $j('#level'+this.id).removeClass('hidden');
+            this.onpause();
+          } else if (this.status.delayed == true) {
+            $j('#modeValue'+this.id).text('Replay');
+            $j('#rateValue'+this.id).text(this.status.rate);
+            $j('#rate'+this.id).removeClass('hidden');
+            $j('#delayValue'+this.id).text(delayString);
+            $j('#delay'+this.id).removeClass('hidden');
+            $j('#level'+this.id).removeClass('hidden');
+            if (this.status.rate == 1) {
+              if (this.onplay) this.onplay();
+            } else if (this.status.rate > 0) {
+              if (this.status.rate < 1) {
+                streamCmdSlowFwd(false);
+              } else {
+                streamCmdFastFwd(false);
+              }
+            } else {
+              if (this.status.rate > -1) {
+                streamCmdSlowRev(false);
+              } else {
+                streamCmdFastRev(false);
+              }
+            } // rate
+          } else {
+            $j('#modeValue'+this.id).text('Live');
+            $j('#rate'+this.id).addClass('hidden');
+            $j('#delay'+this.id).addClass('hidden');
+            $j('#level'+this.id).addClass('hidden');
+            if (this.onplay) this.onplay();
+          } // end if paused or delayed
+
+          $j('#zoomValue'+this.id).text(this.status.zoom);
+          if ('zoomOutBtn' in this.buttons) {
+            if (this.status.zoom == '1.0') {
+              setButtonState('zoomOutBtn', 'unavail');
+            } else {
+              setButtonState('zoomOutBtn', 'inactive');
+            }
           }
-        }
-        if (false && SOUND_ON_ALARM) {
-          if ( oldAlarm ) {
-            // Disable alarm sound
-            $j('#alarmSound').addClass('hidden');
+        } // end if compact montage
+
+        this.setAlarmState(this.status.state);
+
+        if (canEdit.Monitors) {
+          if (streamStatus.enabled) {
+            if ('enableAlarmButton' in this.buttons) {
+              this.buttons.enableAlarmButton.addClass('disabled');
+              this.buttons.enableAlarmButton.prop('title', disableAlarmsStr);
+            }
+            if ('forceAlarmButton' in this.buttons) {
+              if (streamStatus.forced) {
+                this.buttons.forceAlarmButton.addClass('disabled');
+                this.buttons.forceAlarmButton.prop('title', cancelForcedAlarmStr);
+              } else {
+                this.buttons.forceAlarmButton.removeClass('disabled');
+                this.buttons.forceAlarmButton.prop('title', forceAlarmStr);
+              }
+              this.buttons.forceAlarmButton.prop('disabled', false);
+            }
+          } else {
+            if ('enableAlarmButton' in this.buttons) {
+              this.buttons.enableAlarmButton.removeClass('disabled');
+              this.buttons.enableAlarmButton.prop('title', enableAlarmsStr);
+            }
+            if ('forceAlarmButton' in this.buttons) {
+              this.buttons.forceAlarmButton.prop('disabled', true);
+            }
           }
-        }
+          if ('enableAlarmButton' in this.buttons) {
+            this.buttons.enableAlarmButton.prop('disabled', false);
+          }
+        } // end if canEdit.Monitors
+
         if (this.status.auth) {
           if (this.status.auth != this.auth_hash) {
             // Try to reload the image stream.
-            if (stream) {
+            if (stream && stream.src) {
               const oldsrc = stream.src;
               stream.src = '';
               stream.src = oldsrc.replace(/auth=\w+/i, 'auth='+this.status.auth);
@@ -283,23 +412,25 @@ function MonitorStream(monitorData) {
       console.error(respObj.message);
       // Try to reload the image stream.
       if (stream) {
-        if ( stream.src ) {
+        if (stream.src) {
           console.log('Reloading stream: ' + stream.src);
           src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-          if ( src != stream.src ) {
+          // Maybe navbar updated auth FIXME
+          if (src != stream.src) {
             stream.src = src;
           } else {
             console.log("Failed to update rand on stream src");
           }
-        } else {
         }
       } else {
         console.log('No stream to reload?');
       }
     } // end if Ok or not
+  };
 
-    this.lastAlarmState = this.alarmState;
-    setTimeout(this.streamCmdQuery.bind(this), statusRefreshTimeout);
+  this.statusQuery = function() {
+    this.streamCmdQuery(CMD_QUERY);
+    setTimeout(this.statusQuery.bind(this), statusRefreshTimeout);
   };
 
   this.streamCmdQuery = function(resent) {
@@ -310,15 +441,44 @@ function MonitorStream(monitorData) {
     }
   };
 
-  if ( this.type != 'WebSite' ) {
+  this.streamCommand = function(command) {
+    if (typeof(command) == 'object') {
+      for (const key in command) this.streamCmdParms[key] = command[key];
+    } else {
+      this.streamCmdParms.command = command;
+    }
+    this.streamCmdReq(this.streamCmdParms);
+  };
+
+  this.alarmCommand = function(command) {
+    if (this.ajaxQueue) {
+      this.ajaxQueue.abort();
+    }
+    const alarmCmdParms = Object.assign({}, this.streamCmdParms);
+    alarmCmdParms.request = 'alarm';
+    alarmCmdParms.command = command;
+    alarmCmdParms.id = this.id;
+
+    this.ajaxQueue = jQuery.ajaxQueue({
+      url: this.url,
+      data: alarmCmdParms, dataType: "json"})
+        .done(this.getStreamCmdResponse.bind(this))
+        .fail(this.onFailure.bind(this));
+  };
+
+  if (this.type != 'WebSite') {
+    $j.ajaxSetup({timeout: AJAX_TIMEOUT});
+    if (auth_hash) {
+      this.streamCmdParms.auth = auth_hash;
+    } else if ( auth_relay ) {
+      this.streamCmdParms.auth_relay = '';
+    }
+
     this.streamCmdReq = function(streamCmdParms) {
-      if ( auth_hash ) {
-        this.streamCmdParms.auth = auth_hash;
-      } else if ( auth_relay ) {
-        this.streamCmdParms.auth_relay = '';
+      if (this.ajaxQueue) {
+        this.ajaxQueue.abort();
       }
-      $j.ajaxSetup({timeout: AJAX_TIMEOUT});
-      $j.getJSON(this.url, streamCmdParms)
+      this.ajaxQueue = jQuery.ajaxQueue({url: this.url, data: streamCmdParms, dataType: "json"})
           .done(this.getStreamCmdResponse.bind(this))
           .fail(this.onFailure.bind(this));
     };
@@ -326,7 +486,7 @@ function MonitorStream(monitorData) {
   this.analyse_frames = true;
   this.show_analyse_frames = function(toggle) {
     this.analyse_frames = toggle;
-    this.streamCmdParms.command = this.analyse_frames?CMD_ANALYZE_ON:CMD_ANALYZE_OFF;
+    this.streamCmdParms.command = this.analyse_frames ? CMD_ANALYZE_ON : CMD_ANALYZE_OFF;
     this.streamCmdReq(this.streamCmdParms);
   };
 } // end function MonitorStream

From 2da9c20c08be3103c66bc05775b95430b301c3a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:49:59 -0500
Subject: [PATCH 336/501] Add ajaxQueue

---
 web/js/ajaxQueue.js | 48 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 web/js/ajaxQueue.js

diff --git a/web/js/ajaxQueue.js b/web/js/ajaxQueue.js
new file mode 100644
index 000000000..c706fb978
--- /dev/null
+++ b/web/js/ajaxQueue.js
@@ -0,0 +1,48 @@
+// See https://github.com/gnarf/jquery-ajaxQueue for license and copyright
+
+(function($) {
+
+// jQuery on an empty object, we are going to use this as our Queue
+var ajaxQueue = $({});
+
+$.ajaxQueue = function( ajaxOpts ) {
+    var jqXHR,
+        dfd = $.Deferred(),
+        promise = dfd.promise();
+
+    // run the actual query
+    function doRequest( next ) {
+        jqXHR = $.ajax( ajaxOpts );
+        jqXHR.done( dfd.resolve )
+            .fail( dfd.reject )
+            .then( next, next );
+    }
+
+    // queue our ajax request
+    ajaxQueue.queue( doRequest );
+
+    // add the abort method
+    promise.abort = function( statusText ) {
+
+        // proxy abort to the jqXHR if it is active
+        if ( jqXHR ) {
+            return jqXHR.abort( statusText );
+        }
+
+        // if there wasn't already a jqXHR we need to remove from queue
+        var queue = ajaxQueue.queue(),
+            index = $.inArray( doRequest, queue );
+
+        if ( index > -1 ) {
+            queue.splice( index, 1 );
+        }
+
+        // and then reject the deferred
+        dfd.rejectWith( ajaxOpts.context || ajaxOpts, [ promise, statusText, "" ] );
+        return promise;
+    };
+
+    return promise;
+};
+
+})(jQuery);

From 97f2c0a02b8f5a0b001883c2d7f9cf59ed0787ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:50:25 -0500
Subject: [PATCH 337/501] Load ajaxQueue

---
 web/skins/classic/includes/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index c593601aa..beb6590e0 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -916,6 +916,7 @@ function xhtmlFooter() {
 ?>
   <script src="<?php echo cache_bust('skins/'.$skin.'/js/jquery.min.js'); ?>"></script>
   <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
+  <script src="<?php echo cache_bust('js/ajaxQueue.js') ?>"></script>
   <script src="skins/<?php echo $skin; ?>/js/bootstrap-4.5.0.min.js"></script>
 <?php echo output_script_if_exists(array(
   'js/tableExport.min.js',
@@ -944,7 +945,8 @@ function xhtmlFooter() {
   <script src="skins/<?php echo $skin ?>/js/moment.min.js"></script>
 <?php
 ?>
-  <script nonce="<?php echo $cspNonce; ?>">var $j = jQuery.noConflict();
+  <script nonce="<?php echo $cspNonce; ?>">
+    var $j = jQuery.noConflict();
 <?php
   if ( $skinJsPhpFile ) {
     require_once( $skinJsPhpFile );

From 24a9dcbf47db254d868580c1d87fd5dfc5363e84 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:50:53 -0500
Subject: [PATCH 338/501] If rate > 1600, limit it to 1600 to prevent logged
 errors

---
 web/skins/classic/views/js/montage.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index f6da7fbac..5dfff5afc 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -117,7 +117,7 @@ function changeSize() {
     monitor_frame.css('height', ( height ? height+'px' : 'auto'));
 
     /*Stream could be an applet so can't use moo tools*/
-    var streamImg = document.getElementById('liveStream'+monitor.id);
+    var streamImg = monitor.getElement();
     if ( streamImg ) {
       if ( streamImg.nodeName == 'IMG' ) {
         var src = streamImg.src;
@@ -269,7 +269,7 @@ function cancel_layout(button) {
   $j('#EditLayout').show();
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
-    monitor.setup_onclick();
+    monitor.setup_onclick(handleClick);
 
     //monitor_feed = $j('#imageFeed'+monitor.id);
     //monitor_feed.click(monitor.onclick);
@@ -312,7 +312,7 @@ function initPage() {
     if ( monitors[i].type == 'WebSite' && interval > 0 ) {
       setInterval(reloadWebSite, interval*1000, i);
     }
-    monitors[i].setup_onclick();
+    monitors[i].setup_onclick(handleClick);
   }
   selectLayout('#zmMontageLayout');
 }
@@ -322,5 +322,15 @@ function watchFullscreen() {
   openFullscreen(content);
 }
 
+function handleClick(evt) {
+  console.log("handleClick");
+  var el = evt.currentTarget;
+  console.log(el);
+  var id = el.getAttribute("data-monitor-id");
+  var url = '?view=watch&mid='+id;
+  evt.preventDefault();
+  window.location.assign(url);
+}
+
 // Kick everything off
 $j(document).ready(initPage);

From 77486169926fcd25ee7d8a795e2975426e2978e8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:51:08 -0500
Subject: [PATCH 339/501] If rate > 1600, limit it to 1600 to prevent logged
 errors

---
 web/skins/classic/views/event.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index b096fda97..050359ce5 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -46,6 +46,10 @@ if (isset($_REQUEST['rate']) ) {
 } else {
   $rate = reScale(RATE_BASE, $monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
 }
+if ($rate > 1600) {
+  $rate = 1600;
+  zm_setcookie('zmEventRate', $rate);
+}
 
 if (isset($_REQUEST['scale'])) {
   $scale = validInt($_REQUEST['scale']);

From e73659843ad768be54dd9df8e4d3a055d9e40326 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:52:01 -0500
Subject: [PATCH 340/501] Rework to use MonitorStream.js

---
 web/skins/classic/views/js/watch.js | 309 ++++++++--------------------
 1 file changed, 83 insertions(+), 226 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 13d54928a..6c9a669fe 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -182,73 +182,6 @@ function changeScale() {
   }
 } // end function changeScale
 
-function setAlarmState(currentAlarmState) {
-  alarmState = currentAlarmState;
-
-  var stateClass = '';
-  if (alarmState == STATE_ALARM) {
-    stateClass = 'alarm';
-  } else if (alarmState == STATE_ALERT) {
-    stateClass = 'alert';
-  }
-  $j('#stateValue').text(stateStrings[alarmState]);
-  if (stateClass) {
-    $j('#stateValue').addClass(stateClass);
-  } else {
-    $j('#stateValue').removeClass();
-  }
-
-  var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
-  var wasAlarmed = ( lastAlarmState == STATE_ALARM || lastAlarmState == STATE_ALERT );
-
-  var newAlarm = ( isAlarmed && !wasAlarmed );
-  var oldAlarm = ( !isAlarmed && wasAlarmed );
-
-  if (newAlarm) {
-    table.bootstrapTable('refresh');
-    if (SOUND_ON_ALARM) {
-      // Enable the alarm sound
-      if (!msieVer) {
-        $j('#alarmSound').removeClass('hidden');
-      } else {
-        $j('#MediaPlayer').trigger('play');
-      }
-    }
-    if (POPUP_ON_ALARM) {
-      window.focus();
-    }
-  }
-  if (oldAlarm) { // done with an event do a refresh
-    table.bootstrapTable('refresh');
-    if (SOUND_ON_ALARM) {
-      // Disable alarm sound
-      if (!msieVer) {
-        $j('#alarmSound').addClass('hidden');
-      } else {
-        $j('#MediaPlayer').trigger('pause');
-      }
-    }
-  }
-
-  lastAlarmState = alarmState;
-} // end function setAlarmState( currentAlarmState )
-
-function streamCmdReq(data) {
-  if (auth_hash) data.auth = auth_hash;
-  $j.getJSON(monitorUrl + '?view=request&request=stream&connkey='+connKey, data)
-      .done(getStreamCmdResponse)
-      .fail(getStreamCmdError);
-
-  streamCmdTimer = null;
-}
-
-function getStreamCmdError(text, error) {
-  console.log(error);
-  // Error are normally due to failed auth. reload the page.
-
-  //window.location.reload();
-}
-
 function getStreamCmdResponse(respObj, respText) {
   watchdogOk('stream');
   if (streamCmdTimer) {
@@ -379,7 +312,7 @@ function streamCmdQuery() {
   streamCmdReq({command: CMD_QUERY});
 }
 
-function streamCmdPause(action) {
+function onPause() {
   setButtonState('pauseBtn', 'active');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -389,18 +322,17 @@ function streamCmdPause(action) {
     setButtonState('slowRevBtn', 'inactive');
     setButtonState('fastRevBtn', 'inactive');
   }
+}
+function streamCmdPause(action) {
+  onPause();
   if (action) {
-    var data = {};
-    if (auth_hash) data.auth = auth_hash;
-    data.command = CMD_PAUSE;
-    streamCmdReq(data);
+    monitorStream.streamCommand(CMD_PAUSE);
   }
 }
-
-function streamCmdPlay(action) {
+function onPlay() {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'active');
-  if (streamStatus.delayed == true) {
+  if (monitorStream.status.delayed == true) {
     setButtonState('stopBtn', 'inactive');
     if (monitorStreamReplayBuffer) {
       setButtonState('fastFwdBtn', 'inactive');
@@ -417,11 +349,14 @@ function streamCmdPlay(action) {
       setButtonState('fastRevBtn', 'unavail');
     }
   }
-  if (action) {
-    streamCmdReq({command: CMD_PLAY});
-  }
 }
 
+function streamCmdPlay(action) {
+  onPlay();
+  if (action) {
+    monitorStream.streamCommand(CMD_PLAY);
+  }
+}
 
 function streamCmdStop(action) {
   setButtonState('pauseBtn', 'inactive');
@@ -434,7 +369,7 @@ function streamCmdStop(action) {
     setButtonState('fastRevBtn', 'unavail');
   }
   if (action) {
-    streamCmdReq({command: CMD_STOP});
+    monitorStream.streamCommand(CMD_STOP);
   }
   setButtonState('stopBtn', 'unavail');
   setButtonState('playBtn', 'active');
@@ -451,7 +386,7 @@ function streamCmdFastFwd(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    streamCmdReq({command: CMD_FASTFWD});
+    monitorStream.streamCommand(CMD_FASTFWD);
   }
 }
 
@@ -466,7 +401,7 @@ function streamCmdSlowFwd(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    streamCmdReq({command: CMD_SLOWFWD});
+    monitorStream.command(CMD_SLOWFWD);
   }
   setButtonState('pauseBtn', 'active');
   if (monitorStreamReplayBuffer) {
@@ -485,7 +420,7 @@ function streamCmdSlowRev(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    streamCmdReq({command: CMD_SLOWREV});
+    monitorStream.command(CMD_SLOWREV);
   }
   setButtonState('pauseBtn', 'active');
   if (monitorStreamReplayBuffer) {
@@ -504,35 +439,24 @@ function streamCmdFastRev(action) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if (action) {
-    streamCmdReq({command: CMD_FASTREV});
+    monitorStream.command(CMD_FASTREV);
   }
 }
 
 function streamCmdZoomIn(x, y) {
-  var data = {};
-  data.x = x;
-  data.y = y;
-  data.command = CMD_ZOOMIN;
-  streamCmdReq(data);
+  monitorStream.streamCommand({x: x, y: y, command: CMD_ZOOMIN});
 }
 
 function streamCmdZoomOut() {
-  streamCmdReq({command: CMD_ZOOMOUT});
+  monitorStream.streamCommand(CMD_ZOOMOUT);
 }
 
 function streamCmdScale(scale) {
-  var data = {};
-  data.command = CMD_SCALE;
-  data.scale = scale;
-  streamCmdReq(data);
+  monitorStream.streamCommand({command: CMD_SCALE, scale: scale});
 }
 
 function streamCmdPan(x, y) {
-  var data = {};
-  data.x = x;
-  data.y = y;
-  data.command = CMD_PAN;
-  streamCmdReq(data);
+  monitorStream.streamCommand({x: x, y: y, command: CMD_PAN});
 }
 
 
@@ -565,33 +489,12 @@ function statusCmdQuery() {
   statusCmdTimer = null;
 }
 
-function alarmCmdReq(data) {
-  if (auth_hash) data.auth = auth_hash;
-  $j.getJSON(monitorUrl + '?view=request&request=alarm&id='+monitorId, data)
-      .done(getAlarmCmdResponse)
-      .fail(function(jqxhr, textStatus, error) {
-        if (textStatus === 'timeout') {
-          streamCmdQuery();
-        } else {
-          logAjaxFail(jqxhr, textStatus, error);
-        }
-      });
-}
-
-function getAlarmCmdResponse(respObj, respText) {
-  checkStreamForErrors('getAlarmCmdResponse', respObj);
-}
-
 function cmdDisableAlarms() {
-  var data = {};
-  data.command = 'disableAlarms';
-  alarmCmdReq(data);
+  monitorStream.alarmCommand('disableAlarms');
 }
 
 function cmdEnableAlarms() {
-  var data = {};
-  data.command = 'enableAlarms';
-  alarmCmdReq(data);
+  monitorStream.alarmCommand('enableAlarms');
 }
 
 function cmdAlarm() {
@@ -603,16 +506,13 @@ function cmdAlarm() {
 }
 
 function cmdForceAlarm() {
-  var data = {};
-  data.command = 'forceAlarm';
-  alarmCmdReq(data);
+  monitorStream.alarmCommand('forceAlarm');
   if (window.event) window.event.preventDefault();
+  return false;
 }
 
 function cmdCancelForcedAlarm() {
-  var data = {};
-  data.command = 'cancelForcedAlarm';
-  alarmCmdReq(data);
+  monitorStream.alarmCommand('cancelForcedAlarm');
   if (window.event) window.event.preventDefault();
   return false;
 }
@@ -717,6 +617,7 @@ function fetchImage(streamImage) {
 function handleClick(event) {
   // target should be the img tag
   var target = $j(event.target);
+  console.log("click " + showMode);
   var width = target.width();
   var height = target.height();
 
@@ -892,6 +793,10 @@ function msieVer() {
   }
 }
 
+function refresh_events_table() {
+  table.bootstrapTable('refresh');
+}
+
 function initPage() {
   if (canView.Control) {
     // Load the PTZ Preset modal into the DOM
@@ -899,79 +804,37 @@ function initPage() {
     // Load the settings modal into the DOM
     if (monitorType == 'Local') getSettingsModal();
   }
+  // Only enable the settings button for local cameras
+  settingsBtn.prop('disabled', !(canView.Control && (monitorType == 'Local')));
 
   if (monitorType != 'WebSite') {
-    if (streamMode != 'janus') {
-      if (streamMode == 'single') {
-        statusCmdTimer = setTimeout(statusCmdQuery, 200);
-        setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
-      } else {
-        streamCmdTimer = setTimeout(streamCmdQuery, 200);
-        setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
-      }
+    monitorStream = new MonitorStream(monitorData[monIdx]);
+
+    // Start the fps and status updates. give a random delay so that we don't assault the server
+    monitorStream.setScale('auto');
+    monitorStream.start(Math.round( (Math.random()+0.5)*statusRefreshTimeout ));
+    if (streamMode == 'single') {
+      monitorStream.setup_onclick(fetchImage);
+    } else {
+      monitorStream.setup_onclick(handleClick);
     }
-    if (streamMode == 'janus') {
-      server = "http://" + window.location.hostname + ":8088/janus";
-      opaqueId = "streamingtest-"+Janus.randomString(12);
-      Janus.init({debug: "all", callback: function() {
-        janus = new Janus({
-          server: server,
-          success: function() {
-            janus.attach({
-              plugin: "janus.plugin.streaming",
-              opaqueId: opaqueId,
-              success: function(pluginHandle) {
-                streaming2 = pluginHandle;
-                var body = {"request": "watch", "id": monitorId};
-                streaming2.send({"message": body});
-              },
-              error: function(error) {
-                Janus.error("  -- Error attaching plugin... ", error);
-              },
-              onmessage: function(msg, jsep) {
-                Janus.debug(" ::: Got a message :::");
-                Janus.debug(msg);
-                var result = msg["result"];
-                if (result !== null && result !== undefined) {
-                  if (result["status"] !== undefined && result["status"] !== null) {
-                    var status = result["status"];
-                    console.log(status);
-                  }
-                } else if (msg["error"] !== undefined && msg["error"] !== null) {
-                  Janus.error(msg["error"]);
-                  return;
-                }
-                if (jsep !== undefined && jsep !== null) {
-                  Janus.debug("Handling SDP as well...");
-                  Janus.debug(jsep);
-                  // Offer from the plugin, let's answer
-                  streaming2.createAnswer({
-                    jsep: jsep,
-                    // We want recvonly audio/video and, if negotiated, datachannels
-                    media: {audioSend: false, videoSend: false, data: true},
-                    success: function(jsep) {
-                      Janus.debug("Got SDP!");
-                      Janus.debug(jsep);
-                      var body = {"request": "start"};
-                      streaming2.send({"message": body, "jsep": jsep});
-                    },
-                    error: function(error) {
-                      Janus.error("WebRTC error:", error);
-                    }
-                  });
-                }
-              }, //onmessage function
-              onremotestream: function(stream) {
-                Janus.debug(" ::: Got a remote track :::");
-                Janus.debug(stream);
-                Janus.attachMediaStream(document.getElementById("liveStream" + monitorId), stream);
-                document.getElementById("liveStream" + monitorId).play();
-              }
-            }); // attach
-          } //Success functio
-        }); //new Janus
-      }}); //janus.init callback
-    } else if (canStreamNative || (streamMode == 'single')) {
+    monitorStream.setup_onpause(onPause);
+    monitorStream.setup_onplay(onPlay);
+    monitorStream.setup_onalarm(refresh_events_table);
+
+    monitorStream.setButton('enableAlarmButton', enableAlmBtn);
+    monitorStream.setButton('forceAlarmButton', forceAlmBtn);
+    monitorStream.setButton('zoomOutButton', $j('zoomOutBtn'));
+
+    /*
+    if (streamMode == 'single') {
+      statusCmdTimer = setTimeout(statusCmdQuery, 200);
+      setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
+    } else {
+      streamCmdTimer = setTimeout(streamCmdQuery, 200);
+      setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
+    }
+    if (canStreamNative || (streamMode == 'single')) {
       var streamImg = $j('#imageFeed img');
       if (!streamImg) streamImg = $j('#imageFeed object');
       if (!streamImg) {
@@ -996,6 +859,7 @@ function initPage() {
     if (refreshApplet && appletRefreshTime) {
       setTimeout(appletRefresh, appletRefreshTime*1000);
     }
+    */
     if (window.history.length == 1) {
       $j('#closeControl').html('');
     }
@@ -1006,6 +870,27 @@ function initPage() {
     document.querySelectorAll('select[name="changeRate"]').forEach(function(el) {
       el.onchange = window['changeRate'].bind(el, el);
     });
+
+    // Init the bootstrap-table
+    table.bootstrapTable({icons: icons});
+    // Update table rows each time after new data is loaded
+    table.on('post-body.bs.table', function(data) {
+      $j('#eventList tr:contains("New Event")').addClass('recent');
+    });
+
+    // Take appropriate action when the user clicks on a cell
+    table.on('click-cell.bs.table', processClicks);
+
+    // Some toolbar events break the thumbnail animation, so re-init eventlistener
+    table.on('all.bs.table', initThumbAnimation);
+
+    // Update table links each time after new data is loaded
+    table.on('post-body.bs.table', function(data) {
+      var thumb_ndx = $j('#eventList tr th').filter(function() {
+        return $j(this).text().trim() == 'Thumbnail';
+      }).index();
+      table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
+    });
   } else if (monitorRefresh > 0) {
     setInterval(reloadWebSite, monitorRefresh*1000);
   }
@@ -1042,31 +927,6 @@ function initPage() {
   } else {
     cyclePause();
   }
-
-  // Only enable the settings button for local cameras
-  settingsBtn.prop('disabled', !(canView.Control && (monitorType == 'Local')));
-
-  // Init the bootstrap-table
-  if (monitorType != 'WebSite') table.bootstrapTable({icons: icons});
-
-  // Update table rows each time after new data is loaded
-  table.on('post-body.bs.table', function(data) {
-    $j('#eventList tr:contains("New Event")').addClass('recent');
-  });
-
-  // Take appropriate action when the user clicks on a cell
-  table.on('click-cell.bs.table', processClicks);
-
-  // Some toolbar events break the thumbnail animation, so re-init eventlistener
-  table.on('all.bs.table', initThumbAnimation);
-
-  // Update table links each time after new data is loaded
-  table.on('post-body.bs.table', function(data) {
-    var thumb_ndx = $j('#eventList tr th').filter(function() {
-      return $j(this).text().trim() == 'Thumbnail';
-    }).index();
-    table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
-  });
 } // initPage
 
 function watchFullscreen() {
@@ -1151,10 +1011,7 @@ function cycleToggle(e) {
 function changeRate(e) {
   const newvalue = $j(e).val();
   if (1) {
-    var data = {};
-    data.command = CMD_MAXFPS;
-    data.maxfps = newvalue;
-    streamCmdReq(data);
+    monitorStream.streamCommand({command: CMD_MAXFPS, maxfps: newvalue});
   } else {
     streamImage = $j('#liveStream'+monitorData[monIdx].id);
     const oldsrc = streamImage.attr('src');

From 9c3509a620814df0d71342d3da650a160d480597 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:52:54 -0500
Subject: [PATCH 341/501] put an mid in imageFeed id so we can use
 MOnitorStream.js.  Use Monitor->getStatusHTML to generate status html

---
 web/skins/classic/views/watch.php | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index f47bd1ccb..340ee8e33 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -247,7 +247,7 @@ echo htmlSelect('cyclePeriod', $cyclePeriodOptions, $period, array('id'=>'cycleP
           </ul>
         </nav>
       <div class="container-fluid col-sm-offset-2 h-100 pr-0">
-        <div id="imageFeed"
+        <div id="imageFeed<?php echo $monitor->Id() ?>"
 <?php
 if ($streamMode == 'jpeg') {
   echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
@@ -255,24 +255,9 @@ if ($streamMode == 'jpeg') {
 ?>
 ><?php echo getStreamHTML($monitor, $options); ?>
         </div>
-<?php if ($monitor->Type() != 'WebSite') { ?>
-        <div id="monitorStatus">
-          <div id="monitorState">
-            <span><?php echo translate('State') ?>:<span id="stateValue"></span></span>
-            <span id="viewingFPS" title="<?php echo translate('Viewing FPS')?>"><span id="viewingFPSValue"></span> fps</span>
-            <span id="captureFPS" title="<?php echo translate('Capturing FPS')?>"><span id="captureFPSValue"></span> fps</span>
-            <?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
-            <span id="analysisFPS" title="<?php echo translate('Analysis FPS')?>"><span id="analysisFPSValue"></span> fps</span>
-            <?php } ?>
-          </div>
-        </div>
-        <div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
-          <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
-          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
-          <span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
-          <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
-          <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
-        </div>
+<?php if ($monitor->Type() != 'WebSite') {
+    echo $monitor->getMonitorStateHTML();
+ ?>
         <div class="buttons" id="dvrControls">
 <?php
 if ($streamMode == 'jpeg') {
@@ -413,4 +398,5 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
   </div>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="/javascript/janus/janus.js"></script>
+  <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>

From 57bb91e10550a9fae50e983ed2b9ffaccb25320d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:53:05 -0500
Subject: [PATCH 342/501] add connKey to monitorData

---
 web/skins/classic/views/js/watch.js.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 2f383ab24..cef3cdd79 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -64,6 +64,7 @@ foreach ($monitors as $m) {
 ?>
 monitorData[monitorData.length] = {
   'id': <?php echo $m->Id() ?>,
+  'connKey': <?php echo $m->connKey() ?>,
   'width': <?php echo $m->ViewWidth() ?>,
   'height':<?php echo $m->ViewHeight() ?>,
   'janusEnabled':<?php echo $m->JanusEnabled() ?>,

From 91d6ff20298a66852e48ec974f43e9b5ee1cb059 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:53:35 -0500
Subject: [PATCH 343/501] Use Monitor->getStatusHTML to generate status html

---
 web/skins/classic/views/zone.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 5031c316f..4c2cc2d30 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -164,10 +164,10 @@ if ( count($other_zones) ) {
                 <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="Editing <?php echo $zone['Type'] ?>"/>
                 Sorry, your browser does not support inline SVG
               </svg>
-            </div><?php # imageFrame?>
-            <div id="monitorState">
-              <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
-            </div>
+            </div><?php # imageFrame
+              echo $monitor->getMonitorStateHTML();
+?>
+
             <div id="StreamControlButtons">
               <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Showing Analysis') ?>">
                 <i class="material-icons md-18">assessment</i>

From 5ce701f5cb1cd16b63cafd9362992dc783ee11df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 11:53:44 -0500
Subject: [PATCH 344/501] Use Monitor->getStatusHTML to generate status html

---
 web/skins/classic/views/zones.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 423326a98..0d3844fd2 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -91,9 +91,7 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 ?>
           Sorry, your browser does not support inline SVG
         </svg>
-        <div id="monitorState">
-          <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
-        </div>
+<?php echo $monitor->getMonitorStateHTML(); ?>
         </div>
         <div class="zones">
           <table id="zonesTable" class="major">

From 4eb4e0eb185d2996e207f1039674e58bf4601ef8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Jan 2022 12:02:17 -0500
Subject: [PATCH 345/501] ignore ajaxQueue.js

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index 2e2fdd39a..f5529e8ee 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -14,6 +14,7 @@ web/skins/classic/js/moment.js
 web/skins/classic/js/video.js
 web/tools/mootools
 web/js/janus.js
+web/js/ajaxQueue.js
 
 # Cannot be parsed as JS
 web/skins/classic/includes/export_functions.php

From 52e48c02b61bcb9fb2fedc79b5d8b546d74d2b2c Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Fri, 21 Jan 2022 22:23:41 -0600
Subject: [PATCH 346/501] Add janus_path and janus_secret, allowing for more
 secure and flexible Janus installs

---
 .../lib/ZoneMinder/ConfigData.pm.in           | 22 ++++++++++++++++
 src/zm_monitor.cpp                            | 26 +++++++++++++++----
 web/includes/functions.php                    |  2 +-
 web/js/MonitorStream.js                       |  4 ++-
 web/skins/classic/views/cycle.php             |  1 +
 web/skins/classic/views/js/cycle.js           |  9 ++++++-
 web/skins/classic/views/montage.php           |  1 +
 web/skins/classic/views/watch.php             |  1 +
 8 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 48d494614..9b8a4e61e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -370,6 +370,28 @@ our @options = (
     type        => $types{boolean},
     category    => 'system',
   },
+  {
+    name        => 'ZM_JANUS_SECRET',
+    default     => '',
+    description => 'Password for Janus streaming administration.',
+    help        => q`This value should be set to a secure password,
+      and match the admin_key value in janus.plugin.streaming.config.
+      `,
+    type        => $types{string},
+    category    => 'system',
+  },
+  {
+    name        => 'ZM_JANUS_PATH',
+    default     => '',
+    description => 'URL for Janus HTTP/S port',
+    help        => q`Janus requires HTTP/S communication to administer
+      and initiate h.264 streams. If left blank, this will default to
+      the ZM hostname, port 8088/janus. This setting is particularly
+      useful for putting janus behind a reverse proxy.
+      `,
+    type        => $types{string},
+    category    => 'system',
+  },
   {
     name        => 'ZM_ENABLE_CSRF_MAGIC',
     default     => 'yes',
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 2179197e8..9a1b747b6 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3383,7 +3383,12 @@ size_t Monitor::WriteCallback(void *contents, size_t size, size_t nmemb, void *u
 int Monitor::add_to_janus() {
   //TODO clean this up, add error checking, etc
   std::string response;
-  std::string endpoint = "127.0.0.1:8088/janus/";
+  std::string endpoint;
+  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
+    endpoint = config.janus_path;
+  } else {
+    endpoint = "127.0.0.1:8088/janus/";
+  }
   std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
   std::string rtsp_username;
   std::string rtsp_password;
@@ -3425,6 +3430,7 @@ int Monitor::add_to_janus() {
   if (pos == std::string::npos) return -1;
   janus_id = response.substr(pos + 6, 16);
   response = "";
+  endpoint += "/";
   endpoint += janus_id;
   postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
   curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
@@ -3445,8 +3451,10 @@ int Monitor::add_to_janus() {
 
   //Assemble our actual request
   postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
-  postData +=  "\"request\" : \"create\", \"admin_key\" : \"supersecret\", \"type\" : \"rtsp\", ";
-  postData +=  "\"url\" : \"";
+  postData +=  "\"request\" : \"create\", \"admin_key\" : \"";
+  postData += config.janus_secret;
+  postData += "\", \"type\" : \"rtsp\", ";
+  postData += "\"url\" : \"";
   postData += rtsp_path;
   postData += "\", \"rtsp_user\" : \"";
   postData += rtsp_username;
@@ -3474,7 +3482,12 @@ int Monitor::add_to_janus() {
 int Monitor::remove_from_janus() {
   //TODO clean this up, add error checking, etc
   std::string response;
-  std::string endpoint = "127.0.0.1:8088/janus/";
+  std::string endpoint;
+  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
+    endpoint = config.janus_path;
+  } else {
+    endpoint = "127.0.0.1:8088/janus/";
+  }
   std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
   std::size_t pos;
   CURLcode res;
@@ -3495,6 +3508,7 @@ int Monitor::remove_from_janus() {
   if (pos == std::string::npos) return -1;
   std::string janus_id = response.substr(pos + 6, 16);
   response = "";
+  endpoint += "/";
   endpoint += janus_id;
   postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
   curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
@@ -3512,7 +3526,9 @@ int Monitor::remove_from_janus() {
 
   //Assemble our actual request
   postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
-  postData +=  "\"request\" : \"destroy\", \"admin_key\" : \"supersecret\", \"id\" : ";
+  postData +=  "\"request\" : \"destroy\", \"admin_key\" : \"";
+  postData += config.janus_secret;
+  postData += "\", \"id\" : ";
   postData += std::to_string(id);
   postData += "}}";
 
diff --git a/web/includes/functions.php b/web/includes/functions.php
index f9b8abf72..e346ceb34 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2095,7 +2095,7 @@ function getStreamHTML($monitor, $options = array()) {
     ) );
     return getVideoStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
   } else if ( $monitor->JanusEnabled() ) {
-    return '<video id="liveStream'.$monitor->Id().'" width="'.$options['width'].'"autoplay muted playsinline=""></video>';
+    return '<video id="liveStream'.$monitor->Id().'" width="'.$options['width'].'"autoplay muted controls playsinline="" ></video>';
   } else if ( $options['mode'] == 'stream' and canStream() ) {
     $options['mode'] = 'jpeg';
     $streamSrc = $monitor->getStreamSrc($options);
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 17f43c4b9..373902e1f 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -92,7 +92,9 @@ function MonitorStream(monitorData) {
     if (this.janusEnabled) {
       var id = parseInt(this.id);
       var server;
-      if (window.location.protocol=='https:') {
+      if (ZM_JANUS_PATH) {
+        server = ZM_JANUS_PATH;
+      } else if (window.location.protocol=='https:') {
         // Assume reverse proxy setup for now
         server = "https://" + window.location.hostname + "/janus";
       } else {
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index ee9e03d4f..50bb42045 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -192,6 +192,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
         </div>
       </div>
     </div>
+<script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
 <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
 <script src="/javascript/janus/janus.js"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 670671faa..9e128d0ab 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -51,7 +51,14 @@ function initCycle() {
   if ( scale == '0' || scale == 'auto' ) changeScale();
 
   if (monitorData[monIdx].janusEnabled) {
-    server = "http://" + window.location.hostname + ":8088/janus";
+          if (ZM_JANUS_PATH) {
+        server = ZM_JANUS_PATH;
+      } else if (window.location.protocol=='https:') {
+        // Assume reverse proxy setup for now
+        server = "https://" + window.location.hostname + "/janus";
+      } else {
+        server = "http://" + window.location.hostname + ":8088/janus";
+      }
     opaqueId = "streamingtest-"+Janus.randomString(12);
     Janus.init({debug: "all", callback: function() {
       janus = new Janus({
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index a96e8a88e..c59ce9f66 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -318,6 +318,7 @@ foreach (array_reverse($zones) as $zone) {
       </div>
     </div>
   </div>
+  <script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="/javascript/janus/janus.js"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 340ee8e33..46ee11f90 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -396,6 +396,7 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
 ?>
     </div>
   </div>
+  <script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="/javascript/janus/janus.js"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>

From 2e9bda1af190a3f18ae06eb7bbe10b8f8f08f49c Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Fri, 21 Jan 2022 23:21:41 -0600
Subject: [PATCH 347/501] Add firefox specific workaround for Janus streaming

---
 web/js/MonitorStream.js             | 3 +++
 web/skins/classic/views/js/cycle.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 373902e1f..b5f9d0b6a 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -521,6 +521,9 @@ async function attachVideo(id) {
       if (jsep !== undefined && jsep !== null) {
         Janus.debug("Handling SDP as well...");
         Janus.debug(jsep);
+        if ((navigator.userAgent.toLowerCase().indexOf('firefox') > -1) && (jsep["sdp"].includes("420029"))) { //because firefox devs are stubborn
+          jsep["sdp"] = jsep["sdp"].replace("420029", "42e01f");
+        }
         // Offer from the plugin, let's answer
         streaming[id].createAnswer({
           jsep: jsep,
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 9e128d0ab..7e7bd0147 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -91,6 +91,9 @@ function initCycle() {
               if (jsep !== undefined && jsep !== null) {
                 Janus.debug("Handling SDP as well...");
                 Janus.debug(jsep);
+                if ((navigator.userAgent.toLowerCase().indexOf('firefox') > -1) && (jsep["sdp"].includes("420029"))) { //because firefox devs are stubborn
+                  jsep["sdp"] = jsep["sdp"].replace("420029", "42e01f");
+                }
                 // Offer from the plugin, let's answer
                 streaming2.createAnswer({
                   jsep: jsep,

From 45db266ede1036b79823298cc7bd6239954e885d Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:07:12 -0500
Subject: [PATCH 348/501] Put full config available to javascript

---
 web/skins/classic/js/skin.js.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 2b7980c3a..6cde755b6 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -105,3 +105,10 @@ stateStrings[STATE_PREALARM] = "<?php echo translate('Prealarm') ?>";
 stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
 stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
 stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
+
+<?php
+global $config;
+foreach ($config as $name=>$c) {
+  echo $name . ' = \''.$c['Value'].'\''.PHP_EOL;
+}
+?>

From 35efb111ac2f264387d999cbac7adb98451787d1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:30:59 -0500
Subject: [PATCH 349/501] Add Private to Config

---
 db/zm_create.sql.in                           |  1 +
 db/zm_update-1.37.10.sql                      | 20 +++++++++++++++++++
 .../ZoneMinder/lib/ZoneMinder/Config.pm.in    |  5 +++--
 .../lib/ZoneMinder/ConfigData.pm.in           |  3 +++
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 db/zm_update-1.37.10.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index db72cb58d..7dc77cc47 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -39,6 +39,7 @@ CREATE TABLE `Config` (
   `Help` text,
   `Category` varchar(32) NOT NULL default '',
   `Readonly` tinyint(3) unsigned NOT NULL default '0',
+  `Private` BOOLEAN NOT NULL DEFAULT FALSE,
   `Requires` text,
   PRIMARY KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
diff --git a/db/zm_update-1.37.10.sql b/db/zm_update-1.37.10.sql
new file mode 100644
index 000000000..30c2d8766
--- /dev/null
+++ b/db/zm_update-1.37.10.sql
@@ -0,0 +1,20 @@
+--
+-- Update Config table to have Private
+--
+
+SELECT 'Checking for Private in Config';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Config'
+  AND table_schema = DATABASE()
+  AND column_name = 'Private'
+  ) > 0,
+"SELECT 'Column Private already exists in Config'",
+"ALTER TABLE `Config` ADD COLUMN `Private` BOOLEAN NOT NULL DEFAULT FALSE AFTER `Readonly`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 21f9a2d02..849ec5450 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -156,7 +156,7 @@ sub loadConfigFromDB {
     print("Error: unable to load options from database: $DBI::errstr\n");
     return(0);
   }
-  my $sql = "select * from Config";
+  my $sql = 'SELECT * FROM Config';
   my $sth = $dbh->prepare_cached( $sql )
     or croak( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute()
@@ -203,7 +203,7 @@ sub saveConfigToDB {
   my $res = $dbh->do( $sql )
     or croak( "Can't do '$sql': ".$dbh->errstr() );
 
-  $sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
+  $sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Private = ?, Requires = ?";
   my $sth = $dbh->prepare_cached( $sql )
     or croak( "Can't prepare '$sql': ".$dbh->errstr() );
   foreach my $option ( @options ) {
@@ -240,6 +240,7 @@ sub saveConfigToDB {
         $option->{help},
         $option->{category},
         $option->{readonly} ? 1 : 0,
+        $option->{private} ? 1 : 0,
         $option->{db_requires}
         ) or croak("Can't execute when updating config entry $$option{name}: ".$sth->errstr() );
   } # end foreach option
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 48d494614..d9d3c5306 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -304,6 +304,7 @@ our @options = (
       { name=>'ZM_AUTH_RELAY', value=>'hashed' }
     ],
     type        => $types{string},
+    private     => 1,
     category    => 'system',
   },
   {
@@ -462,6 +463,7 @@ our @options = (
                      {name=>'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'}
                    ],
     type        => $types{string},
+    private     => 1,
     category    => 'system',
   },
   {
@@ -477,6 +479,7 @@ our @options = (
                      {name=>'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'}
                    ],
     type        => $types{string},
+    private     => 1,
     category    => 'system',
   },
   {

From ce2d605b3d0eaa498ddc51a2b09e38a07623f57e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:31:15 -0500
Subject: [PATCH 350/501] load Private as well as Name,Value from Config

---
 web/includes/config.php.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index b30aebdea..c463a14ae 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -165,7 +165,7 @@ function loadConfig( $defineConsts=true ) {
 
   $config = array();
 
-  $result = $dbConn->query('SELECT Name,Value FROM Config');
+  $result = $dbConn->query('SELECT Name,Value,Private FROM Config');
   if ( !$result )
     echo mysql_error();
   while( $row = dbFetchNext($result) ) {

From 3a0b88c013709a1336b8e86c0d3ab83f06ed6a5f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:31:36 -0500
Subject: [PATCH 351/501] Don't make private config entries available to js
 land.

---
 web/skins/classic/js/skin.js.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 6cde755b6..336c0a352 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -109,6 +109,7 @@ stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 <?php
 global $config;
 foreach ($config as $name=>$c) {
-  echo $name . ' = \''.$c['Value'].'\''.PHP_EOL;
+  if (!$c['Private'])
+    echo $name . ' = \''.$c['Value'].'\''.PHP_EOL;
 }
 ?>

From 47aa1d1913319d47a540efe98147077b7717612e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:31:56 -0500
Subject: [PATCH 352/501] Bump version to 1.37.10

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 16b8efb7e..b95d80626 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.9
+Version: 1.37.10
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index 938adc6f6..a9009bf2a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.9
+1.37.10

From 90f75dae93214bf0f9300183cfb855f87d662445 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 12:33:48 -0500
Subject: [PATCH 353/501] Make config entries const

---
 web/skins/classic/js/skin.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 336c0a352..2d443fbe1 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -110,6 +110,6 @@ stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 global $config;
 foreach ($config as $name=>$c) {
   if (!$c['Private'])
-    echo $name . ' = \''.$c['Value'].'\''.PHP_EOL;
+    echo 'const '. $name . ' = \''.$c['Value'].'\''.PHP_EOL;
 }
 ?>

From 9443aaa2d866ee7d60fa3e4f9c083bdc2df0359a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 22 Jan 2022 13:33:39 -0500
Subject: [PATCH 354/501] Do state changes when in RECORD mode as well as it
 doesn't do motion detection Fixes #3411

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 2179197e8..9952f727f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2120,7 +2120,7 @@ bool Monitor::Analyse() {
 
           // snap->score -1 means didn't do motion detection so don't do state transition
           // In Nodect, we may still have a triggered event, so need this code to run to end the event.
-          } else if (!score and ((snap->score == 0) or (function == NODECT))) {
+          } else if (!score and ((snap->score == 0) or (function == NODECT || function == RECORD))) {
             Debug(1, "!score %s", State_Strings[state].c_str());
             alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count
 

From 07c5b23aa6668e33d8b21204953e408994d9a9db Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 22 Jan 2022 11:53:44 -0600
Subject: [PATCH 355/501] Adds Janus streaming checks to polling thread

---
 src/zm_monitor.cpp | 91 ++++++++++++++++++++++++++++++++++++++++------
 src/zm_monitor.h   |  1 +
 2 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 9a1b747b6..cc426586c 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -52,6 +52,7 @@
 #include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <chrono>
 
 #if ZM_MEM_MAPPED
 #include <sys/mman.h>
@@ -1123,9 +1124,7 @@ bool Monitor::connect() {
 #if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
       if (add_to_janus() != 0) {
-        if (add_to_janus() != 0) { //The initial attempt may fail. This is a temporary workaround.
-          Warning("Failed to add monitor stream to Janus!");
-        }
+          Warning("Failed to add monitor stream to Janus!"); //The first attempt may fail. Will be reattempted in the Poller thread
       }
     }
 #else
@@ -1797,6 +1796,8 @@ void Monitor::UpdateFPS() {
 //Thread where ONVIF polling, and other similar status polling can happen.
 //Since these can be blocking, run here to avoid intefering with other processing
 bool Monitor::Poll() {
+  //We want to trigger every 5 seconds or so. so grab the time at the beginning of the loop, and sleep at the end.
+  std::chrono::system_clock::time_point loop_start_time = std::chrono::system_clock::now();
 
 #ifdef WITH_GSOAP
   if (ONVIF_Healthy) {
@@ -1838,10 +1839,14 @@ bool Monitor::Poll() {
         }
       }
     }
-  } else {
-    std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep to avoid the busy loop.
   }
 #endif
+  if (janus_enabled) {
+    if (check_janus() != 1) {
+      add_to_janus();
+    }
+  }
+  std::this_thread::sleep_until(loop_start_time + std::chrono::seconds(5));
   return TRUE;
 } //end Poll
 
@@ -3166,10 +3171,8 @@ int Monitor::PrimeCapture() {
     }
   }  // end if rtsp_server
 
-#ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
-  //ONVIF Thread
-
-  if (onvif_event_listener  && ONVIF_Healthy) {
+  //Poller Thread
+  if (onvif_event_listener || janus_enabled) {
 
     if (!Poller) {
       Poller = zm::make_unique<PollThread>(this);
@@ -3177,7 +3180,7 @@ int Monitor::PrimeCapture() {
       Poller->Start();
     }
   }
-#endif
+
   if (decoding_enabled) {
     if (!decoder_it) decoder_it = packetqueue.get_video_it(false);
     if (!decoder) {
@@ -3381,7 +3384,6 @@ size_t Monitor::WriteCallback(void *contents, size_t size, size_t nmemb, void *u
 }
 
 int Monitor::add_to_janus() {
-  //TODO clean this up, add error checking, etc
   std::string response;
   std::string endpoint;
   if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
@@ -3479,8 +3481,73 @@ int Monitor::add_to_janus() {
   curl_easy_cleanup(curl);
   return 0;
 }
+
+int Monitor::check_janus() {
+  std::string response;
+  std::string endpoint;
+  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
+    endpoint = config.janus_path;
+  } else {
+    endpoint = "127.0.0.1:8088/janus/";
+  }
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  std::size_t pos;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(!curl) return -1;
+
+
+  //Start Janus API init. Need to get a session_id and handle_id
+  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos) return -1;
+  std::string janus_id = response.substr(pos + 6, 16);
+  response = "";
+  endpoint += "/";
+  endpoint += janus_id;
+  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos) return -1;
+  std::string handle_id = response.substr(pos + 6, 16);
+  endpoint += "/";
+  endpoint += handle_id;
+
+  //Assemble our actual request
+  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"info\", \"id\" : ";
+  postData += std::to_string(id);
+  postData += "}}";
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) return -1;
+
+  Debug(1, "Queried for stream status: %s", response.c_str());
+  curl_easy_cleanup(curl);
+  if (response.find("No such mountpoint") == std::string::npos) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
 int Monitor::remove_from_janus() {
-  //TODO clean this up, add error checking, etc
   std::string response;
   std::string endpoint;
   if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 898349eb3..381855c97 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -521,6 +521,7 @@ public:
   bool OnvifEnabled() {
     return onvif_event_listener;
   }
+  int check_janus(); //returns 1 for healthy, 0 for success but missing stream, negative for error.
 #ifdef WITH_GSOAP
   bool OnvifHealthy() {
     return ONVIF_Healthy;

From abbd27d1cba082ea9bb4ec16ebb75c528f8d7bb9 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 22 Jan 2022 13:31:47 -0600
Subject: [PATCH 356/501] Remove hard-coded config Vars

---
 web/skins/classic/views/cycle.php   | 1 -
 web/skins/classic/views/montage.php | 1 -
 web/skins/classic/views/watch.php   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 50bb42045..ee9e03d4f 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -192,7 +192,6 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
         </div>
       </div>
     </div>
-<script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
 <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
 <script src="/javascript/janus/janus.js"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index c59ce9f66..a96e8a88e 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -318,7 +318,6 @@ foreach (array_reverse($zones) as $zone) {
       </div>
     </div>
   </div>
-  <script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="/javascript/janus/janus.js"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 46ee11f90..340ee8e33 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -396,7 +396,6 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
 ?>
     </div>
   </div>
-  <script>var ZM_JANUS_PATH = '<?php echo ZM_JANUS_PATH ?>'</script>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
   <script src="/javascript/janus/janus.js"></script>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>

From d11098793571b6c9b0dc17f5aead5c5d3ad32e2d Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sat, 22 Jan 2022 13:37:44 -0600
Subject: [PATCH 357/501] Fix indentation for ESLint

---
 web/skins/classic/views/js/cycle.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 7e7bd0147..19f4497be 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -51,14 +51,14 @@ function initCycle() {
   if ( scale == '0' || scale == 'auto' ) changeScale();
 
   if (monitorData[monIdx].janusEnabled) {
-          if (ZM_JANUS_PATH) {
-        server = ZM_JANUS_PATH;
-      } else if (window.location.protocol=='https:') {
-        // Assume reverse proxy setup for now
-        server = "https://" + window.location.hostname + "/janus";
-      } else {
-        server = "http://" + window.location.hostname + ":8088/janus";
-      }
+    if (ZM_JANUS_PATH) {
+      server = ZM_JANUS_PATH;
+    } else if (window.location.protocol=='https:') {
+      // Assume reverse proxy setup for now
+      server = "https://" + window.location.hostname + "/janus";
+    } else {
+      server = "http://" + window.location.hostname + ":8088/janus";
+    }
     opaqueId = "streamingtest-"+Janus.randomString(12);
     Janus.init({debug: "all", callback: function() {
       janus = new Janus({

From 5485c04bc6fdb0151b44a30ee7a2a95ca842189f Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sun, 23 Jan 2022 01:07:48 -0600
Subject: [PATCH 358/501] Rework of the Janus polling loop

---
 src/zm_monitor.cpp | 200 +++++++++++++++++++++++----------------------
 src/zm_monitor.h   |   2 +
 2 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index cc426586c..25a8c9f73 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1123,6 +1123,7 @@ bool Monitor::connect() {
 
 #if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
+      get_janus_session();
       if (add_to_janus() != 0) {
           Warning("Failed to add monitor stream to Janus!"); //The first attempt may fail. Will be reattempted in the Poller thread
       }
@@ -1842,7 +1843,10 @@ bool Monitor::Poll() {
   }
 #endif
   if (janus_enabled) {
-    if (check_janus() != 1) {
+    if (janus_session.empty()) {
+      get_janus_session();
+    }
+    if (check_janus() == 0) {
       add_to_janus();
     }
   }
@@ -3395,7 +3399,6 @@ int Monitor::add_to_janus() {
   std::string rtsp_username;
   std::string rtsp_password;
   std::string rtsp_path = "rtsp://";
-  std::string janus_id;
   std::size_t pos;
   std::size_t pos2;
   CURLcode res;
@@ -3416,40 +3419,8 @@ int Monitor::add_to_janus() {
   rtsp_password = path.substr(pos+1, pos2 - pos - 1);
   rtsp_path += path.substr(pos2 + 1);
 
-  //Start Janus API init. Need to get a session_id and handle_id
-  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) {
-    Error("Failed to curl_easy_perform getting session/handle id");
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  janus_id = response.substr(pos + 6, 16);
-  response = "";
   endpoint += "/";
-  endpoint += janus_id;
-  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) {
-    Error("Failed to curl_easy_perform attaching");
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  std::string handle_id = response.substr(pos + 6, 16); //TODO: This is an assumption that the string is always 16
-  endpoint += "/";
-  endpoint += handle_id;
+  endpoint += janus_session;
 
   //Assemble our actual request
   postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
@@ -3477,6 +3448,13 @@ int Monitor::add_to_janus() {
     curl_easy_cleanup(curl);
     return -1;
   }
+  if ((response.find("error") != std::string::npos) && ((response.find("No such session") != std::string::npos) || (response.find("No such handle") != std::string::npos))) {
+    janus_session = "";
+    curl_easy_cleanup(curl);
+    return -2;
+  }
+  //scan for missing session or handle id "No such session" "no such handle"
+
   Debug(1,"Added stream to Janus: %s", response.c_str());
   curl_easy_cleanup(curl);
   return 0;
@@ -3490,41 +3468,15 @@ int Monitor::check_janus() {
   } else {
     endpoint = "127.0.0.1:8088/janus/";
   }
-  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
-  std::size_t pos;
+  std::string postData;
+  //std::size_t pos;
   CURLcode res;
 
   curl = curl_easy_init();
   if(!curl) return -1;
 
-
-  //Start Janus API init. Need to get a session_id and handle_id
-  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  std::string janus_id = response.substr(pos + 6, 16);
-  response = "";
   endpoint += "/";
-  endpoint += janus_id;
-  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  std::string handle_id = response.substr(pos + 6, 16);
-  endpoint += "/";
-  endpoint += handle_id;
+  endpoint += janus_session;
 
   //Assemble our actual request
   postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
@@ -3537,16 +3489,28 @@ int Monitor::check_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
+  if (res != CURLE_OK) { //may mean an error code thrown by Janus, because of a bad session
+    Warning("Attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    janus_session = "";
+    return -1;
+  }
 
-  Debug(1, "Queried for stream status: %s", response.c_str());
   curl_easy_cleanup(curl);
-  if (response.find("No such mountpoint") == std::string::npos) {
-    return 1;
-  } else {
+  Debug(1, "Queried for stream status: %s", response.c_str());
+  if ((response.find("error") != std::string::npos) && ((response.find("No such session") != std::string::npos) || (response.find("No such handle") != std::string::npos))) {
+  Warning("Janus Session timed out");
+    janus_session = "";
+    return -2;
+  } else if (response.find("No such mountpoint") != std::string::npos) {
+    Warning("Mountpoint Missing");
     return 0;
+  } else {
+    return 1;
   }
 }
+
+
 int Monitor::remove_from_janus() {
   std::string response;
   std::string endpoint;
@@ -3556,40 +3520,14 @@ int Monitor::remove_from_janus() {
     endpoint = "127.0.0.1:8088/janus/";
   }
   std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
-  std::size_t pos;
+  //std::size_t pos;
   CURLcode res;
 
   curl = curl_easy_init();
   if(!curl) return -1;
 
-
-  //Start Janus API init. Need to get a session_id and handle_id
-  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  std::string janus_id = response.substr(pos + 6, 16);
-  response = "";
   endpoint += "/";
-  endpoint += janus_id;
-  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos) return -1;
-  std::string handle_id = response.substr(pos + 6, 16);
-  endpoint += "/";
-  endpoint += handle_id;
+  endpoint += janus_session;
 
   //Assemble our actual request
   postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
@@ -3604,9 +3542,75 @@ int Monitor::remove_from_janus() {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
   curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
   res = curl_easy_perform(curl);
-  if (res != CURLE_OK) return -1;
+  if (res != CURLE_OK) {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return -1;
+  }
 
   Debug(1, "Removed stream from Janus: %s", response.c_str());
   curl_easy_cleanup(curl);
   return 0;
 }
+
+int Monitor::get_janus_session() {
+  std::string response;
+  std::string endpoint;
+  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
+    endpoint = config.janus_path;
+  } else {
+    endpoint = "127.0.0.1:8088/janus/";
+  }
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  std::size_t pos;
+  CURLcode res;
+  curl = curl_easy_init();
+  if(!curl) return -1;
+
+  //Start Janus API init. Need to get a session_id and handle_id
+  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos)
+  {
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+  janus_session = response.substr(pos + 6, 16);
+
+  response = "";
+  endpoint += "/";
+  endpoint += janus_session;
+  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK)
+  {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos)
+  {
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+  janus_session += "/";
+  janus_session += response.substr(pos + 6, 16);
+  curl_easy_cleanup(curl);
+  return 1;
+} //get_janus_session
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 381855c97..98c36e5a9 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -455,6 +455,8 @@ protected:
   static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
   int add_to_janus();
   int remove_from_janus();
+  int get_janus_session();
+  std::string janus_session;
 
   // Used in check signal
   uint8_t red_val;

From 146ea4822d6986950c5b19741dd44c05ca0c4f1e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 21 Jan 2022 09:44:44 -0500
Subject: [PATCH 359/501] Bump the db queue limit to 30 before we warn. I only
 have 1 server that gets over 20 and it is still ok.

---
 src/zm_db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index f0b13d538..cc0797c12 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -251,7 +251,7 @@ void zmDbQueue::process() {
       mCondition.wait(lock);
     }
     while (!mQueue.empty()) {
-      if (mQueue.size() > 20) {
+      if (mQueue.size() > 30) {
         Logger *log = Logger::fetch();
         Logger::Level db_level = log->databaseLevel();
         log->databaseLevel(Logger::NOLOG);

From 3cc243b9a8992a3a70a5e2bb67b61e9c3831a09c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 24 Jan 2022 09:23:19 -0500
Subject: [PATCH 360/501] Don't freshing config when doing update. That is it's
 own command

---
 scripts/zmupdate.pl.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index d096c70b5..f62b14316 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -444,11 +444,6 @@ if ( $version ) {
 
   print( "\nUpgrading database to version ".ZM_VERSION."\n" );
 
-# Update config first of all
-  migratePaths();
-  ZoneMinder::Config::loadConfigFromDB();
-  ZoneMinder::Config::saveConfigToDB();
-
   my $cascade = undef;
   if ( $cascade || $version eq "1.19.0" ) {
 # Patch the database

From 26ae5052f4bd19e34857223887439b171e65a8ca Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 11:55:21 -0500
Subject: [PATCH 361/501] Fix fail to get Sources in RTSP. the string msg
 although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is
 changed whatever it's contents are. So need to re-reserve.

---
 src/zm_comms.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_comms.h b/src/zm_comms.h
index 7e7329d5d..ac772ae26 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -245,6 +245,7 @@ class Socket : public CommsBase {
   }
 
   virtual ssize_t recv(std::string &msg) const {
+    msg.reserve(ZM_NETWORK_BUFSIZ);
     std::vector<char> buffer(msg.capacity());
     ssize_t nBytes;
     if ((nBytes = ::recv(mSd, buffer.data(), buffer.size(), 0)) < 0) {

From cf82d767de9976d39f8f98a6cc5bfe29a4ce9416 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 14:24:52 -0500
Subject: [PATCH 362/501] Remove the decoding code, just populate the
 av_packet. This fixes rtsp decoding because we weren't copying the decoded
 frame to shm raw image.

---
 dep/RtspServer                |  2 +-
 src/zm_remote_camera_rtsp.cpp | 62 ++++++++++++++---------------------
 2 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/dep/RtspServer b/dep/RtspServer
index cd7fd49be..1b40f1661 160000
--- a/dep/RtspServer
+++ b/dep/RtspServer
@@ -1 +1 @@
-Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
+Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 8cdecdf94..b49862845 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -168,8 +168,10 @@ int RemoteCameraRtsp::PrimeCapture() {
     }
   } // end foreach stream
 
-  if ( mVideoStreamId == -1 )
-    Fatal("Unable to locate video stream");
+  if ( mVideoStreamId == -1 ) {
+    Error("Unable to locate video stream");
+    return -1;
+  }
   if ( mAudioStreamId == -1 )
     Debug(3, "Unable to locate audio stream");
 
@@ -179,17 +181,22 @@ int RemoteCameraRtsp::PrimeCapture() {
 
   // Find the decoder for the video stream
   AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id);
-  if ( codec == nullptr )
-    Panic("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
+  if ( codec == nullptr ) {
+    Error("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
+    return -1;
+  }
 
   // Open codec
-  if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 )
-    Panic("Can't open codec");
+  if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 ) {
+    Error("Can't open codec");
+    return -1;
+  }
 
   int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
 
   if ( (unsigned int)pSize != imagesize ) {
-    Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
+    Error("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
+    return -1;
   }
 
   return 1;
@@ -208,18 +215,13 @@ int RemoteCameraRtsp::PreCapture() {
 int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
   int frameComplete = false;
   AVPacket *packet = &zm_packet->packet;
-  if ( !zm_packet->image ) {
-    Debug(1, "Allocating image %dx%d %d colours %d", width, height, colours, subpixelorder);
-    zm_packet->image = new Image(width, height, colours, subpixelorder);
-  }
 
-  
   while (!frameComplete) {
     buffer.clear();
     if (!rtspThread || rtspThread->IsStopped())
       return -1;
 
-    if ( rtspThread->getFrame(buffer) ) {
+    if (rtspThread->getFrame(buffer)) {
       Debug(3, "Read frame %d bytes", buffer.size());
       Hexdump(4, buffer.head(), 16);
 
@@ -254,36 +256,20 @@ int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
 
       //while ( (!frameComplete) && (buffer.size() > 0) ) {
       if ( buffer.size() > 0 ) {
-        packet->data = buffer.head();
+        packet->data = (uint8_t*)av_malloc(buffer.size());
+        memcpy(packet->data, buffer.head(), buffer.size());
+        //packet->data = buffer.head();
         packet->size = buffer.size();
         bytes += packet->size;
+        buffer -= packet->size;
 
         struct timeval now;
-        gettimeofday(&now, NULL);
+        gettimeofday(&now, nullptr);
         packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec;
-
-        int bytes_consumed = zm_packet->decode(mVideoCodecContext);
-        if ( bytes_consumed < 0 ) {
-          Error("Error while decoding frame %d", frameCount);
-          //Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
-        }
-        buffer -= packet->size;
-        if ( bytes_consumed ) {
-          zm_dump_video_frame(zm_packet->in_frame, "remote_rtsp_decode");
-          if (!mVideoStream->codecpar->width) {
-            zm_dump_codec(mVideoCodecContext);
-            zm_dump_codecpar(mVideoStream->codecpar);
-            mVideoStream->codecpar->width = zm_packet->in_frame->width;
-            mVideoStream->codecpar->height = zm_packet->in_frame->height;
-            zm_dump_codecpar(mVideoStream->codecpar);
-          }
-          zm_packet->codec_type = mVideoCodecContext->codec_type;
-          zm_packet->stream = mVideoStream;
-          frameComplete = true;
-          Debug(2, "Frame: %d - %d/%d", frameCount, bytes_consumed, buffer.size());
-          packet->data = nullptr;
-          packet->size = 0;
-        }
+        zm_packet->codec_type = mVideoCodecContext->codec_type;
+        zm_packet->stream = mVideoStream;
+        frameComplete = true;
+        Debug(2, "Frame: %d - %d/%d", frameCount, packet->size, buffer.size());
       }
     } /* getFrame() */
   } // end while true

From c8c09e560f071d2a5bb7ba4a04447c1a765e7879 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 14:25:13 -0500
Subject: [PATCH 363/501] Fix mTerminate not being initialised.

---
 src/zm_rtp_source.cpp | 4 +++-
 src/zm_rtp_source.h   | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp
index 1862c1886..56ca2cf0d 100644
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@@ -45,8 +45,10 @@ RtpSource::RtpSource(
   mFrame(65536),
   mFrameCount(0),
   mFrameGood(true),
+  prevM(false),
   mFrameReady(false),
-  mFrameProcessed(false)
+  mFrameProcessed(false),
+  mTerminate(false)
 {
   char hostname[256] = "";
   gethostname(hostname, sizeof(hostname));
diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h
index a39e8225f..71be9af2c 100644
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@@ -91,8 +91,6 @@ private:
   bool mFrameGood;
   bool prevM;
 
-  bool mTerminate;
-
   bool mFrameReady;
   std::condition_variable mFrameReadyCv;
   std::mutex mFrameReadyMutex;
@@ -100,6 +98,7 @@ private:
   bool mFrameProcessed;
   std::condition_variable mFrameProcessedCv;
   std::mutex mFrameProcessedMutex;
+  bool mTerminate;
 
 private:
   void init(uint16_t seq);

From 38da3b4d52dc21c2443bf4a295cd0c636f5683e7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 14:25:27 -0500
Subject: [PATCH 364/501] add some brackets to make logic more clear

---
 src/zm_rtp_ctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp
index 25d34f0ff..a82ff2b2a 100644
--- a/src/zm_rtp_ctrl.cpp
+++ b/src/zm_rtp_ctrl.cpp
@@ -277,7 +277,7 @@ void RtpCtrlThread::Run() {
   TimePoint last_receive = std::chrono::steady_clock::now();
   bool timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
 
-  while (!mTerminate && select.wait() >= 0) {
+  while (!mTerminate && (select.wait() >= 0)) {
     TimePoint now = std::chrono::steady_clock::now();
     zm::Select::CommsList readable = select.getReadable();
     if ( readable.size() == 0 ) {

From 4d90a816f86730ec1f6336f9e27eef0abffba2c6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 16:22:33 -0500
Subject: [PATCH 365/501] Put a lock around jpeg writing. libjpeg is not thread
 safe

---
 src/zm_image.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index a4aad8b61..7260791a5 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -24,6 +24,7 @@
 #include "zm_utils.h"
 #include <algorithm>
 #include <fcntl.h>
+#include <mutex>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -80,6 +81,8 @@ imgbufcpy_fptr_t fptr_imgbufcpy;
 /* Font */
 static ZmFont font;
 
+std::mutex              jpeg_mutex;
+
 void Image::update_function_pointers() {
   /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
   if ( pixels % 16 || pixels % 12 ) {
@@ -1083,6 +1086,9 @@ bool Image::WriteJpeg(const std::string &filename,
                       const int &quality_override,
                       SystemTimePoint timestamp,
                       bool on_blocking_abort) const {
+  // jpeg libs are not thread safe
+  std::unique_lock<std::mutex> lck(jpeg_mutex);
+
   if (config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8)) {
     Image temp_image(*this);
     temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
@@ -1366,6 +1372,8 @@ bool Image::EncodeJpeg(JOCTET *outbuffer, int *outbuffer_size, int quality_overr
     return temp_image.EncodeJpeg(outbuffer, outbuffer_size, quality_override);
   }
 
+  std::unique_lock<std::mutex> lck(jpeg_mutex);
+
   int quality = quality_override ? quality_override : config.jpeg_stream_quality;
 
   struct jpeg_compress_struct *cinfo = encodejpg_ccinfo[quality];

From 961256d2e78bb6c84912e621ca0fdb0b9b6cd54d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 Jan 2022 16:24:21 -0500
Subject: [PATCH 366/501] terminate when zm_terminate is set. Do a countdown
 instead of countup.  Sleeo for 10000 microseconds instead of 100. This
 restores the old value

---
 src/zm_remote_camera_rtsp.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index b49862845..ffb4a061d 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -22,6 +22,7 @@
 #include "zm_config.h"
 #include "zm_monitor.h"
 #include "zm_packet.h"
+#include "zm_signal.h"
 
 RemoteCameraRtsp::RemoteCameraRtsp(
     const Monitor *monitor,
@@ -126,8 +127,8 @@ int RemoteCameraRtsp::Disconnect() {
 
 int RemoteCameraRtsp::PrimeCapture() {
   Debug(2, "Waiting for sources");
-  for (int i = 0; i < 100 && !rtspThread->hasSources(); i++) {
-    std::this_thread::sleep_for(Microseconds(100));
+  for (int i = 100; i && !zm_terminate && !rtspThread->hasSources(); i--) {
+    std::this_thread::sleep_for(Microseconds(10000));
   }
 
   if (!rtspThread->hasSources()) {
@@ -218,7 +219,7 @@ int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
 
   while (!frameComplete) {
     buffer.clear();
-    if (!rtspThread || rtspThread->IsStopped())
+    if (!rtspThread || rtspThread->IsStopped() || zm_terminate)
       return -1;
 
     if (rtspThread->getFrame(buffer)) {

From ec9403fb6f6635cf42d0cf7fd82bb40894f8769e Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 25 Jan 2022 22:27:11 -0600
Subject: [PATCH 367/501] Adds Amcrest On-camera Motion Detection

---
 CMakeLists.txt                               |   2 +-
 db/zm_create.sql.in                          |   1 +
 db/zm_update-1.37.11.sql                     |  18 ++
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm |   1 +
 src/zm_monitor.cpp                           | 219 ++++++++++++++-----
 src/zm_monitor.h                             |  11 +-
 web/includes/Monitor.php                     |   1 +
 web/skins/classic/views/js/monitor.js        |  17 ++
 web/skins/classic/views/monitor.php          |   4 +
 9 files changed, 214 insertions(+), 60 deletions(-)
 create mode 100644 db/zm_update-1.37.11.sql

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df6aaa70..1a65f85eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,7 +318,7 @@ endif()
 # Do not check for cURL if ZM_NO_CURL is on
 if(NOT ZM_NO_CURL)
   # cURL
-  find_package(CURL)
+  find_package(CURL REQUIRED)
   if(CURL_FOUND)
     set(HAVE_LIBCURL 1)
     list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 7dc77cc47..040bc593c 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -467,6 +467,7 @@ CREATE TABLE `Monitors` (
   `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
   `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
   `ONVIF_Event_Listener`  BOOLEAN NOT NULL DEFAULT FALSE,
+  `use_Amcrest_API`  BOOLEAN NOT NULL DEFAULT FALSE,
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
diff --git a/db/zm_update-1.37.11.sql b/db/zm_update-1.37.11.sql
new file mode 100644
index 000000000..58a3d0cf1
--- /dev/null
+++ b/db/zm_update-1.37.11.sql
@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have use_Amcrest_API
+--
+
+SELECT 'Checking for use_Amcrest_API in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'use_Amcrest_API'
+  ) > 0,
+"SELECT 'Column use_Amcrest_API already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `use_Amcrest_API` BOOLEAN NOT NULL default false AFTER `ONVIF_Event_Listener`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 54ce25c87..10cfffe8b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -63,6 +63,7 @@ $serial = $primary_key = 'Id';
   ONVIF_Password
   ONVIF_Options
   ONVIF_Event_Listener
+  use_Amcrest_API
   Device
   Channel
   Format
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4ae155e23..558a30380 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -92,7 +92,7 @@ std::string load_monitor_sql =
 "`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
 "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`,"
 "`RTSPServer`, `RTSPStreamName`,"
-"`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, "
+"`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, `use_Amcrest_API`, "
 "`SignalCheckPoints`, `SignalCheckColour`, `Importance`-1 FROM `Monitors`";
 
 std::string CameraType_Strings[] = {
@@ -461,7 +461,7 @@ Monitor::Monitor()
  "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, "
  "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif,"
  "`RTSPServer`,`RTSPStreamName`,
- "`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, "
+ "`ONVIF_URL`, `ONVIF_Username`, `ONVIF_Password`, `ONVIF_Options`, `ONVIF_Event_Listener`, `use_Amcrest_API`, "
  "SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors";
 */
 
@@ -639,6 +639,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   onvif_password = std::string(dbrow[col] ? dbrow[col] : ""); col++;
   onvif_options = std::string(dbrow[col] ? dbrow[col] : ""); col++;
   onvif_event_listener = (*dbrow[col] != '0'); col++;
+  use_Amcrest_API = (*dbrow[col] != '0'); col++;
 
  /*"SignalCheckPoints, SignalCheckColour, Importance-1 FROM Monitors"; */
   signal_check_points = atoi(dbrow[col]); col++;
@@ -1040,6 +1041,7 @@ bool Monitor::connect() {
   Debug(3, "Allocated %zu %zu image buffers", image_buffer.capacity(), image_buffer.size());
 
   if (purpose == CAPTURE) {
+    curl_global_init(CURL_GLOBAL_DEFAULT); //May not be the appropriate place. Need to do this before any other curl calls, and any other threads start.
     memset(mem_ptr, 0, mem_size);
     shared_data->size = sizeof(SharedData);
     shared_data->active = enabled;
@@ -1079,47 +1081,59 @@ bool Monitor::connect() {
     usedsubpixorder = camera->SubpixelOrder();  // Used in CheckSignal
     shared_data->valid = true;
 
-#ifdef WITH_GSOAP
 
-    //ONVIF Setup
+    //ONVIF and Amcrest Setup
+    //since they serve the same function, handling them as two options of the same feature.
     ONVIF_Trigger_State = FALSE;
-    if (onvif_event_listener) { //Temporarily using this option to enable the feature
+    if (onvif_event_listener) { //
       Debug(1, "Starting ONVIF");
       ONVIF_Healthy = FALSE;
       if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
         ONVIF_Closes_Event = TRUE;
       }
-      tev__PullMessages.Timeout = "PT600S";
-      tev__PullMessages.MessageLimit = 100;
-      soap = soap_new();
-      soap->connect_timeout = 5;
-      soap->recv_timeout = 5;
-      soap->send_timeout = 5;
-      soap_register_plugin(soap, soap_wsse);
-      proxyEvent = PullPointSubscriptionBindingProxy(soap);
-      std::string full_url = onvif_url + "/Events";
-      proxyEvent.soap_endpoint = full_url.c_str();
+      if (use_Amcrest_API) {
+        curl_multi = curl_multi_init();
+        start_Amcrest();
+        //spin up curl_multi
+        //use the onvif_user and onvif_pass and onvif_url here.
+        //going to use the non-blocking curl api, and in the polling thread, block for 5 seconds waiting for input, just like onvif
+        //note that it's not possible for a single camera to use both.
+      } else { //using GSOAP
+#ifdef WITH_GSOAP
+        tev__PullMessages.Timeout = "PT600S";
+        tev__PullMessages.MessageLimit = 100;
+        soap = soap_new();
+        soap->connect_timeout = 5;
+        soap->recv_timeout = 5;
+        soap->send_timeout = 5;
+        soap_register_plugin(soap, soap_wsse);
+        proxyEvent = PullPointSubscriptionBindingProxy(soap);
+        std::string full_url = onvif_url + "/Events";
+        proxyEvent.soap_endpoint = full_url.c_str();
 
-      set_credentials(soap);
-      Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
-      if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
-        Error("Couldn't create subscription! %s, %s", soap_fault_string(soap), soap_fault_detail(soap));
-      } else {
-        //Empty the stored messages
         set_credentials(soap);
-        if ((proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) &&
-            ( soap->error != SOAP_EOF)) { //SOAP_EOF could indicate no messages to pull.
-          Error("Couldn't do initial event pull! Error %i %s, %s", soap->error, soap_fault_string(soap), soap_fault_detail(soap));
+        Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
+        if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
+          Error("Couldn't create subscription! %s, %s", soap_fault_string(soap), soap_fault_detail(soap));
         } else {
-          Debug(1, "Good Initial ONVIF Pull");
-          ONVIF_Healthy = TRUE;
+          //Empty the stored messages
+          set_credentials(soap);
+          if ((proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse) != SOAP_OK) &&
+              ( soap->error != SOAP_EOF)) { //SOAP_EOF could indicate no messages to pull.
+            Error("Couldn't do initial event pull! Error %i %s, %s", soap->error, soap_fault_string(soap), soap_fault_detail(soap));
+          } else {
+            Debug(1, "Good Initial ONVIF Pull");
+            ONVIF_Healthy = TRUE;
+          }
         }
+#else
+        Error("zmc not compiled with GSOAP. ONVIF support not built in!");
+#endif
       }
     } else {
       Debug(1, "Not Starting ONVIF");
     }
     //End ONVIF Setup
-#endif
 
 #if HAVE_LIBCURL    //janus setup. Depends on libcurl.
     if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
@@ -1228,6 +1242,12 @@ Monitor::~Monitor() {
     sws_freeContext(convert_context);
     convert_context = nullptr;
   }
+  if (Amcrest_handle != nullptr) {
+    curl_multi_remove_handle(curl_multi, Amcrest_handle);
+    curl_easy_cleanup(Amcrest_handle);
+  }
+  if (curl_multi != nullptr) curl_multi_cleanup(curl_multi);
+  curl_global_cleanup();
 }  // end Monitor::~Monitor()
 
 void Monitor::AddPrivacyBitmask() {
@@ -1800,36 +1820,25 @@ bool Monitor::Poll() {
   //We want to trigger every 5 seconds or so. so grab the time at the beginning of the loop, and sleep at the end.
   std::chrono::system_clock::time_point loop_start_time = std::chrono::system_clock::now();
 
-#ifdef WITH_GSOAP
   if (ONVIF_Healthy) {
-    set_credentials(soap);
-    int result = proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse);
-    if (result != SOAP_OK) {
-      if (result != SOAP_EOF) { //Ignore the timeout error
-        Error("Failed to get ONVIF messages! %s", soap_fault_string(soap));
-        ONVIF_Healthy = FALSE;
-      }
-    } else {
-      Debug(1, "Got Good Response! %i", result);
-      for (auto msg : tev__PullMessagesResponse.wsnt__NotificationMessage) {
-        if (msg->Topic->__any.text != NULL &&
-        std::strstr(msg->Topic->__any.text, "MotionAlarm") &&
-        msg->Message.__any.elts != NULL &&
-        msg->Message.__any.elts->next != NULL &&
-        msg->Message.__any.elts->next->elts != NULL &&
-        msg->Message.__any.elts->next->elts->atts != NULL &&
-        msg->Message.__any.elts->next->elts->atts->next != NULL &&
-        msg->Message.__any.elts->next->elts->atts->next->text != NULL) {
-        Debug(1,"Got Motion Alarm!");
-          if (strcmp(msg->Message.__any.elts->next->elts->atts->next->text, "true") == 0) {
+    if(use_Amcrest_API) {
+      int open_handles;
+      int transfers;
+      curl_multi_perform(curl_multi, &open_handles);
+      if (open_handles == 0) {
+        start_Amcrest(); //http transfer ended, need to restart.
+      } else {
+        curl_multi_wait(curl_multi, NULL, 0, 5000, &transfers); //wait for max 5 seconds for event.
+        if (transfers > 0) { //have data to deal with
+          curl_multi_perform(curl_multi, &open_handles); //actually grabs the data, populates amcrest_response
+          if (amcrest_response.find("action=Start") != std::string::npos) {
           //Event Start
-            Debug(1,"Triggered on ONVIF");
+          Debug(1,"Triggered on ONVIF");
             if (!ONVIF_Trigger_State) {
               Debug(1,"Triggered Event");
               ONVIF_Trigger_State = TRUE;
-              std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep
             }
-          } else {
+          } else if (amcrest_response.find("action=Stop") != std::string::npos){
             Debug(1, "Triggered off ONVIF");
             ONVIF_Trigger_State = FALSE;
             if (!ONVIF_Closes_Event) { //If we get a close event, then we know to expect them.
@@ -1837,11 +1846,53 @@ bool Monitor::Poll() {
               Debug(1,"Setting ClosesEvent");
             }
           }
+          amcrest_response.clear(); //We've dealt with the message, need to clear the queue
         }
       }
+    } else {
+
+#ifdef WITH_GSOAP
+      set_credentials(soap);
+      int result = proxyEvent.PullMessages(response.SubscriptionReference.Address, NULL, &tev__PullMessages, tev__PullMessagesResponse);
+      if (result != SOAP_OK) {
+        if (result != SOAP_EOF) { //Ignore the timeout error
+          Error("Failed to get ONVIF messages! %s", soap_fault_string(soap));
+          ONVIF_Healthy = FALSE;
+        }
+      } else {
+        Debug(1, "Got Good Response! %i", result);
+        for (auto msg : tev__PullMessagesResponse.wsnt__NotificationMessage) {
+          if (msg->Topic->__any.text != NULL &&
+          std::strstr(msg->Topic->__any.text, "MotionAlarm") &&
+          msg->Message.__any.elts != NULL &&
+          msg->Message.__any.elts->next != NULL &&
+          msg->Message.__any.elts->next->elts != NULL &&
+          msg->Message.__any.elts->next->elts->atts != NULL &&
+          msg->Message.__any.elts->next->elts->atts->next != NULL &&
+          msg->Message.__any.elts->next->elts->atts->next->text != NULL) {
+          Debug(1,"Got Motion Alarm!");
+            if (strcmp(msg->Message.__any.elts->next->elts->atts->next->text, "true") == 0) {
+            //Event Start
+              Debug(1,"Triggered on ONVIF");
+              if (!ONVIF_Trigger_State) {
+                Debug(1,"Triggered Event");
+                ONVIF_Trigger_State = TRUE;
+                std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep
+              }
+            } else {
+              Debug(1, "Triggered off ONVIF");
+              ONVIF_Trigger_State = FALSE;
+              if (!ONVIF_Closes_Event) { //If we get a close event, then we know to expect them.
+                ONVIF_Closes_Event = TRUE;
+                Debug(1,"Setting ClosesEvent");
+              }
+            }
+          }
+        }
+      }
+#endif
     }
   }
-#endif
   if (janus_enabled) {
     if (janus_session.empty()) {
       get_janus_session();
@@ -3223,11 +3274,15 @@ int Monitor::Close() {
     analysis_thread->Stop();
   }
 
-#ifdef WITH_GSOAP
   //ONVIF Teardown
   if (Poller) {
     Poller->Stop();
   }
+  if (curl_multi != nullptr) {
+    curl_multi_cleanup(curl_multi);
+    curl_multi = nullptr;
+  }
+#ifdef WITH_GSOAP
   if (onvif_event_listener && (soap != nullptr)) {
     Debug(1, "Tearing Down Onvif");
     _wsnt__Unsubscribe wsnt__Unsubscribe;
@@ -3240,9 +3295,9 @@ int Monitor::Close() {
   }  //End ONVIF
 #endif
 #if HAVE_LIBCURL  //Janus Teardown
-    if (janus_enabled && (purpose == CAPTURE)) {
-      remove_from_janus();
-    }
+  if (janus_enabled && (purpose == CAPTURE)) {
+    remove_from_janus();
+  }
 #endif
 
   packetqueue.clear();
@@ -3614,3 +3669,55 @@ int Monitor::get_janus_session() {
   curl_easy_cleanup(curl);
   return 1;
 } //get_janus_session
+
+int Monitor::start_Amcrest() {
+  //init the transfer and start it in multi-handle
+  int running_handles;
+  long response_code;
+  struct CURLMsg *m;
+  CURLMcode curl_error;
+  if (Amcrest_handle != nullptr) {  //potentially clean up the old handle
+    curl_multi_remove_handle(curl_multi, Amcrest_handle);
+    curl_easy_cleanup(Amcrest_handle);
+  }
+
+  std::string full_url = onvif_url;
+  if (full_url.back() != '/') full_url += '/';
+  full_url += "eventManager.cgi?action=attach&codes=[VideoMotion]";
+  Amcrest_handle = curl_easy_init();
+  if (!Amcrest_handle){
+    Warning("Handle is null!");
+    return -1;
+  }
+  curl_easy_setopt(Amcrest_handle, CURLOPT_URL, full_url.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEDATA, &amcrest_response);
+  curl_easy_setopt(Amcrest_handle, CURLOPT_USERNAME, onvif_username.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_PASSWORD, onvif_password.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+  curl_error = curl_multi_add_handle(curl_multi, Amcrest_handle);
+    Warning("error of %i", curl_error);
+  curl_error = curl_multi_perform(curl_multi, &running_handles);
+  if (curl_error == CURLM_OK) {
+    curl_easy_getinfo(Amcrest_handle, CURLINFO_RESPONSE_CODE, &response_code);
+    int msgq = 0;
+    m = curl_multi_info_read(curl_multi, &msgq);
+    if (m && (m->msg == CURLMSG_DONE)) {
+      Warning("Libcurl exited Early: %i", m->data.result);
+    }
+
+    curl_multi_wait(curl_multi, NULL, 0, 300, NULL);
+    curl_error = curl_multi_perform(curl_multi, &running_handles);
+  }
+
+  if ((curl_error == CURLM_OK) && (running_handles > 0)) {
+    ONVIF_Healthy = TRUE;
+  } else {
+    Warning("Response: %s", amcrest_response.c_str());
+    Warning("Seeing %i streams, and error of %i, url: %s", running_handles, curl_error, full_url.c_str());
+    curl_easy_getinfo(Amcrest_handle, CURLINFO_OS_ERRNO, &response_code);
+    Warning("Response code: %lu", response_code);
+  }
+
+return 0;
+}
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 98c36e5a9..7a4b7ad83 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -285,7 +285,9 @@ protected:
   std::string onvif_username;
   std::string onvif_password;
   std::string onvif_options;
+  std::string amcrest_response;
   bool        onvif_event_listener;
+  bool        use_Amcrest_API;
 
   std::string     device;
   int             palette;
@@ -437,7 +439,7 @@ protected:
 
   //ONVIF
 #ifdef WITH_GSOAP
-  struct soap *soap;
+  struct soap *soap = nullptr;
   bool ONVIF_Trigger_State;
   bool ONVIF_Healthy;
   bool ONVIF_Closes_Event;
@@ -449,8 +451,11 @@ protected:
   void set_credentials(struct soap *soap);
 #endif
 
-  //curl stuff for Janus
-  CURL *curl;
+  //curl stuff
+  CURL *curl = nullptr;
+  CURLM *curl_multi = nullptr;
+  CURL *Amcrest_handle = nullptr;
+  int start_Amcrest();
   //helper class for CURL
   static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
   int add_to_janus();
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 09d4657a8..9c7d8d25c 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -66,6 +66,7 @@ class Monitor extends ZM_Object {
     'ONVIF_Password'  =>  '',
     'ONVIF_Options'   =>  '',
     'ONVIF_Event_Listener'  =>  '0',
+    'use_Amcrest_API'  =>  '0',
     'Device'  =>  '',
     'Channel' =>  0,
     'Format'  =>  '0',
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 62c0c6514..30a906df6 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -275,6 +275,23 @@ function initPage() {
     }
   });
 
+  // Amcrest API controller
+  if (document.getElementsByName("newMonitor[ONVIF_Event_Listener]")[0].checked) {
+    document.getElementById("function_use_Amcrest_API").hidden = false;
+  } else {
+    document.getElementById("function_use_Amcrest_API").hidden = true;
+  }
+  document.getElementsByName("newMonitor[ONVIF_Event_Listener]")[0].addEventListener('change', function() {
+    if (this.checked) {
+      document.getElementById("function_use_Amcrest_API").hidden = false;
+    }
+  });
+  document.getElementsByName("newMonitor[ONVIF_Event_Listener]")[1].addEventListener('change', function() {
+    if (this.checked) {
+      document.getElementById("function_use_Amcrest_API").hidden = true;
+    }
+  });
+
   if ( ZM_OPT_USE_GEOLOCATION ) {
     if ( window.L ) {
       var form = document.getElementById('contentForm');
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 6756c239b..deba63879 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -730,6 +730,10 @@ if (count($available_monitor_ids)) {
               <td class="text-right pr-3"><?php echo translate('ONVIF_Event_Listener') ?></td>
               <td><?php echo html_radio('newMonitor[ONVIF_Event_Listener]', array('1'=>translate('Enabled'), '0'=>'Disabled'), $monitor->ONVIF_Event_Listener()); ?></td>
             </tr>
+            <tr id="function_use_Amcrest_API">
+              <td class="text-right pr-3"><?php echo translate('use_Amcrest_API') ?></td>
+              <td><?php echo html_radio('newMonitor[use_Amcrest_API]', array('1'=>translate('Enabled'), '0'=>'Disabled'), $monitor->use_Amcrest_API()); ?></td>
+            </tr>
 <?php
         break;
     }

From 57a697093ea90c4e04ad74f732c1c033791fbdf4 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 25 Jan 2022 22:27:48 -0600
Subject: [PATCH 368/501] Remove redundant JS define

---
 web/skins/classic/views/js/monitor.js.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index c635af233..49f313143 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -1,4 +1,3 @@
-var ZM_OPT_USE_GEOLOCATION = '<?php echo ZM_OPT_USE_GEOLOCATION ?>' == '1' ? true : false;
 <?php
 if ( ZM_OPT_USE_GEOLOCATION ) { 
   echo 'var ZM_OPT_GEOLOCATION_TILE_PROVIDER=\''.ZM_OPT_GEOLOCATION_TILE_PROVIDER.'\''.PHP_EOL;

From a2a2f1a78145c8d106b095a5c019ca251bf2923a Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 25 Jan 2022 22:46:09 -0600
Subject: [PATCH 369/501] Move variables out of the ifdef gsoap block, as they
 are used for Amcrest support, too

---
 src/zm_monitor.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 7a4b7ad83..4ce0a9b08 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -438,11 +438,12 @@ protected:
   std::string diag_path_delta;
 
   //ONVIF
-#ifdef WITH_GSOAP
-  struct soap *soap = nullptr;
-  bool ONVIF_Trigger_State;
+  bool ONVIF_Trigger_State; //Re-using some variables for Amcrest API support
   bool ONVIF_Healthy;
   bool ONVIF_Closes_Event;
+
+#ifdef WITH_GSOAP
+  struct soap *soap = nullptr;
   _tev__CreatePullPointSubscription request;
   _tev__CreatePullPointSubscriptionResponse response;
   _tev__PullMessages tev__PullMessages;

From 138bada0951453e989029bcc1751fee5b4902943 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 26 Jan 2022 09:27:29 -0500
Subject: [PATCH 370/501] Add libdatetime-perl. Some Control modules need it

---
 distros/ubuntu2004/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index 37c0e5e51..dda0e7852 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -42,7 +42,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libswscale5|libswscale4
         ,libswresample3|libswresample2
         ,ffmpeg
-        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+        ,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl

From 42e24614d67fd12f47d10eeaf17b609c08faa37d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 26 Jan 2022 11:01:09 -0500
Subject: [PATCH 371/501] Include filename in debugs when writing out jpegs

---
 src/zm_event.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index e14c1a343..e0ffdff46 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -423,7 +423,7 @@ void Event::AddFrame(Image *image,
     // If this is the first frame, we should add a thumbnail to the event directory
     if ((frames == 1) || (score > max_score)) {
       write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
-      Debug(1, "Writing snapshot");
+      Debug(1, "Writing snapshot to %s", snapshot_file.c_str());
       WriteFrameImage(image, timestamp, snapshot_file.c_str());
     } else {
       Debug(1, "Not Writing snapshot because frames %d score %d > max %d", frames, score, max_score);
@@ -435,17 +435,19 @@ void Event::AddFrame(Image *image,
       if (!alarm_frame_written) {
         write_to_db = true; // OD processing will need it, so the db needs to know about it
         alarm_frame_written = true;
-        Debug(1, "Writing alarm image");
-        WriteFrameImage(image, timestamp, alarm_file.c_str());
+        Debug(1, "Writing alarm image to %s", alarm_file.c_str());
+        if (!WriteFrameImage(image, timestamp, alarm_file.c_str())) {
+          Error("Failed to write alarm frame image to %s", alarm_file.c_str());
+        }
       } else {
         Debug(3, "Not Writing alarm image because alarm frame already written");
       }
 
       if (alarm_image and (save_jpegs & 2)) {
         std::string event_file = stringtf(staticConfig.analyse_file_format.c_str(), path.c_str(), frames);
-        Debug(1, "Writing analysis frame %d", frames);
+        Debug(1, "Writing analysis frame %d to %s", frames, event_file.c_str());
         if (!WriteFrameImage(alarm_image, timestamp, event_file.c_str(), true)) {
-          Error("Failed to write analysis frame image");
+          Error("Failed to write analysis frame image to %s", event_file.c_str());
         }
       }
     }  // end if is an alarm frame

From fe8747e5e79b288f9d594ed75d69ca9cdf4922e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 26 Jan 2022 11:45:04 -0500
Subject: [PATCH 372/501] Make ONVIF inputs 100%

---
 web/skins/classic/css/base/views/monitor.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/css/base/views/monitor.css b/web/skins/classic/css/base/views/monitor.css
index f827af5ca..28afbf480 100644
--- a/web/skins/classic/css/base/views/monitor.css
+++ b/web/skins/classic/css/base/views/monitor.css
@@ -15,7 +15,11 @@ input[name="newMonitor[Path]"],
 input[name="newMonitor[SecondPath]"],
 input[name="newMonitor[LabelFormat]"],
 input[name="newMonitor[ControlDevice]"],
-input[name="newMonitor[ControlAddress]"] {
+input[name="newMonitor[ControlAddress]"],
+input[name="newMonitor[ONVIF_URL]"],
+input[name="newMonitor[ONVIF_Username]"],
+input[name="newMonitor[ONVIF_Password]"],
+input[name="newMonitor[ONVIF_Options]"] {
   width: 100%;
 }
 input[name="newMonitor[LabelFormat]"]{

From 8e62562afdeb87be0ce2a241b5aa02cadc67bd3c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 26 Jan 2022 21:39:29 -0500
Subject: [PATCH 373/501] Move onclick to the surrounding div instead of the
 img.  Fixes clicking on montage

---
 web/js/MonitorStream.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index b5f9d0b6a..86b9b97e0 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -38,6 +38,14 @@ function MonitorStream(monitorData) {
     }
     return this.element;
   };
+  this.getFrame = function() {
+    if (this.frame) return this.frame;
+    this.frame = document.getElementById('imageFeed'+this.id);
+    if (!this.frame) {
+      console.error("No frame div for #imageFeed"+this.id);
+    }
+    return this.frame;
+  };
 
   /* if the img element didn't have a src, this would fill it in, causing it to show. */
   this.show = function() {
@@ -161,7 +169,7 @@ function MonitorStream(monitorData) {
 
   this.setup_onclick = function(func) {
     this.onclick = func;
-    const el = this.getElement();
+    const el = this.getFrame();
     if (!el) return;
     el.addEventListener('click', this.onclick, false);
   };

From d567d8aafcfd1ead184f7685234768ea88aadc0d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 27 Jan 2022 17:06:18 -0500
Subject: [PATCH 374/501] Merge upstream patches to RTSPServer

---
 dep/RtspServer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dep/RtspServer b/dep/RtspServer
index 1b40f1661..333717a3a 160000
--- a/dep/RtspServer
+++ b/dep/RtspServer
@@ -1 +1 @@
-Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f
+Subproject commit 333717a3ac59b8f98389905c1281909e5543bff6

From a91e7d96f8a1bd37d657fd7148cb068597c5fc67 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 28 Jan 2022 12:42:41 -0500
Subject: [PATCH 375/501] Merge fix for VP8

---
 dep/RtspServer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dep/RtspServer b/dep/RtspServer
index 333717a3a..eab328514 160000
--- a/dep/RtspServer
+++ b/dep/RtspServer
@@ -1 +1 @@
-Subproject commit 333717a3ac59b8f98389905c1281909e5543bff6
+Subproject commit eab32851421ffe54fec0229c3efc44c642bc8d46

From e5792c21c923a19a315cefb2127fe27c3bb66516 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 28 Jan 2022 15:38:18 -0500
Subject: [PATCH 376/501] Push locked packets into event packetqueue instead of
 unlcoked contents.  Prevents freeing of data before writing to event, hence
 crashing.

---
 src/zm_event.cpp   |  8 ++++---
 src/zm_event.h     |  4 ++--
 src/zm_monitor.cpp | 60 +++++++++++++++++++++++-----------------------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index e0ffdff46..3ef7ea887 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -301,9 +301,9 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
   }  // end if update
 }  // void Event::updateNotes(const StringSetMap &newNoteSetMap)
 
-void Event::AddPacket(const std::shared_ptr<ZMPacket>&packet) {
+void Event::AddPacket(ZMLockedPacket *packetlock) {
   std::unique_lock<std::mutex> lck(packet_queue_mutex);
-  packet_queue.push(packet);
+  packet_queue.push(packetlock);
   packet_queue_condition.notify_one();
 }
 
@@ -684,7 +684,9 @@ void Event::Run() {
   while (true) {
     if (!packet_queue.empty()) {
       Debug(1, "adding packet");
-      this->AddPacket_(packet_queue.front());
+      const ZMLockedPacket * packet_lock = packet_queue.front();
+      this->AddPacket_(packet_lock->packet_);
+      delete packet_lock;
       packet_queue.pop();
     } else {
       if (terminate_ or zm_terminate) {
diff --git a/src/zm_event.h b/src/zm_event.h
index 31a23fad4..2029c062a 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -105,7 +105,7 @@ class Event {
 
     void createNotes(std::string &notes);
 
-    std::queue<std::shared_ptr<ZMPacket>> packet_queue;
+    std::queue<ZMLockedPacket *> packet_queue;
     std::mutex packet_queue_mutex;
     std::condition_variable packet_queue_condition;
 
@@ -134,7 +134,7 @@ class Event {
     SystemTimePoint EndTime() const { return end_time; }
     TimePoint::duration Duration() const { return end_time - start_time; };
 
-    void AddPacket(const std::shared_ptr<ZMPacket> &p);
+    void AddPacket(ZMLockedPacket *);
     void AddPacket_(const std::shared_ptr<ZMPacket> &p);
     bool WritePacket(const std::shared_ptr<ZMPacket> &p);
     bool SendFrameImage(const Image *image, bool alarm_frame=false);
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4ae155e23..b55d2f91d 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2270,34 +2270,34 @@ bool Monitor::Analyse() {
       shared_data->state = state = IDLE;
     } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
 
-    if (event) event->AddPacket(snap);
+    if (event) event->AddPacket(packet_lock);
+
+    // In the case where people have pre-alarm frames, the web ui will generate the frame images
+    // from the mp4. So no one will notice anyways.
+    if (snap->image and (videowriter == PASSTHROUGH)) {
+      if (!savejpegs) {
+        Debug(1, "Deleting image data for %d", snap->image_index);
+        // Don't need raw images anymore
+        delete snap->image;
+        snap->image = nullptr;
+      }
+      if (snap->analysis_image and !(savejpegs & 2)) {
+        Debug(1, "Deleting analysis image data for %d", snap->image_index);
+        delete snap->analysis_image;
+        snap->analysis_image = nullptr;
+      }
+    }
+
+    packetqueue.clearPackets(snap);
+
+    if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
+      // Only do these if it's a video packet.
+      shared_data->last_read_index = snap->image_index;
+      analysis_image_count++;
+    }
+    packetqueue.increment_it(analysis_it);
+    if (!event) delete packet_lock;
   } // end scope for event_lock
-
-  // In the case where people have pre-alarm frames, the web ui will generate the frame images
-  // from the mp4. So no one will notice anyways.
-  if (snap->image and (videowriter == PASSTHROUGH)) {
-    if (!savejpegs) {
-      Debug(1, "Deleting image data for %d", snap->image_index);
-      // Don't need raw images anymore
-      delete snap->image;
-      snap->image = nullptr;
-    }
-    if (snap->analysis_image and !(savejpegs & 2)) {
-      Debug(1, "Deleting analysis image data for %d", snap->image_index);
-      delete snap->analysis_image;
-      snap->analysis_image = nullptr;
-    }
-  }
-
-  packetqueue.clearPackets(snap);
-
-  if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
-    // Only do these if it's a video packet.
-    shared_data->last_read_index = snap->image_index;
-    analysis_image_count++;
-  }
-  packetqueue.increment_it(analysis_it);
-  delete packet_lock;
   //packetqueue.unlock(packet_lock);
   shared_data->last_read_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
@@ -2870,16 +2870,16 @@ Event * Monitor::openEvent(
 
   // Write out starting packets, do not modify packetqueue it will garbage collect itself
   while (starting_packet and ((*start_it) != *analysis_it)) {
-    event->AddPacket(starting_packet);
+    event->AddPacket(starting_packet_lock);
     // Have added the packet, don't want to unlock it until we have locked the next
 
     packetqueue.increment_it(start_it);
     if ((*start_it) == *analysis_it) {
-      if (starting_packet_lock) delete starting_packet_lock;
+      //if (starting_packet_lock) delete starting_packet_lock;
       break;
     }
     ZMLockedPacket *lp = packetqueue.get_packet(start_it);
-    delete starting_packet_lock;
+    //delete starting_packet_lock;
     if (!lp) return nullptr; // only on terminate FIXME
     starting_packet_lock = lp;
     starting_packet = lp->packet_;

From 61028a3ae1f09003403eec6bf462d2791490e838 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 31 Jan 2022 10:09:31 -0500
Subject: [PATCH 377/501] Remove travis badge, use Isaac's full name. Fixes
 #3417

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index da96b3e60..bcb53ba8a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 ZoneMinder
 ==========
 
-[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
 [![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 [![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
 
@@ -25,7 +24,7 @@ https://github.com/ZoneMinder/zmdockerfiles
 
 This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
 
-- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor)
+- Ubuntu via [Isaac Connor's PPA](https://launchpad.net/~iconnor)
 - Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
 - RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org)
 - Fedora via [RPM Fusion](http://rpmfusion.org)

From 46ad8e74e600b8efd74cccf83d3157868fbf5935 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 31 Jan 2022 11:01:51 -0500
Subject: [PATCH 378/501] Add publish

---
 .github/workflows/create-packages.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 6a76da322..29e5d471a 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -29,3 +29,13 @@ jobs:
           DIST: ${{ matrix.os_dist.dist }}
           DOCKER_REPO: iconzm/packpack
         run: utils/packpack/startpackpack.sh
+
+      - name: Publish
+        uses: nogsantos/scp-deploy@master
+        with:
+          src: ./build/*.{deb,dsc,tar.xz,buildinfo,changes}
+          host: ${{ secrets.ZMREPO_HOST }}
+          remote: debian/master/mini-dinstall/incoming/
+          port: ${{ secrets.ZMREPO_SSH_PORT }}
+          user: ${{ secrets.ZMREPO_SSH_USER }}
+          key: ${{ secrets.ZMREPO_SSH_KEY }}

From 3a2484b874af8b870dd70d487529c79768d1b513 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 31 Jan 2022 11:19:36 -0500
Subject: [PATCH 379/501] Try a different ssh implementation

---
 .github/workflows/create-packages.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 29e5d471a..2fdc3577c 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -31,11 +31,11 @@ jobs:
         run: utils/packpack/startpackpack.sh
 
       - name: Publish
-        uses: nogsantos/scp-deploy@master
-        with:
-          src: ./build/*.{deb,dsc,tar.xz,buildinfo,changes}
-          host: ${{ secrets.ZMREPO_HOST }}
-          remote: debian/master/mini-dinstall/incoming/
-          port: ${{ secrets.ZMREPO_SSH_PORT }}
-          user: ${{ secrets.ZMREPO_SSH_USER }}
-          key: ${{ secrets.ZMREPO_SSH_KEY }}
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }}
+          ARGS: "-rltgoDzvO"
+          SOURCE: ./build/*.{deb,dsc,tar.xz,buildinfo,changes}
+          REMOTE_HOST: ${{ secrets.ZMREPO_HOST }}
+          REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }}
+          TARGET: debian/master/mini-dinstall/incoming/

From b00ca5ce91b4f6343737a2983fbd38f4919e0838 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 Jan 2022 11:47:42 -0500
Subject: [PATCH 380/501] upload entire build dir as shell expansions don't
 seem to work

---
 .github/workflows/create-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 2fdc3577c..87d46246d 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -35,7 +35,7 @@ jobs:
         env:
           SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }}
           ARGS: "-rltgoDzvO"
-          SOURCE: ./build/*.{deb,dsc,tar.xz,buildinfo,changes}
+          SOURCE: build/
           REMOTE_HOST: ${{ secrets.ZMREPO_HOST }}
           REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }}
           TARGET: debian/master/mini-dinstall/incoming/

From 6b8cc14723024bbdcc8c3eca8785b8c39c58bd9a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 Jan 2022 12:07:09 -0500
Subject: [PATCH 381/501] Don't free image data if we added the packet to an
 event. The lock moves to the event so it's not safe

---
 src/zm_monitor.cpp | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index b55d2f91d..2c56ec6fe 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2270,24 +2270,6 @@ bool Monitor::Analyse() {
       shared_data->state = state = IDLE;
     } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
 
-    if (event) event->AddPacket(packet_lock);
-
-    // In the case where people have pre-alarm frames, the web ui will generate the frame images
-    // from the mp4. So no one will notice anyways.
-    if (snap->image and (videowriter == PASSTHROUGH)) {
-      if (!savejpegs) {
-        Debug(1, "Deleting image data for %d", snap->image_index);
-        // Don't need raw images anymore
-        delete snap->image;
-        snap->image = nullptr;
-      }
-      if (snap->analysis_image and !(savejpegs & 2)) {
-        Debug(1, "Deleting analysis image data for %d", snap->image_index);
-        delete snap->analysis_image;
-        snap->analysis_image = nullptr;
-      }
-    }
-
     packetqueue.clearPackets(snap);
 
     if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
@@ -2295,9 +2277,30 @@ bool Monitor::Analyse() {
       shared_data->last_read_index = snap->image_index;
       analysis_image_count++;
     }
-    packetqueue.increment_it(analysis_it);
-    if (!event) delete packet_lock;
+
+    if (event) {
+      event->AddPacket(packet_lock);
+    } else {
+      // In the case where people have pre-alarm frames, the web ui will generate the frame images
+      // from the mp4. So no one will notice anyways.
+      if (snap->image and (videowriter == PASSTHROUGH)) {
+        if (!savejpegs) {
+          Debug(1, "Deleting image data for %d", snap->image_index);
+          // Don't need raw images anymore
+          delete snap->image;
+          snap->image = nullptr;
+        }
+        if (snap->analysis_image and !(savejpegs & 2)) {
+          Debug(1, "Deleting analysis image data for %d", snap->image_index);
+          delete snap->analysis_image;
+          snap->analysis_image = nullptr;
+        }
+      }
+      delete packet_lock;
+    }
   } // end scope for event_lock
+
+  packetqueue.increment_it(analysis_it);
   //packetqueue.unlock(packet_lock);
   shared_data->last_read_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 

From 0eb4d95d0e048c71adacca9eb38a3a123fa0f4a9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 Jan 2022 18:32:58 -0500
Subject: [PATCH 382/501] remove geolocation copies from config to javscript
 land.  Now all of config is brought in my skin.js.php

---
 web/skins/classic/views/js/monitor.js.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index c635af233..7b06905f7 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -1,10 +1,3 @@
-var ZM_OPT_USE_GEOLOCATION = '<?php echo ZM_OPT_USE_GEOLOCATION ?>' == '1' ? true : false;
-<?php
-if ( ZM_OPT_USE_GEOLOCATION ) { 
-  echo 'var ZM_OPT_GEOLOCATION_TILE_PROVIDER=\''.ZM_OPT_GEOLOCATION_TILE_PROVIDER.'\''.PHP_EOL;
-  echo 'var ZM_OPT_GEOLOCATION_ACCESS_TOKEN=\''.ZM_OPT_GEOLOCATION_ACCESS_TOKEN.'\''.PHP_EOL;
-}
-?>
 var optControl = <?php echo ZM_OPT_CONTROL ?>;
 var hasOnvif = <?php echo ZM_HAS_ONVIF ?>;
 var defaultAspectRatio = '<?php echo ZM_DEFAULT_ASPECT_RATIO ?>';

From 34d7f192b4d10da46294185c97db73c5371c2c7c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 1 Feb 2022 07:23:12 -0500
Subject: [PATCH 383/501] Remove field that ffmpeg 5.0 doesn't have.

---
 src/zm_ffmpeg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 3986b38b8..4fe14051f 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -257,8 +257,8 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
     Debug(1, "ids [0x%x]", st->id);
   if (lang)
     Debug(1, "language (%s)", lang->value);
-  Debug(1, "frames:%d, frame_size:%d stream timebase: %d/%d",
-      st->codec_info_nb_frames, codec->frame_size,
+  Debug(1, "frame_size:%d stream timebase: %d/%d",
+      codec->frame_size,
       st->time_base.num, st->time_base.den
       );
 

From 462ec45a0725bc12d15ffb64f880091935c602cb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 1 Feb 2022 09:46:37 -0500
Subject: [PATCH 384/501] Escape newlines in config values.

---
 web/skins/classic/js/skin.js.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 2d443fbe1..52beb07ce 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -109,7 +109,9 @@ stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 <?php
 global $config;
 foreach ($config as $name=>$c) {
-  if (!$c['Private'])
-    echo 'const '. $name . ' = \''.$c['Value'].'\''.PHP_EOL;
+  if (!$c['Private']) {
+
+    echo 'const '. $name . ' = \''.preg_replace('/(\n\r?)/', '\$1', $c['Value']).'\''.PHP_EOL;
+  }
 }
 ?>

From bc4884afe5ef2da04e6778827fba16a003f9d678 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 1 Feb 2022 10:07:04 -0500
Subject: [PATCH 385/501] fix replacement on escape. For some reason needs
 double bacl slash

---
 web/skins/classic/js/skin.js.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 52beb07ce..67cf74fd0 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -110,8 +110,7 @@ stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 global $config;
 foreach ($config as $name=>$c) {
   if (!$c['Private']) {
-
-    echo 'const '. $name . ' = \''.preg_replace('/(\n\r?)/', '\$1', $c['Value']).'\''.PHP_EOL;
+    echo 'const '. $name . ' = \''.preg_replace('/(\n\r?)/', '\\\\$1', $c['Value']).'\';'.PHP_EOL;
   }
 }
 ?>

From 80461cb1350b3cba4c2f4bb9190c389e44300d54 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 1 Feb 2022 13:36:11 -0500
Subject: [PATCH 386/501] add libcurl4 as a dependency as it was in
 build-depends.

---
 distros/ubuntu2004/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index dda0e7852..54ca58af1 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -42,6 +42,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libswscale5|libswscale4
         ,libswresample3|libswresample2
         ,ffmpeg
+        ,libcurl4
         ,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
         ,libphp-serialization-perl

From 4949159b88fd45663cc483400daaaf69e9233805 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 1 Feb 2022 14:06:12 -0500
Subject: [PATCH 387/501] Rough in pcm alaw support.  Untested.

---
 src/zm_rtsp_server.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/zm_rtsp_server.cpp b/src/zm_rtsp_server.cpp
index ea6f4e2b7..3da273e00 100644
--- a/src/zm_rtsp_server.cpp
+++ b/src/zm_rtsp_server.cpp
@@ -298,6 +298,14 @@ int main(int argc, char *argv[]) {
               session->GetMediaSessionId(), xop::channel_1, audioFifoPath);
           audioSource->setFrequency(monitor->GetAudioFrequency());
           audioSource->setChannels(monitor->GetAudioChannels());
+        } else if (std::string::npos != audioFifoPath.find("pcm_alaw")) {
+          Debug(1, "Adding G711A source at %dHz %d channels",
+              monitor->GetAudioFrequency(), monitor->GetAudioChannels());
+          session->AddSource(xop::channel_1, xop::G711ASource::CreateNew());
+          audioSource = new ADTS_ZoneMinderFifoSource(rtspServer,
+              session->GetMediaSessionId(), xop::channel_1, audioFifoPath);
+          audioSource->setFrequency(monitor->GetAudioFrequency());
+          audioSource->setChannels(monitor->GetAudioChannels());
         } else {
           Warning("Unknown format in %s", audioFifoPath.c_str());
         }

From 18532096c59b0244e1984dae5ae48da2c20c63dc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 1 Feb 2022 16:10:46 -0500
Subject: [PATCH 388/501] Need full commits to get # of commits since last
 version change

---
 .github/workflows/create-packages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 87d46246d..93279cc57 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -21,6 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          fetch-depth: '0'
           submodules: recursive
       - name: Run packpack
         env:

From ad0a095886fde17650533848249c0cc9faf2c1d9 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy@turnkeylinux.org>
Date: Wed, 2 Feb 2022 11:35:36 +1100
Subject: [PATCH 389/501] Update MariaDB Bullseye info

Specifically note that setting a root password is not required (or recommended; unix socket authentication is better than simple password auth).
---
 docs/installationguide/debian.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index b92ff267a..cf8bffdc5 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -35,7 +35,7 @@ Run the following commands.
     sudo apt install mariadb-server
     sudo apt install zoneminder
 
-When mariadb is installed for the first time, it doesn't add a password to the root user. Therefore, for security, it is recommended to run ``mysql secure installation``.
+By default MariaDB uses `unix socket authentication`_, so no root user password is required (root MariaDB user access only avaialble to local root Linux user). If you wish, you can set a root MariaDB password (and apply other security tweaks) by running `mariadb-secure-installation`_.
 
 **Step 3:** Setup permissions for zm.conf
 
@@ -337,3 +337,6 @@ Reload Apache to enable your changes and then start ZoneMinder.
     sudo systemctl start zoneminder
 
 You are now ready to go with ZoneMinder. Open a browser and type either ``localhost/zm`` one the local machine or ``{IP-OF-ZM-SERVER}/zm`` if you connect from a remote computer.
+
+.. _unix socket authentication: https://mariadb.com/kb/en/authentication-plugin-unix-socket/
+.. _mariadb-secure-installation: https://mariadb.com/kb/en/mysql_secure_installation/

From 63b3042d3726a32aeea239a77c4308e8a402422d Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy@turnkeylinux.org>
Date: Wed, 2 Feb 2022 14:18:26 +1100
Subject: [PATCH 390/501] fix typo

---
 docs/installationguide/debian.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index cf8bffdc5..a5162d185 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -35,7 +35,7 @@ Run the following commands.
     sudo apt install mariadb-server
     sudo apt install zoneminder
 
-By default MariaDB uses `unix socket authentication`_, so no root user password is required (root MariaDB user access only avaialble to local root Linux user). If you wish, you can set a root MariaDB password (and apply other security tweaks) by running `mariadb-secure-installation`_.
+By default MariaDB uses `unix socket authentication`_, so no root user password is required (root MariaDB user access only available to local root Linux user). If you wish, you can set a root MariaDB password (and apply other security tweaks) by running `mariadb-secure-installation`_.
 
 **Step 3:** Setup permissions for zm.conf
 

From 4874dedc1ff92592a83318569bb7c20f68115c11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 10:28:18 -0500
Subject: [PATCH 391/501] Bump version of RtspServer used

---
 utils/packpack/startpackpack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 2ea949078..9737c794a 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -118,7 +118,7 @@ commonprep () {
         fi
     fi
 
-    RTSPVER="cd7fd49becad6010a1b8466bfebbd93999a39878"
+    RTSPVER="eab32851421ffe54fec0229c3efc44c642bc8d46"
     if [ -e "build/RtspServer-${RTSPVER}.tar.gz" ]; then
         echo "Found existing RtspServer ${RTSPVER} tarball..."
     else

From 31eff49a46a66439890c94e1519cab9a7975a1b8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 10:49:05 -0500
Subject: [PATCH 392/501] Implement filter limits.  Which go before
 pagination/advanced search limits

---
 web/ajax/events.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index 4db6b99cc..c95b404c4 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -187,6 +187,9 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
 
   $col_str = 'E.*, M.Name AS Monitor';
   $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id'.$where.($sort?' ORDER BY '.$sort.' '.$order:'');
+  if ($filter->limit() and !count($filter->pre_sql_conditions()) and !count($filter->post_sql_conditions())) {
+    $sql .= ' LIMIT '.$filter->limit();
+  }
 
   $storage_areas = ZM\Storage::find();
   $StorageById = array();
@@ -213,6 +216,12 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
     $unfiltered_rows[] = $row;
   } # end foreach row
 
+  # Filter limits come before pagination limits.
+  if ($filter->limit() and ($filter->limit() > count($unfiltered_rows))) {
+    ZM\Debug("Filtering rows due to filter->limit " . count($unfiltered_rows)." limit: ".$filter->limit());
+    $unfiltered_rows = array_slice($unfiltered_rows, 0, $filter->limit());
+  }
+
   ZM\Debug('Have ' . count($unfiltered_rows) . ' events matching base filter.');
 
   $filtered_rows = null;
@@ -251,8 +260,10 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
     $filtered_rows = $unfiltered_rows;
   } # end if search_filter->terms() > 1
 
-  if ($limit) 
+  if ($limit) {
+    ZM\Debug("Filtering rows due to limit " . count($filtered_rows)." offset: $offset limit: $limit");
     $filtered_rows = array_slice($filtered_rows, $offset, $limit);
+  }
 
   $returned_rows = array();
   foreach ($filtered_rows as $row) {

From 1f9e654821131c2ebf9e934e74e55d3f8f62e881 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 11:02:34 -0500
Subject: [PATCH 393/501] Default limit to 0 which means no limit

---
 web/includes/Filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 4fdd8e43f..2b599fe36 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -240,7 +240,7 @@ class Filter extends ZM_Object {
     }
     if ( isset( $this->Query()['limit'] ) )
       return $this->{'Query'}['limit'];
-    return 100;
+    return 0;
     #return $this->defaults{'limit'};
   }
 

From 70f4a68269694ace8682b3164911341c164d857a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 13:13:00 -0500
Subject: [PATCH 394/501] bump version for use_Amcrest_API

---
 distros/redhat/zoneminder.spec | 2 +-
 version                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index b95d80626..f15e60326 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.10
+Version: 1.37.11
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version b/version
index a9009bf2a..f951feb88 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.37.10
+1.37.11

From 606c47ba8758d2b88595f4585f73a820bea9919f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 14:33:58 -0500
Subject: [PATCH 395/501] If possible, use the v-channel from the yuv420p image
 for motion detection instead of the rgba data.

---
 src/zm_monitor.cpp | 81 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 12 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 56b3dfc04..c3333e051 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -422,9 +422,9 @@ Monitor::Monitor()
   privacy_bitmask(nullptr),
   n_linked_monitors(0),
   linked_monitors(nullptr),
+  ONVIF_Closes_Event(FALSE),
 #ifdef WITH_GSOAP
   soap(nullptr),
-  ONVIF_Closes_Event(FALSE),
 #endif
   red_val(0),
   green_val(0),
@@ -1996,8 +1996,19 @@ bool Monitor::Analyse() {
           } else {
             event->addNote(SIGNAL_CAUSE, "Reacquired");
           }
-          if (snap->image)
+          if (snap->in_frame && (
+                ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
+                ||
+                ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
+                ) ) {
+            Debug(1, "assigning refimage from v-channel");
+            Image v_image(snap->in_frame->width,
+                snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+            ref_image.Assign(v_image);
+          } else if (snap->image) {
+            Debug(1, "assigning refimage from snap->image");
             ref_image.Assign(*(snap->image));
+          }
         }
         shared_data->state = state = IDLE;
         shared_data->active = signal;
@@ -2076,12 +2087,32 @@ bool Monitor::Analyse() {
               // decoder may not have been able to provide an image
               if (!ref_image.Buffer()) {
                 Debug(1, "Assigning instead of Detecting");
-                ref_image.Assign(*(snap->image));
+                if (snap->in_frame && (
+                      ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
+                      ||
+                      ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
+                      ) ) {
+                  Debug(1, "assigning refimage from v-channel");
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                  ref_image.Assign(v_image);
+                } else {
+            Debug(1, "assigning refimage from snap->image");
+                  ref_image.Assign(*(snap->image));
+                }
                 alarm_image.Assign(*(snap->image));
               } else if (!(analysis_image_count % (motion_frame_skip+1))) {
                 Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
                 // Get new score.
-                snap->score = DetectMotion(*(snap->image), zoneSet);
+                if (snap->in_frame && (
+                      ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
+                      ||
+                      ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
+                      ) ) {
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                  snap->score = DetectMotion(v_image, zoneSet);
+                } else {
+                  snap->score = DetectMotion(*(snap->image), zoneSet);
+                }
 
                 if (!snap->analysis_image)
                   snap->analysis_image = new Image(*(snap->image));
@@ -2298,16 +2329,42 @@ bool Monitor::Analyse() {
             } // end if ! event
           } // end if RECORDING
 
-          if ((function == MODECT or function == MOCORD) and snap->image) {
+          if (function == MODECT or function == MOCORD) {
             if (!ref_image.Buffer()) {
-              Debug(1, "Assigning");
-              ref_image.Assign(*(snap->image));
+              if (snap->in_frame && (
+                    ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
+                    ||
+                    ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
+                    ) ) {
+                Debug(1, "Assigning from vchannel");
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                ref_image.Assign(v_image);
+              } else if (snap->image) {
+                Debug(1, "Assigning");
+                ref_image.Assign(*(snap->image));
+              }
             } else {
-              Debug(1, "Blending");
-              ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
-              Debug(1, "Done Blending");
-            }
-          }
+              if (snap->in_frame &&
+                  ( 
+                   ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) 
+                   ||
+                   ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
+                  )
+                 ) {
+                Debug(1, "Blending from vchannel");
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                ref_image.Blend(v_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
+              } else if (snap->image) {
+                Debug(1, "Blending because %p and format %d != %d, %d", snap->in_frame,
+                    snap->in_frame->format,
+                    AV_PIX_FMT_YUV420P,
+                    AV_PIX_FMT_YUVJ420P
+                    );
+                ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
+                Debug(1, "Done Blending");
+              }
+            } // end if have image
+          } // end if detecting
           last_signal = signal;
         } // end if videostream
       } // end if signal

From 339f102196091f4466b939fea31b9c0e661b565b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Feb 2022 14:34:53 -0500
Subject: [PATCH 396/501] Implement reboot and ping methods for Trendnet PTZ
 Control

---
 .../lib/ZoneMinder/Control/Trendnet.pm        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
index 8bdf1db42..cc437974f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
@@ -374,6 +374,25 @@ sub reset {
   $self->sendCmdPost($url,$cmd);
 }
 
+sub reboot {
+  my $self = shift;
+  Debug('Camera Reboot');
+  $self->sendCmdPost('/eng/admin/reboot.cgi', { reboot => 'true' });
+  #$referer = 'http://'.$HI->ip().'/eng/admin/tools_default.cgi';
+  #$initial_url = $HI->ip().'/eng/admin/tools_default.cgi';
+}
+
+sub ping {
+  return -1 if ! $ADDRESS;
+
+  require Net::Ping;
+
+  my $p = Net::Ping->new();
+  my $rv = $p->ping($ADDRESS);
+  $p->close();
+  return $rv;
+}
+
 1;
 __END__
 

From 89e1c5d53c31776d2c5e0e2f29468d3c0896bd8a Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Wed, 26 Jan 2022 16:54:27 -0600
Subject: [PATCH 397/501] Move Monitor::MonitorLink to dedicated file

---
 src/CMakeLists.txt             |   1 +
 src/zm_monitor_monitorlink.cpp | 198 +++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 src/zm_monitor_monitorlink.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6878a6589..439a77291 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,6 +33,7 @@ set(ZM_BIN_SRC_FILES
   zm_libvnc_camera.cpp
   zm_local_camera.cpp
   zm_monitor.cpp
+  zm_monitor_monitorlink.cpp
   zm_monitorstream.cpp
   zm_ffmpeg.cpp
   zm_ffmpeg_camera.cpp
diff --git a/src/zm_monitor_monitorlink.cpp b/src/zm_monitor_monitorlink.cpp
new file mode 100644
index 000000000..95432388a
--- /dev/null
+++ b/src/zm_monitor_monitorlink.cpp
@@ -0,0 +1,198 @@
+//
+// ZoneMinder Monitor Class Implementation, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#include "zm_monitor.h"
+
+#include <sys/stat.h>
+
+#if ZM_MEM_MAPPED
+#include <sys/mman.h>
+#include <fcntl.h>
+#else // ZM_MEM_MAPPED
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#endif // ZM_MEM_MAPPED
+
+Monitor::MonitorLink::MonitorLink(unsigned int p_id, const char *p_name) :
+  id(p_id),
+  shared_data(nullptr),
+  trigger_data(nullptr),
+  video_store_data(nullptr)
+{
+  strncpy(name, p_name, sizeof(name)-1);
+
+#if ZM_MEM_MAPPED
+  map_fd = -1;
+  mem_file = stringtf("%s/zm.mmap.%u", staticConfig.PATH_MAP.c_str(), id);
+#else // ZM_MEM_MAPPED
+  shm_id = 0;
+#endif // ZM_MEM_MAPPED
+  mem_size = 0;
+  mem_ptr = nullptr;
+
+  last_event_id = 0;
+  last_state = IDLE;
+
+  last_connect_time = 0;
+  connected = false;
+}
+
+Monitor::MonitorLink::~MonitorLink() {
+  disconnect();
+}
+
+bool Monitor::MonitorLink::connect() {
+  SystemTimePoint now = std::chrono::system_clock::now();
+  if (!last_connect_time || (now - std::chrono::system_clock::from_time_t(last_connect_time)) > Seconds(60)) {
+    last_connect_time = std::chrono::system_clock::to_time_t(now);
+
+    mem_size = sizeof(SharedData) + sizeof(TriggerData);
+
+    Debug(1, "link.mem.size=%jd", static_cast<intmax_t>(mem_size));
+#if ZM_MEM_MAPPED
+    map_fd = open(mem_file.c_str(), O_RDWR, (mode_t)0600);
+    if (map_fd < 0) {
+      Debug(3, "Can't open linked memory map file %s: %s", mem_file.c_str(), strerror(errno));
+      disconnect();
+      return false;
+    }
+    while (map_fd <= 2) {
+      int new_map_fd = dup(map_fd);
+      Warning("Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd);
+      close(map_fd);
+      map_fd = new_map_fd;
+    }
+
+    struct stat map_stat;
+    if (fstat(map_fd, &map_stat) < 0) {
+      Error("Can't stat linked memory map file %s: %s", mem_file.c_str(), strerror(errno));
+      disconnect();
+      return false;
+    }
+
+    if (map_stat.st_size == 0) {
+      Error("Linked memory map file %s is empty: %s", mem_file.c_str(), strerror(errno));
+      disconnect();
+      return false;
+    } else if (map_stat.st_size < mem_size) {
+      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, static_cast<intmax_t>(mem_size));
+      disconnect();
+      return false;
+    }
+
+    mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
+    if (mem_ptr == MAP_FAILED) {
+      Error("Can't map file %s (%jd bytes) to memory: %s", mem_file.c_str(), static_cast<intmax_t>(mem_size), strerror(errno));
+      disconnect();
+      return false;
+    }
+#else // ZM_MEM_MAPPED
+    shm_id = shmget((config.shm_key&0xffff0000)|id, mem_size, 0700);
+    if (shm_id < 0) {
+      Debug(3, "Can't shmget link memory: %s", strerror(errno));
+      connected = false;
+      return false;
+    }
+    mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
+    if ((int)mem_ptr == -1) {
+      Debug(3, "Can't shmat link memory: %s", strerror(errno));
+      connected = false;
+      return false;
+    }
+#endif // ZM_MEM_MAPPED
+
+    shared_data = (SharedData *)mem_ptr;
+    trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
+
+    if (!shared_data->valid) {
+      Debug(3, "Linked memory not initialised by capture daemon");
+      disconnect();
+      return false;
+    }
+
+    last_state = shared_data->state;
+    last_event_id = shared_data->last_event_id;
+    connected = true;
+
+    return true;
+  }
+  return false;
+}  // end bool Monitor::MonitorLink::connect()
+
+bool Monitor::MonitorLink::disconnect() {
+  if (connected) {
+    connected = false;
+
+#if ZM_MEM_MAPPED
+    if (mem_ptr > (void *)0) {
+      msync(mem_ptr, mem_size, MS_ASYNC);
+      munmap(mem_ptr, mem_size);
+    }
+    if (map_fd >= 0)
+      close(map_fd);
+
+    map_fd = -1;
+#else // ZM_MEM_MAPPED
+    struct shmid_ds shm_data;
+    if (shmctl(shm_id, IPC_STAT, &shm_data) < 0) {
+      Debug(3, "Can't shmctl: %s", strerror(errno));
+      return false;
+    }
+
+    shm_id = 0;
+
+    if (shm_data.shm_nattch <= 1) {
+      if (shmctl(shm_id, IPC_RMID, 0) < 0) {
+        Debug(3, "Can't shmctl: %s", strerror(errno));
+        return false;
+      }
+    }
+
+    if (shmdt(mem_ptr) < 0) {
+      Debug(3, "Can't shmdt: %s", strerror(errno));
+      return false;
+    }
+#endif // ZM_MEM_MAPPED
+    mem_size = 0;
+    mem_ptr = nullptr;
+  }
+  return true;
+}
+
+bool Monitor::MonitorLink::isAlarmed() {
+  if (!connected) {
+    return false;
+  }
+  return( shared_data->state == ALARM );
+}
+
+bool Monitor::MonitorLink::inAlarm() {
+  if (!connected) {
+    return false;
+  }
+  return( shared_data->state == ALARM || shared_data->state == ALERT );
+}
+
+bool Monitor::MonitorLink::hasAlarmed() {
+  if (shared_data->state == ALARM) {
+    return true;
+  }
+  last_event_id = shared_data->last_event_id;
+  return false;
+}

From 7e9c707f92d5c8c7221e36449441f5171fcccfd3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 08:19:08 -0500
Subject: [PATCH 398/501] V plane is actually the 3rd array entry, not the 4th

---
 src/zm_monitor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c3333e051..2b6436379 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2003,7 +2003,7 @@ bool Monitor::Analyse() {
                 ) ) {
             Debug(1, "assigning refimage from v-channel");
             Image v_image(snap->in_frame->width,
-                snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
             ref_image.Assign(v_image);
           } else if (snap->image) {
             Debug(1, "assigning refimage from snap->image");
@@ -2093,7 +2093,7 @@ bool Monitor::Analyse() {
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                       ) ) {
                   Debug(1, "assigning refimage from v-channel");
-                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
                   ref_image.Assign(v_image);
                 } else {
             Debug(1, "assigning refimage from snap->image");
@@ -2108,7 +2108,7 @@ bool Monitor::Analyse() {
                       ||
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                       ) ) {
-                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
                   snap->score = DetectMotion(v_image, zoneSet);
                 } else {
                   snap->score = DetectMotion(*(snap->image), zoneSet);
@@ -2337,7 +2337,7 @@ bool Monitor::Analyse() {
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                     ) ) {
                 Debug(1, "Assigning from vchannel");
-                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
                 ref_image.Assign(v_image);
               } else if (snap->image) {
                 Debug(1, "Assigning");
@@ -2352,7 +2352,7 @@ bool Monitor::Analyse() {
                   )
                  ) {
                 Debug(1, "Blending from vchannel");
-                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[3], 0);
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
                 ref_image.Blend(v_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
               } else if (snap->image) {
                 Debug(1, "Blending because %p and format %d != %d, %d", snap->in_frame,

From b05bc211f744870e82193a5737985866b19dbb18 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 10:50:40 -0500
Subject: [PATCH 399/501] Apparently it is actually the Y channel that we want.

---
 src/zm_monitor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 2b6436379..a33b00c40 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2003,7 +2003,7 @@ bool Monitor::Analyse() {
                 ) ) {
             Debug(1, "assigning refimage from v-channel");
             Image v_image(snap->in_frame->width,
-                snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
+                snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
             ref_image.Assign(v_image);
           } else if (snap->image) {
             Debug(1, "assigning refimage from snap->image");
@@ -2093,7 +2093,7 @@ bool Monitor::Analyse() {
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                       ) ) {
                   Debug(1, "assigning refimage from v-channel");
-                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                   ref_image.Assign(v_image);
                 } else {
             Debug(1, "assigning refimage from snap->image");
@@ -2108,7 +2108,7 @@ bool Monitor::Analyse() {
                       ||
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                       ) ) {
-                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
+                  Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                   snap->score = DetectMotion(v_image, zoneSet);
                 } else {
                   snap->score = DetectMotion(*(snap->image), zoneSet);
@@ -2337,7 +2337,7 @@ bool Monitor::Analyse() {
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
                     ) ) {
                 Debug(1, "Assigning from vchannel");
-                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                 ref_image.Assign(v_image);
               } else if (snap->image) {
                 Debug(1, "Assigning");
@@ -2352,7 +2352,7 @@ bool Monitor::Analyse() {
                   )
                  ) {
                 Debug(1, "Blending from vchannel");
-                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[2], 0);
+                Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                 ref_image.Blend(v_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
               } else if (snap->image) {
                 Debug(1, "Blending because %p and format %d != %d, %d", snap->in_frame,

From 838704e58e2ac24ef2af10282ddfa27be3ce4a39 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 10:07:21 -0500
Subject: [PATCH 400/501] Add more stop_ tests so that when we are told to
 terminate, we actually do so.

---
 src/zm_rtsp_server_fifo_source.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/zm_rtsp_server_fifo_source.cpp b/src/zm_rtsp_server_fifo_source.cpp
index 40dbc14fc..1845c96ef 100644
--- a/src/zm_rtsp_server_fifo_source.cpp
+++ b/src/zm_rtsp_server_fifo_source.cpp
@@ -109,7 +109,7 @@ void ZoneMinderFifoSource::WriteRun() {
           fuNal.buffer()[2] = fuNal.buffer()[2]&~0x80; // FU header (no S bit)
           headerSize = 3;
         }
-        while (nalRemaining) {
+        while (nalRemaining && !stop_) {
           if ( nalRemaining < maxNalSize ) {
             // This is the last fragment:
             fuNal.buffer()[headerSize-1] |= 0x40; // set the E bit in the FU header
@@ -166,7 +166,7 @@ int ZoneMinderFifoSource::getNextFrame() {
   }
 
   Debug(3, "%s bytes read %d bytes, buffer size %u", m_fifo.c_str(), bytes_read, m_buffer.size());
-  while (m_buffer.size()) {
+  while (m_buffer.size() and !stop_) {
     unsigned int data_size = 0;
     int64_t pts;
     unsigned char *header_end = nullptr;
@@ -224,7 +224,7 @@ int ZoneMinderFifoSource::getNextFrame() {
     int bytes_needed = data_size - (m_buffer.size() - header_size);
     if (bytes_needed > 0) {
       Debug(4, "Need another %d bytes. Trying to read them", bytes_needed);
-      while (bytes_needed) {
+      while (bytes_needed and !stop_) {
         bytes_read = m_buffer.read_into(m_fd, bytes_needed);
         if (bytes_read <= 0) {
           Debug(1, "Failed to read another %d bytes, got %d.", bytes_needed, bytes_read);
@@ -252,13 +252,14 @@ int ZoneMinderFifoSource::getNextFrame() {
     {
       std::unique_lock<std::mutex> lck(mutex_);
       Debug(3, "have lock");
-      while (framesList.size()) {
+      while (!stop_ && framesList.size()) {
         std::pair<unsigned char*, size_t> nal = framesList.front();
         framesList.pop_front();
         NAL_Frame *Nal = new NAL_Frame(nal.first, nal.second, pts);
         m_nalQueue.push(Nal);
       }
     }
+    Debug(3, "notifying");
     condition_.notify_all();
   } // end while m_buffer.size()
   return 1;

From 67ac0fdffd2003e7605a8b9ff1138205223c6115 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 11:57:00 -0500
Subject: [PATCH 401/501] Disable alleged y-channel image motion detection.
 Doesn't work.

---
 src/zm_monitor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index a33b00c40..6b2b44e63 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1996,7 +1996,7 @@ bool Monitor::Analyse() {
           } else {
             event->addNote(SIGNAL_CAUSE, "Reacquired");
           }
-          if (snap->in_frame && (
+          if (0 and snap->in_frame && (
                 ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
                 ||
                 ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@@ -2087,7 +2087,7 @@ bool Monitor::Analyse() {
               // decoder may not have been able to provide an image
               if (!ref_image.Buffer()) {
                 Debug(1, "Assigning instead of Detecting");
-                if (snap->in_frame && (
+                if (0 and snap->in_frame && (
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
                       ||
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@@ -2103,7 +2103,7 @@ bool Monitor::Analyse() {
               } else if (!(analysis_image_count % (motion_frame_skip+1))) {
                 Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
                 // Get new score.
-                if (snap->in_frame && (
+                if (0 and snap->in_frame && (
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
                       ||
                       ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@@ -2331,7 +2331,7 @@ bool Monitor::Analyse() {
 
           if (function == MODECT or function == MOCORD) {
             if (!ref_image.Buffer()) {
-              if (snap->in_frame && (
+              if (0 snap->in_frame && (
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
                     ||
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)

From 02a2c783e495edeb2c22a8f24a3d3a4d0e84a34b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 11:57:27 -0500
Subject: [PATCH 402/501] Disable alleged y-channel image motion detection.
 Doesn't work.

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 6b2b44e63..3a4879e5c 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2331,7 +2331,7 @@ bool Monitor::Analyse() {
 
           if (function == MODECT or function == MOCORD) {
             if (!ref_image.Buffer()) {
-              if (0 snap->in_frame && (
+              if (0 and snap->in_frame && (
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
                     ||
                     ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)

From d24b419f0e6a6af95f0c38a125b3e46ed17deab9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 12:06:00 -0500
Subject: [PATCH 403/501] Only create packages for master

---
 .github/workflows/create-packages.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index 93279cc57..e62c5aec1 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -2,8 +2,7 @@ name: Create packages
 
 on:
   push:
-    branches:
-      - '*'
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 

From da4c8802333c4e5acbb11c8cfa2752b222b84f27 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 12:16:01 -0500
Subject: [PATCH 404/501] 0 out another used of y-image

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 3a4879e5c..fcd8e4b9e 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2344,7 +2344,7 @@ bool Monitor::Analyse() {
                 ref_image.Assign(*(snap->image));
               }
             } else {
-              if (snap->in_frame &&
+              if (0 and snap->in_frame &&
                   ( 
                    ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) 
                    ||

From 7515711eb848293542a6f5a8f123c9893ae0a90c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 14:45:17 -0500
Subject: [PATCH 405/501] Implement Server function which figures out which
 Server likely has the video.  Use it to remove duplicate logic

---
 web/includes/Event.php | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index e042849e9..6f180ef17 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -214,22 +214,24 @@ class Event extends ZM_Object {
     }
   } # end Event->delete
 
-  public function getStreamSrc( $args=array(), $querySep='&' ) {
-
-    $streamSrc = '';
-    $Server = null;
+  public function Server() {
     if ( $this->Storage()->ServerId() ) {
       # The Event may have been moved to Storage on another server,
       # So prefer viewing the Event from the Server that is actually
       # storing the video
-      $Server = $this->Storage()->Server();
+      return $this->Storage()->Server();
     } else if ( $this->Monitor()->ServerId() ) {
       # Assume that the server that recorded it has it
-      $Server = $this->Monitor()->Server();
-    } else {
-      # A default Server will result in the use of ZM_DIR_EVENTS
-      $Server = new Server();
+      return $this->Monitor()->Server();
     }
+    # A default Server will result in the use of ZM_DIR_EVENTS
+    return new Server();
+  }
+
+  public function getStreamSrc( $args=array(), $querySep='&' ) {
+
+    $streamSrc = '';
+    $Server = $this->Server();
 
     # If we are in a multi-port setup, then use the multiport, else by
     # passing null Server->Url will use the Port set in the Server setting
@@ -354,15 +356,7 @@ class Event extends ZM_Object {
 # We always store at least 1 image when capturing
 
     $streamSrc = '';
-    $Server = null;
-    if ( $this->Storage()->ServerId() ) {
-      $Server = $this->Storage()->Server();
-    } else if ( $this->Monitor()->ServerId() ) {
-      # Assume that the server that recorded it has it
-      $Server = $this->Monitor()->Server();
-    } else {
-      $Server = new Server();
-    }
+    $Server = $this->Server();
     $streamSrc .= $Server->UrlToIndex(
       ZM_MIN_STREAMING_PORT ?
       ZM_MIN_STREAMING_PORT+$this->{'MonitorId'} :
@@ -514,7 +508,7 @@ class Event extends ZM_Object {
       return false;
     }
     $Storage= $this->Storage();
-    $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
+    $Server = $this->Server();
     if ( $Server->Id() != ZM_SERVER_ID ) {
 
       $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
@@ -562,7 +556,7 @@ class Event extends ZM_Object {
       return false;
     }
     $Storage= $this->Storage();
-    $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
+    $Server = $this->Server();
     if ( $Server->Id() != ZM_SERVER_ID ) {
 
       $url = $Server->UrlToApi().'/events/'.$this->{'Id'}.'.json';

From 7a95aa7210e0484b29b917ddc1792cbce6933eb9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 14:46:39 -0500
Subject: [PATCH 406/501] Don't render cues if we don't have any. This occurs
 on initial load we call changeScale which would re-render the cues but the
 cur ajax hasn't completed yet, so this just avoids an error being logged

---
 web/skins/classic/views/js/event.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index ac05f51fe..31363e154 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -203,7 +203,10 @@ function changeScale() {
     streamScale(scale == '0' ? autoScale : scale);
     drawProgressBar();
   }
-  alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues.  skip ajax call
+  if (cueFrames) {
+    //just re-render alarmCues.  skip ajax call
+    alarmCue.html(renderAlarmCues(eventViewer));
+  }
   setCookie('zmEventScale'+eventData.MonitorId, scale, 3600);
 
   // After a resize, check if we still have room to display the event stats table

From 3c655807e841d9194fc9612b9337b6ce85d55796 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 14:47:32 -0500
Subject: [PATCH 407/501] Use new Event->Server function to return the correct
 (and matching url to zms) url to use for ajax status calls.  Fixes errors in
 a multi-server environment.

---
 web/skins/classic/views/js/event.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index 5d4d57f7c..c2b61f395 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -87,7 +87,7 @@ var eventDataStrings = {
     Emailed: '<?php echo translate('Emailed') ?>'
 };
 
-var monitorUrl = '<?php echo $Event->Storage()->Server()->UrlToIndex(); ?>';
+var monitorUrl = '<?php echo $Event->Server()->UrlToIndex(); ?>';
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';

From ac39be33f50403974476c9baa638b71a55291754 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 17:24:33 -0500
Subject: [PATCH 408/501] Don't assume filename of mp4.  We store it in the
 event record for a reason. Fixes #3422

---
 scripts/zmfilter.pl.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 960c090cb..3fb286039 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -464,15 +464,18 @@ sub generateImage {
   my $event_path = $Event->Path();
   my $capture_image_path = sprintf('%s/%0'.$Config{ZM_EVENT_IMAGE_DIGITS}.'d-capture.jpg', $event_path, $frame->{FrameId});
   my $analyse_image_path = sprintf('%s/%0'.$Config{ZM_EVENT_IMAGE_DIGITS}.'d-analyse.jpg', $event_path, $frame->{FrameId}) if $analyse;
-  my $video_path =  sprintf('%s/%d-video.mp4', $event_path, $Event->{Id});
+  my $video_path =  sprintf('%s/%s', $event_path, $Event->{DefaultVideo});
   my $image_path = '';
 
 # check if the image file exists. If the file doesn't exist and we use H264 try to extract it from .mp4 video
   if ( $analyse && -r $analyse_image_path ) {
+    Debug("Using analysis and jpeg exists $analyse_image_path");
     $image_path = $analyse_image_path;
   } elsif ( -r $capture_image_path ) {
+    Debug("Using captures and jpeg exists $capture_image_path");
     $image_path = $capture_image_path;
   } elsif ( -r $video_path ) {
+    Debug("mp4 exists $video_path");
     my $command ="ffmpeg -nostdin -ss $$frame{Delta} -i '$video_path' -frames:v 1 '$capture_image_path'";
     #$command = "ffmpeg -y -v 0 -i $video_path -vf 'select=gte(n\\,$$frame{FrameId}),setpts=PTS-STARTPTS' -vframes 1 -f image2 $capture_image_path";
     my $output = qx($command);
@@ -486,6 +489,8 @@ sub generateImage {
     } else {
       $image_path = $capture_image_path;
     }
+  } else {
+    Debug("No files found at $analyse_image_path, $capture_image_path or $video_path");
   }
   return $image_path;
 }
@@ -723,7 +728,7 @@ sub substituteTags {
         if ( -e $path ) {
           push @$attachments_ref, { type=>'image/jpeg', path=>$path };
         } else {
-          Warning("Path to first image does not exist at $path");
+          Warning("Path to first image does not exist at $path for image $first_alarm_frame");
         }
       }
 

From a6dc7ba0fc769f5af8aceebaa4669d429df557fe Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 17:30:38 -0500
Subject: [PATCH 409/501] Add debugging, but commented out

---
 web/includes/Object.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/includes/Object.php b/web/includes/Object.php
index ff5d40baa..5023587fd 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -237,10 +237,13 @@ class ZM_Object {
     $changes = array();
 
     if ($defaults) {
+      // FIXME: This code basically means that the new_values must be a full object, not a subset
+      // Perhaps if it only concerned itself with the keys of new_values
       foreach ($defaults as $field => $type) {
         if (isset($new_values[$field])) continue;
 
         if (isset($this->defaults[$field])) {
+          //Debug("Setting default for $field");
           if (is_array($this->defaults[$field])) {
             $new_values[$field] = $this->defaults[$field]['default'];
           } else {
@@ -255,9 +258,11 @@ class ZM_Object {
         if (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) {
           if (is_array($this->defaults[$field]['filter_regexp'])) {
             foreach ($this->defaults[$field]['filter_regexp'] as $regexp) {
+              //Debug("regexping array $field $value to " . preg_replace($regexp, '', trim($value)));
               $value = preg_replace($regexp, '', trim($value));
             }
           } else {
+            //Debug("regexping $field $value to " . preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value)));
             $value = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
           }
         }
@@ -265,10 +270,12 @@ class ZM_Object {
         $old_value = $this->$field();
         if (is_array($old_value)) {
           $diff = array_recursive_diff($old_value, $value);
+          //Debug("$field array old: " .print_r($old_value, true) . " new: " . print_r($value, true). ' diff: '. print_r($diff, true));
           if ( count($diff) ) {
             $changes[$field] = $value;
           }
         } else if ( $this->$field() != $value ) {
+          //Debug("$field != $value");
           $changes[$field] = $value;
         }
       } else if (property_exists($this, $field)) {

From dde3884084880ba308bad7cab6664ee6ba598f7a Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Thu, 3 Feb 2022 16:31:07 -0600
Subject: [PATCH 410/501] Moves Janus and Amcrest into their own nested classes

---
 src/CMakeLists.txt         |   2 +
 src/zm_monitor.cpp         | 575 +++----------------------------------
 src/zm_monitor.h           |  79 +++--
 src/zm_monitor_amcrest.cpp | 126 ++++++++
 src/zm_monitor_janus.cpp   | 316 ++++++++++++++++++++
 5 files changed, 538 insertions(+), 560 deletions(-)
 create mode 100644 src/zm_monitor_amcrest.cpp
 create mode 100644 src/zm_monitor_janus.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 439a77291..6943a102a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,8 @@ set(ZM_BIN_SRC_FILES
   zm_local_camera.cpp
   zm_monitor.cpp
   zm_monitor_monitorlink.cpp
+  zm_monitor_janus.cpp
+  zm_monitor_amcrest.cpp
   zm_monitorstream.cpp
   zm_ffmpeg.cpp
   zm_ffmpeg_camera.cpp
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c3333e051..576b4d517 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -130,175 +130,7 @@ std::string TriggerState_Strings[] = {
   "Cancel", "On", "Off"
 };
 
-Monitor::MonitorLink::MonitorLink(unsigned int p_id, const char *p_name) :
-  id(p_id),
-  shared_data(nullptr),
-  trigger_data(nullptr),
-  video_store_data(nullptr)
-{
-  strncpy(name, p_name, sizeof(name)-1);
-
-#if ZM_MEM_MAPPED
-  map_fd = -1;
-  mem_file = stringtf("%s/zm.mmap.%u", staticConfig.PATH_MAP.c_str(), id);
-#else // ZM_MEM_MAPPED
-  shm_id = 0;
-#endif // ZM_MEM_MAPPED
-  mem_size = 0;
-  mem_ptr = nullptr;
-
-  last_event_id = 0;
-  last_state = IDLE;
-
-  last_connect_time = 0;
-  connected = false;
-}
-
-Monitor::MonitorLink::~MonitorLink() {
-  disconnect();
-}
-
-bool Monitor::MonitorLink::connect() {
-  SystemTimePoint now = std::chrono::system_clock::now();
-  if (!last_connect_time || (now - std::chrono::system_clock::from_time_t(last_connect_time)) > Seconds(60)) {
-    last_connect_time = std::chrono::system_clock::to_time_t(now);
-
-    mem_size = sizeof(SharedData) + sizeof(TriggerData);
-
-    Debug(1, "link.mem.size=%jd", static_cast<intmax_t>(mem_size));
-#if ZM_MEM_MAPPED
-    map_fd = open(mem_file.c_str(), O_RDWR, (mode_t)0600);
-    if (map_fd < 0) {
-      Debug(3, "Can't open linked memory map file %s: %s", mem_file.c_str(), strerror(errno));
-      disconnect();
-      return false;
-    }
-    while (map_fd <= 2) {
-      int new_map_fd = dup(map_fd);
-      Warning("Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd);
-      close(map_fd);
-      map_fd = new_map_fd;
-    }
-
-    struct stat map_stat;
-    if (fstat(map_fd, &map_stat) < 0) {
-      Error("Can't stat linked memory map file %s: %s", mem_file.c_str(), strerror(errno));
-      disconnect();
-      return false;
-    }
-
-    if (map_stat.st_size == 0) {
-      Error("Linked memory map file %s is empty: %s", mem_file.c_str(), strerror(errno));
-      disconnect();
-      return false;
-    } else if (map_stat.st_size < mem_size) {
-      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, static_cast<intmax_t>(mem_size));
-      disconnect();
-      return false;
-    }
-
-    mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
-    if (mem_ptr == MAP_FAILED) {
-      Error("Can't map file %s (%jd bytes) to memory: %s", mem_file.c_str(), static_cast<intmax_t>(mem_size), strerror(errno));
-      disconnect();
-      return false;
-    }
-#else // ZM_MEM_MAPPED
-    shm_id = shmget((config.shm_key&0xffff0000)|id, mem_size, 0700);
-    if (shm_id < 0) {
-      Debug(3, "Can't shmget link memory: %s", strerror(errno));
-      connected = false;
-      return false;
-    }
-    mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
-    if ((int)mem_ptr == -1) {
-      Debug(3, "Can't shmat link memory: %s", strerror(errno));
-      connected = false;
-      return false;
-    }
-#endif // ZM_MEM_MAPPED
-
-    shared_data = (SharedData *)mem_ptr;
-    trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
-
-    if (!shared_data->valid) {
-      Debug(3, "Linked memory not initialised by capture daemon");
-      disconnect();
-      return false;
-    }
-
-    last_state = shared_data->state;
-    last_event_id = shared_data->last_event_id;
-    connected = true;
-
-    return true;
-  }
-  return false;
-}  // end bool Monitor::MonitorLink::connect()
-
-bool Monitor::MonitorLink::disconnect() {
-  if (connected) {
-    connected = false;
-
-#if ZM_MEM_MAPPED
-    if (mem_ptr > (void *)0) {
-      msync(mem_ptr, mem_size, MS_ASYNC);
-      munmap(mem_ptr, mem_size);
-    }
-    if (map_fd >= 0)
-      close(map_fd);
-
-    map_fd = -1;
-#else // ZM_MEM_MAPPED
-    struct shmid_ds shm_data;
-    if (shmctl(shm_id, IPC_STAT, &shm_data) < 0) {
-      Debug(3, "Can't shmctl: %s", strerror(errno));
-      return false;
-    }
-
-    shm_id = 0;
-
-    if (shm_data.shm_nattch <= 1) {
-      if (shmctl(shm_id, IPC_RMID, 0) < 0) {
-        Debug(3, "Can't shmctl: %s", strerror(errno));
-        return false;
-      }
-    }
-
-    if (shmdt(mem_ptr) < 0) {
-      Debug(3, "Can't shmdt: %s", strerror(errno));
-      return false;
-    }
-#endif // ZM_MEM_MAPPED
-    mem_size = 0;
-    mem_ptr = nullptr;
-  }
-  return true;
-}
-
-bool Monitor::MonitorLink::isAlarmed() {
-  if (!connected) {
-    return false;
-  }
-  return( shared_data->state == ALARM );
-}
-
-bool Monitor::MonitorLink::inAlarm() {
-  if (!connected) {
-    return false;
-  }
-  return( shared_data->state == ALARM || shared_data->state == ALERT );
-}
-
-bool Monitor::MonitorLink::hasAlarmed() {
-  if (shared_data->state == ALARM) {
-    return true;
-  }
-  last_event_id = shared_data->last_event_id;
-  return false;
-}
-
-Monitor::Monitor() 
+Monitor::Monitor()
  : id(0),
   name(""),
   server_id(0),
@@ -317,7 +149,7 @@ Monitor::Monitor()
   //user
   //pass
   //path
-  //device 
+  //device
   palette(0),
   channel(0),
   format(0),
@@ -422,7 +254,9 @@ Monitor::Monitor()
   privacy_bitmask(nullptr),
   n_linked_monitors(0),
   linked_monitors(nullptr),
-  ONVIF_Closes_Event(FALSE),
+  Event_Poller_Closes_Event(FALSE),
+  Janus_Manager(nullptr),
+  Amcrest_Manager(nullptr),
 #ifdef WITH_GSOAP
   soap(nullptr),
 #endif
@@ -1083,21 +917,16 @@ bool Monitor::connect() {
 
 
     //ONVIF and Amcrest Setup
-    //since they serve the same function, handling them as two options of the same feature.
-    ONVIF_Trigger_State = FALSE;
+    //For now, only support one event type per camera, so share some state.
+    Poll_Trigger_State = FALSE;
     if (onvif_event_listener) { //
       Debug(1, "Starting ONVIF");
-      ONVIF_Healthy = FALSE;
+      Event_Poller_Healthy = FALSE;
       if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
-        ONVIF_Closes_Event = TRUE;
+        Event_Poller_Closes_Event = TRUE;
       }
       if (use_Amcrest_API) {
-        curl_multi = curl_multi_init();
-        start_Amcrest();
-        //spin up curl_multi
-        //use the onvif_user and onvif_pass and onvif_url here.
-        //going to use the non-blocking curl api, and in the polling thread, block for 5 seconds waiting for input, just like onvif
-        //note that it's not possible for a single camera to use both.
+        Amcrest_Manager = new AmcrestAPI(this);
       } else { //using GSOAP
 #ifdef WITH_GSOAP
         tev__PullMessages.Timeout = "PT600S";
@@ -1123,7 +952,7 @@ bool Monitor::connect() {
             Error("Couldn't do initial event pull! Error %i %s, %s", soap->error, soap_fault_string(soap), soap_fault_detail(soap));
           } else {
             Debug(1, "Good Initial ONVIF Pull");
-            ONVIF_Healthy = TRUE;
+            Event_Poller_Healthy = TRUE;
           }
         }
 #else
@@ -1135,17 +964,9 @@ bool Monitor::connect() {
     }
     //End ONVIF Setup
 
-#if HAVE_LIBCURL    //janus setup. Depends on libcurl.
-    if (janus_enabled && (path.find("rtsp://") !=  std::string::npos)) {
-      get_janus_session();
-      if (add_to_janus() != 0) {
-          Warning("Failed to add monitor stream to Janus!"); //The first attempt may fail. Will be reattempted in the Poller thread
-      }
+    if (janus_enabled) {
+      Janus_Manager = new JanusManager(this);
     }
-#else
-    if (janus_enabled)
-      Error("zmc not compiled with LIBCURL. Janus support not built in!");
-#endif
 
   } else if (!shared_data->valid) {
     Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
@@ -1242,12 +1063,12 @@ Monitor::~Monitor() {
     sws_freeContext(convert_context);
     convert_context = nullptr;
   }
-  if (Amcrest_handle != nullptr) {
-    curl_multi_remove_handle(curl_multi, Amcrest_handle);
-    curl_easy_cleanup(Amcrest_handle);
+  if (Amcrest_Manager != nullptr) {
+    delete Amcrest_Manager;
+  }
+  if (purpose == CAPTURE) {
+    curl_global_cleanup(); //not sure about this location.
   }
-  if (curl_multi != nullptr) curl_multi_cleanup(curl_multi);
-  curl_global_cleanup();
 }  // end Monitor::~Monitor()
 
 void Monitor::AddPrivacyBitmask() {
@@ -1817,38 +1638,13 @@ void Monitor::UpdateFPS() {
 //Thread where ONVIF polling, and other similar status polling can happen.
 //Since these can be blocking, run here to avoid intefering with other processing
 bool Monitor::Poll() {
+
   //We want to trigger every 5 seconds or so. so grab the time at the beginning of the loop, and sleep at the end.
   std::chrono::system_clock::time_point loop_start_time = std::chrono::system_clock::now();
 
-  if (ONVIF_Healthy) {
+  if (Event_Poller_Healthy) {
     if(use_Amcrest_API) {
-      int open_handles;
-      int transfers;
-      curl_multi_perform(curl_multi, &open_handles);
-      if (open_handles == 0) {
-        start_Amcrest(); //http transfer ended, need to restart.
-      } else {
-        curl_multi_wait(curl_multi, NULL, 0, 5000, &transfers); //wait for max 5 seconds for event.
-        if (transfers > 0) { //have data to deal with
-          curl_multi_perform(curl_multi, &open_handles); //actually grabs the data, populates amcrest_response
-          if (amcrest_response.find("action=Start") != std::string::npos) {
-          //Event Start
-          Debug(1,"Triggered on ONVIF");
-            if (!ONVIF_Trigger_State) {
-              Debug(1,"Triggered Event");
-              ONVIF_Trigger_State = TRUE;
-            }
-          } else if (amcrest_response.find("action=Stop") != std::string::npos){
-            Debug(1, "Triggered off ONVIF");
-            ONVIF_Trigger_State = FALSE;
-            if (!ONVIF_Closes_Event) { //If we get a close event, then we know to expect them.
-              ONVIF_Closes_Event = TRUE;
-              Debug(1,"Setting ClosesEvent");
-            }
-          }
-          amcrest_response.clear(); //We've dealt with the message, need to clear the queue
-        }
-      }
+      Amcrest_Manager->WaitForMessage();
     } else {
 
 #ifdef WITH_GSOAP
@@ -1857,7 +1653,7 @@ bool Monitor::Poll() {
       if (result != SOAP_OK) {
         if (result != SOAP_EOF) { //Ignore the timeout error
           Error("Failed to get ONVIF messages! %s", soap_fault_string(soap));
-          ONVIF_Healthy = FALSE;
+          Event_Poller_Healthy = FALSE;
         }
       } else {
         Debug(1, "Got Good Response! %i", result);
@@ -1874,16 +1670,16 @@ bool Monitor::Poll() {
             if (strcmp(msg->Message.__any.elts->next->elts->atts->next->text, "true") == 0) {
             //Event Start
               Debug(1,"Triggered on ONVIF");
-              if (!ONVIF_Trigger_State) {
+              if (!Poll_Trigger_State) {
                 Debug(1,"Triggered Event");
-                ONVIF_Trigger_State = TRUE;
+                Poll_Trigger_State = TRUE;
                 std::this_thread::sleep_for (std::chrono::seconds(1)); //thread sleep
               }
             } else {
               Debug(1, "Triggered off ONVIF");
-              ONVIF_Trigger_State = FALSE;
-              if (!ONVIF_Closes_Event) { //If we get a close event, then we know to expect them.
-                ONVIF_Closes_Event = TRUE;
+              Poll_Trigger_State = FALSE;
+              if (!Event_Poller_Closes_Event) { //If we get a close event, then we know to expect them.
+                Event_Poller_Closes_Event = TRUE;
                 Debug(1,"Setting ClosesEvent");
               }
             }
@@ -1894,11 +1690,9 @@ bool Monitor::Poll() {
     }
   }
   if (janus_enabled) {
-    if (janus_session.empty()) {
-      get_janus_session();
-    }
-    if (check_janus() == 0) {
-      add_to_janus();
+
+    if (Janus_Manager->check_janus() == 0) {
+      Janus_Manager->add_to_janus();
     }
   }
   std::this_thread::sleep_until(loop_start_time + std::chrono::seconds(5));
@@ -1953,8 +1747,8 @@ bool Monitor::Analyse() {
       Event::StringSetMap noteSetMap;
 
 #ifdef WITH_GSOAP
-      if (onvif_event_listener  && ONVIF_Healthy) {
-        if (ONVIF_Trigger_State) {
+      if (onvif_event_listener  && Event_Poller_Healthy) {
+        if (Poll_Trigger_State) {
           score += 9;
           Debug(1, "Triggered on ONVIF");
           Event::StringSet noteSet;
@@ -1962,10 +1756,10 @@ bool Monitor::Analyse() {
           noteSetMap[MOTION_CAUSE] = noteSet;
           cause += "ONVIF";
           //If the camera isn't going to send an event close, we need to close it here, but only after it has actually triggered an alarm.
-          if (!ONVIF_Closes_Event && state == ALARM)
-            ONVIF_Trigger_State = FALSE;
+          if (!Event_Poller_Closes_Event && state == ALARM)
+            Poll_Trigger_State = FALSE;
         }  // end ONVIF_Trigger
-      }  // end if (onvif_event_listener  && ONVIF_Healthy)
+      }  // end if (onvif_event_listener  && Event_Poller_Healthy)
 #endif
 
       // Specifically told to be on.  Setting the score here is not enough to trigger the alarm. Must jump directly to ALARM
@@ -3287,8 +3081,7 @@ int Monitor::PrimeCapture() {
   }  // end if rtsp_server
 
   //Poller Thread
-  if (onvif_event_listener || janus_enabled) {
-
+  if (onvif_event_listener || janus_enabled || use_Amcrest_API) {
     if (!Poller) {
       Poller = zm::make_unique<PollThread>(this);
     } else {
@@ -3338,10 +3131,6 @@ int Monitor::Close() {
   if (Poller) {
     Poller->Stop();
   }
-  if (curl_multi != nullptr) {
-    curl_multi_cleanup(curl_multi);
-    curl_multi = nullptr;
-  }
 #ifdef WITH_GSOAP
   if (onvif_event_listener && (soap != nullptr)) {
     Debug(1, "Tearing Down Onvif");
@@ -3354,11 +3143,11 @@ int Monitor::Close() {
     soap = nullptr;
   }  //End ONVIF
 #endif
-#if HAVE_LIBCURL  //Janus Teardown
+   //Janus Teardown
   if (janus_enabled && (purpose == CAPTURE)) {
-    remove_from_janus();
+    delete Janus_Manager;
   }
-#endif
+
 
   packetqueue.clear();
   if (audio_fifo) {
@@ -3495,289 +3284,3 @@ int SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char
   return soap_send_empty_response(soap, SOAP_OK);
 }
 #endif
-
-size_t Monitor::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
-    ((std::string*)userp)->append((char*)contents, size * nmemb);
-    return size * nmemb;
-}
-
-int Monitor::add_to_janus() {
-  std::string response;
-  std::string endpoint;
-  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
-    endpoint = config.janus_path;
-  } else {
-    endpoint = "127.0.0.1:8088/janus/";
-  }
-  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
-  std::string rtsp_username;
-  std::string rtsp_password;
-  std::string rtsp_path = "rtsp://";
-  std::size_t pos;
-  std::size_t pos2;
-  CURLcode res;
-
-  curl = curl_easy_init();
-  if (!curl) {
-    Error("Failed to init curl");
-    return -1;
-  }
-  //parse username and password
-  pos = path.find(":", 7);
-  if (pos == std::string::npos) return -1;
-  rtsp_username = path.substr(7, pos-7);
-
-  pos2 = path.find("@", pos);
-  if (pos2 == std::string::npos) return -1;
-
-  rtsp_password = path.substr(pos+1, pos2 - pos - 1);
-  rtsp_path += path.substr(pos2 + 1);
-
-  endpoint += "/";
-  endpoint += janus_session;
-
-  //Assemble our actual request
-  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
-  postData +=  "\"request\" : \"create\", \"admin_key\" : \"";
-  postData += config.janus_secret;
-  postData += "\", \"type\" : \"rtsp\", ";
-  postData += "\"url\" : \"";
-  postData += rtsp_path;
-  postData += "\", \"rtsp_user\" : \"";
-  postData += rtsp_username;
-  postData += "\", \"rtsp_pwd\" : \"";
-  postData += rtsp_password;
-  postData += "\", \"id\" : ";
-  postData += std::to_string(id);
-  if (janus_audio_enabled)  postData += ", \"audio\" : true";
-  postData += ", \"video\" : true}}";
-
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) {
-    Error("Failed to curl_easy_perform adding rtsp stream");
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-  if ((response.find("error") != std::string::npos) && ((response.find("No such session") != std::string::npos) || (response.find("No such handle") != std::string::npos))) {
-    janus_session = "";
-    curl_easy_cleanup(curl);
-    return -2;
-  }
-  //scan for missing session or handle id "No such session" "no such handle"
-
-  Debug(1,"Added stream to Janus: %s", response.c_str());
-  curl_easy_cleanup(curl);
-  return 0;
-}
-
-int Monitor::check_janus() {
-  std::string response;
-  std::string endpoint;
-  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
-    endpoint = config.janus_path;
-  } else {
-    endpoint = "127.0.0.1:8088/janus/";
-  }
-  std::string postData;
-  //std::size_t pos;
-  CURLcode res;
-
-  curl = curl_easy_init();
-  if(!curl) return -1;
-
-  endpoint += "/";
-  endpoint += janus_session;
-
-  //Assemble our actual request
-  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
-  postData +=  "\"request\" : \"info\", \"id\" : ";
-  postData += std::to_string(id);
-  postData += "}}";
-
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) { //may mean an error code thrown by Janus, because of a bad session
-    Warning("Attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
-    curl_easy_cleanup(curl);
-    janus_session = "";
-    return -1;
-  }
-
-  curl_easy_cleanup(curl);
-  Debug(1, "Queried for stream status: %s", response.c_str());
-  if ((response.find("error") != std::string::npos) && ((response.find("No such session") != std::string::npos) || (response.find("No such handle") != std::string::npos))) {
-  Warning("Janus Session timed out");
-    janus_session = "";
-    return -2;
-  } else if (response.find("No such mountpoint") != std::string::npos) {
-    Warning("Mountpoint Missing");
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-
-int Monitor::remove_from_janus() {
-  std::string response;
-  std::string endpoint;
-  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
-    endpoint = config.janus_path;
-  } else {
-    endpoint = "127.0.0.1:8088/janus/";
-  }
-  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
-  //std::size_t pos;
-  CURLcode res;
-
-  curl = curl_easy_init();
-  if(!curl) return -1;
-
-  endpoint += "/";
-  endpoint += janus_session;
-
-  //Assemble our actual request
-  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
-  postData +=  "\"request\" : \"destroy\", \"admin_key\" : \"";
-  postData += config.janus_secret;
-  postData += "\", \"id\" : ";
-  postData += std::to_string(id);
-  postData += "}}";
-
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) {
-    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-
-  Debug(1, "Removed stream from Janus: %s", response.c_str());
-  curl_easy_cleanup(curl);
-  return 0;
-}
-
-int Monitor::get_janus_session() {
-  std::string response;
-  std::string endpoint;
-  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
-    endpoint = config.janus_path;
-  } else {
-    endpoint = "127.0.0.1:8088/janus/";
-  }
-  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
-  std::size_t pos;
-  CURLcode res;
-  curl = curl_easy_init();
-  if(!curl) return -1;
-
-  //Start Janus API init. Need to get a session_id and handle_id
-  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK) {
-    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos)
-  {
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-  janus_session = response.substr(pos + 6, 16);
-
-  response = "";
-  endpoint += "/";
-  endpoint += janus_session;
-  postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
-  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
-  res = curl_easy_perform(curl);
-  if (res != CURLE_OK)
-  {
-    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-
-  pos = response.find("\"id\": ");
-  if (pos == std::string::npos)
-  {
-    curl_easy_cleanup(curl);
-    return -1;
-  }
-  janus_session += "/";
-  janus_session += response.substr(pos + 6, 16);
-  curl_easy_cleanup(curl);
-  return 1;
-} //get_janus_session
-
-int Monitor::start_Amcrest() {
-  //init the transfer and start it in multi-handle
-  int running_handles;
-  long response_code;
-  struct CURLMsg *m;
-  CURLMcode curl_error;
-  if (Amcrest_handle != nullptr) {  //potentially clean up the old handle
-    curl_multi_remove_handle(curl_multi, Amcrest_handle);
-    curl_easy_cleanup(Amcrest_handle);
-  }
-
-  std::string full_url = onvif_url;
-  if (full_url.back() != '/') full_url += '/';
-  full_url += "eventManager.cgi?action=attach&codes=[VideoMotion]";
-  Amcrest_handle = curl_easy_init();
-  if (!Amcrest_handle){
-    Warning("Handle is null!");
-    return -1;
-  }
-  curl_easy_setopt(Amcrest_handle, CURLOPT_URL, full_url.c_str());
-  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEDATA, &amcrest_response);
-  curl_easy_setopt(Amcrest_handle, CURLOPT_USERNAME, onvif_username.c_str());
-  curl_easy_setopt(Amcrest_handle, CURLOPT_PASSWORD, onvif_password.c_str());
-  curl_easy_setopt(Amcrest_handle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-  curl_error = curl_multi_add_handle(curl_multi, Amcrest_handle);
-    Warning("error of %i", curl_error);
-  curl_error = curl_multi_perform(curl_multi, &running_handles);
-  if (curl_error == CURLM_OK) {
-    curl_easy_getinfo(Amcrest_handle, CURLINFO_RESPONSE_CODE, &response_code);
-    int msgq = 0;
-    m = curl_multi_info_read(curl_multi, &msgq);
-    if (m && (m->msg == CURLMSG_DONE)) {
-      Warning("Libcurl exited Early: %i", m->data.result);
-    }
-
-    curl_multi_wait(curl_multi, NULL, 0, 300, NULL);
-    curl_error = curl_multi_perform(curl_multi, &running_handles);
-  }
-
-  if ((curl_error == CURLM_OK) && (running_handles > 0)) {
-    ONVIF_Healthy = TRUE;
-  } else {
-    Warning("Response: %s", amcrest_response.c_str());
-    Warning("Seeing %i streams, and error of %i, url: %s", running_handles, curl_error, full_url.c_str());
-    curl_easy_getinfo(Amcrest_handle, CURLINFO_OS_ERRNO, &response_code);
-    Warning("Response code: %lu", response_code);
-  }
-
-return 0;
-}
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 4ce0a9b08..30bc57d87 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -93,7 +93,7 @@ public:
   } Orientation;
 
   typedef enum {
-    DEINTERLACE_DISABLED = 0x00000000, 
+    DEINTERLACE_DISABLED = 0x00000000,
     DEINTERLACE_FOUR_FIELD_SOFT = 0x00001E04,
     DEINTERLACE_FOUR_FIELD_MEDIUM = 0x00001404,
     DEINTERLACE_FOUR_FIELD_HARD = 0x00000A04,
@@ -154,12 +154,12 @@ protected:
     uint32_t last_frame_score;  /* +60   */
     uint32_t  audio_frequency;  /* +64   */
     uint32_t  audio_channels;   /* +68   */
-    /* 
+    /*
      ** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
      ** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
-     ** Because startup_time is 64bit it may be aligned to a 64bit boundary.  So it's offset SHOULD be a multiple 
+     ** Because startup_time is 64bit it may be aligned to a 64bit boundary.  So it's offset SHOULD be a multiple
      ** of 8. Add or delete epadding's to achieve this.
-     */  
+     */
     union {                     /* +72   */
       time_t startup_time;			/* When the zmc process started.  zmwatch uses this to see how long the process has been running without getting any images */
       uint64_t extrapad1;
@@ -256,7 +256,49 @@ protected:
       bool hasAlarmed();
   };
 
+  class AmcrestAPI {
   protected:
+    Monitor *parent;
+    std::string amcrest_response;
+    CURLM *curl_multi = nullptr;
+    CURL *Amcrest_handle = nullptr;
+    static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
+
+  public:
+    AmcrestAPI( Monitor *parent_);
+    ~AmcrestAPI();
+    int API_Connect();
+    void WaitForMessage();
+    bool Amcrest_Alarmed;
+    int start_Amcrest();
+  };
+
+  class JanusManager {
+  protected:
+    Monitor *parent;
+    CURL *curl = nullptr;
+    //helper class for CURL
+    static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
+    bool Janus_Healthy;
+    std::string janus_session;
+    std::string janus_handle;
+    std::string janus_endpoint;
+    std::string stream_key;
+    std::string rtsp_username;
+    std::string rtsp_password;
+    std::string rtsp_path;
+
+  public:
+    JanusManager(Monitor *parent_);
+    ~JanusManager();
+    int add_to_janus();
+    int check_janus();
+    int remove_from_janus();
+    int get_janus_session();
+    int get_janus_handle();
+    int get_janus_plugin();
+    std::string get_stream_key();
+  };
 
 
   // These are read from the DB and thereafter remain unchanged
@@ -285,7 +327,6 @@ protected:
   std::string onvif_username;
   std::string onvif_password;
   std::string onvif_options;
-  std::string amcrest_response;
   bool        onvif_event_listener;
   bool        use_Amcrest_API;
 
@@ -438,9 +479,12 @@ protected:
   std::string diag_path_delta;
 
   //ONVIF
-  bool ONVIF_Trigger_State; //Re-using some variables for Amcrest API support
-  bool ONVIF_Healthy;
-  bool ONVIF_Closes_Event;
+  bool Poll_Trigger_State;
+  bool Event_Poller_Healthy;
+  bool Event_Poller_Closes_Event;
+
+  JanusManager *Janus_Manager;
+  AmcrestAPI *Amcrest_Manager;
 
 #ifdef WITH_GSOAP
   struct soap *soap = nullptr;
@@ -452,17 +496,6 @@ protected:
   void set_credentials(struct soap *soap);
 #endif
 
-  //curl stuff
-  CURL *curl = nullptr;
-  CURLM *curl_multi = nullptr;
-  CURL *Amcrest_handle = nullptr;
-  int start_Amcrest();
-  //helper class for CURL
-  static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
-  int add_to_janus();
-  int remove_from_janus();
-  int get_janus_session();
-  std::string janus_session;
 
   // Used in check signal
   uint8_t red_val;
@@ -530,11 +563,9 @@ public:
     return onvif_event_listener;
   }
   int check_janus(); //returns 1 for healthy, 0 for success but missing stream, negative for error.
-#ifdef WITH_GSOAP
-  bool OnvifHealthy() {
-    return ONVIF_Healthy;
+  bool EventPollerHealthy() {
+    return Event_Poller_Healthy;
   }
-#endif
   inline const char *EventPrefix() const { return event_prefix.c_str(); }
   inline bool Ready() const {
     if ( image_count >= ready_count ) {
@@ -583,7 +614,7 @@ public:
   void SetVideoWriterStartTime(SystemTimePoint t) {
     video_store_data->recording = zm::chrono::duration_cast<timeval>(t.time_since_epoch());
   }
- 
+
   unsigned int GetPreEventCount() const { return pre_event_count; };
   int32_t GetImageBufferCount() const { return image_buffer_count; };
   State GetState() const { return (State)shared_data->state; }
diff --git a/src/zm_monitor_amcrest.cpp b/src/zm_monitor_amcrest.cpp
new file mode 100644
index 000000000..04af8734c
--- /dev/null
+++ b/src/zm_monitor_amcrest.cpp
@@ -0,0 +1,126 @@
+//
+// ZoneMinder Monitor::AmcrestAPI Class Implementation, $Date$, $Revision$
+// Copyright (C) 2022 Jonathan Bennett
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#include "zm_monitor.h"
+
+
+Monitor::AmcrestAPI::AmcrestAPI(Monitor *parent_) {
+  parent = parent_;
+  curl_multi = curl_multi_init();
+  start_Amcrest();
+}
+
+Monitor::AmcrestAPI::~AmcrestAPI() {
+  if (Amcrest_handle != nullptr) {  //potentially clean up the old handle
+    curl_multi_remove_handle(curl_multi, Amcrest_handle);
+    curl_easy_cleanup(Amcrest_handle);
+  }
+  if (curl_multi != nullptr) curl_multi_cleanup(curl_multi);
+}
+
+int Monitor::AmcrestAPI::start_Amcrest() {
+  //init the transfer and start it in multi-handle
+  int running_handles;
+  long response_code;
+  struct CURLMsg *m;
+  CURLMcode curl_error;
+  if (Amcrest_handle != nullptr) {  //potentially clean up the old handle
+    curl_multi_remove_handle(curl_multi, Amcrest_handle);
+    curl_easy_cleanup(Amcrest_handle);
+  }
+
+  std::string full_url = parent->onvif_url;
+  if (full_url.back() != '/') full_url += '/';
+  full_url += "eventManager.cgi?action=attach&codes=[VideoMotion]";
+  Amcrest_handle = curl_easy_init();
+  if (!Amcrest_handle){
+    Warning("Handle is null!");
+    return -1;
+  }
+  curl_easy_setopt(Amcrest_handle, CURLOPT_URL, full_url.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(Amcrest_handle, CURLOPT_WRITEDATA, &amcrest_response);
+  curl_easy_setopt(Amcrest_handle, CURLOPT_USERNAME, parent->onvif_username.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_PASSWORD, parent->onvif_password.c_str());
+  curl_easy_setopt(Amcrest_handle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+  curl_error = curl_multi_add_handle(curl_multi, Amcrest_handle);
+    if (curl_error != CURLM_OK) {
+      Warning("error of %i", curl_error);
+    }
+  curl_error = curl_multi_perform(curl_multi, &running_handles);
+  if (curl_error == CURLM_OK) {
+    curl_easy_getinfo(Amcrest_handle, CURLINFO_RESPONSE_CODE, &response_code);
+    int msgq = 0;
+    m = curl_multi_info_read(curl_multi, &msgq);
+    if (m && (m->msg == CURLMSG_DONE)) {
+      Warning("Libcurl exited Early: %i", m->data.result);
+    }
+
+    curl_multi_wait(curl_multi, NULL, 0, 300, NULL);
+    curl_error = curl_multi_perform(curl_multi, &running_handles);
+  }
+
+  if ((curl_error == CURLM_OK) && (running_handles > 0)) {
+    parent->Event_Poller_Healthy = TRUE;
+  } else {
+    Warning("Response: %s", amcrest_response.c_str());
+    Warning("Seeing %i streams, and error of %i, url: %s", running_handles, curl_error, full_url.c_str());
+    curl_easy_getinfo(Amcrest_handle, CURLINFO_OS_ERRNO, &response_code);
+    Warning("Response code: %lu", response_code);
+  }
+
+return 0;
+}
+
+void Monitor::AmcrestAPI::WaitForMessage() {
+  int open_handles;
+  int transfers;
+  curl_multi_perform(curl_multi, &open_handles);
+  if (open_handles == 0) {
+    start_Amcrest(); //http transfer ended, need to restart.
+  } else {
+    curl_multi_wait(curl_multi, NULL, 0, 5000, &transfers); //wait for max 5 seconds for event.
+    if (transfers > 0) { //have data to deal with
+      curl_multi_perform(curl_multi, &open_handles); //actually grabs the data, populates amcrest_response
+      if (amcrest_response.find("action=Start") != std::string::npos) {
+      //Event Start
+      Debug(1,"Triggered on ONVIF");
+        if (!parent->Poll_Trigger_State) {
+          Debug(1,"Triggered Event");
+          parent->Poll_Trigger_State = TRUE;
+        }
+      } else if (amcrest_response.find("action=Stop") != std::string::npos){
+        Debug(1, "Triggered off ONVIF");
+        parent->Poll_Trigger_State = FALSE;
+        if (!parent->Event_Poller_Closes_Event) { //If we get a close event, then we know to expect them.
+          parent->Event_Poller_Closes_Event = TRUE;
+          Debug(1,"Setting ClosesEvent");
+        }
+      }
+      amcrest_response.clear(); //We've dealt with the message, need to clear the queue
+    }
+  }
+  return;
+}
+
+size_t Monitor::AmcrestAPI::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
+{
+    ((std::string*)userp)->append((char*)contents, size * nmemb);
+    return size * nmemb;
+}
diff --git a/src/zm_monitor_janus.cpp b/src/zm_monitor_janus.cpp
new file mode 100644
index 000000000..2fe9b3f26
--- /dev/null
+++ b/src/zm_monitor_janus.cpp
@@ -0,0 +1,316 @@
+//
+// ZoneMinder Monitor::JanusManager Class Implementation, $Date$, $Revision$
+// Copyright (C) 2022 Jonathan Bennett
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#include "zm_monitor.h"
+
+
+Monitor::JanusManager::JanusManager(Monitor *parent_) { //constructor takes care of init and calls add_to
+  std::string response;
+  std::size_t pos;
+  parent = parent_;
+  if ((config.janus_path != nullptr) && (config.janus_path[0] != '\0')) {
+    janus_endpoint = config.janus_path; //TODO: strip trailing /
+  } else {
+    janus_endpoint = "127.0.0.1:8088/janus";
+  }
+  if (janus_endpoint.back() == '/') janus_endpoint.pop_back(); //remove the trailing slash if present
+  std::size_t pos2 = parent->path.find("@", pos);
+  if (pos2 != std::string::npos) { //If we find an @ symbol, we have a username/password. Otherwise, passwordless login.
+
+    std::size_t pos = parent->path.find(":", 7); //Search for the colon, but only after the RTSP:// text.
+    if (pos == std::string::npos) throw std::runtime_error("Cannot Parse URL for Janus."); //Looks like an invalid url
+    rtsp_username = parent->path.substr(7, pos-7);
+
+    rtsp_password = parent->path.substr(pos+1, pos2 - pos - 1);
+    rtsp_path = "RTSP://";
+    rtsp_path += parent->path.substr(pos2 + 1);
+
+  } else {
+    rtsp_username = "";
+    rtsp_password = "";
+    rtsp_path = parent->path;
+  }
+}
+
+Monitor::JanusManager::~JanusManager() {
+  if (janus_session.empty()) get_janus_session();
+  if (janus_handle.empty()) get_janus_handle();
+
+  std::string response;
+  std::string endpoint;
+
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  //std::size_t pos;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(!curl) return;
+
+  endpoint = janus_endpoint;
+  endpoint += "/";
+  endpoint += janus_session;
+  endpoint += "/";
+  endpoint += janus_handle;
+
+  //Assemble our actual request
+  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"destroy\", \"admin_key\" : \"";
+  postData += config.janus_secret;
+  postData += "\", \"id\" : ";
+  postData += std::to_string(parent->id);
+  postData += "}}";
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return;
+  }
+
+  Debug(1, "Removed stream from Janus: %s", response.c_str());
+  curl_easy_cleanup(curl);
+  return;
+}
+
+
+
+int Monitor::JanusManager::check_janus() {
+  if (janus_session.empty()) get_janus_session();
+  if (janus_handle.empty()) get_janus_handle();
+
+  std::string response;
+  std::string endpoint = janus_endpoint;
+  std::string postData;
+  //std::size_t pos;
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if(!curl) return -1;
+
+  endpoint += "/";
+  endpoint += janus_session;
+  endpoint += "/";
+  endpoint += janus_handle;
+
+  //Assemble our actual request
+  postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"info\", \"id\" : ";
+  postData += std::to_string(parent->id);
+  postData += "}}";
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) { //may mean an error code thrown by Janus, because of a bad session
+    Warning("Attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    janus_session = "";
+    janus_handle = "";
+    return -1;
+  }
+
+  curl_easy_cleanup(curl);
+  Debug(1, "Queried for stream status: %s", response.c_str());
+  if (response.find("\"janus\": \"error\"") != std::string::npos) {
+    if (response.find("No such session") != std::string::npos) {
+      Warning("Janus Session timed out");
+      janus_session = "";
+      return -2;
+    } else if (response.find("No such handle") != std::string::npos) {
+      Warning("Janus Handle timed out");
+      janus_handle = "";
+      return -2;
+    }
+  } else if (response.find("No such mountpoint") != std::string::npos) {
+    Warning("Mountpoint Missing");
+    return 0;
+  }
+  return 1;
+}
+
+int Monitor::JanusManager::add_to_janus() {
+  if (janus_session.empty()) get_janus_session();
+  if (janus_handle.empty()) get_janus_handle();
+
+  std::string response;
+  std::string endpoint = janus_endpoint;
+
+  CURLcode res;
+
+  curl = curl_easy_init();
+  if (!curl) {
+    Error("Failed to init curl");
+    return -1;
+  }
+
+  endpoint += "/";
+  endpoint += janus_session;
+  endpoint += "/";
+  endpoint += janus_handle;
+
+  //Assemble our actual request
+  std::string postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
+  postData +=  "\"request\" : \"create\", \"admin_key\" : \"";
+  postData += config.janus_secret;
+  postData += "\", \"type\" : \"rtsp\", ";
+  postData += "\"url\" : \"";
+  postData += rtsp_path;
+  if (rtsp_username != "") {
+    postData += "\", \"rtsp_user\" : \"";
+    postData += rtsp_username;
+    postData += "\", \"rtsp_pwd\" : \"";
+    postData += rtsp_password;
+  }
+  postData += "\", \"id\" : ";
+  postData += std::to_string(parent->id);
+  if (parent->janus_audio_enabled)  postData += ", \"audio\" : true";
+  postData += ", \"video\" : true}}";
+  Warning("Sending %s to %s", postData.c_str(), endpoint.c_str());
+
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) {
+    Error("Failed to curl_easy_perform adding rtsp stream");
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+  if (response.find("\"janus\": \"error\"") != std::string::npos) {
+    if (response.find("No such session") != std::string::npos) {
+      Warning("Janus Session timed out");
+      janus_session = "";
+      return -2;
+    } else if (response.find("No such handle") != std::string::npos) {
+      Warning("Janus Handle timed out");
+      janus_handle = "";
+      return -2;
+    }
+  }
+  //scan for missing session or handle id "No such session" "no such handle"
+
+  Debug(1,"Added stream to Janus: %s", response.c_str());
+  curl_easy_cleanup(curl);
+  return 0;
+}
+
+
+size_t Monitor::JanusManager::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
+{
+    ((std::string*)userp)->append((char*)contents, size * nmemb);
+    return size * nmemb;
+}
+
+/*
+void Monitor::JanusManager::generateKey()
+{
+    const std::string CHARACTERS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    std::random_device random_device;
+    std::mt19937 generator(random_device());
+    std::uniform_int_distribution<> distribution(0, CHARACTERS.size() - 1);
+
+    std::string random_string;
+
+    for (std::size_t i = 0; i < 16; ++i)
+    {
+        random_string += CHARACTERS[distribution(generator)];
+    }
+
+    stream_key = random_string;
+}
+*/
+
+
+int Monitor::JanusManager::get_janus_session() {
+  janus_session = "";
+  std::string endpoint = janus_endpoint;
+
+  std::string response;
+
+  std::string postData = "{\"janus\" : \"create\", \"transaction\" : \"randomString\"}";
+  std::size_t pos;
+  CURLcode res;
+  curl = curl_easy_init();
+  if(!curl) return -1;
+
+  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK) {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos)
+  {
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+  janus_session = response.substr(pos + 6, 16);
+  curl_easy_cleanup(curl);
+  return 1;
+
+} //get_janus_session
+
+int Monitor::JanusManager::get_janus_handle() {
+  std::string response = "";
+  std::string endpoint = janus_endpoint;
+  std::size_t pos;
+
+  CURLcode res;
+  curl = curl_easy_init();
+  if(!curl) return -1;
+
+  endpoint += "/";
+  endpoint += janus_session;
+  std::string postData = "{\"janus\" : \"attach\", \"plugin\" : \"janus.plugin.streaming\", \"transaction\" : \"randomString\"}";
+  curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postData.c_str());
+  res = curl_easy_perform(curl);
+  if (res != CURLE_OK)
+  {
+    Warning("Libcurl attempted %s got %s", endpoint.c_str(), curl_easy_strerror(res));
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+
+  pos = response.find("\"id\": ");
+  if (pos == std::string::npos)
+  {
+    curl_easy_cleanup(curl);
+    return -1;
+  }
+  janus_handle = response.substr(pos + 6, 16);
+  curl_easy_cleanup(curl);
+  return 1;
+} //get_janus_handle

From b3092f2f591f97e453d7b7acf1e5843c5a1bb3c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 17:31:37 -0500
Subject: [PATCH 411/501] Add special handling for skip_locked, as it is a
 checkbox.  Don't update REQUEST['Id'] on execute so we can redirect to the
 original filter.

---
 web/includes/actions/filter.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php
index 058a004ed..4f627b0b0 100644
--- a/web/includes/actions/filter.php
+++ b/web/includes/actions/filter.php
@@ -48,6 +48,7 @@ if (isset($_REQUEST['object']) and ($_REQUEST['object'] == 'filter')) {
       $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
       $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
       $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
+      $_REQUEST['filter']['Query']['skip_locked'] = isset($_REQUEST['filter']['Query']['skip_locked']) ? validInt($_REQUEST['filter']['Query']['skip_locked']) : 0;
       
       $_REQUEST['filter']['AutoCopy'] = empty($_REQUEST['filter']['AutoCopy']) ? 0 : 1;
       $_REQUEST['filter']['AutoCopyTo'] = empty($_REQUEST['filter']['AutoCopyTo']) ? 0 : $_REQUEST['filter']['AutoCopyTo'];
@@ -80,21 +81,23 @@ if (isset($_REQUEST['object']) and ($_REQUEST['object'] == 'filter')) {
           $error_message = $filter->get_last_error();
           return;
         }
-        // We update the request id so that the newly saved filter is auto-selected
-        $_REQUEST['Id'] = $filter->Id();
+        if ($action == 'Save' or $action == 'SaveAs' ) {
+          // We update the request id so that the newly saved filter is auto-selected
+          $_REQUEST['Id'] = $filter->Id();
+        }
       } # end if changes
 
       if ($action == 'execute') {
         $filter->execute();
         if (count($changes)) {
           $filter->delete();
-					$filter->Id(null);
+					$filter->Id($_REQUEST['Id']);
         }
       } else if ($filter->Background()) {
         $filter->control('start');
       }
       global $redirect;
-      $redirect = '?view=filter'.$filter->querystring('filter', '&');
+      $redirect = '?view=filter&Id='.$_REQUEST['Id'].$filter->querystring('filter', '&');
 
     } else if ($action == 'control') {
       if ( $_REQUEST['command'] == 'start'

From ac909d404aac7716b55c9c593fabe5b3d2d32142 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Feb 2022 18:19:01 -0500
Subject: [PATCH 412/501] Use the reported move with x=0 y=0 for autostop in
 addition to old stop movement code

---
 .../ZoneMinder/lib/ZoneMinder/Control/Netcat.pm   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
index f10b7aabb..8043eedad 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
@@ -194,7 +194,6 @@ sub getCamParams {
   }
 }
 
-#autoStop
 #This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
 sub autoStop {
   my $self = shift;
@@ -202,13 +201,19 @@ sub autoStop {
 
   if ( $autostop ) {
     Debug('Auto Stop');
-    my $cmd = 'onvif/PTZ';
-    my $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><PanTilt>true</PanTilt><Zoom>false</Zoom></Stop></s:Body></s:Envelope>';
-    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
     usleep($autostop);
+
+    my $cmd = 'onvif/PTZ';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">'.((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '').'<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><Velocity><PanTilt x="0" y="0" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    $self->sendCmd($cmd, $msg, $content_type);
+
+    # Reported to not work, so superceded by the cmd above
+    $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><PanTilt>true</PanTilt><Zoom>false</Zoom></Stop></s:Body></s:Envelope>';
     $self->sendCmd($cmd, $msg, $content_type);
   }
-}
+} # end sub autoStop
 
 # Reset the Camera
 sub reset {

From 02d896abe2e5681ad2a1bc8f9cffaf2b4f78203c Mon Sep 17 00:00:00 2001
From: r01k <srmycall@yahoo.com>
Date: Fri, 4 Feb 2022 22:19:15 -0500
Subject: [PATCH 413/501] Fixed in export.php "Class 'Filter' not found" and
 construction of SQL query with wrong syntax

---
 web/skins/classic/views/export.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 306a61083..ab444e551 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -86,7 +86,7 @@ $limitQuery = '';
 if ( $user['MonitorIds'] ) {
   $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
   $eventsSql .= $user_monitor_ids;
-} else {
+} else if ( !isset($_REQUEST['filter']) ) {
   $eventsSql .= ' 1';
 }
 
@@ -98,7 +98,7 @@ if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
   $eventsValues += $_REQUEST['eids'];
 } else if ( isset($_REQUEST['filter']) ) {
   parseSort();
-  $filter = Filter::parse($_REQUEST['filter']);
+  $filter = ZM\Filter::parse($_REQUEST['filter']);
   $filterQuery = $filter->querystring();
 
   if ( $filter->sql() ) {

From 69053424cdfa00af7e6ab9fc036149a7cf0487ba Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 6 Feb 2022 19:06:35 -0500
Subject: [PATCH 414/501] When adding a new monitor, ModelId and ManufacturerId
 are not defined, so handle that

---
 web/includes/Monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 9c7d8d25c..e3599bbf4 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -698,7 +698,7 @@ class Monitor extends ZM_Object {
   }
   function Model() {
     if (!property_exists($this, 'Model')) {
-      if ($this->{'ModelId'}) {
+      if (property_exists($this, 'ModelId') and $this->{'ModelId'}) {
         $this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId()));
         if (!$this->{'Model'})
           $this->{'Model'} = new Model();
@@ -710,7 +710,7 @@ class Monitor extends ZM_Object {
   }
   function Manufacturer() {
     if (!property_exists($this, 'Manufacturer')) {
-      if ($this->{'ManufacturerId'}) {
+      if (property_exists($this, 'ManufacturerId') and $this->{'ManufacturerId'}) {
         $this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId()));
         if (!$this->{'Manufacturer'})
           $this->{'Manufacturer'} = new Manufacturer();

From 5078eecdfd867be58c8e9f38c3277bcadbd458e0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Feb 2022 12:31:31 -0500
Subject: [PATCH 415/501] Add in get_networks and get_subnets as utilities to
 parse devices and networks in preparation for scanning/probing

---
 web/includes/functions.php | 66 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index e346ceb34..bfa4b9746 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2414,4 +2414,70 @@ function i18n() {
 
   return implode('-', $string);
 }
+
+function get_networks() {
+  $interfaces = array();
+
+  exec('ip link', $output, $status);
+  if ( $status ) {
+    $html_output = implode('<br/>', $output);
+    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
+  } else {
+    foreach ( $output as $line ) {
+      if ( preg_match('/^\d+: ([[:alnum:]]+):/', $line, $matches ) ) {
+        if ( $matches[1] != 'lo' ) {
+          $interfaces[$matches[1]] = $matches[1];
+        } else {
+          ZM\Debug("No match for $line");
+        }
+      }
+    }
+  }
+  $routes = array();
+  exec('ip route', $output, $status);
+  if ( $status ) {
+    $html_output = implode('<br/>', $output);
+    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
+  } else {
+    foreach ( $output as $line ) {
+      if ( preg_match('/^default via [.[:digit:]]+ dev ([[:alnum:]]+)/', $line, $matches) ) {
+        $interfaces['default'] = $matches[1];
+      } else if ( preg_match('/^([.[:digit:]]+\/[[:digit:]]+) dev ([[:alnum:]]+)/', $line, $matches) ) {
+        $interfaces[$matches[2]] .= ' ' . $matches[1];
+        ZM\Debug("Matched $line: $matches[2] .= $matches[1]");
+      } else {
+        ZM\Debug("Didn't match $line");
+      }
+    } # end foreach line of output
+  }
+  return $interfaces;
+}
+
+# Returns an array of subnets like 192.168.1.0/24 for a given interface.
+# Will ignore mdns networks.
+
+function get_subnets($interface) {
+  $subnets = array();
+  exec('ip route', $output, $status);
+  if ( $status ) {
+    $html_output = implode('<br/>', $output); 
+    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
+  } else {
+    foreach ($output as $line) {
+      if (preg_match('/^([.[:digit:]]+\/[[:digit:]]+) dev ([[:alnum:]]+)/', $line, $matches)) {
+        if ($matches[1] == '169.254.0.0/16') {
+          # Ignore mdns
+        } else if ($matches[2] == $interface) {
+          $subnets[] = $matches[1];
+        } else {
+          ZM\Debug("Wrong interface $matches[1] != $interface");
+        }
+      } else {
+        ZM\Debug("Didn't match $line");
+      }
+    } # end foreach line of output
+  }
+  return $subnets;
+}
+
 ?>

From d056f15e54590496c779ec56b49dfd12b62f68d5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Feb 2022 12:32:16 -0500
Subject: [PATCH 416/501] Add arp-scan to executable for use in network probing
 for cameras.

---
 CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a65f85eb..6337e50c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ mark_as_advanced(
   ZM_TARGET_DISTRO
   ZM_PATH_MAP
   ZM_PATH_ARP
+  ZM_PATH_ARP_SCAN
   ZM_CONFIG_DIR
   ZM_CONFIG_SUBDIR
   ZM_SYSTEMD
@@ -145,6 +146,8 @@ set(ZM_PATH_MAP "/dev/shm" CACHE PATH
   "Location to save mapped memory files, default: /dev/shm")
 set(ZM_PATH_ARP "" CACHE PATH
   "Full path to compatible arp binary. Leave empty for automatic detection.")
+set(ZM_PATH_ARP_SCAN "" CACHE PATH
+  "Full path to compatible scan_arp binary. Leave empty for automatic detection.")
 set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH
   "Location of ZoneMinder configuration, default system config directory")
 set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH
@@ -641,6 +644,18 @@ if(ZM_PATH_ARP STREQUAL "")
   endif()
 endif()
 
+# Find the path to an arp-scan compatible executable
+if(ZM_PATH_ARP_SCAN STREQUAL "")
+  find_program(ARP_SCAN_EXECUTABLE arp-scan)
+  if(ARP_SCAN_EXECUTABLE)
+    set(ZM_PATH_ARP_SCAN "${ARP_SCAN_EXECUTABLE}")
+    mark_as_advanced(ARP_SCAN_EXECUTABLE)
+  endif()
+  if(ARP_SCAN_EXECUTABLE-NOTFOUND)
+    message(WARNING "Unable to find a compatible arp-scan binary. Monitor probe will be less powerful.")
+  endif()
+endif()
+
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
 set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf")

From 2b468fa11591851352dfe18a67b199bddad8dd4e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Feb 2022 12:32:50 -0500
Subject: [PATCH 417/501] Add policykit rules for arp-scan

---
 misc/CMakeLists.txt                    |  4 ++++
 misc/com.zoneminder.arp-scan.policy.in | 21 +++++++++++++++++++++
 misc/com.zoneminder.arp-scan.rules.in  |  7 +++++++
 3 files changed, 32 insertions(+)
 create mode 100644 misc/com.zoneminder.arp-scan.policy.in
 create mode 100644 misc/com.zoneminder.arp-scan.rules.in

diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index e51636771..c705b63bb 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -7,6 +7,8 @@ configure_file(logrotate.conf.in "${CMAKE_CURRENT_BINARY_DIR}/logrotate.conf" @O
 configure_file(syslog.conf.in "${CMAKE_CURRENT_BINARY_DIR}/syslog.conf" @ONLY)
 configure_file(com.zoneminder.systemctl.policy.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" @ONLY)
 configure_file(com.zoneminder.systemctl.rules.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" @ONLY)
+configure_file(com.zoneminder.arp-scan.policy.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.arp-scan.policy" @ONLY)
+configure_file(com.zoneminder.arp-scan.rules.in "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.arp-scan.rules" @ONLY)
 configure_file(zoneminder.service.in "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.service" @ONLY)
 configure_file(zoneminder-tmpfiles.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zoneminder-tmpfiles.conf" @ONLY)
 configure_file(zoneminder.desktop.in "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.desktop" @ONLY)
@@ -19,6 +21,8 @@ configure_file(zm-sudo.in "${CMAKE_CURRENT_BINARY_DIR}/zm-sudo" @ONLY)
 if(WITH_SYSTEMD)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.arp-scan.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.arp-scan.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
 endif()
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
diff --git a/misc/com.zoneminder.arp-scan.policy.in b/misc/com.zoneminder.arp-scan.policy.in
new file mode 100644
index 000000000..7b5b6043e
--- /dev/null
+++ b/misc/com.zoneminder.arp-scan.policy.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>The ZoneMinder Project</vendor>
+  <vendor_url>http://www.zoneminder.com/</vendor_url>
+
+  <action id="com.zoneminder.policykit.pkexec.run-arp-scan">
+    <description>Allow the ZoneMinder webuser to run arp-scan</description>
+    <message>The ZoneMinder webuser is trusted to run arp-scan</message>
+    <defaults>
+      <allow_any>yes</allow_any>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/arp-scan</annotate>
+  </action>
+
+</policyconfig>
diff --git a/misc/com.zoneminder.arp-scan.rules.in b/misc/com.zoneminder.arp-scan.rules.in
new file mode 100644
index 000000000..74ac25af0
--- /dev/null
+++ b/misc/com.zoneminder.arp-scan.rules.in
@@ -0,0 +1,7 @@
+polkit.addRule(function(action, subject) {
+    if (action.id == "com.zoneminder.policykit.pkexec.run-arp-scan" &&
+        subject.user != "@WEB_USER@") {
+        return polkit.Result.NO;
+    }
+
+});

From 2c23e18ea0071268b376b128c4fdd5a8625bbba1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Feb 2022 12:33:05 -0500
Subject: [PATCH 418/501] Add system path for arp-scan

---
 conf.d/01-system-paths.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf.d/01-system-paths.conf.in b/conf.d/01-system-paths.conf.in
index 277f63b70..523a8c0c8 100644
--- a/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@@ -47,5 +47,9 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 # ZoneMinder will find the arp binary automatically on most systems
 ZM_PATH_ARP="@ZM_PATH_ARP@"
 
+# Full path to optional arp-scan binary
+# ZoneMinder will find the arp-scan binary automatically on most systems
+ZM_PATH_ARP_SCAN="@ZM_PATH_ARP_SCAN@"
+
 #Full path to shutdown binary
 ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"

From 33473eac6aa4797d50d456292c6699f80b356caf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 7 Feb 2022 12:33:53 -0500
Subject: [PATCH 419/501] Add arp-scan as a tool for getting list of devices on
 network.  Add an interface specifier to monitor probe just like on
 onvif-probe.  Rough in support for Hikvision cameras

---
 web/skins/classic/views/js/monitorprobe.js |   4 +
 web/skins/classic/views/monitorprobe.php   | 128 ++++++++++++++++++---
 web/skins/classic/views/onvifprobe.php     |  37 +-----
 3 files changed, 121 insertions(+), 48 deletions(-)

diff --git a/web/skins/classic/views/js/monitorprobe.js b/web/skins/classic/views/js/monitorprobe.js
index 96f0c701e..1ecd93d23 100644
--- a/web/skins/classic/views/js/monitorprobe.js
+++ b/web/skins/classic/views/js/monitorprobe.js
@@ -11,3 +11,7 @@ function configureButtons( element ) {
   var form = element.form;
   form.saveBtn.disabled = (form.probe.selectedIndex==0);
 }
+
+function changeInterface(element) {
+  element.form.submit();
+}
diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index 7bb15a68d..f9d47fcad 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -194,6 +194,21 @@ function probeActi($ip) {
   return $camera;
 }
 
+function probeHikvision($ip) {
+  $url = 'rtsp://admin:password@'.$ip.':554/Streaming/Channels/101?transportmode=unicast';
+  $camera = array(
+    'model' => 'Unknown Hikvision Camera',
+    'monitor' =>  array(
+      'Type'  =>  'FFmpeg',
+      'Path' => $url,
+      'Colours' =>  4,
+      'Width'   =>  1920,
+      'Height'  =>  1080,
+    ),
+  );
+  return $camera;
+}
+
 function probeVivotek($ip) {
   $url = 'http://'.$ip.'/cgi-bin/viewer/getparam.cgi';
   $camera = array(
@@ -244,20 +259,60 @@ function probeWansview($ip) {
   return $camera;
 }
 
-function probeNetwork() {
-  $cameras = array();
+function get_arp_results() {
+  $results = array();
   $arp_command = ZM_PATH_ARP;
   $result = explode(' ', $arp_command);
   if ( !is_executable($result[0]) ) {
     ZM\Error('ARP compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP points to a valid arp tool.');
-    return $cameras;
+    return $results;
+  }
+  if (count($result)==1) {
+    $arp_command .= ' -n';
   }
 
   $result = exec(escapeshellcmd($arp_command), $output, $status);
-  if ( $status ) {
+  if ($status) {
     ZM\Error("Unable to probe network cameras, status is '$status'");
-    return $cameras;
+    return $results;
   }
+  foreach ($output as $line) {
+    if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) ) {
+      ZM\Debug("Didn't match preg $line");
+      continue;
+    }
+    $results[$matches[2]] = $matches[1]; // results[mac] = ip
+  }
+  return $results;
+}
+
+function get_arp_scan_results($network) {
+  ZM\Debug("arp-scanning $network");
+  $results = array();
+  $arp_scan_command = ZM_PATH_ARP_SCAN;
+  $result = explode(' ', $arp_scan_command);
+  if (!is_executable($result[0])) {
+    ZM\Error('arp-scan compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP_SCAN points to a valid arp-scan tool.');
+    return $results;
+  }
+  $arp_scan_command = '/usr/bin/pkexec '.ZM_PATH_ARP_SCAN.' '.$network.' 2>&1';
+  $result = exec(escapeshellcmd($arp_scan_command), $output, $status);
+  if ($status) {
+    ZM\Error("Unable to probe network cameras, command was $arp_scan_command, status is '$status' output: ".implode(PHP_EOL, $output));
+    return $results;
+  }
+  foreach ($output as $line) {
+    if (preg_match('/(\d+\.\d+\.\d+\.\d+)\s+(([0-9a-f]{2}:){5})/', $line, $matches)) {
+      $results[$matches[2]] = $matches[1];
+    } else {
+      ZM\Debug("Didn't match preg $line");
+    }
+  }
+  return $results;
+}
+
+function probeNetwork() {
+  $cameras = array();
 
   $monitors = array();
   foreach ( dbFetchAll("SELECT `Id`, `Name`, `Host` FROM `Monitors` WHERE `Type` = 'Remote' ORDER BY `Host`") as $monitor ) {
@@ -269,25 +324,26 @@ function probeNetwork() {
       $monitors[gethostbyname($monitor['Host'])] = $monitor;
     }
   }
+  foreach ( dbFetchAll("SELECT `Id`, `Name`, `Path` FROM `Monitors` WHERE `Type` = 'Ffmpeg' ORDER BY `Path`") as $monitor ) {
+    $url_parts = parse_url($monitor['Path']);
+    ZM\Debug("Ffmpeg monitor ${url_parts['host']} = ${monitor['Id']} ${monitor['Name']}");
+    $monitors[gethostbyname($url_parts['host'])] = $monitor;
+  }
 
   $macBases = array(
-    '00:40:8c' => array('type'=>'Axis', 'probeFunc'=>'probeAxis'),
-    '00:80:f0' => array('type'=>'Panasonic','probeFunc'=>'probePana'),
     '00:0f:7c' => array('type'=>'ACTi','probeFunc'=>'probeACTi'),
+    '00:40:8c' => array('type'=>'Axis', 'probeFunc'=>'probeAxis'),
+    '2c:a5:9c' => array('type'=>'Hikvision', 'probeFunc'=>'probeHikvision'),
+    '00:80:f0' => array('type'=>'Panasonic','probeFunc'=>'probePana'),
     '00:02:d1' => array('type'=>'Vivotek','probeFunc'=>'probeVivotek'),
     '7c:dd:90' => array('type'=>'Wansview','probeFunc'=>'probeWansview'),
     '78:a5:dd' => array('type'=>'Wansview','probeFunc'=>'probeWansview')
   );
 
-  foreach ( $output as $line ) {
-    if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) )
-      continue;
-    $ip = $matches[1];
-    $host = $ip;
-    $mac = $matches[2];
-    //echo "I:$ip, H:$host, M:$mac<br/>";
+  foreach ( get_arp_results() as $mac=>$ip ) {
     $macRoot = substr($mac,0,8);
     if ( isset($macBases[$macRoot]) ) {
+      ZM\Debug("Have match for $macRoot ".$macBases[$macRoot]['type']);
       $macBase = $macBases[$macRoot];
       $camera = call_user_func($macBase['probeFunc'], $ip);
       $sourceDesc = base64_encode(json_encode($camera['monitor']));
@@ -299,8 +355,36 @@ function probeNetwork() {
         $sourceString .= ' - '.translate('Available');
       }
       $cameras[$sourceDesc] = $sourceString;
+    } else {
+      ZM\Debug("No match for $macRoot");
     }
   } # end foreach output line
+
+  if (isset($_REQUEST['interface']) and $_REQUEST['interface']) {
+    foreach (get_subnets($_REQUEST['interface']) as $network) {
+      foreach ( get_arp_scan_results($network) as $mac=>$ip ) {
+        $macRoot = substr($mac,0,8);
+        ZM\Debug("Got $macRoot from $mac");
+        if (isset($macBases[$macRoot])) {
+          ZM\Debug("Have match for $macRoot $ip ".$macBases[$macRoot]['type']);
+          $macBase = $macBases[$macRoot];
+          $camera = call_user_func($macBase['probeFunc'], $ip);
+          $sourceDesc = base64_encode(json_encode($camera['monitor']));
+          $sourceString = $camera['model'].' @ '.$host;
+          if (isset($monitors[$ip])) {
+            $monitor = $monitors[$ip];
+            $sourceString .= ' ('.$monitor['Name'].')';
+          } else {
+            $sourceString .= ' - '.translate('Available');
+          }
+          $cameras[$sourceDesc] = $sourceString;
+        } else {
+          ZM\Debug("No match for $macRoot");
+        }
+      } # end foreach output line
+    } # end foreach network
+  } # end if we have a network specified
+
   return $cameras;
 } # end function probeNetwork()
 
@@ -324,11 +408,25 @@ xhtmlHeaders(__FILE__, translate('MonitorProbe') );
     <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="mid" value="<?php echo isset($_REQUEST['mid'])?validNum($_REQUEST['mid']):'' ?>"/>
+        <input type="hidden" name="view" value="monitorprobe"/>
+    
         <p>
           <?php echo translate('MonitorProbeIntro') ?>
         </p>
+<p><label for="interface"><?php echo translate('Interface') ?></label>
+<?php
+$interfaces = array('', 'select');
+  $interfaces += get_networks();
+  $default_interface = $interfaces['default'];
+  unset($interfaces['default']);
+
+  echo htmlSelect('interface', $interfaces,
+    (isset($_REQUEST['interface']) ? $_REQUEST['interface'] : $default_interface),
+    array('data-on-change-this'=>'changeInterface') );
+
+?>
+        </p>
         <p>
           <label for="probe"><?php echo translate('DetectedCameras') ?></label>
           <?php echo htmlSelect('probe', $cameras, null, array('data-on-change-this'=>'configureButtons')); ?>
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index 754bb50ef..bcc349192 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -173,39 +173,10 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
           <?php echo translate('OnvifProbeIntro') ?>
         </p>
         <p><label for="interface"><?php echo translate('Interface') ?></label>
-          <?php 
-  $interfaces = array();
-  $default_interface = null;
-
-  exec('ip link', $output, $status);
-  if ( $status ) {
-    $html_output = implode('<br/>', $output);
-    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
-  } else {
-    foreach ( $output as $line ) {
-      if ( preg_match('/^\d+: ([[:alnum:]]+):/', $line, $matches ) ) {
-        if ( $matches[1] != 'lo' ) {
-          $interfaces[$matches[1]] = $matches[1];
-        } else {
-          ZM\Debug("No match for $line");
-        }
-      }
-    }
-  }
-  $routes = array();
-  exec('ip route', $output, $status);
-  if ( $status ) {
-    $html_output = implode('<br/>', $output);
-    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
-  } else {
-    foreach ( $output as $line ) {
-      if ( preg_match('/^default via [.[:digit:]]+ dev ([[:alnum:]]+)/', $line, $matches) ) {
-        $default_interface = $matches[1];
-      } else if ( preg_match('/^([.\/[:digit:]]+) dev ([[:alnum:]]+)/', $line, $matches) ) {
-        $interfaces[$matches[2]] .= ' ' . $matches[1];
-      }
-    } # end foreach line of output
-  }
+<?php 
+  $interfaces = get_networks();
+  $default_interface = $interfaces['default'];
+  unset($interfaces['default']);
 
   echo htmlSelect('interface', $interfaces, 
     (isset($_REQUEST['interface']) ? $_REQUEST['interface'] : $default_interface),

From fe01af6966cbdd2c698c4023172853dee16d0b2f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 09:57:56 -0500
Subject: [PATCH 420/501] Don't need to test for end() because we added our
 packet to the queue and still have the lock

---
 src/zm_packetqueue.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 8b831ec2d..e7e58b6e8 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -117,7 +117,8 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
 
       for (
           auto it = ++pktQueue.begin();
-          it != pktQueue.end() and *it != add_packet;
+          //it != pktQueue.end() and  // can't git end because we added our packet
+          *it != add_packet;
           // iterator is incremented by erase
       ) {
         std::shared_ptr <ZMPacket>zm_packet = *it;

From 2f5a403fc4a54ecefbb7f832bef7900a08c24baf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 10:04:19 -0500
Subject: [PATCH 421/501] Handle when no swap is configured

---
 web/skins/classic/includes/functions.php | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index beb6590e0..6055a5805 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -472,19 +472,21 @@ function getRamHTML() {
   } else if ($mem_used_percent > 90) {
     $used_class = 'text-warning';
   }
-  $swap_used = $meminfo['SwapTotal'] - $meminfo['SwapFree'];
-  $swap_used_percent = (int)(100*$swap_used/$meminfo['SwapTotal']);
-  $swap_class = '';
-  if ($swap_used_percent > 95) {
-    $swap_class = 'text-danger';
-  } else if ($swap_used_percent > 90) {
-    $swap_class = 'text-warning';
-  }
-
   $result .= ' <li id="getRamHTML" class="nav-item dropdown mx-2">'.
-    '<span class="'.$used_class.'" title="' .human_filesize($mem_used). ' of ' .human_filesize($meminfo['MemTotal']). '">'.translate('Memory').': '.$mem_used_percent.'%</span> '.
-    '<span class="'.$swap_class.'" title="' .human_filesize($swap_used). ' of ' .human_filesize($meminfo['SwapTotal']). '">'.translate('Swap').': '.$swap_used_percent.'%</span> '.
-    '</li>'.PHP_EOL;
+    '<span class="'.$used_class.'" title="' .human_filesize($mem_used). ' of ' .human_filesize($meminfo['MemTotal']). '">'.translate('Memory').': '.$mem_used_percent.'%</span> ';
+
+  if ($meminfo['SwapTotal']) {
+    $swap_used = $meminfo['SwapTotal'] - $meminfo['SwapFree'];
+    $swap_used_percent = (int)(100*$swap_used/$meminfo['SwapTotal']);
+    $swap_class = '';
+    if ($swap_used_percent > 95) {
+      $swap_class = 'text-danger';
+    } else if ($swap_used_percent > 90) {
+      $swap_class = 'text-warning';
+    }
+    $result .= '<span class="'.$swap_class.'" title="' .human_filesize($swap_used). ' of ' .human_filesize($meminfo['SwapTotal']). '">'.translate('Swap').': '.$swap_used_percent.'%</span> ';
+  } # end if SwapTotal
+  $result .= '</li>'.PHP_EOL;
   
   return $result;
 }

From 8e689340ce83fdf1b98ba7b1c08fc0e1137724bb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 10:06:32 -0500
Subject: [PATCH 422/501] Don't need to check for end of queue as we already
 did that when adding packet to the queue

---
 src/zm_packetqueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index e7e58b6e8..7daf0503d 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -138,7 +138,7 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
             ) {
           auto iterator_it = *iterators_it;
           // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
-          if ((*iterator_it!=pktQueue.end()) and (*(*iterator_it) == zm_packet)) {
+          if (*(*iterator_it) == zm_packet) {
             Debug(1, "Bumping IT because it is at the front that we are deleting");
             ++(*iterator_it);
           }

From 8c13aa7d3ad1ed6ed504e4f3838b51d8c6d78df9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 10:10:00 -0500
Subject: [PATCH 423/501] Cleanup LockedPacket, use RAII

---
 src/zm_packetqueue.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 7daf0503d..d5407b05d 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -123,10 +123,9 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
       ) {
         std::shared_ptr <ZMPacket>zm_packet = *it;
 
-        ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
-        if (!lp->trylock()) {
+        ZMLockedPacket lp(zm_packet);
+        if (!lp.trylock()) {
           Warning("Found locked packet when trying to free up video packets. This basically means that decoding is not keeping up.");
-          delete lp;
           ++it;
           continue;
         }
@@ -155,8 +154,6 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
             max_video_packet_count,
             pktQueue.size());
 
-        delete lp;
-
         if (zm_packet->packet.stream_index == video_stream_id)
           break;
       }  // end while

From 2768975f960f338ab405455bdccaf1f6114f4965 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 10:12:29 -0500
Subject: [PATCH 424/501] Only notify one.  Anyone waiting is waiting on a lock
 and only 1 process can get that lock, so only one should try.

---
 src/zm_packetqueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index d5407b05d..26f19de75 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -161,7 +161,7 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
   }  // end lock scope
   // We signal on every packet because someday we may analyze sound
   Debug(4, "packetqueue queuepacket, unlocked signalling");
-  condition.notify_all();
+  condition.notify_one();
 
 	return true;
 }  // end bool PacketQueue::queuePacket(ZMPacket* zm_packet)

From a7dc9d4e36521678d438d7593af1ebce3d6c22d0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 10:14:00 -0500
Subject: [PATCH 425/501] Implement General::jsonLoad

---
 scripts/ZoneMinder/lib/ZoneMinder/General.pm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index b14b08aae..90e7399ce 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -28,6 +28,7 @@ our %EXPORT_TAGS = (
       makePath
       jsonEncode
       jsonDecode
+      jsonLoad
       systemStatus
       packageControl
       daemonControl
@@ -536,6 +537,23 @@ sub jsonDecode {
   return $result;
 }
 
+sub jsonLoad {
+  my $file = shift;
+  my $json = undef;
+  eval {
+    require File::Slurp;
+    my $contents = File::Slurp::read_file($file);
+    if (!$contents) {
+      Error("No contents for $file");
+      return $json;
+    }
+    require JSON;
+    $json = JSON::decode_json($contents);
+  };
+  Error($@) if $@;
+  return $json;
+}
+
 sub parseNameEqualsValueToHash {
   my %settings;
   foreach my $line ( split ( /\r?\n/, $_[0] ) ) {

From 03f66370608ec8dc131ed34bac24980e22c3b93c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 11:03:25 -0500
Subject: [PATCH 426/501] Only load janus.js if we are using it

---
 web/skins/classic/views/watch.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 340ee8e33..fdcdae06d 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -397,6 +397,12 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
     </div>
   </div>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
+<?php
+if ( $monitor->JanusEnabled() ) {
+?>
   <script src="/javascript/janus/janus.js"></script>
+<?php
+}
+?>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>

From 8cdd96f286c589e808f45f09f716c578c3ba2299 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 13:29:51 -0500
Subject: [PATCH 427/501] Implement a check on change of language.  Make sure
 that the specified language file exists. Reports errors to UI

---
 web/includes/actions/options.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/web/includes/actions/options.php b/web/includes/actions/options.php
index 07b71c001..9b0033f4e 100644
--- a/web/includes/actions/options.php
+++ b/web/includes/actions/options.php
@@ -24,6 +24,8 @@ if ( !canEdit('System') ) {
   return;
 }
 
+global $error_message;
+
 if ( $action == 'delete' ) {
   if ( isset($_REQUEST['object']) ) {
     if ( $_REQUEST['object'] == 'server' ) {
@@ -65,10 +67,19 @@ if ( $action == 'delete' ) {
     }
 
     if ( isset($newValue) && ($newValue != $config['Value']) ) {
+      # Handle special cases first
+      if ($config['Name'] == 'ZM_LANG_DEFAULT') {
+        # Verify that the language file exists in the lang directory.
+        if (!file_exists(ZM_PATH_WEB.'/lang/'.$newValue.'.php')) {
+          $error_message .= 'Error setting ' . $config['Name'].'. New value ' .$newValue.' not saved because '.ZM_PATH_WEB.'/lang/'.$newValue.'.php doesn\'t exist.<br/>';
+          ZM\Error($error_message);
+          continue;
+        }
+      }
       dbQuery('UPDATE Config SET Value=? WHERE Name=?', array($newValue, $config['Name']));
       $changed = true;
-    }
-  }
+    } # end if value changed
+  } # end foreach config entry
   if ( $changed ) {
     switch ( $_REQUEST['tab'] ) {
     case 'system' :

From cc9306afe36228a2777980f3494191a51c0fc45e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 13:32:37 -0500
Subject: [PATCH 428/501] Change the error message banner to always take up
 space and be seen.

---
 web/skins/classic/css/base/skin.css      | 8 ++++++++
 web/skins/classic/includes/functions.php | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index ff37e5dd8..07e79bf20 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -340,6 +340,14 @@ ul.tabList li.active a {
 .alarm, .errorText, .error {
     color: #ff3f34;
 }
+/* Refers to the error box at the top of the web UI */
+#error {
+  width: 100%;
+  padding: 5px;
+  font-weight: bold;
+  background-color: white;
+  color: #ff3f34;
+}
 
 .timedErrorBox {
   color:white;
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 6055a5805..0f0a9352b 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -169,7 +169,7 @@ function getBodyTopHTML() {
 ';
   global $error_message;
   if ( $error_message ) {
-   echo '<div class="error">'.$error_message.'</div>';
+   echo '<div id="error">'.$error_message.'</div>';
   }
 } // end function getBodyTopHTML
 
@@ -203,7 +203,7 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
   $status = runtimeStatus($running);
 
 ?>
-<div class="fixed-top container-fluid p-0">
+<div class="container-fluid p-0">
   <nav class="navbar navbar-expand-md navbar-dark bg-dark justify-content-center flex-row">
 
     <div class="navbar-brand justify-content-start align-self-start">

From d7a8947e053ef32a635a5fcb713fe6b3bb5a87fd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 13:33:02 -0500
Subject: [PATCH 429/501] Only include janus.js if needed

---
 web/skins/classic/views/cycle.php   | 8 +++++++-
 web/skins/classic/views/montage.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index ee9e03d4f..0744d26f7 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -193,5 +193,11 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
       </div>
     </div>
 <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
-<script src="/javascript/janus/janus.js"></script>
+<?php
+if ( $monitor->JanusEnabled() ) {
+?>
+  <script src="/javascript/janus/janus.js"></script>
+<?php
+}
+?>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index a96e8a88e..b880d42e6 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -117,6 +117,7 @@ include('_monitor_filters.php');
 $filterbar = ob_get_contents();
 ob_end_clean();
 
+$need_janus = false;
 $monitors = array();
 foreach ( $displayMonitors as &$row ) {
   if ( $row['Function'] == 'None' )
@@ -133,7 +134,10 @@ foreach ( $displayMonitors as &$row ) {
   if ( ! isset($heights[$row['Height']]) ) {
     $heights[$row['Height']] = $row['Height'].'px';
   }
-  $monitors[] = new ZM\Monitor($row);
+  $monitor = $monitors[] = new ZM\Monitor($row);
+  if ($monitor->JanusEnabled()) {
+    $need_janus = true;
+  }
 } # end foreach Monitor
 
 xhtmlHeaders(__FILE__, translate('Montage'));
@@ -319,6 +323,8 @@ foreach (array_reverse($zones) as $zone) {
     </div>
   </div>
   <script src="<?php echo cache_bust('js/adapter.min.js') ?>"></script>
+<?php if ($need_janus) { ?>
   <script src="/javascript/janus/janus.js"></script>
+<?php } ?>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>

From b1d235f9910900aaffa8371f7f44c2fc6d8c252f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 13:33:22 -0500
Subject: [PATCH 430/501] Use getBodyTopHTML so that we get error messages in
 UI

---
 web/skins/classic/views/options.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 25cad40cc..5f648ba27 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -54,9 +54,9 @@ else
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Options'));
+getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-<body>
-  <?php echo getNavBarHTML(); ?>
   <div class="container-fluid">
     <div class="row flex-nowrap">
       <nav id="sidebar">

From 2db781ed4419971d299ae3456c7407e74995dbb6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 14:16:50 -0500
Subject: [PATCH 431/501] Test for valid language file when saving user.

---
 web/includes/actions/user.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/web/includes/actions/user.php b/web/includes/actions/user.php
index b13471231..75bcf3f7f 100644
--- a/web/includes/actions/user.php
+++ b/web/includes/actions/user.php
@@ -44,12 +44,21 @@ if ($action == 'Save') {
     } else {
       unset($_REQUEST['newUser']['Password']);
     }
+    if (isset($_REQUEST['newUser']['Language']) and $_REQUEST['newUser']['Language']) {
+      # Verify that the language file exists in the lang directory.
+      if (!file_exists(ZM_PATH_WEB.'/lang/'.$_REQUEST['newUser']['Language'].'.php')) {
+        $error_message .= 'Error setting Language. New value ' .$_REQUEST['newUser']['Language'].' not saved because '.ZM_PATH_WEB.'/lang/'.$_REQUEST['newUser']['Language'].'.php doesn\'t exist.<br/>';
+        ZM\Error($error_message);
+        unset($_REQUEST['newUser']['Language']);
+        unset($_REQUEST['redirect']);
+      }
+    }
     $changes = $dbUser->changes($_REQUEST['newUser']);
-    ZM\Debug("Changes: " . print_r($changes, true));
+    ZM\Debug('Changes: ' . print_r($changes, true));
 
     if (count($changes)) {
       if (!$dbUser->save($changes)) {
-        $error_message = $dbUser->get_last_error();
+        $error_message .= $dbUser->get_last_error().'<br/>';
         unset($_REQUEST['redirect']);
         return;
       }
@@ -73,6 +82,15 @@ if ($action == 'Save') {
     } else {
       unset($_REQUEST['newUser']['Password']);
     }
+    if (isset($_REQUEST['newUser']['Language']) and $_REQUEST['newUser']['Language']) {
+      # Verify that the language file exists in the lang directory.
+      if (!file_exists(ZM_PATH_WEB.'/lang/'.$_REQUEST['newUser']['Language'].'.php')) {
+        $error_message .= 'Error setting Language. New value ' .$_REQUEST['newUser']['Language'].' not saved because '.ZM_PATH_WEB.'/lang/'.$_REQUEST['newUser']['Language'].'.php doesn\'t exist.<br/>';
+        ZM\Error($error_message);
+        unset($_REQUEST['newUser']['Language']);
+        unset($_REQUEST['redirect']);
+      }
+    }
     $fields = array('Password'=>'', 'Language'=>'', 'HomeView'=>'');
     ZM\Debug("changes: ".print_r(array_intersect_key($_REQUEST['newUser'], $fields),true));
     $changes = $dbUser->changes(array_intersect_key($_REQUEST['newUser'], $fields));
@@ -80,7 +98,7 @@ if ($action == 'Save') {
 
     if (count($changes)) {
       if (!$dbUser->save($changes)) {
-        $error_message = $dbUser->get_last_error();
+        $error_message .= $dbUser->get_last_error();
         unset($_REQUEST['redirect']);
         return;
       }

From 9fee64b62fbdff5bf5ece1d617f1f53c7b1967cb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 14:17:30 -0500
Subject: [PATCH 432/501] detaint language file.

---
 web/includes/lang.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/includes/lang.php b/web/includes/lang.php
index 78a64a0e1..9fb4c8193 100644
--- a/web/includes/lang.php
+++ b/web/includes/lang.php
@@ -30,20 +30,21 @@ function translate($name) {
 function loadLanguage($prefix='') {
   global $user;
 
-  if ( $prefix )
+  if ($prefix)
     $prefix = $prefix.'/';
 
-  if ( isset($user['Language']) and $user['Language'] ) {
-    $userLangFile = $prefix.'lang/'.$user['Language'].'.php';
+  if (isset($user['Language']) and $user['Language']) {
+    # Languages can only have letters, numbers and underscore
+    $userLangFile = $prefix.'lang/'.preg_replace('/[^[:alnum:]_]+/', '', $user['Language']).'.php';
 
-    if ( file_exists($userLangFile) ) {
+    if (file_exists($userLangFile)) {
       return $userLangFile;
     } else {
       ZM\Warning("User language file $userLangFile does not exist.");
     }
   }
 
-  $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
+  $systemLangFile = $prefix.'lang/'.preg_replace('/[^[:alnum:]_]+/', '', ZM_LANG_DEFAULT).'.php';
   if ( file_exists($systemLangFile) ) {
     return $systemLangFile;
   } else {

From b86688806267d0c063435116a9f5cad5dc80c2b3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 17:51:21 -0500
Subject: [PATCH 433/501] Change title of settings button to give an indication
 WHY it isn't enabled

---
 web/skins/classic/views/js/watch.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 6c9a669fe..21026c3c8 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -805,7 +805,15 @@ function initPage() {
     if (monitorType == 'Local') getSettingsModal();
   }
   // Only enable the settings button for local cameras
-  settingsBtn.prop('disabled', !(canView.Control && (monitorType == 'Local')));
+  if (!canView.Control) {
+    settingsBtn.prop('disabled', true);
+    settingsBtn.prop('title', 'Disbled due to lack of Control View permission.');
+  } else if (monitorType != 'Local') {
+    settingsBtn.prop('disabled', true);
+    settingsBtn.prop('title', 'Settings only available for Local monitors.');
+  } else {
+    settingsBtn.prop('disabled', false);
+  }
 
   if (monitorType != 'WebSite') {
     monitorStream = new MonitorStream(monitorData[monIdx]);

From bcd0b6430be59705a836d6bf9715e8dde97bfeee Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Feb 2022 18:11:33 -0500
Subject: [PATCH 434/501] Convert Fatal()s to Errors() which is really more
 appropriate anyways. Maybe Fixes #3426

---
 web/views/image.php | 108 ++++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/web/views/image.php b/web/views/image.php
index 8e8cfdd2c..6e2c47714 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -65,7 +65,7 @@ if ( empty($_REQUEST['path']) ) {
 
   if ( empty($_REQUEST['fid']) ) {
     header('HTTP/1.0 404 Not Found');
-    ZM\Fatal('No Frame ID specified');
+    ZM\Error('No Frame ID specified');
     return;
   }
 
@@ -73,47 +73,50 @@ if ( empty($_REQUEST['path']) ) {
     $Event = ZM\Event::find_one(array('Id'=>$_REQUEST['eid']));
     if ( !$Event ) {
       header('HTTP/1.0 404 Not Found');
-      ZM\Fatal('Event '.$_REQUEST['eid'].' Not found');
+      ZM\Error('Event '.$_REQUEST['eid'].' Not found');
       return;
     }
 
     if ( $_REQUEST['fid'] == 'objdetect' ) {
-        // if animation file is found, return that, else return image
-        // we are only looking for GIF or jpg here, not mp4
-        // as most often, browsers asking for this link will be expecting
-        // media types that can be rendered as <img src=>
-        $path_anim_gif = $Event->Path().'/objdetect.gif';
-        $path_image = $Event->Path().'/objdetect.jpg';
-        if (file_exists($path_anim_gif)) {
-          // we found the animation gif file
-          $media_type = 'image/gif';
-          ZM\Debug("Animation file found at $path");
-          $path = $path_anim_gif;
-        } else if (file_exists($path_image)) {
-            // animation not found, but image found
-            ZM\Debug("Image file found at $path");
-            $path = $path_image;
-        } else {
-            // neither animation nor image found
-            header('HTTP/1.0 404 Not Found');
-            ZM\Fatal("Object detection animation and image not found for this event");  
-        }
-        $Frame = new ZM\Frame();
-        $Frame->Id('objdetect');
-      } else if ( $_REQUEST['fid'] == 'objdetect_mp4' ) {
-        $path = $Event->Path().'/objdetect.mp4';
-        if ( !file_exists($path) ) {
-          header('HTTP/1.0 404 Not Found');
-          ZM\Fatal("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
-          }
-        $Frame = new ZM\Frame();
-        $Frame->Id('objdetect');
-        $media_type = 'video/mp4';
-      } else if ( $_REQUEST['fid'] == 'objdetect_gif' ) {
-        $path = $Event->Path().'/objdetect.gif';
-        if ( !file_exists($path) ) {
-          header('HTTP/1.0 404 Not Found');
-          ZM\Fatal("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
+      // if animation file is found, return that, else return image
+      // we are only looking for GIF or jpg here, not mp4
+      // as most often, browsers asking for this link will be expecting
+      // media types that can be rendered as <img src=>
+      $path_anim_gif = $Event->Path().'/objdetect.gif';
+      $path_image = $Event->Path().'/objdetect.jpg';
+      if (file_exists($path_anim_gif)) {
+        // we found the animation gif file
+        $media_type = 'image/gif';
+        ZM\Debug("Animation file found at $path");
+        $path = $path_anim_gif;
+      } else if (file_exists($path_image)) {
+        // animation not found, but image found
+        ZM\Debug("Image file found at $path");
+        $path = $path_image;
+      } else {
+        // neither animation nor image found
+        header('HTTP/1.0 404 Not Found');
+        ZM\Error('Object detection animation and image not found for this event');  
+        return;
+      }
+      $Frame = new ZM\Frame();
+      $Frame->Id('objdetect');
+    } else if ( $_REQUEST['fid'] == 'objdetect_mp4' ) {
+      $path = $Event->Path().'/objdetect.mp4';
+      if ( !file_exists($path) ) {
+        header('HTTP/1.0 404 Not Found');
+        ZM\Error("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
+        return;
+      }
+      $Frame = new ZM\Frame();
+      $Frame->Id('objdetect');
+      $media_type = 'video/mp4';
+    } else if ( $_REQUEST['fid'] == 'objdetect_gif' ) {
+      $path = $Event->Path().'/objdetect.gif';
+      if ( !file_exists($path) ) {
+        header('HTTP/1.0 404 Not Found');
+        ZM\Error("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
+        return;
       }
       $Frame = new ZM\Frame();
       $Frame->Id('objdetect');
@@ -122,7 +125,8 @@ if ( empty($_REQUEST['path']) ) {
       $path = $Event->Path().'/objdetect.jpg';
       if ( !file_exists($path) ) {
         header('HTTP/1.0 404 Not Found');
-        ZM\Fatal("File $path does not exist. Please make sure store_frame_in_zm is enabled in the object detection config");
+        ZM\Error("File $path does not exist. Please make sure store_frame_in_zm is enabled in the object detection config");
+        return;
       }
       $Frame = new ZM\Frame();
       $Frame->Id('objdetect');
@@ -149,7 +153,7 @@ if ( empty($_REQUEST['path']) ) {
           $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
         } else {
           header('HTTP/1.0 404 Not Found');
-          ZM\Fatal('No alarm jpg found for event '.$_REQUEST['eid']);
+          ZM\Error('No alarm jpg found for event '.$_REQUEST['eid']);
           return;
         }
       } else {
@@ -189,11 +193,12 @@ if ( empty($_REQUEST['path']) ) {
             ZM\Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
             if ( ! file_exists($path) ) {
               header('HTTP/1.0 404 Not Found');
-              ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
+              ZM\Error('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
 
                 Command was: '.$command.'
 
                 Output was: '.implode(PHP_EOL,$output) );
+              return;
             }
             # Generating an image file will use up more disk space, so update the Event record.
             if ( $Event->EndDateTime() ) {
@@ -202,7 +207,7 @@ if ( empty($_REQUEST['path']) ) {
             }
           } else {
             header('HTTP/1.0 404 Not Found');
-            ZM\Fatal('No snapshot jpg found for event '.$_REQUEST['eid']);
+            ZM\Error('No snapshot jpg found for event '.$_REQUEST['eid']);
             return;
           }
         } # end if stored jpgs
@@ -231,7 +236,8 @@ if ( empty($_REQUEST['path']) ) {
           $Frame->Delta($previousBulkFrame['Delta'] + floor( 100* ( $nextBulkFrame['Delta'] - $previousBulkFrame['Delta'] ) * $percentage )/100);
           ZM\Debug('Got virtual frame from Bulk Frames previous delta: ' . $previousBulkFrame['Delta'] . ' + nextdelta:' . $nextBulkFrame['Delta'] . ' - ' . $previousBulkFrame['Delta'] . ' * ' . $percentage );
         } else {
-          ZM\Fatal('No Frame found for event('.$_REQUEST['eid'].') and frame id('.$_REQUEST['fid'].')');
+          ZM\Error('No Frame found for event('.$_REQUEST['eid'].') and frame id('.$_REQUEST['fid'].')');
+          return;
         }
       }  # end if !Frame
       // Frame can be non-existent.  We have Bulk frames.  So now we should try to load the bulk frame 
@@ -244,14 +250,14 @@ if ( empty($_REQUEST['path']) ) {
     $Frame = ZM\Frame::find_one(array('Id'=>$_REQUEST['fid']));
     if ( !$Frame ) {
       header('HTTP/1.0 404 Not Found');
-      ZM\Fatal('Frame ' . $_REQUEST['fid'] . ' Not Found');
+      ZM\Error('Frame ' . $_REQUEST['fid'] . ' Not Found');
       return;
     }
 
     $Event = ZM\Event::find_one(array('Id'=>$Frame->EventId()));
     if ( !$Event ) {
       header('HTTP/1.0 404 Not Found');
-      ZM\Fatal('Event ' . $Frame->EventId() . ' Not Found');
+      ZM\Error('Event ' . $Frame->EventId() . ' Not Found');
       return;
     }
     $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
@@ -263,7 +269,8 @@ if ( empty($_REQUEST['path']) ) {
     if ( ($show == 'capture') and $Event->DefaultVideo() ) {
       if ( !file_exists($Event->Path().'/'.$Event->DefaultVideo()) ) {
         header('HTTP/1.0 404 Not Found');
-        ZM\Fatal("Can't create frame images from video because there is no video file for this event at (".$Event->Path().'/'.$Event->DefaultVideo() );
+        ZM\Error("Can't create frame images from video because there is no video file for this event at (".$Event->Path().'/'.$Event->DefaultVideo() );
+        return;
       }
       $command = ZM_PATH_FFMPEG.' -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path . ' 2>&1';
       #$command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
@@ -275,11 +282,12 @@ if ( empty($_REQUEST['path']) ) {
       ZM\Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
       if ( ! file_exists($path) ) {
         header('HTTP/1.0 404 Not Found');
-        ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
+        ZM\Error('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
 
 Command was: '.$command.'
 
 Output was: '.implode(PHP_EOL,$output) );
+        return;
       }
       # Generating an image file will use up more disk space, so update the Event record.
       if ( $Event->EndDateTime() ) {
@@ -288,8 +296,9 @@ Output was: '.implode(PHP_EOL,$output) );
       }
     } else {
       header('HTTP/1.0 404 Not Found');
-      ZM\Fatal("Can't create frame $show images from video because there is no video file for this event at ".
+      ZM\Error("Can't create frame $show images from video because there is no video file for this event at ".
         $Event->Path().'/'.$Event->DefaultVideo() );
+      return;
     }
   } # end if ! file_exists($path)
 
@@ -317,7 +326,8 @@ Output was: '.implode(PHP_EOL,$output) );
   }
   if ( !file_exists($path) ) {
     header('HTTP/1.0 404 Not Found');
-    ZM\Fatal("Image not found at $path");
+    ZM\Error("Image not found at $path");
+    return;
   }
 }
 

From 4507b06e2981b395b28efc92a884b8b6d85db90a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 10 Feb 2022 11:57:57 -0500
Subject: [PATCH 435/501] libcurl4-gnutls-dev is actually a runtime dependency

---
 distros/ubuntu2004/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index 54ca58af1..a73713976 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -42,7 +42,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libswscale5|libswscale4
         ,libswresample3|libswresample2
         ,ffmpeg
-        ,libcurl4
+        ,libcurl4, libcurl4-gnutls-dev
         ,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
         ,libphp-serialization-perl

From 514a64ad4580090ee253bc689d5e36ac93b770ff Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 11 Feb 2022 12:43:10 -0500
Subject: [PATCH 436/501] small code cleanup, add Warnings when using slow
 blend functions.

---
 src/zm_image.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 7260791a5..ea785195e 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -95,6 +95,7 @@ void Image::update_function_pointers() {
     delta8_abgr = &std_delta8_abgr;
     delta8_gray8 = &std_delta8_gray8;
     blend = &std_blend;
+    Warning("Using slow std functions");
   } else {
     // Use either sse or neon, or loop unrolled version
     delta8_rgb = fptr_delta8_rgb;
@@ -1737,7 +1738,6 @@ void Image::Overlay( const Image &image, const unsigned int lo_x, const unsigned
 }  // end void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
 
 void Image::Blend( const Image &image, int transparency ) {
-  uint8_t* new_buffer;
 
   if ( !(
         width == image.width && height == image.height
@@ -1751,7 +1751,7 @@ void Image::Blend( const Image &image, int transparency ) {
   if ( transparency <= 0 )
     return;
 
-  new_buffer = AllocBuffer(size);
+  uint8_t* new_buffer = AllocBuffer(size);
 
 #ifdef ZM_IMAGE_PROFILING
   TimePoint start = std::chrono::steady_clock::now();
@@ -3397,6 +3397,7 @@ __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const
 }
 
 __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
+  Warning("Using slow std_blend");
   double divide = blendpercent / 100.0;
   double opacity = 1.0 - divide;
   const uint8_t* const max_ptr = result + count;

From 4cc82e24f3bf75051d323119fb40e441045abe2f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:30:51 -0500
Subject: [PATCH 437/501] convert some tags to classes instead of ids.  Add
 margin: 0 auto so that monitor images are centered

---
 web/skins/classic/css/base/views/timeline.css | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/css/base/views/timeline.css b/web/skins/classic/css/base/views/timeline.css
index 815492bb6..0068767b5 100644
--- a/web/skins/classic/css/base/views/timeline.css
+++ b/web/skins/classic/css/base/views/timeline.css
@@ -40,14 +40,11 @@
     margin: 4px auto 6px;
 }
 
-#topPanel #imagePanel 
-{
-    width: 50%;
-    float: left;
+#topPanel .imagePanel {
     text-align: right;
 }
 
-#topPanel #image {
+#topPanel .image {
     margin: 0 auto;
     text-align: right;
     margin-right: 2px;
@@ -57,7 +54,7 @@
     width: 100%;
 }
 
-#topPanel #image img {
+#topPanel .image img {
     width: auto;
     max-width: 100%;
     height: 100%;
@@ -66,6 +63,7 @@
     bottom: 0;
     left: 0;
     right: 0;
+    margin: 0 auto;
 }
 
 #topPanel #dataPanel {

From 3250e0edfef813feb2c5c53d09dbcfa9cce103cd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:32:27 -0500
Subject: [PATCH 438/501] simplify some code, pass around zm_event json objects
 instead of event_id.  Each monitor has it's own image so when loading event
 data put it into a div/img referenced by monitor Id

---
 web/skins/classic/views/js/timeline.js | 46 +++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 9e2548b23..97e735b34 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -67,17 +67,20 @@ function frameDataResponse( respObj, respText ) {
   zm_event['frames'][frame.FrameId] = frame;
   zm_event['frames'][frame.FrameId]['html'] = createEventHtml( zm_event, frame );
 
-  showEventData(frame.EventId, frame.FrameId);
+  showEventData(zm_event, frame.FrameId);
 }
 
-function showEventData(eventId, frameId) {
-  if ( events[eventId] ) {
-    var zm_event = events[eventId];
+function showEventData(zm_event, frameId) {
+  if ( zm_event ) {
     if ( zm_event['frames'] ) {
       if ( zm_event['frames'][frameId] ) {
-        showEventDetail( zm_event['frames'][frameId]['html'] );
+        $('instruction').addClass('hidden');
+        eventData = $('eventData'+zm_event.MonitorId);
+        eventData.empty();
+        eventData.adopt(zm_event['frames'][frameId]['html']);
+        eventData.removeClass('hidden');
         var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
-        loadEventImage(imagePath, eventId, frameId);
+        loadEventImage(imagePath, zm_event, frameId);
         return;
       } else {
         console.log('No frames for ' + frameId);
@@ -86,7 +89,7 @@ function showEventData(eventId, frameId) {
       console.log('No frames');
     }
   } else {
-    console.log('No event for ' + eventId);
+    console.log('No event');
   }
 }
 
@@ -125,25 +128,22 @@ function previewEvent(slot) {
   }
 }
 
-function loadEventImage( imagePath, eid, fid ) {
-  var eventData = $j('#eventData');
-  var imageSrc = $j('#imageSrc');
+function loadEventImage( imagePath, zm_event, fid ) {
+  var imageSrc = $('imageSrc'+zm_event.MonitorId);
 
   imageSrc.show();
-  imageSrc.attr('src', imagePath);
-  imageSrc.attr('data-event-id', eid);
-  imageSrc.attr('data-frame-id', fid);
-  imageSrc.off('click');
-  imageSrc.click(function() {
-    showEvent(this);
-  });
+  imageSrc.setProperty('src', imagePath);
+  imageSrc.setAttribute('data-event-id', zm_event.Id);
+  imageSrc.setAttribute('data-frame-id', fid);
+  imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
 
-  eventData.attr('data-event-id', eid);
-  eventData.attr('data-frame-id', fid);
-  eventData.off('click');
-  eventData.click(function() {
-    showEvent(this);
-  });
+  var eventData = $('eventData'.zm_event.MonitorId);
+  if ( eventData ) {
+    eventData.removeEvent('click');
+    eventData.addEvent('click', showEvent.pass());
+  } else {
+    console.log("No eventdata area found for monitor " + zm_event.MonitorId);
+  }
 }
 
 function tlZoomBounds(event) {

From 94bc40a6cf49718568d43d6a273b0f84a95968ec Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 5 Jan 2020 17:33:36 -0500
Subject: [PATCH 439/501] Split the data by monitor and display a monitor
 image/info for each monitor.

---
 web/skins/classic/views/timeline.php | 38 +++++++++++++++++-----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index 587517fe0..42417503b 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -682,23 +682,32 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
     </div>
     
     <div id="content" class="chartSize">
+      <div id="instruction">
+        <p><?php echo translate('TimelineTip1') ?></p>
+        <p><?php echo translate('TimelineTip2') ?></p>
+        <p><?php echo translate('TimelineTip3') ?></p>
+        <p><?php echo translate('TimelineTip4') ?></p>
+      </div>
       <div id="topPanel" class="graphWidth">
-        <div id="imagePanel">
-          <div id="image" class="imageHeight">
-		        <img id="imageSrc" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
-          </div>
-        </div>
-        <div id="dataPanel">
-          <div id="textPanel">
-            <div id="instruction">
-              <p><?php echo translate('TimelineTip1') ?></p>
-              <p><?php echo translate('TimelineTip2') ?></p>
-              <p><?php echo translate('TimelineTip3') ?></p>
-              <p><?php echo translate('TimelineTip4') ?></p>
-              </div>
-            <div id="eventData">
+<?php 
+foreach ( $monitors as $monitor ) {
+?>
+        <div class="monitorPanel" style="width:<?php echo 100/count($monitors); ?>%;float:left;">
+          <div class="imagePanel">
+            <div class="imageHeight image">
+              <img id="imageSrc<?php echo $monitor->Id() ?>" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
             </div>
           </div>
+          <div id="dataPanel<?php echo $monitor->Id() ?>">
+            <div id="textPanel<?php echo $monitor->Id() ?>">
+              <div id="eventData<?php echo $monitor->Id() ?>">
+              </div>
+            </div>
+          </div>
+        </div>
+<?php 
+} # end foreach monitor
+?>
           <div id="navPanel">
             <button type="button" title="<?php echo translate('PanLeft') ?>" data-on-click="tlPanLeft">
             <i class="material-icons md-18">fast_rewind</i>
@@ -710,7 +719,6 @@ xhtmlHeaders(__FILE__, translate('Timeline'));
             <i class="material-icons md-18">fast_forward</i>
             </button>
           </div>
-        </div>
       </div>
       <div id="chartPanel">
         <div id="chart" class="graphSize">

From 6e7e6d9e8ec28b4ba8acd6ae54790588ed88f802 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 11 Feb 2022 12:43:10 -0500
Subject: [PATCH 440/501] small code cleanup, add Warnings when using slow
 blend functions.

---
 src/zm_image.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 7260791a5..ea785195e 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -95,6 +95,7 @@ void Image::update_function_pointers() {
     delta8_abgr = &std_delta8_abgr;
     delta8_gray8 = &std_delta8_gray8;
     blend = &std_blend;
+    Warning("Using slow std functions");
   } else {
     // Use either sse or neon, or loop unrolled version
     delta8_rgb = fptr_delta8_rgb;
@@ -1737,7 +1738,6 @@ void Image::Overlay( const Image &image, const unsigned int lo_x, const unsigned
 }  // end void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
 
 void Image::Blend( const Image &image, int transparency ) {
-  uint8_t* new_buffer;
 
   if ( !(
         width == image.width && height == image.height
@@ -1751,7 +1751,7 @@ void Image::Blend( const Image &image, int transparency ) {
   if ( transparency <= 0 )
     return;
 
-  new_buffer = AllocBuffer(size);
+  uint8_t* new_buffer = AllocBuffer(size);
 
 #ifdef ZM_IMAGE_PROFILING
   TimePoint start = std::chrono::steady_clock::now();
@@ -3397,6 +3397,7 @@ __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const
 }
 
 __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
+  Warning("Using slow std_blend");
   double divide = blendpercent / 100.0;
   double opacity = 1.0 - divide;
   const uint8_t* const max_ptr = result + count;

From 91b536b868fe7be14bc3f5a957f2a421adeada9e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 14 Feb 2022 09:43:48 -0500
Subject: [PATCH 441/501] Change the test for slow functions to mod4. The
 unrolled and SSE function work on 4 pixels at a time or 16 or 12 bytes
 depending on colours.This will improve cpu use on resolutions like 1280x800

---
 src/zm_image.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index ea785195e..35efa8774 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -84,8 +84,11 @@ static ZmFont font;
 std::mutex              jpeg_mutex;
 
 void Image::update_function_pointers() {
-  /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
-  if ( pixels % 16 || pixels % 12 ) {
+  /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements
+   * previous tests were %16 or %12 but that is incorrect.  Should just be %4
+   */
+
+  if (pixels %4) {
     // have to use non-loop unrolled functions
     delta8_rgb = &std_delta8_rgb;
     delta8_bgr = &std_delta8_bgr;
@@ -95,7 +98,7 @@ void Image::update_function_pointers() {
     delta8_abgr = &std_delta8_abgr;
     delta8_gray8 = &std_delta8_gray8;
     blend = &std_blend;
-    Warning("Using slow std functions");
+    Warning("Using slow std functions because pixels %d mod 4=%d", pixels, pixels%4);
   } else {
     // Use either sse or neon, or loop unrolled version
     delta8_rgb = fptr_delta8_rgb;

From b6d2d96d11af82bace0bf5fd73270187b3b50a99 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 14 Feb 2022 09:47:59 -0500
Subject: [PATCH 442/501] Remove offending extra comma

---
 web/skins/classic/views/frame.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 7a281a29a..bf434448a 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -115,10 +115,11 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
       <div>
         <p id="image">
 <?php
-if ( $imageData['hasAnalImage'] ) {
+if ($imageData['hasAnalImage']) {
   echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s" title="Click to display frame %s analysis">',
-    $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ),
-    ( $show=='anal'?'without':'with' ),
+    $Event->Id(), $Frame->FrameId(), $scale,
+    ($show=='anal'?'capt':'anal'),
+    ($show=='anal'?'without':'with')
   );
 }
 ?>

From 13f2076dc98f674b8659a1b6330ccfff2d0ac273 Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Tue, 15 Feb 2022 14:15:08 +0100
Subject: [PATCH 443/501] Add SQL opTypes IN, NOT IN to filter view, #3432

This possibly fixes the issue where changing the filter for an event
view via the filter button would produce invalid SQL and SQL errors.

web_php[43835].ERR [1.2.3.4] [SQL-ERR 'SQLSTATE[HY000]: General error: 4078 Illegal parameter data types int and row for operation '='', statement was 'SELECT E.*, M.Name AS Monitor FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE ( ( E.StartDateTime >= '2022-02-14 00:47:41'
 and E.StartDateTime <= '2022-02-14 11:47:41' )
 and E.MonitorId = ('1','3')
) ORDER BY E.StartDateTime DESC' params:] at /usr/share/zoneminder/www/includes/database.php line 161

When in the events view, clicking the filterBtn sends us to the filter view with this query term (url-decoded):

&filter[Query][terms][2][attr]=MonitorId&filter[Query][terms][2][op]=IN&filter[Query][terms][2][val]=1,3&filter[Query][sort_asc]=0

but the filter view displays this as "equals", not "in set", because it doesn't know IN from opTypes, only =[].
---
 web/skins/classic/views/filter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 8445d2c12..de2016489 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -130,6 +130,8 @@ $opTypes = array(
     '!~'  => translate('OpNotMatches'),
     '=[]' => translate('OpIn'),
     '![]' => translate('OpNotIn'),
+    'IN'  => translate('OpIn'),
+    'NOT IN' => translate('OpNotIn'),
     'IS'  => translate('OpIs'),
     'IS NOT'  => translate('OpIsNot'),
     'LIKE' => translate('OpLike'),

From 5fd5c7fdd11beb59dbb4dad46c7f4e65f04d01a1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 10:04:31 -0500
Subject: [PATCH 444/501] Maybe fix build on freebsd by including unistd.h

---
 src/zm_monitor_monitorlink.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_monitor_monitorlink.cpp b/src/zm_monitor_monitorlink.cpp
index 95432388a..9e7a60d49 100644
--- a/src/zm_monitor_monitorlink.cpp
+++ b/src/zm_monitor_monitorlink.cpp
@@ -24,6 +24,7 @@
 #if ZM_MEM_MAPPED
 #include <sys/mman.h>
 #include <fcntl.h>
+#include <unistd.h>
 #else // ZM_MEM_MAPPED
 #include <sys/ipc.h>
 #include <sys/shm.h>

From 554840d811f6a7f39bc47dde76aa13501f370224 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 15 Feb 2022 10:07:48 -0500
Subject: [PATCH 445/501] Revert "Add SQL opTypes IN, NOT IN to filter view,
 #3432"

---
 web/skins/classic/views/filter.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index de2016489..8445d2c12 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -130,8 +130,6 @@ $opTypes = array(
     '!~'  => translate('OpNotMatches'),
     '=[]' => translate('OpIn'),
     '![]' => translate('OpNotIn'),
-    'IN'  => translate('OpIn'),
-    'NOT IN' => translate('OpNotIn'),
     'IS'  => translate('OpIs'),
     'IS NOT'  => translate('OpIsNot'),
     'LIKE' => translate('OpLike'),

From 59039de98527be1cad4d0c7c5165573deaa4270e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 10:23:30 -0500
Subject: [PATCH 446/501] Use =[] instead of IN as operator. Fixes #3432

---
 web/skins/classic/views/report_event_audit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php
index be53c87b0..fa2a07004 100644
--- a/web/skins/classic/views/report_event_audit.php
+++ b/web/skins/classic/views/report_event_audit.php
@@ -42,7 +42,7 @@ $filter = new ZM\Filter();
 $filter->addTerm(array('attr'=>'StartDateTime', 'op'=>'>=', 'val'=>$minTime, 'obr'=>'1'));
 $filter->addTerm(array('attr'=>'StartDateTime', 'op'=>'<=', 'val'=>$maxTime, 'cnj'=>'and', 'cbr'=>'1'));
 if ( count($selected_monitor_ids) ) {
-  $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
+  $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'=[]', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
 } else if ( ( $group_id != 0 || isset($_SESSION['ServerId']) || isset($_SESSION['StorageId']) || isset($_SESSION['Status']) ) ) {
 # this should be redundant
   for ( $i=0; $i < count($displayMonitors); $i++ ) {
@@ -164,11 +164,11 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 
   if ( count($FileMissing) ) {
     $FileMissing_filter = new ZM\Filter();
-    $FileMissing_filter->addTerm(array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing))));
+    $FileMissing_filter->addTerm(array('attr'=>'Id', 'op'=>'=[]', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing))));
   }
   if ( count($ZeroSize) ) {
     $ZeroSize_filter = new ZM\Filter();
-    $ZeroSize_filter->addTerm(array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize))));
+    $ZeroSize_filter->addTerm(array('attr'=>'Id', 'op'=>'=[]', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize))));
   }
 ?>
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">

From b2e0f805bd262c86c46f6692e739c162ba276c60 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 10:29:58 -0500
Subject: [PATCH 447/501] Add NOT IN case.  Also, fix bad SQL when value evals
 to false.  Test for empty string instead. Fixes #3425

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 726685a7e..0a10baa3b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -231,7 +231,7 @@ sub Sql {
         } else {
           ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
           # Empty value will result in () from split
-          foreach my $temp_value ( $stripped_value ? split( /["'\s]*?,["'\s]*?/, $stripped_value ) : $stripped_value ) {
+          foreach my $temp_value ( $stripped_value ne '' ? split( /["'\s]*?,["'\s]*?/, $stripped_value ) : $stripped_value ) {
             if ( $term->{attr} eq 'AlarmedZoneId' ) {
               $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND Score > 0 AND ZoneId='.$value.')';
             } elsif ( $term->{attr} =~ /^MonitorName/ ) {
@@ -323,7 +323,7 @@ sub Sql {
               $self->{Sql} .= ' IS NOT '.$value;
             } elsif ( $term->{op} eq '=[]' or $term->{op} eq 'IN' ) {
               $self->{Sql} .= ' IN ('.join(',', @value_list).")";
-            } elsif ( $term->{op} eq '![]' ) {
+            } elsif ( $term->{op} eq '![]' or $term->{op} eq 'NOT IN') {
               $self->{Sql} .= ' NOT IN ('.join(',', @value_list).')';
             } elsif ( $term->{op} eq 'LIKE' ) {
               $self->{Sql} .= ' LIKE '.$value;

From a149fa37fc56044b8d9c97953196e53ac2c3b0e0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 10:37:14 -0500
Subject: [PATCH 448/501] Make filter debug modal work on non-saved filter

---
 web/ajax/modals/filterdebug.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/ajax/modals/filterdebug.php b/web/ajax/modals/filterdebug.php
index f3a961874..d3ffaaf01 100644
--- a/web/ajax/modals/filterdebug.php
+++ b/web/ajax/modals/filterdebug.php
@@ -11,13 +11,20 @@
 <?php
   require_once('includes/Filter.php');
   $fid = validInt($_REQUEST['fid']);
-  if (!$fid) {
-    echo '<div class="error">No filter id specified.</div>';
-  } else {
-    $filter = new ZM\Filter($_REQUEST['fid']);
+
+  $filter = null;
+  if ($fid) {
+    $filter = new ZM\Filter($fid);
     if (!$filter->Id()) {
       echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>';
     }
+  } else {
+   $filter = new ZM\Filter();
+   if ( isset($_REQUEST['filter'])) {
+     $filter->set($_REQUEST['filter']);
+   } else {
+     echo '<div class="error">No filter id or contents specified.</div>';
+   }
   }
 ?>
        <form name="contentForm" id="filterdebugForm" method="post" action="?">

From 956579d557671b5fadca210c78d683785fd438fe Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 10:41:42 -0500
Subject: [PATCH 449/501] handle snap->in_frame being null.

---
 src/zm_monitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 062e10ac7..c094aecff 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2150,7 +2150,7 @@ bool Monitor::Analyse() {
                 ref_image.Blend(v_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
               } else if (snap->image) {
                 Debug(1, "Blending because %p and format %d != %d, %d", snap->in_frame,
-                    snap->in_frame->format,
+                    (snap->in_frame ? snap->in_frame->format : -1),
                     AV_PIX_FMT_YUV420P,
                     AV_PIX_FMT_YUVJ420P
                     );
@@ -2674,7 +2674,7 @@ bool Monitor::Decode() {
 
     if (config.timestamp_on_capture) {
       Debug(3, "Timestamping");
-      TimestampImage(packet->image, packet->timestamp);
+      TimestampImage(capture_image, packet->timestamp);
     }
 
     image_buffer[index]->Assign(*(packet->image));

From 33f23cbd84c5d8f767ed7abf68a06c5b7610be9e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:51:10 -0500
Subject: [PATCH 450/501] Sync up n_frames, frame_count, curr_frame_id on int
 instead of a mix of long int, int and unsigned long int

---
 src/zm_eventstream.cpp | 72 ++++++++++++++++++++++--------------------
 src/zm_eventstream.h   | 12 +++----
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 28a0e50d6..34f693f36 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -68,17 +68,17 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
     curr_frame_id = 1; // curr_frame_id is 1-based
     if (event_time >= event_data->start_time) {
       Debug(2, "event time is after event start");
-      for (unsigned int i = 0; i < event_data->frame_count; i++) {
+      for (int i = 0; i < event_data->frame_count; i++) {
         //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
         if (event_data->frames[i].timestamp >= event_time) {
           curr_frame_id = i + 1;
-          Debug(3, "Set curr_stream_time: %.2f, curr_frame_id: %ld",
+          Debug(3, "Set curr_stream_time: %.2f, curr_frame_id: %d",
                 FPSeconds(curr_stream_time.time_since_epoch()).count(),
                 curr_frame_id);
           break;
         }
       } // end foreach frame
-      Debug(3, "Skipping %ld frames", event_data->frame_count);
+      Debug(3, "Skipping %d frames", event_data->frame_count);
     } else {
       Warning("Requested an event time less than the start of the event. event_time %" PRIi64 " < start_time %" PRIi64,
               static_cast<int64>(std::chrono::duration_cast<Seconds>(event_time.time_since_epoch()).count()),
@@ -90,13 +90,13 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
 
 bool EventStream::loadInitialEventData(
     uint64_t init_event_id,
-    unsigned int init_frame_id
+    int init_frame_id
     ) {
   loadEventData(init_event_id);
 
   if ( init_frame_id ) {
     if ( init_frame_id >= event_data->frame_count ) {
-      Error("Invalid frame id specified. %d > %lu", init_frame_id, event_data->frame_count);
+      Error("Invalid frame id specified. %d > %d", init_frame_id, event_data->frame_count);
       curr_stream_time = event_data->start_time;
       curr_frame_id = 1;
     } else {
@@ -225,20 +225,24 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   sql = stringtf("SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` "
                  "FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id);
-
   result = zmDbFetch(sql);
   if (!result) {
     exit(-1);
   }
 
   event_data->n_frames = mysql_num_rows(result);
-
   event_data->frames = new FrameData[event_data->frame_count];
+  if (event_data->frame_count < event_data->n_frames) {
+    event_data->frame_count = event_data->n_frames;
+    Warning("Event %" PRId64 " has more frames in the Frames table (%d) than in the Event record (%d)",
+        event_data->event_id, event_data->n_frames, event_data->frame_count);
+  }
+
   int last_id = 0;
   SystemTimePoint last_timestamp = event_data->start_time;
   Microseconds last_delta = Seconds(0);
 
-  while ( ( dbrow = mysql_fetch_row(result) ) ) {
+  while ((dbrow = mysql_fetch_row(result))) {
     int id = atoi(dbrow[0]);
     //timestamp = atof(dbrow[1]);
     Microseconds delta = std::chrono::duration_cast<Microseconds>(FPSeconds(atof(dbrow[2])));
@@ -280,7 +284,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
   // Incomplete events might not have any frame data
   event_data->last_frame_id = last_id;
 
-  if ( mysql_errno(&dbconn) ) {
+  if (mysql_errno(&dbconn)) {
     Error("Can't fetch row: %s", mysql_error(&dbconn));
     exit(mysql_errno(&dbconn));
   }
@@ -310,7 +314,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
     else
       curr_stream_time = event_data->frames[event_data->last_frame_id-1].timestamp;
   }
-  Debug(2, "Event: %" PRIu64 ", Frames: %ld, Last Frame ID (%ld, Duration: %.2f s Frames Duration: %.2f s",
+  Debug(2, "Event: %" PRIu64 ", Frames: %d, Last Frame ID (%d, Duration: %.2f s Frames Duration: %.2f s",
         event_data->event_id,
         event_data->frame_count,
         event_data->last_frame_id,
@@ -342,12 +346,12 @@ void EventStream::processCommand(const CmdMsg *msg) {
         if (
             (mode == MODE_SINGLE || mode == MODE_NONE)
             &&
-            ((unsigned int)curr_frame_id == event_data->last_frame_id)
+            (curr_frame_id == event_data->last_frame_id)
             ) {
           Debug(1, "Was in single or no replay mode, and at last frame, so jumping to 1st frame");
           curr_frame_id = 1;
         } else {
-          Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
+          Debug(1, "mode is %s, current frame is %d, frame count is %d, last frame id is %d",
                 StreamMode_Strings[(int) mode].c_str(),
                 curr_frame_id,
                 event_data->frame_count,
@@ -404,9 +408,9 @@ void EventStream::processCommand(const CmdMsg *msg) {
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = 1;
-        if ( (unsigned int)curr_frame_id < event_data->last_frame_id )
+        if (curr_frame_id < event_data->last_frame_id)
           curr_frame_id += 1;
-        Debug(1, "Got SLOWFWD command new frame id %ld", curr_frame_id);
+        Debug(1, "Got SLOWFWD command new frame id %d", curr_frame_id);
         break;
     case CMD_SLOWREV :
         paused = true;
@@ -414,7 +418,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
         step = -1;
         curr_frame_id -= 1;
         if ( curr_frame_id < 1 ) curr_frame_id = 1;
-        Debug(1, "Got SLOWREV command new frame id %ld", curr_frame_id);
+        Debug(1, "Got SLOWREV command new frame id %d", curr_frame_id);
         break;
     case CMD_FASTREV :
         Debug(1, "Got FAST REV command");
@@ -538,12 +542,12 @@ void EventStream::processCommand(const CmdMsg *msg) {
 
         if ( curr_frame_id < 1 ) {
           curr_frame_id = 1;
-        } else if ( (unsigned long)curr_frame_id > event_data->last_frame_id ) {
+        } else if (curr_frame_id > event_data->last_frame_id) {
           curr_frame_id = event_data->last_frame_id;
         }
 
         curr_stream_time = event_data->frames[curr_frame_id-1].timestamp;
-        Debug(1, "Got SEEK command, to %f s (new current frame id: %ld offset %f s)",
+        Debug(1, "Got SEEK command, to %f s (new current frame id: %d offset %f s)",
               FPSeconds(offset).count(),
               curr_frame_id,
               FPSeconds(event_data->frames[curr_frame_id - 1].offset).count());
@@ -615,11 +619,11 @@ bool EventStream::checkEventLoaded() {
     sql = stringtf(
         "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` < %" PRIu64 " ORDER BY `Id` DESC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
-  } else if ( (unsigned int)curr_frame_id > event_data->last_frame_id ) {
+  } else if (curr_frame_id > event_data->last_frame_id) {
     if (event_data->end_time.time_since_epoch() == Seconds(0)) {
       // We are viewing an in-process event, so just reload it.
       loadEventData(event_data->event_id);
-      if ( (unsigned int)curr_frame_id > event_data->last_frame_id )
+      if (curr_frame_id > event_data->last_frame_id)
         curr_frame_id = event_data->last_frame_id;
       return false;
     }
@@ -628,7 +632,7 @@ bool EventStream::checkEventLoaded() {
         event_data->monitor_id, event_data->event_id);
   } else {
     // No event change required
-    Debug(3, "No event change required, as curr frame %ld <=> event frames %lu",
+    Debug(3, "No event change required, as curr frame %d <=> event frames %d",
         curr_frame_id, event_data->frame_count);
     return false;
   }
@@ -662,7 +666,7 @@ bool EventStream::checkEventLoaded() {
         curr_frame_id = event_data->last_frame_id;
       else
         curr_frame_id = 1;
-      Debug(2, "New frame id = %ld", curr_frame_id);
+      Debug(2, "New frame id = %d", curr_frame_id);
       start = std::chrono::steady_clock::now();
       return true;
     } else {
@@ -689,13 +693,13 @@ bool EventStream::checkEventLoaded() {
 
 Image * EventStream::getImage( ) {
   std::string path = stringtf(staticConfig.capture_file_format.c_str(), event_data->path.c_str(), curr_frame_id);
-  Debug(2, "EventStream::getImage path(%s) from %s frame(%ld) ", path.c_str(), event_data->path.c_str(), curr_frame_id);
+  Debug(2, "EventStream::getImage path(%s) from %s frame(%d) ", path.c_str(), event_data->path.c_str(), curr_frame_id);
   Image *image = new Image(path.c_str());
   return image;
 }
 
 bool EventStream::sendFrame(Microseconds delta_us) {
-  Debug(2, "Sending frame %ld", curr_frame_id);
+  Debug(2, "Sending frame %d", curr_frame_id);
 
   std::string filepath;
   struct stat filestat = {};
@@ -881,7 +885,7 @@ void EventStream::runStream() {
 
     if ( !paused ) {
       // Figure out if we should send this frame
-      Debug(3, "not paused at cur_frame_id (%ld-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
+      Debug(3, "not paused at cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
       // If we are streaming and this frame is due to be sent
       // frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2
       // so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc.
@@ -983,7 +987,7 @@ void EventStream::runStream() {
       if ( (mode == MODE_SINGLE) && (
             (curr_frame_id < 1 )
             ||
-            ((unsigned int)curr_frame_id >= event_data->frame_count)
+            (curr_frame_id >= event_data->frame_count)
             )
          ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
@@ -992,7 +996,7 @@ void EventStream::runStream() {
         start = now;
       }
 
-      if ((unsigned int)curr_frame_id <= event_data->frame_count) {
+      if (curr_frame_id <= event_data->frame_count) {
         frame_data = &event_data->frames[curr_frame_id-1];
 
         // frame_data->delta is the time since last frame as a float in seconds
@@ -1032,7 +1036,7 @@ void EventStream::runStream() {
           }
         } // end if need to sleep
       } else {
-        Debug(1, "invalid curr_frame_id %ld !< %lu", curr_frame_id, event_data->frame_count);
+        Debug(1, "invalid curr_frame_id %d !< %d", curr_frame_id, event_data->frame_count);
       }  // end if not at end of event
     } else {
       // Paused
@@ -1110,12 +1114,12 @@ bool EventStream::send_file(const std::string &filepath) {
   }
   if (!filestat.st_size) {
     fclose(fdj); /* Close the file handle */
-    Info("File size is zero. Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("File size is zero. Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size)) {
     fclose(fdj); /* Close the file handle */
-    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
@@ -1124,7 +1128,7 @@ bool EventStream::send_file(const std::string &filepath) {
     fclose(fdj); /* Close the file handle */
     return true;
   }
-  Warning("Unable to send raw frame %ld: %s rc %d != %d",
+  Warning("Unable to send raw frame %d: %s rc %d != %d",
       curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
 #endif
 
@@ -1134,7 +1138,7 @@ bool EventStream::send_file(const std::string &filepath) {
   int img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
   fclose(fdj); /* Close the file handle */
   if ( !img_buffer_size ) {
-    Info("Unable to read raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to read raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
 
@@ -1143,13 +1147,13 @@ bool EventStream::send_file(const std::string &filepath) {
 
 bool EventStream::send_buffer(uint8_t* buffer, int size) {
   if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", size) ) {
-    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   int rc = fwrite(buffer, size, 1, stdout);
 
   if ( 1 != rc ) {
-    Error("Unable to send raw frame %ld: %s %d", curr_frame_id, strerror(errno), rc);
+    Error("Unable to send raw frame %d: %s %d", curr_frame_id, strerror(errno), rc);
     return false;
   }
   return true;
@@ -1157,7 +1161,7 @@ bool EventStream::send_buffer(uint8_t* buffer, int size) {
 
 void EventStream::setStreamStart(
     uint64_t init_event_id,
-    unsigned int init_frame_id=0) {
+    int init_frame_id=0) {
   loadInitialEventData(init_event_id, init_frame_id);
 }  // end void EventStream::setStreamStart(init_event_id,init_frame_id=0)
 
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 969e6725d..093bcd0eb 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -49,9 +49,9 @@ class EventStream : public StreamBase {
     struct EventData {
       uint64_t  event_id;
       unsigned int    monitor_id;
-      unsigned long   storage_id;
-      unsigned long   frame_count;    // Value of Frames column in Event
-      unsigned long   last_frame_id;  // Highest frame id known about. Can be < frame_count in incomplete events
+      unsigned int    storage_id;
+      int             frame_count;    // Value of Frames column in Event
+      int             last_frame_id;  // Highest frame id known about. Can be < frame_count in incomplete events
       SystemTimePoint start_time;
       SystemTimePoint end_time;
       Microseconds duration;
@@ -73,7 +73,7 @@ class EventStream : public StreamBase {
     StreamMode mode;
     bool forceEventChange;
 
-    long curr_frame_id;
+    int curr_frame_id;
     SystemTimePoint curr_stream_time;
     bool  send_frame;
     TimePoint start;     // clock time when started the event
@@ -82,7 +82,7 @@ class EventStream : public StreamBase {
 
   protected:
     bool loadEventData(uint64_t event_id);
-    bool loadInitialEventData(uint64_t init_event_id, unsigned int init_frame_id);
+    bool loadInitialEventData(uint64_t init_event_id, int init_frame_id);
     bool loadInitialEventData(int monitor_id, SystemTimePoint event_time);
 
     bool checkEventLoaded();
@@ -118,7 +118,7 @@ class EventStream : public StreamBase {
           ffmpeg_input = nullptr;
         }
     }
-    void setStreamStart(uint64_t init_event_id, unsigned int init_frame_id);
+    void setStreamStart(uint64_t init_event_id, int init_frame_id);
     void setStreamStart(int monitor_id, time_t event_time);
     void setStreamMode(StreamMode p_mode) { mode = p_mode; }
     void runStream() override;

From 8b14885541d6fd9ca464249273a5ca981639c09e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:51:54 -0500
Subject: [PATCH 451/501] Add handling of NOT IN and =\[\] and \!\[\]

---
 web/includes/FilterTerm.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php
index 8a58e2f98..903cce811 100644
--- a/web/includes/FilterTerm.php
+++ b/web/includes/FilterTerm.php
@@ -174,6 +174,7 @@ class FilterTerm {
     case 'IN' :
       return ' IN ';
     case '![]' :
+    case 'NOT IN' :
       return ' NOT IN ';
     case 'EXISTS' :
      return ' EXISTS ';
@@ -303,7 +304,7 @@ class FilterTerm {
     }
     $sql .= $this->sql_operator();
     $values = $this->sql_values();
-    if ( (count($values) > 1) or ($this->op == 'IN') or ($this->op == 'NOT IN') ) {
+    if ((count($values) > 1) or ($this->op == 'IN') or ($this->op == 'NOT IN') or ($this->op == '=[]') or ($this->op == '![]')) {
       $sql .= '('.join(',', $values).')';
     } else {
       $sql .= $values[0];

From b67e7b8111afa3b5691a61ca78abb251f8e878b4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:52:27 -0500
Subject: [PATCH 452/501] serialize form instead of just passing filter id
 because the modal can now handle unsaved filters

---
 web/skins/classic/views/js/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 5765a0e76..e7979db15 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -378,7 +378,7 @@ function delTerm( element ) {
 }
 
 function debugFilter() {
-  getModal('filterdebug', 'fid='+filterid);
+  getModal('filterdebug', $j(form).serialize());
 }
 
 function manageModalBtns(id) {

From efc1ec770c6fb5205c75b4379eabfc6154ddac10 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:52:40 -0500
Subject: [PATCH 453/501] Debug the contents of REQUEST on every hit.

---
 web/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/index.php b/web/index.php
index 5ace8e9b6..abca33c9f 100644
--- a/web/index.php
+++ b/web/index.php
@@ -55,6 +55,7 @@ if ( 0 and ZM\Logger::fetch()->debugOn() ) {
   ZM\Debug(ob_get_contents());
   ob_end_clean();
 }
+ZM\Debug(print_r($_REQUEST, true));
 
 global $Servers;
 $Servers = ZM\Server::find();

From 59d283095dfcdd8f7314af97a90ac24f4ddde576 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 07:54:01 -0600
Subject: [PATCH 454/501] bump rpm specfile rtsp commit

anytime the rtsp commit is bumped in packpack, it must also be bumped in the rpm specfile
---
 distros/redhat/zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index f15e60326..37920dcf8 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -9,7 +9,7 @@
 %global ceb_version 1.0-zm
 
 # RtspServer is configured as a git submodule
-%global rtspserver_commit     cd7fd49becad6010a1b8466bfebbd93999a39878
+%global rtspserver_commit     eab32851421ffe54fec0229c3efc44c642bc8d46
 
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key

From a2a4a8e74f0c3d8fd4f09aa715c3f8ae4ef77435 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 08:22:37 -0600
Subject: [PATCH 455/501] include arp-scan polkit files in rpm

---
 distros/redhat/zoneminder.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 37920dcf8..042eeb7c3 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -352,7 +352,8 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
 %{_unitdir}/zoneminder.service
-%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/actions/com.zoneminder.*
+%{_datadir}/polkit-1/rules.d/com.zoneminder.arp-scan.rules
 %{_bindir}/zmsystemctl.pl
 
 %{_bindir}/zmaudit.pl

From 9d400b9f6cf5a04bb490c362696793fe2fdc4dd3 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 08:33:44 -0600
Subject: [PATCH 456/501] use rockylinux:8 container for ci workflow

---
 .github/workflows/ci-centos-8.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-centos-8.yml b/.github/workflows/ci-centos-8.yml
index f01f9929b..8ad222793 100644
--- a/.github/workflows/ci-centos-8.yml
+++ b/.github/workflows/ci-centos-8.yml
@@ -19,7 +19,7 @@ jobs:
           - crypto_backend: gnutls
             jwt_backend: libjwt
     runs-on: ubuntu-latest
-    container: centos:8
+    container: rockylinux:8
 
     steps:
       - name: Enable RPMFusion, EPEL and PowerTools

From 93ab345a3a1be5047dffded2ee67f6e8baa9e6c2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:28:21 -0500
Subject: [PATCH 457/501] DefaultCodec is for event view, not live

---
 web/lang/en_gb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 623d55571..d8d57d1f3 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -294,10 +294,10 @@ $SLANG = array(
     'Debug'                 => 'Debug',
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
-    'DefaultCodec'          => 'Default Method For Live View',
+    'DefaultCodec'          => 'Default Method For Event View',
     'DefaultView'           => 'Default View',
     'Deinterlacing'         => 'Deinterlacing',
-    'RTSPDescribe'         => 'Use RTSP Response Media URL',
+    'RTSPDescribe'          => 'Use RTSP Response Media URL',
     'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete &amp; Next',
     'DeleteAndPrev'         => 'Delete &amp; Prev',

From 055414c77822fcb4f18b0dc793263f56904ce8c3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:28:58 -0500
Subject: [PATCH 458/501] DefaultCodec is for event view, not live

---
 web/lang/zh_tw.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lang/zh_tw.php b/web/lang/zh_tw.php
index 642b884e2..601d8609a 100644
--- a/web/lang/zh_tw.php
+++ b/web/lang/zh_tw.php
@@ -278,7 +278,7 @@ $SLANG = array(
     'Debug'                 => '除錯',
     'DefaultRate'           => '預設 Rate',
     'DefaultScale'          => '預設 Scale',
-    'DefaultCodec'          => '預設 Method For Live View',
+    'DefaultCodec'          => '預設 Method For Event View',
     'DefaultView'           => '預設 View',
     'Deinterlacing'         => 'Deinterlacing',
     'RTSPDescribe'          => 'Use RTSP Response Media URL',

From 2d3f99eabbdb3279ae75903ff7056c0dfb6b7582 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:59:23 -0500
Subject: [PATCH 459/501] rework zm_sendfile to try again if not all bytes were
 sent. According to the docs, this is entirely possible.

---
 src/zm_sendfile.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index fd72e2e61..3568e2fea 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -3,22 +3,25 @@
 
 #ifdef HAVE_SENDFILE4_SUPPORT
 #include <sys/sendfile.h>
-int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-  int err;
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
+  size_t remaining = size;
+  while (remaining) {
+    ssize_t err = sendfile(out_fd, in_fd, offset, remaining);
+    if (err < 0) {
+      return -errno;
+    }
+    remaining -= err;
+    offset += err;
+  }
 
-  err = sendfile(out_fd, in_fd, offset, size);
-  if ( err < 0 )
-    return -errno;
-
-  return err;
+  return size-remaining;
 }
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
-  int err;
-  err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
+  ssize_t err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
   if (err && errno != EAGAIN)
     return -errno;
 

From f3d3cad4192725511f32a4c926487e205104e775 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:59:39 -0500
Subject: [PATCH 460/501] Remove non-translations

---
 web/lang/en_gb.php | 254 +++------------------------------------------
 1 file changed, 14 insertions(+), 240 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index d8d57d1f3..c80a37e85 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -78,18 +78,10 @@ define( "STRF_FMT_DATETIME_SHORTER", "%x %H:%M:%S" );
 $SLANG = array(
     'SystemLog'             => 'System Log',
     'DateTime'              => 'Date/Time',
-    'Component'             => 'Component',
     'Pid'                   => 'PID',
-    'Level'                 => 'Level',
-    'Message'               => 'Message',
-    'Line'                  => 'Line',
-    'More'                  => 'More',
-    'Clear'                 => 'Clear',
     '24BitColour'           => '24 bit colour',
     '32BitColour'           => '32 bit colour',
     '8BitGrey'              => '8 bit greyscale',
-    'Action'                => 'Action',
-    'Actual'                => 'Actual',
     'AddNewControl'         => 'Add New Control',
     'AddNewMonitor'         => 'Add',
     'AddMonitorDisabled'    => 'Your user is not allowed to add a new monitor',
@@ -97,7 +89,6 @@ $SLANG = array(
     'AddNewStorage'         => 'Add New Storage',
     'AddNewUser'            => 'Add New User',
     'AddNewZone'            => 'Add New Zone',
-    'Alarm'                 => 'Alarm',
     'AlarmBrFrames'         => 'Alarm<br/>Frames',
     'AlarmFrame'            => 'Alarm Frame',
     'AlarmFrameCount'       => 'Alarm Frame Count',
@@ -106,20 +97,13 @@ $SLANG = array(
     'AlarmPx'               => 'Alarm Px',
     'AlarmRefImageBlendPct' => 'Alarm Reference Image Blend %ge',
     'AlarmRGBUnset'         => 'You must set an alarm RGB colour',
-    'Alert'                 => 'Alert',
-    'All'                   => 'All',
     'AllTokensRevoked'      => 'All Tokens Revoked',
     'AnalysisFPS'           => 'Analysis FPS',
     'AnalysisUpdateDelay'   => 'Analysis Update Delay',
-    'API'                   => 'API',
     'APIEnabled'            => 'API Enabled',
-    'Apply'                 => 'Apply',
     'ApplyingStateChange'   => 'Applying State Change',
     'ArchArchived'          => 'Archived Only',
-    'Archive'               => 'Archive',
-    'Archived'              => 'Archived',
     'ArchUnarchived'        => 'Unarchived Only',
-    'Area'                  => 'Area',
     'AreaUnits'             => 'Area (px/%)',
     'AttrAlarmFrames'       => 'Alarm Frames',
     'AttrAlarmedZone'       => 'Alarmed Zone',
@@ -154,12 +138,8 @@ $SLANG = array(
     'AttrTotalScore'        => 'Total Score',
     'AttrStartWeekday'      => 'Start Weekday',
     'AttrEndWeekday'        => 'End Weekday',
-    'Auto'                  => 'Auto',
     'AutoStopTimeout'       => 'Auto Stop Timeout',
-    'Available'             => 'Available',
     'AvgBrScore'            => 'Avg.<br/>Score',
-    'Available'             => 'Available',
-    'Background'            => 'Background',
     'BackgroundFilter'      => 'Run filter in background',
     'BadAlarmFrameCount'    => 'Alarm frame count must be an integer of one or more',
     'BadAlarmMaxFPS'        => 'Alarm Maximum FPS must be a positive integer or floating point value',
@@ -197,20 +177,14 @@ $SLANG = array(
     'BadWebColour'          => 'Web colour must be a valid web colour string',
     'BadWebSitePath'        => 'Please enter a complete website url, including the http:// or https:// prefix.',
     'BadWidth'              => 'Width must be set to a valid value',
-    'Bandwidth'             => 'Bandwidth',
     'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
     'BlobPx'                => 'Blob Px',
-    'Blobs'                 => 'Blobs',
     'BlobSizes'             => 'Blob Sizes',
-    'Brightness'            => 'Brightness',
-    'Buffer'                => 'Buffer',
-    'Buffers'               => 'Buffers',
     'CanAutoFocus'          => 'Can Auto Focus',
     'CanAutoGain'           => 'Can Auto Gain',
     'CanAutoIris'           => 'Can Auto Iris',
     'CanAutoWhite'          => 'Can Auto White Bal.',
     'CanAutoZoom'           => 'Can Auto Zoom',
-    'Cancel'                => 'Cancel',
     'CancelForcedAlarm'     => 'Cancel Forced Alarm',
     'CanFocusAbs'           => 'Can Focus Absolute',
     'CanFocus'              => 'Can Focus',
@@ -232,7 +206,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Can Move Relative',
     'CanPan'                => 'Can Pan' ,
     'CanReset'              => 'Can Reset',
-	'CanReboot'             => 'Can Reboot',
+    'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Can Set Presets',
     'CanSleep'              => 'Can Sleep',
     'CanTilt'               => 'Can Tilt',
@@ -251,7 +225,6 @@ $SLANG = array(
     'CaptureResolution'     => 'Capture Resolution',
     'CapturePalette'        => 'Capture Palette',
     'CaptureWidth'          => 'Capture Width',
-    'Cause'                 => 'Cause',
     'CheckMethod'           => 'Alarm Check Method',
     'ChooseDetectedCamera'  => 'Choose Detected Camera',
     'ChooseDetectedProfile' => 'Choose Detected Profile',
@@ -260,11 +233,7 @@ $SLANG = array(
     'ChooseLogSelection'    => 'Choose a log selection',
     'ChoosePreset'          => 'Choose Preset',
     'CloneMonitor'          => 'Clone',
-    'Close'                 => 'Close',
-    'Colour'                => 'Colour',
-    'Command'               => 'Command',
     'ConcurrentFilter'      => 'Run filter concurrently',
-    'Config'                => 'Config',
     'ConfigOptions'         => 'ConfigOptions',
     'ConfigType'            => 'Config Type',
     'ConfiguredFor'         => 'Configured for',
@@ -276,47 +245,29 @@ $SLANG = array(
     'ConfirmPassword'       => 'Confirm Password',
     'ConjAnd'               => 'and',
     'ConjOr'                => 'or',
-    'Console'               => 'Console',
     'ContactAdmin'          => 'Please contact your adminstrator for details.',
-    'Continue'              => 'Continue',
-    'Contrast'              => 'Contrast',
     'ControlAddress'        => 'Control Address',
     'ControlCap'            => 'Control Capability',
     'ControlCaps'           => 'Control Capabilities',
-    'Control'               => 'Control',
     'ControlDevice'         => 'Control Device',
     'Controllable'          => 'Controllable',
     'ControlType'           => 'Control Type',
-    'Current'               => 'Current',
-    'Cycle'                 => 'Cycle',
     'CycleWatch'            => 'Cycle Watch',
-    'Day'                   => 'Day',
-    'Debug'                 => 'Debug',
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
     'DefaultCodec'          => 'Default Method For Event View',
     'DefaultView'           => 'Default View',
-    'Deinterlacing'         => 'Deinterlacing',
     'RTSPDescribe'          => 'Use RTSP Response Media URL',
-    'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete &amp; Next',
     'DeleteAndPrev'         => 'Delete &amp; Prev',
-    'Delete'                => 'Delete',
     'DeleteSavedFilter'     => 'Delete saved filter',
-    'Description'           => 'Description',
     'DetectedCameras'       => 'Detected Cameras',
     'DetectedProfiles'      => 'Detected Profiles',
     'DeviceChannel'         => 'Device Channel',
     'DeviceFormat'          => 'Device Format',
     'DeviceNumber'          => 'Device Number',
     'DevicePath'            => 'Device Path',
-    'Device'                => 'Device',
-    'Devices'               => 'Devices',
-    'Dimensions'            => 'Dimensions',
     'DisableAlarms'         => 'Disable Alarms',
-    'Disk'                  => 'Disk',
-    'Display'               => 'Display',
-    'Displaying'            => 'Displaying',
     'DonateAlready'         => 'No, I\'ve already donated',
     'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to <a href="https://zoneminder.com/donate/" target="_blank">https://zoneminder.com/donate/</a> in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on <a href="https://forums.zoneminder.com">ZoneMinder.com</a> for support or suggestions about how to make your ZoneMinder experience even better.',
     'Donate'                => 'Please Donate',
@@ -327,34 +278,23 @@ $SLANG = array(
     'DonateRemindWeek'      => 'Not yet, remind again in 1 week',
     'DonateYes'             => 'Yes, I\'d like to donate now',
     'DoNativeMotionDetection'=> 'Do Native Motion Detection',
-    'Download'              => 'Download',
     'DuplicateMonitorName'  => 'Duplicate Monitor Name',
     'DuplicateRTSPStreamName' =>  'Duplicate RTSP Stream Name',
-    'Duration'              => 'Duration',
-    'Edit'                  => 'Edit',
     'EditControl'           => 'Edit Control',
     'EditLayout'            => 'Edit Layout',
-    'Email'                 => 'Email',
     'EnableAlarms'          => 'Enable Alarms',
-    'Enabled'               => 'Enabled',
     'EnterNewFilterName'    => 'Enter new filter name',
     'ErrorBrackets'         => 'Error, please check you have an equal number of opening and closing brackets',
-    'Error'                 => 'Error',
     'ErrorValidValue'       => 'Error, please check that all terms have a valid value',
     'Etc'                   => 'etc',
-    'Event'                 => 'Event',
     'EventFilter'           => 'Event Filter',
     'EventId'               => 'Event Id',
     'EventName'             => 'Event Name',
     'EventPrefix'           => 'Event Prefix',
-    'Events'                => 'Events',
-    'Exclude'               => 'Exclude',
-    'Execute'               => 'Execute',
     'ExportCompress'        => 'Use Compression',
     'ExportDetails'         => 'Export Event Details',
     'ExportMatches'         => 'Export Matches',
     'Exif'                  => 'Embed EXIF data into image',
-    'Export'                => 'Export',
     'DownloadVideo'         => 'Download Video',
     'GenerateDownload'      => 'Generate Download',
     'ExistsInFileSystem'    => 'Exists In File System',
@@ -370,11 +310,7 @@ $SLANG = array(
     'ExportOptions'         => 'Export Options',
     'ExportSucceeded'       => 'Export Succeeded',
     'ExportVideoFiles'      => 'Export Video Files (if present)',
-    'Far'                   => 'Far',
     'FastForward'           => 'Fast Forward',
-    'Feed'                  => 'Feed',
-    'Ffmpeg'                => 'Ffmpeg',
-    'File'                  => 'File',
     'FilterArchiveEvents'   => 'Archive all matches',
     'FilterUnarchiveEvents' => 'Unarchive all matches',
     'FilterUpdateDiskSpace' => 'Update used disk space',
@@ -390,13 +326,10 @@ $SLANG = array(
     'FilterLog'             => 'Filter log',
     'FilterMessageEvents'   => 'Message details of all matches',
     'FilterPx'              => 'Filter Px',
-    'Filter'                => 'Filter',
-    'Filters'               => 'Filters',
     'FilterUnset'           => 'You must specify a filter width and height',
     'FilterUploadEvents'    => 'Upload all matches',
     'FilterUser'            => 'User to run filter as',
     'FilterVideoEvents'     => 'Create video for all matches',
-    'First'                 => 'First',
     'FlippedHori'           => 'Flipped Horizontally',
     'FlippedVert'           => 'Flipped Vertically',
     'FnNone'                => 'None',            // Added 2013.08.16.
@@ -406,29 +339,17 @@ $SLANG = array(
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
     'FnExtdect'             => 'Extdect',           // Added 2014.12.14.
-    'Focus'                 => 'Focus',
     'ForceAlarm'            => 'Force Alarm',
-    'Format'                => 'Format',
     'FPS'                   => 'fps',
     'FPSReportInterval'     => 'FPS Report Interval',
-    'Frame'                 => 'Frame',
     'FrameId'               => 'Frame Id',
     'FrameRate'             => 'Frame Rate',
-    'Frames'                => 'Frames',
     'FrameSkip'             => 'Frame Skip',
     'MotionFrameSkip'       => 'Motion Frame Skip',
-    'FTP'                   => 'FTP',
-    'Func'                  => 'Func',
-    'Function'              => 'Function',
-    'Gain'                  => 'Gain',
-    'General'               => 'General',
     'GenerateVideo'         => 'Generate Video',
     'GeneratingVideo'       => 'Generating Video',
     'GetCurrentLocation'    => 'Get Current Location',
     'GoToZoneMinder'        => 'Go to ZoneMinder.com',
-    'Grey'                  => 'Grey',
-    'Group'                 => 'Group',
-    'Groups'                => 'Groups',
     'HasFocusSpeed'         => 'Has Focus Speed',
     'HasGainSpeed'          => 'Has Gain Speed',
     'HasHomePreset'         => 'Has Home Preset',
@@ -441,49 +362,17 @@ $SLANG = array(
     'HasWhiteSpeed'         => 'Has White Bal. Speed',
     'HasZoomSpeed'          => 'Has Zoom Speed',
     'HighBW'                => 'High&nbsp;B/W',
-    'High'                  => 'High',
-    'Home'                  => 'Home',
-    'Hostname'				=> 'Hostname',
-    'Hour'                  => 'Hour',
-    'Hue'                   => 'Hue',
-    'Id'                    => 'Id',
-    'Idle'                  => 'Idle',
-    'Ignore'                => 'Ignore',
     'ImageBufferSize'       => 'Image Buffer Size (frames)',
     'MaxImageBufferCount'   => 'Maximum Image Buffer Size (frames)',
-    'Image'                 => 'Image',
-    'Images'                => 'Images',
-    'Include'               => 'Include',
-    'In'                    => 'In',
     'InvalidateTokens'      => 'Invalidate all generated tokens',
-    'Inverted'              => 'Inverted',
-    'Iris'                  => 'Iris',
     'KeyString'             => 'Key String',
-    'Label'                 => 'Label',
-    'Language'              => 'Language',
-    'Last'                  => 'Last',
-    'Layout'                => 'Layout',
-    'Libvlc'                => 'Libvlc',
     'LimitResultsPost'      => 'results only', // This is used at the end of the phrase 'Limit to first N results only'
     'LimitResultsPre'       => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
     'LinkedMonitors'        => 'Linked Monitors',
-    'List'                  => 'List',
     'ListMatches'           => 'List Matches',
-    'Load'                  => 'Load',
-    'Local'                 => 'Local',
-    'Log'                   => 'Log',
-    'Logs'                  => 'Logs',
-    'Logging'               => 'Logging',
     'LoggedInAs'            => 'Logged in as',
     'LoggingIn'             => 'Logging In',
-    'Login'                 => 'Login',
-    'Logout'                => 'Logout',
     'LowBW'                 => 'Low&nbsp;B/W',
-    'Low'                   => 'Low',
-    'Main'                  => 'Main',
-    'Man'                   => 'Man',
-    'Manual'                => 'Manual',
-    'Mark'                  => 'Mark',
     'MaxBandwidth'          => 'Max Bandwidth',
     'MaxBrScore'            => 'Max.<br/>Score',
     'MaxFocusRange'         => 'Max Focus Range',
@@ -496,7 +385,6 @@ $SLANG = array(
     'MaxIrisRange'          => 'Max Iris Range',
     'MaxIrisSpeed'          => 'Max Iris Speed',
     'MaxIrisStep'           => 'Max Iris Step',
-    'Max'                   => 'Max',
     'MaxPanRange'           => 'Max Pan Range',
     'MaxPanSpeed'           => 'Max Pan Speed',
     'MaxPanStep'            => 'Max Pan Step',
@@ -510,7 +398,6 @@ $SLANG = array(
     'MaxZoomSpeed'          => 'Max Zoom Speed',
     'MaxZoomStep'           => 'Max Zoom Step',
     'MediumBW'              => 'Medium&nbsp;B/W',
-    'Medium'                => 'Medium',
     'MetaConfig'            => 'Meta Config',
     'MinAlarmAreaLtMax'     => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'     => 'You must specify the minimum alarm pixel count',
@@ -546,20 +433,13 @@ $SLANG = array(
     'MinZoomRange'          => 'Min Zoom Range',
     'MinZoomSpeed'          => 'Min Zoom Speed',
     'MinZoomStep'           => 'Min Zoom Step',
-    'Misc'                  => 'Misc',
-    'Mode'                  => 'Mode',
     'ModectDuringPTZ'       => 'Do motion detection during PTZ motion',
     'MonitorIds'            => 'Monitor&nbsp;Ids',
-    'Monitor'               => 'Monitor',
     'MonitorPresetIntro'    => 'Select an appropriate preset from the list below.<br/><br/>Please note that this may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'MonitorPreset'         => 'Monitor Preset',
     'MonitorProbeIntro'     => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'MonitorProbe'          => 'Monitor Probe',
-    'Monitors'              => 'Monitors',
-    'Montage'               => 'Montage',
     'MontageReview'         => 'Montage Review',
-    'Month'                 => 'Month',
-    'Move'                  => 'Move',
     'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
@@ -570,35 +450,23 @@ $SLANG = array(
     'MustConfirmPassword'   => 'You must confirm the password',
     'MustSupplyPassword'    => 'You must supply a password',
     'MustSupplyUsername'    => 'You must supply a username',
-    'Name'                  => 'Name',
-    'Near'                  => 'Near',
-    'Network'               => 'Network',
     'NewGroup'              => 'New Group',
     'NewLabel'              => 'New Label',
-    'New'                   => 'New',
     'NewPassword'           => 'New Password',
     'NewState'              => 'New State',
     'NewUser'               => 'New User',
-    'Next'                  => 'Next',
     'NextMonitor'           => 'Next Monitor',
     'NoDetectedCameras'     => 'No Detected Cameras',
     'NoDetectedProfiles'    => 'No Detected Profiles',
     'NoFramesRecorded'      => 'There are no frames recorded for this event',
     'NoGroup'               => 'No Group',
     'NoneAvailable'         => 'None available',
-    'None'                  => 'None',
-    'No'                    => 'No',
-    'Normal'                => 'Normal',
-    'NoSavedFilters'        => 'NoSavedFilters',
+    'NoSavedFilters'        => 'No Saved Filters',
     'NoStatisticsRecorded'  => 'There are no statistics recorded for this event/frame',
-    'Notes'                 => 'Notes',
     'NumPresets'            => 'Num Presets',
-    'Off'                   => 'Off',
-    'On'                    => 'On',
     'OnvifProbe'            => 'ONVIF',
     'OnvifProbeIntro'       => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'OnvifCredentialsIntro' => 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>',
-    'Open'                  => 'Open',
     'OpEq'                  => 'equal to',
     'OpGtEq'                => 'greater than or equal to',
     'OpGt'                  => 'greater than',
@@ -619,42 +487,26 @@ $SLANG = array(
     'Options'               => 'Options',
     'Order'                 => 'Order',
     'OrEnterNewName'        => 'or enter new name',
-    'Orientation'           => 'Orientation',
-    'Out'                   => 'Out',
     'OverwriteExisting'     => 'Overwrite Existing',
-    'Paged'                 => 'Paged',
     'PanLeft'               => 'Pan Left',
-    'Pan'                   => 'Pan',
     'PanRight'              => 'Pan Right',
     'PanTilt'               => 'Pan/Tilt',
-    'Parameter'             => 'Parameter',
     'ParentGroup'           => 'Parent Group',
-    'Password'              => 'Password',
     'PasswordsDifferent'    => 'The new and confirm passwords are different',
     'PathToIndex'           => 'Path To Index',
     'PathToZMS'             => 'Path To ZMS',
     'PathToApi'             => 'Path To Api',
-    'Paths'                 => 'Paths',
-    'Pause'                 => 'Pause',
     'PauseCycle'            => 'Pause Cycle',
     'PhoneBW'               => 'Phone&nbsp;B/W',
-    'Phone'                 => 'Phone',
     'PixelDiff'             => 'Pixel Diff',
     'Pixels'                => 'pixels',
     'PlayAll'               => 'Play All',
-    'Play'                  => 'Play',
     'PlayCycle'             => 'Play Cycle',
-    'Plugins'               => 'Plugins',
     'PleaseWait'            => 'Please Wait',
-    'Point'                 => 'Point',
     'PostEventImageBuffer'  => 'Post Event Image Count',
     'PreEventImageBuffer'   => 'Pre Event Image Count',
     'PreserveAspect'        => 'Preserve Aspect Ratio',
-    'Preset'                => 'Preset',
-    'Presets'               => 'Presets',
-    'Prev'                  => 'Prev',
     'PreviousMonitor'       => 'Previous Monitor',
-    'Privacy'               => 'Privacy',
     'PrivacyAbout'          => 'About',
     'PrivacyAboutText'      => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.',
     'PrivacyContact'        => 'Contact',
@@ -694,15 +546,9 @@ $SLANG = array(
     'Probe'                 => 'Probe',
     'ProfileProbe'          => 'Stream Probe',
     'ProfileProbeIntro'     => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
-    'Progress'              => 'Progress',
-    'Protocol'              => 'Protocol',
-    'Rate'                  => 'Rate',
     'RecaptchaWarning'      => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // added Sep 24 2015 - PP
-	'RecordAudio'			=> 'Whether to store the audio stream when saving an event.',
-    'Real'                  => 'Real',
-    'Record'                => 'Record',
+    'RecordAudio'		       	=> 'Whether to store the audio stream when saving an event.',
     'RefImageBlendPct'      => 'Reference Image Blend %ge',
-    'Refresh'               => 'Refresh',
     'RemoteHostName'        => 'Host Name',
     'RemoteHostPath'        => 'Path',
     'RemoteHostSubPath'     => 'SubPath',
@@ -710,30 +556,22 @@ $SLANG = array(
     'RemoteImageColours'    => 'Image Colours',
     'RemoteMethod'          => 'Method',
     'RemoteProtocol'        => 'Protocol',
-    'Remote'                => 'Remote',
-    'Rename'                => 'Rename',
     'ReplayAll'             => 'All Events',
     'ReplayGapless'         => 'Gapless Events',
-    'Replay'                => 'Replay',
     'ReplaySingle'          => 'Single Event',
     'ReportEventAudit'      => 'Audit Events Report',
     'ResetEventCounts'      => 'Reset Event Counts',
-    'Reset'                 => 'Reset',
-    'Restarting'            => 'Restarting',
-    'Restart'               => 'Restart',
     'RestrictedCameraIds'   => 'Restricted Camera Ids',
     'RestrictedMonitors'    => 'Restricted Monitors',
     'ReturnDelay'           => 'Return Delay',
     'ReturnLocation'        => 'Return Location',
-    'RevokeAllTokens'       =>  'Revoke All Tokens',
-    'Rewind'                => 'Rewind',
+    'RevokeAllTokens'       => 'Revoke All Tokens',
     'RotateLeft'            => 'Rotate Left',
     'RotateRight'           => 'Rotate Right',
     'RTSPTransport'         => 'RTSP Transport Protocol',
     'RunAudit'              => 'Run Audit Process',
     'RunLocalUpdate'        => 'Please run zmupdate.pl to update',
     'RunMode'               => 'Run Mode',
-    'Running'               => 'Running',
     'RunState'              => 'Run State',
     'RunStats'              => 'Run Stats Process',
     'RunTrigger'            => 'Run Trigger Process',
@@ -741,45 +579,29 @@ $SLANG = array(
     'SaveAs'                => 'Save as',
     'SaveFilter'            => 'Save Filter',
     'SaveJPEGs'             => 'Save JPEGs',
-    'Save'                  => 'Save',
-    'Scale'                 => 'Scale',
-    'Score'                 => 'Score',
-    'Secs'                  => 'Secs',
     'Sectionlength'         => 'Section length',
     'SelectMonitors'        => 'Select Monitors',
-    'Select'                => 'Select',
     'SelectFormat'          => 'Select Format',
     'SelectLog'             => 'Select Log',
     'SelfIntersecting'      => 'Polygon edges must not intersect',
     'SetNewBandwidth'       => 'Set New Bandwidth',
     'SetPreset'             => 'Set Preset',
-    'Set'                   => 'Set',
-    'Settings'              => 'Settings',
     'ShowFilterWindow'      => 'Show Filter Window',
     'ShowTimeline'          => 'Show Timeline',
-    'Shutdown'              => 'Shutdown',
     'SignalCheckColour'     => 'Signal Check Colour',
     'SignalCheckPoints'     => 'Signal Check Points',
-    'Size'                  => 'Size',
     'SkinDescription'       => 'Change the skin for this session',
     'CSSDescription'        => 'Change the css for this session',
-    'Sleep'                 => 'Sleep',
     'SortAsc'               => 'Asc',
     'SortBy'                => 'Sort by',
     'SortDesc'              => 'Desc',
-    'Source'                => 'Source',
     'SourceColours'         => 'Source Colours',
     'SourcePath'            => 'Source Path',
     'SourceType'            => 'Source Type',
     'SpeedHigh'             => 'High Speed',
     'SpeedLow'              => 'Low Speed',
     'SpeedMedium'           => 'Medium Speed',
-    'Speed'                 => 'Speed',
     'SpeedTurbo'            => 'Turbo Speed',
-    'Start'                 => 'Start',
-    'State'                 => 'State',
-    'Stats'                 => 'Stats',
-    'Status'                => 'Status',
     'StatusUnknown'         => 'Unknown',
     'StatusConnected'       => 'Capturing',
     'StatusNotRunning'      => 'Not Running',
@@ -790,23 +612,12 @@ $SLANG = array(
     'StepMedium'            => 'Medium Step',
     'StepNone'              => 'No Step',
     'StepSmall'             => 'Small Step',
-    'Step'                  => 'Step',
-    'Stills'                => 'Stills',
-    'Stopped'               => 'Stopped',
-    'Stop'                  => 'Stop',
     'StorageArea'           => 'Storage Area',
     'StorageDoDelete'       => 'Do Deletes',
     'StorageScheme'         => 'Scheme',
     'StreamReplayBuffer'    => 'Stream Replay Image Buffer',
-    'Stream'                => 'Stream',
-    'Submit'                => 'Submit',
-    'System'                => 'System',
     'TargetColorspace'      => 'Target colorspace',
-    'Tele'                  => 'Tele',
-    'Thumbnail'             => 'Thumbnail',
-    'Tilt'                  => 'Tilt',
     'TimeDelta'             => 'Time Delta',
-    'Timeline'              => 'Timeline',
     'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
     'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
     'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
@@ -815,44 +626,25 @@ $SLANG = array(
     'TimestampLabelX'       => 'Timestamp Label X',
     'TimestampLabelY'       => 'Timestamp Label Y',
     'TimestampLabelSize'    => 'Font Size',
-    'Timestamp'             => 'Timestamp',
     'TimeStamp'             => 'Time Stamp',
-    'Time'                  => 'Time',
-    'Today'                 => 'Today',
-    'Tools'                 => 'Tools',
-    'Total'                 => 'Total',
     'TotalBrScore'          => 'Total<br/>Score',
     'TrackDelay'            => 'Track Delay',
     'TrackMotion'           => 'Track Motion',
-    'Triggers'              => 'Triggers',
     'TurboPanSpeed'         => 'Turbo Pan Speed',
     'TurboTiltSpeed'        => 'Turbo Tilt Speed',
-    'Type'                  => 'Type',
     'TZUnset'               => 'Unset - use value in php.ini',
-    'Unarchive'             => 'Unarchive',
-    'Undefined'             => 'Undefined',
-    'Units'                 => 'Units',
-    'Unknown'               => 'Unknown',
     'UpdateAvailable'       => 'An update to ZoneMinder is available.',
     'UpdateNotNecessary'    => 'No update is necessary.',
-    'Update'                => 'Update',
-    'Upload'                => 'Upload',
-    'Updated'               => 'Updated',
-    'UsedPlugins'	        => 'Used Plugins',
+    'UsedPlugins'	          => 'Used Plugins',
     'UseFilterExprsPost'    => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'     => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
     'UseFilter'             => 'Use Filter',
-    'Username'              => 'Username',
-    'Users'                 => 'Users',
-    'User'                  => 'User',
-    'Value'                 => 'Value',
     'VersionIgnore'         => 'Ignore this version',
     'VersionRemindDay'      => 'Remind again in 1 day',
     'VersionRemindHour'     => 'Remind again in 1 hour',
     'VersionRemindNever'    => 'Don\'t remind about new versions',
     'VersionRemindWeek'     => 'Remind again in 1 week',
     'VersionRemindMonth'    => 'Remind again in 1 month',
-    'Version'               => 'Version',
     'ViewMatches'           => 'View Matches',
     'VideoFormat'           => 'Video Format',
     'VideoGenFailed'        => 'Video Generation Failed!',
@@ -862,31 +654,19 @@ $SLANG = array(
     'VideoGenSucceeded'     => 'Video Generation Succeeded!',
     'VideoSize'             => 'Video Size',
     'VideoWriter'           => 'Video Writer',
-    'Video'                 => 'Video',
     'ViewAll'               => 'View All',
     'ViewEvent'             => 'View Event',
     'ViewPaged'             => 'View Paged',
-    'View'                  => 'View',
-	'V4LCapturesPerFrame'	=> 'Captures Per Frame',
-	'V4LMultiBuffer'		=> 'Multi Buffering',
-    'Wake'                  => 'Wake',
+    'V4LCapturesPerFrame'  	=> 'Captures Per Frame',
+    'V4LMultiBuffer'		    => 'Multi Buffering',
     'WarmupFrames'          => 'Warmup Frames',
-    'Watch'                 => 'Watch',
     'WebColour'             => 'Web Colour',
-    'Web'                   => 'Web',
     'WebSiteUrl'            => 'Website URL',
-    'Week'                  => 'Week',
     'WhiteBalance'          => 'White Balance',
-    'White'                 => 'White',
-    'Wide'                  => 'Wide',
     'X10ActivationString'   => 'X10 Activation String',
     'X10InputAlarmString'   => 'X10 Input Alarm String',
     'X10OutputAlarmString'  => 'X10 Output Alarm String',
-    'X10'                   => 'X10',
-    'X'                     => 'X',
-    'Yes'                   => 'Yes',
     'YouNoPerms'            => 'You do not have permissions to access this resource.',
-    'Y'                     => 'Y',
     'ZoneAlarmColour'       => 'Alarm Colour (Red/Green/Blue)',
     'ZoneArea'              => 'Zone Area',
     'ZoneFilterSize'        => 'Filter Width/Height (pixels)',
@@ -898,11 +678,8 @@ $SLANG = array(
     'ZoneMinMaxPixelThres'  => 'Min/Max Pixel Threshold (0-255)',
     'ZoneOverloadFrames'    => 'Overload Frame Ignore Count',
     'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
-    'Zones'                 => 'Zones',
-    'Zone'                  => 'Zone',
     'ZoomIn'                => 'Zoom In',
     'ZoomOut'               => 'Zoom Out',
-    'Zoom'                  => 'Zoom',
 );
 
 // Complex replacements with formatting and/or placements, must be passed through sprintf
@@ -960,17 +737,14 @@ $VLANG = array(
 //
 // In languages such as English this is fairly simple
 // Note this still has to be used with printf etc to get the right formatting
-function zmVlang( $langVarArray, $count )
-{
-    krsort( $langVarArray );
-    foreach ( $langVarArray as $key=>$value )
-    {
-        if ( abs($count) >= $key )
-        {
-            return( $value );
-        }
+function zmVlang($langVarArray, $count) {
+  krsort($langVarArray);
+  foreach ($langVarArray as $key=>$value) {
+    if (abs($count) >= $key) {
+      return $value;
     }
-    die( 'Error, unable to correlate variable language string' );
+  }
+  ZM\Error('Unable to correlate variable language string');
 }
 
 // This is an version that could be used in the Russian example above

From 2336926d90f97646119f41e06f614b23768c6669 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:01 -0500
Subject: [PATCH 461/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed. Use new reworked zm_sendfile and
 handle if not all bytes are sent. Fixes #3437.

---
 src/zm_eventstream.cpp | 47 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 34f693f36..4521aaf89 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -799,7 +799,13 @@ bool EventStream::sendFrame(Microseconds delta_us) {
       }
 
       Image *send_image = prepareImage(image);
-      static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+      if (temp_img_buffer_size < send_image->Size()) {
+        Debug(1, "Resizing image buffer from %zu to %u",
+            temp_img_buffer_size, send_image->Size());
+        delete[] temp_img_buffer;
+        temp_img_buffer = new uint8_t[send_image->Size()];
+        temp_img_buffer_size = send_image->Size();
+      }
       int img_buffer_size = 0;
       uint8_t *img_buffer = temp_img_buffer;
 
@@ -1098,14 +1104,12 @@ void EventStream::runStream() {
 } // end void EventStream::runStream()
 
 bool EventStream::send_file(const std::string &filepath) {
-  FILE *fdj = nullptr;
-  fdj = fopen(filepath.c_str(), "rb");
+  FILE *fdj = fopen(filepath.c_str(), "rb");
   if (!fdj) {
     Error("Can't open %s: %s", filepath.c_str(), strerror(errno));
     std::string error_message = stringtf("Can't open %s: %s", filepath.c_str(), strerror(errno));
     return sendTextFrame(error_message.c_str());
   }
-#if HAVE_SENDFILE
   static struct stat filestat;
   if (fstat(fileno(fdj), &filestat) < 0) {
     fclose(fdj); /* Close the file handle */
@@ -1117,33 +1121,30 @@ bool EventStream::send_file(const std::string &filepath) {
     Info("File size is zero. Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size)) {
+  if (0 > fprintf(stdout, "Content-Length: %jd\r\n\r\n", filestat.st_size)) {
     fclose(fdj); /* Close the file handle */
     Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
-  if (rc == (int)filestat.st_size) {
+  ssize_t remaining = filestat.st_size;
+
+  while (remaining > 0) {
+    ssize_t rc = zm_sendfile(fileno(stdout), fileno(fdj), nullptr, remaining);
+    if (rc < 0) break;
+    if (rc > 0) {
+      remaining -= rc;
+    } 
+  }  // end while remaining
+
+  if (!remaining) {
     // Success
     fclose(fdj); /* Close the file handle */
     return true;
   }
-  Warning("Unable to send raw frame %d: %s rc %d != %d",
-      curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
-#endif
-
-  static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
-
-  uint8_t *img_buffer = temp_img_buffer;
-  int img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
-  fclose(fdj); /* Close the file handle */
-  if ( !img_buffer_size ) {
-    Info("Unable to read raw frame %d: %s", curr_frame_id, strerror(errno));
-    return false;
-  }
-
-  return send_buffer(img_buffer, img_buffer_size);
-}
+  Warning("Unable to send raw frame %d: %s %zu remaining",
+      curr_frame_id, strerror(errno), remaining);
+  return false;
+}  // end bool EventStream::send_file(const std::string &filepath)
 
 bool EventStream::send_buffer(uint8_t* buffer, int size) {
   if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", size) ) {

From 243c780a6a22e1af7aa3a23ee4a3964effed485f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:25 -0500
Subject: [PATCH 462/501] cleanup and add fallback to read/write if no sendfile
 support.

---
 src/zm_sendfile.h | 51 +++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index 3568e2fea..4edabccab 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -3,37 +3,44 @@
 
 #ifdef HAVE_SENDFILE4_SUPPORT
 #include <sys/sendfile.h>
-ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-  size_t remaining = size;
-  while (remaining) {
-    ssize_t err = sendfile(out_fd, in_fd, offset, remaining);
-    if (err < 0) {
-      return -errno;
-    }
-    remaining -= err;
-    offset += err;
-  }
-
-  return size-remaining;
-}
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
+#else
+#include <unistd.h>
+#endif
+
+/* Function to send the contents of a file. Will use sendfile or fall back to reading/writing */
+
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
+#ifdef HAVE_SENDFILE4_SUPPORT
+  ssize_t err = sendfile(out_fd, in_fd, offset, size);
+  if (err < 0) {
+    return -errno;
+  }
+  return err;
+
+#elif HAVE_SENDFILE7_SUPPORT
   ssize_t err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
   if (err && errno != EAGAIN)
     return -errno;
-
-  if (size) {
-    *offset += size;
-    return size;
+  return size;
+#else
+  uint8_t buffer[size];
+  ssize_t err = read(in_fd, buffer, size);
+  if (err < 0) {
+    Error("Unable to read %zu bytes: %s", size, strerror(errno));
+    return -errno;
   }
 
-  return -EAGAIN;
-}
-#else
-#error "Your platform does not support sendfile. Sorry."
+  err = fwrite(out_fd, buffer, size);
+  if (err < 0) {
+    Error("Unable to write %zu bytes: %s", size, strerror(errno));
+    return -errno;
+  }
+  return err;
 #endif
+}
 
 #endif // ZM_SENDFILE_H

From 67563737c3fdc58e972cbeb298c6316f905bf0a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:46 -0500
Subject: [PATCH 463/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed.

---
 src/zm_stream.cpp | 6 ++----
 src/zm_stream.h   | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 084bd6754..b3b3aa120 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -31,10 +31,8 @@ constexpr Seconds StreamBase::MAX_STREAM_DELAY;
 constexpr Milliseconds StreamBase::MAX_SLEEP;
 
 StreamBase::~StreamBase() {
-  if (vid_stream) {
-    delete vid_stream;
-    vid_stream = nullptr;
-  }
+  delete vid_stream;
+  delete temp_img_buffer;
   closeComms();
 }
 
diff --git a/src/zm_stream.h b/src/zm_stream.h
index d89d97e7f..de58fcf7b 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -144,6 +144,9 @@ protected:
 
   CmdMsg msg;
 
+  unsigned char *temp_img_buffer;     // Used when encoding or sending file data
+  size_t temp_img_buffer_size;
+
 protected:
   bool loadMonitor(int monitor_id);
   bool checkInitialised();
@@ -182,7 +185,9 @@ public:
     actual_fps(0.0),
     frame_count(0),
     last_frame_count(0),
-    frame_mod(1)
+    frame_mod(1),
+    temp_img_buffer(nullptr),
+    temp_img_buffer_size(0)
   {
     memset(&loc_sock_path, 0, sizeof(loc_sock_path));
     memset(&loc_addr, 0, sizeof(loc_addr));

From c9de883a7c1d9a61b76ccaaca62677b9e7c6581a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:18:37 -0500
Subject: [PATCH 464/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed.

---
 src/zm_monitorstream.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index a6232a23e..2bb82d360 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -422,12 +422,17 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
 
     /* double pts = */ vid_stream->EncodeFrame(send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_time.count());
   } else {
-    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+    if (temp_img_buffer_size < send_image->Size()) {
+      Debug(1, "Resizing image buffer from %zu to %u",
+          temp_img_buffer_size, send_image->Size());
+      delete[] temp_img_buffer;
+      temp_img_buffer = new uint8_t[send_image->Size()];
+      temp_img_buffer_size = send_image->Size();
+    }
 
     int img_buffer_size = 0;
     unsigned char *img_buffer = temp_img_buffer;
 
-
     switch ( type ) {
       case STREAM_JPEG :
         send_image->EncodeJpeg(img_buffer, &img_buffer_size);

From b9e6cf803871a758be5a0b408f126e70db541389 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 17:27:12 -0500
Subject: [PATCH 465/501] Spacing, remove dead code, add comments.  When
 implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count
 instead of 0.

---
 src/zm_monitor.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c094aecff..026fad766 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1747,7 +1747,7 @@ bool Monitor::Analyse() {
       Event::StringSetMap noteSetMap;
 
 #ifdef WITH_GSOAP
-      if (onvif_event_listener  && Event_Poller_Healthy) {
+      if (onvif_event_listener && Event_Poller_Healthy) {
         if (Poll_Trigger_State) {
           score += 9;
           Debug(1, "Triggered on ONVIF");
@@ -1856,9 +1856,6 @@ bool Monitor::Analyse() {
               // So... 
               Debug(1, "Waiting for decode");
               packet_lock->wait();
-              //packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
-              //packetqueue.wait();
-              ////packet_lock->lock();
             }  // end while ! decoded
             if (zm_terminate or analysis_thread->Stopped()) {
               delete packet_lock;
@@ -1890,7 +1887,7 @@ bool Monitor::Analyse() {
                   Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                   ref_image.Assign(v_image);
                 } else {
-            Debug(1, "assigning refimage from snap->image");
+                  Debug(1, "assigning refimage from snap->image");
                   ref_image.Assign(*(snap->image));
                 }
                 alarm_image.Assign(*(snap->image));
@@ -1956,7 +1953,7 @@ bool Monitor::Analyse() {
             if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
               // If we should end then previous continuous event and start a new non-continuous event
               if (event && event->Frames()
-                  && !event->AlarmFrames()
+                  && (event->AlarmFrames() < alarm_frame_count)
                   && (event_close_mode == CLOSE_ALARM)
                   // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
                   && (event->Duration() >= min_section_length)
@@ -2016,7 +2013,7 @@ bool Monitor::Analyse() {
               if (
                   ((analysis_image_count - last_alarm_count) > post_event_count)
                   &&
-                 (event->Duration() >= min_section_length)) {
+                  (event->Duration() >= min_section_length)) {
                 Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                     name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
                 if (
@@ -2051,6 +2048,7 @@ bool Monitor::Analyse() {
               Event::EmptyPreAlarmFrames();
           } // end if score or not
 
+          // At this point, snap ONLY has motion score, so this adds other sources
           if (score > snap->score)
             snap->score = score;
 

From 909c0e903f8660ed9ede5e23052156327912a738 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:30:01 -0500
Subject: [PATCH 466/501] Include EndDateTimeShort in event ajax response

---
 web/ajax/status.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/ajax/status.php b/web/ajax/status.php
index 0d17213a5..b37a3bda6 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -113,6 +113,7 @@ $statusData = array(
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
+      'EndDateTimeShort' => array( 'sql' => 'date_format( EndDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'Width' => true,
       'Height' => true,
       'Length' => true,
@@ -141,6 +142,7 @@ $statusData = array(
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
+      'EndDateTimeShort' => array( 'sql' => 'date_format( EndDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'Width' => true,
       'Height' => true,
       'Length' => true,

From 8dedac1a216fe5f78c8a170f759b53d14b559c11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:30:50 -0500
Subject: [PATCH 467/501] Handle empty endtime more gracefully.  If there is a
 next event just jump to it.

---
 web/skins/classic/views/js/event.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 31363e154..1c7a11954 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -52,14 +52,19 @@ function vjsReplay() {
         var overLaid = $j("#videoobj");
         overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
       } else {
-        var endTime = (Date.parse(eventData.EndDateTime)).getTime();
+        if (!eventData.EndDateTime) {
+          // No EndTime but have a next event, just go to it.
+          streamNext(true);
+          return;
+        }
+        var endTime = Date.parse(eventData.EndDateTime).getTime();
         var nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
         if ( nextStartTime <= endTime ) {
           streamNext(true);
           return;
         }
-        var overLaid = $j("#videoobj");
         vid.pause();
+        var overLaid = $j("#videoobj");
         overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>');
         var gapDuration = (new Date().getTime()) + (nextStartTime - endTime);
         var messageP = $j('.vjsMessage');

From adf84133336133915eec031ee8a8009eaac443fb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:31:25 -0500
Subject: [PATCH 468/501] Include EndDateTimeShort in event stats

---
 web/skins/classic/views/js/event.js.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index c2b61f395..700558cca 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -52,6 +52,7 @@ var eventData = {
     StartDateTime: '<?php echo $Event->StartDateTime() ?>',
     StartDateTimeShort: '<?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartDateTime())) ?>',
     EndDateTime: '<?php echo $Event->EndDateTime() ?>',
+    EndDateTimeShort: '<?php echo $Event->EndDateTime()? strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->EndDateTime())) : '' ?>',
     Frames: '<?php echo $Event->Frames() ?>',
     AlarmFrames: '<?php echo $Event->AlarmFrames() ?>',
     TotScore: '<?php echo $Event->TotScore() ?>',
@@ -75,6 +76,7 @@ var eventDataStrings = {
     Cause: '<?php echo translate('Cause') ?>',
     Notes: '<?php echo translate('Notes') ?>',
     StartDateTimeShort: '<?php echo translate('AttrStartTime') ?>',
+    EndDateTimeShort: '<?php echo translate('AttrEndTime') ?>',
     Length: '<?php echo translate('Duration') ?>',
     Frames: '<?php echo translate('AttrFrames') ?>',
     AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',

From 28f3cb18e4458385e6d67e449bd66bdcc05eca1d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 18 Feb 2022 15:59:00 -0500
Subject: [PATCH 469/501] Make std function warning into a debug. Warning will
 happen if they are actually used

---
 src/zm_image.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 35efa8774..7a2048102 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -98,7 +98,7 @@ void Image::update_function_pointers() {
     delta8_abgr = &std_delta8_abgr;
     delta8_gray8 = &std_delta8_gray8;
     blend = &std_blend;
-    Warning("Using slow std functions because pixels %d mod 4=%d", pixels, pixels%4);
+    Debug(1, "Using slow std functions because pixels %d mod 4=%d", pixels, pixels%4);
   } else {
     // Use either sse or neon, or loop unrolled version
     delta8_rgb = fptr_delta8_rgb;
@@ -1167,7 +1167,7 @@ bool Image::WriteJpeg(const std::string &filename,
       } else if (subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
         cinfo->in_color_space = JCS_EXT_XBGR;
       } else {
-        Warning("Unknwon subpixelorder %d", subpixelorder);
+        Warning("Unknown subpixelorder %d", subpixelorder);
         /* Assume RGBA */
         cinfo->in_color_space = JCS_EXT_RGBX;
       }

From 002b2c39aa3f97e5200b82405bb5306dfb24c63d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 18 Feb 2022 17:08:40 -0500
Subject: [PATCH 470/501] fix button assignments. Don't abort ajax, as it might
 be important

---
 web/js/MonitorStream.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 86b9b97e0..110f1665d 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -26,7 +26,7 @@ function MonitorStream(monitorData) {
 
   this.buttons = {}; // index by name
   this.setButton = function(name, element) {
-    this.buttons.name = element;
+    this.buttons[name] = element;
   };
 
   this.element = null;
@@ -380,6 +380,8 @@ function MonitorStream(monitorData) {
             if ('enableAlarmButton' in this.buttons) {
               this.buttons.enableAlarmButton.addClass('disabled');
               this.buttons.enableAlarmButton.prop('title', disableAlarmsStr);
+            } else {
+              console.log('enableAlarmButton not found in buttons');
             }
             if ('forceAlarmButton' in this.buttons) {
               if (streamStatus.forced) {
@@ -390,8 +392,11 @@ function MonitorStream(monitorData) {
                 this.buttons.forceAlarmButton.prop('title', forceAlarmStr);
               }
               this.buttons.forceAlarmButton.prop('disabled', false);
+            } else {
+              console.log('forceAlarmButton not found in buttons');
             }
           } else {
+            console.log("streamStatus not enabled");
             if ('enableAlarmButton' in this.buttons) {
               this.buttons.enableAlarmButton.removeClass('disabled');
               this.buttons.enableAlarmButton.prop('title', enableAlarmsStr);
@@ -462,6 +467,8 @@ function MonitorStream(monitorData) {
 
   this.alarmCommand = function(command) {
     if (this.ajaxQueue) {
+      console.log("Aborting in progress ajax for alarm");
+      // Doing this for responsiveness, but we could be aborting something important. Need smarter logic
       this.ajaxQueue.abort();
     }
     const alarmCmdParms = Object.assign({}, this.streamCmdParms);
@@ -485,9 +492,6 @@ function MonitorStream(monitorData) {
     }
 
     this.streamCmdReq = function(streamCmdParms) {
-      if (this.ajaxQueue) {
-        this.ajaxQueue.abort();
-      }
       this.ajaxQueue = jQuery.ajaxQueue({url: this.url, data: streamCmdParms, dataType: "json"})
           .done(this.getStreamCmdResponse.bind(this))
           .fail(this.onFailure.bind(this));

From 1a54a96c0479537411205a6e6c84961409520833 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 18 Feb 2022 17:09:24 -0500
Subject: [PATCH 471/501] Improve title on alarm buttons when we don't have
 permission. Move onclick from data-on-click to setup in initPage only if
 permitted

---
 web/skins/classic/views/js/watch.js | 8 ++++++++
 web/skins/classic/views/watch.php   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 21026c3c8..4af160389 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -833,6 +833,14 @@ function initPage() {
     monitorStream.setButton('enableAlarmButton', enableAlmBtn);
     monitorStream.setButton('forceAlarmButton', forceAlmBtn);
     monitorStream.setButton('zoomOutButton', $j('zoomOutBtn'));
+    if (canEdit.Monitors) {
+      // Will be enabled by streamStatus ajax
+      enableAlmBtn.on('click', cmdAlarm);
+      forceAlmBtn.on('click', cmdForce);
+    } else {
+      forceAlmBtn.prop('title', forceAlmBtn.prop('title') + ': disabled because cannot edit Monitors');
+      enableAlmBtn.prop('title', enableAlmBtn.prop('title') + ': disabled because cannot edit Monitors');
+    }
 
     /*
     if (streamMode == 'single') {
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index fdcdae06d..8ceb06ab2 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -159,8 +159,8 @@ xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
         <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
         <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
         <button type="button" id="settingsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Settings') ?>" disabled><i class="fa fa-sliders"></i></button>
-        <button type="button" id="enableAlmBtn" class="btn btn-normal" data-on-click="cmdAlarm" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
-        <button type="button" id="forceAlmBtn" class="btn btn-danger" data-on-click="cmdForce" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
+        <button type="button" id="enableAlmBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
+        <button type="button" id="forceAlmBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
       </div>
       <div id="headerButtons">
 <!--

From fc541ac57d86c1fcd09a441a19ad7f3605f7c66b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 18 Feb 2022 17:11:02 -0500
Subject: [PATCH 472/501] fix potential double lock of jpeg mutex

---
 src/zm_image.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 7a2048102..a3662c654 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -1090,14 +1090,16 @@ bool Image::WriteJpeg(const std::string &filename,
                       const int &quality_override,
                       SystemTimePoint timestamp,
                       bool on_blocking_abort) const {
-  // jpeg libs are not thread safe
-  std::unique_lock<std::mutex> lck(jpeg_mutex);
 
   if (config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8)) {
     Image temp_image(*this);
     temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
     return temp_image.WriteJpeg(filename, quality_override, timestamp, on_blocking_abort);
   }
+
+  // jpeg libs are not thread safe
+  std::unique_lock<std::mutex> lck(jpeg_mutex);
+
   int quality = quality_override ? quality_override : config.jpeg_file_quality;
 
   jpeg_compress_struct *cinfo = writejpg_ccinfo[quality];

From dc8f1bc8ed1c202002cc62792af39b47a8d49878 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 18 Feb 2022 17:44:23 -0500
Subject: [PATCH 473/501] Set shared_data->score before state transitions so
 that linked monitors pick it up. Should help with missed linked events

---
 src/zm_monitor.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 026fad766..71dc9d2d5 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1822,8 +1822,8 @@ bool Monitor::Analyse() {
                 Debug(1, "Linked monitor %d %s is connected",
                     linked_monitors[i]->Id(), linked_monitors[i]->Name());
                 if (linked_monitors[i]->hasAlarmed()) {
-                  Debug(1, "Linked monitor %d %s is alarmed",
-                      linked_monitors[i]->Id(), linked_monitors[i]->Name());
+                  Debug(1, "Linked monitor %d %s is alarmed score will be %d",
+                      linked_monitors[i]->Id(), linked_monitors[i]->Name(), linked_monitors[i]->lastFrameScore());
                   if (!event) {
                     if (first_link) {
                       if (cause.length())
@@ -1948,6 +1948,9 @@ bool Monitor::Analyse() {
           } // end if active and doing motion detection
 
 
+          // Set this before any state changes so that it's value is picked up immediately by linked monitors
+          shared_data->last_frame_score = score;
+
           // If motion detecting, score will be > 0 on motion, but if skipping frames, might not be. So also test snap->score
           if ((score > 0) or ((snap->score > 0) and (function != MONITOR))) {
             if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
@@ -2160,7 +2163,6 @@ bool Monitor::Analyse() {
           last_signal = signal;
         } // end if videostream
       } // end if signal
-      shared_data->last_frame_score = score;
     } else {
       Debug(3, "trigger == off");
       if (event) {

From fe69261f102bab62dc149f745e92568767d318e8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 19 Feb 2022 15:33:05 -0500
Subject: [PATCH 474/501] Include MonitorId as second argument of
 EventStartCommand and EventEndCOmmand at @baudneo's request.

---
 src/zm_event.cpp   |  3 +++
 src/zm_event.h     |  1 +
 src/zm_monitor.cpp | 12 ++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3ef7ea887..b9a3ccbf2 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -699,3 +699,6 @@ Debug(1, "wakeing");
     }
   }
 }
+int Event::MonitorId() {
+  return monitor->Id();
+}
diff --git a/src/zm_event.h b/src/zm_event.h
index 2029c062a..1cbf794ef 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -192,5 +192,6 @@ class Event {
     void SavePreAlarmFrames() {
       EmptyPreAlarmFrames();
     }
+    int MonitorId();
 };
 #endif // ZM_EVENT_H
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 71dc9d2d5..853504a31 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2768,7 +2768,11 @@ Event * Monitor::openEvent(
 
   if (!event_start_command.empty()) {
     if (fork() == 0) {
-      execlp(event_start_command.c_str(), event_start_command.c_str(), std::to_string(event->Id()).c_str(), nullptr);
+      execlp(event_start_command.c_str(),
+		      event_start_command.c_str(),
+		      std::to_string(event->Id()).c_str(),
+		      std::to_string(event->MonitorId()).c_str(),
+		      nullptr);
       Error("Error execing %s", event_start_command.c_str());
     }
   }
@@ -2808,11 +2812,15 @@ void Monitor::closeEvent() {
   Debug(1, "Starting thread to close event");
   close_event_thread = std::thread([](Event *e, const std::string &command){
         int64_t event_id = e->Id();
+	int monitor_id = e->MonitorId();
         delete e;
 
         if (!command.empty()) {
           if (fork() == 0) {
-            execlp(command.c_str(), command.c_str(), std::to_string(event_id).c_str(), nullptr);
+            execlp(command.c_str(), command.c_str(),
+			    std::to_string(event_id).c_str(),
+			    std::to_string(monitor_id).c_str(), // monitor id
+			    nullptr);
             Error("Error execing %s", command.c_str());
           }
         }

From ebe502a747756f553a5b240cd8fce5b1714b733b Mon Sep 17 00:00:00 2001
From: Ratchanan Srirattanamet <peathot@hotmail.com>
Date: Sun, 20 Feb 2022 09:58:03 +0000
Subject: [PATCH 475/501] db: fix dead lock in zmDbQueue::stop()

Notifying `mCondition` without taking the lock causes a race condition
in ::process() between checking `mTerminate` and waiting for the
`mCondition`, which causes a dead lock. This commit moves writing to
`mTerminate` and notifying `mCondition` under the lock to eliminate race
condition and dead lock.

This is not theoretical. It has caused zmu to hang at exit on a
Raspberry Pi 4, exhuasting PHP-FPM process pool. The stacks below are
captured when running ZoneMinder 1.36.12-focal1 on Ubuntu 20.04:

(gdb) thread apply all bt

Thread 2 (Thread 0xffff80c1c880 (LWP 259988)):
#0  futex_wait_cancelable (private=0, expected=0, futex_word=0xaaaae0584e80 <dbQueue+176>) at ../sysdeps/nptl/futex-internal.h:183
#1  __pthread_cond_wait_common (abstime=0x0, clockid=0, mutex=0xaaaae0584e28 <dbQueue+88>, cond=0xaaaae0584e58 <dbQueue+136>) at pthread_cond_wait.c:508
#2  __pthread_cond_wait (cond=0xaaaae0584e58 <dbQueue+136>, mutex=0xaaaae0584e28 <dbQueue+88>) at pthread_cond_wait.c:638
#3  0x0000ffff8700d670 in std::condition_variable::wait(std::unique_lock<std::mutex>&) () from /lib/aarch64-linux-gnu/libstdc++.so.6
#4  0x0000aaaae0438f08 in zmDbQueue::process (this=0xaaaae0584dd0 <dbQueue>) at ./src/zm_db.cpp:250
#5  0x0000ffff87013fac in ?? () from /lib/aarch64-linux-gnu/libstdc++.so.6
#6  0x0000ffff891264fc in start_thread (arg=0xffffe60d84bf) at pthread_create.c:477
#7  0x0000ffff86dd767c in thread_start () at ../sysdeps/unix/sysv/linux/aarch64/clone.S:78

Thread 1 (Thread 0xffff80c23010 (LWP 259987)):
#0  __pthread_clockjoin_ex (threadid=281472841926784, thread_return=0x0, clockid=0, abstime=<optimized out>, block=<optimized out>) at pthread_join_common.c:145
#1  0x0000ffff87014240 in std::thread::join() () from /lib/aarch64-linux-gnu/libstdc++.so.6
#2  0x0000aaaae04314d0 in exit_zmu (exit_code=0) at ./src/zmu.cpp:200
#3  0x0000aaaae042f4c8 in main (argc=<optimized out>, argv=<optimized out>) at ./src/zmu.cpp:797
---
 src/zm_db.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index cc0797c12..76bd04e27 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -238,8 +238,13 @@ zmDbQueue::~zmDbQueue() {
 }
 
 void zmDbQueue::stop() {
-  mTerminate = true;
-  mCondition.notify_all();
+  {
+    std::unique_lock<std::mutex> lock(mMutex);
+
+    mTerminate = true;
+    mCondition.notify_all();
+  }
+
   if (mThread.joinable()) mThread.join();
 }
 

From b896974a2923b1aadc6d27d5f6af5ac1c1135310 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 20 Feb 2022 10:32:40 -0500
Subject: [PATCH 476/501] Should get lock before testing for connected

---
 src/zm_db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index cc0797c12..92e1501c8 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -108,8 +108,8 @@ bool zmDbConnect() {
 }
 
 void zmDbClose() {
+  std::lock_guard<std::mutex> lck(db_mutex);
   if (zmDbConnected) {
-    std::lock_guard<std::mutex> lck(db_mutex);
     mysql_close(&dbconn);
     // mysql_init() call implicitly mysql_library_init() but
     // mysql_close() does not call mysql_library_end()

From fc21fb643e030d898d66726df326dd1e9025b9de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 20 Feb 2022 10:33:13 -0500
Subject: [PATCH 477/501] Release lock before notify

---
 src/zm_db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index d8127c6ed..7ddf60c48 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -242,8 +242,8 @@ void zmDbQueue::stop() {
     std::unique_lock<std::mutex> lock(mMutex);
 
     mTerminate = true;
-    mCondition.notify_all();
   }
+  mCondition.notify_all();
 
   if (mThread.joinable()) mThread.join();
 }

From ce267c7e3c4b6f8bc30bf129ddd3182aca540200 Mon Sep 17 00:00:00 2001
From: Ben Dailey <bdailey@hs-c02-bd-ubu.bhmsd.org>
Date: Tue, 15 Feb 2022 13:00:26 -0500
Subject: [PATCH 478/501] Most programmatic images are lazy.

---
 web/ajax/events.php                  | 2 +-
 web/ajax/snapshots.php               | 2 +-
 web/ajax/watch.php                   | 2 +-
 web/includes/functions.php           | 4 ++--
 web/skins/classic/views/console.php  | 2 +-
 web/skins/classic/views/frame.php    | 1 +
 web/skins/classic/views/timeline.php | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index c95b404c4..28512dfd1 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -275,7 +275,7 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
       'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
 
     // Modify the row data as needed
-    $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '"/>';
+    $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '" loading="lazy" />';
     $row['Name'] = validHtmlStr($row['Name']);
     $row['Archived'] = $row['Archived'] ? translate('Yes') : translate('No');
     $row['Emailed'] = $row['Emailed'] ? translate('Yes') : translate('No');
diff --git a/web/ajax/snapshots.php b/web/ajax/snapshots.php
index d122e8a9f..c01e2ddbb 100644
--- a/web/ajax/snapshots.php
+++ b/web/ajax/snapshots.php
@@ -200,7 +200,7 @@ function queryRequest($search, $advsearch, $sort, $offset, $order, $limit) {
       $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());
       $imgSrc = $event->getThumbnailSrc(array(), '&amp;');
 
-      $row['imgHtml'] .= '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'"/>';
+      $row['imgHtml'] .= '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" loading="lazy" />';
     }
     $row['Name'] = validHtmlStr($row['Name']);
     $row['Description'] = validHtmlStr($row['Description']);
diff --git a/web/ajax/watch.php b/web/ajax/watch.php
index e8c551643..367ab45c3 100644
--- a/web/ajax/watch.php
+++ b/web/ajax/watch.php
@@ -62,7 +62,7 @@ foreach ( $rows as $row ) {
     'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
 
   // Modify the row data as needed
-  $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '"/>';
+  $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '" loading="lazy" />';
   $row['Name'] = validHtmlStr($row['Name']);
   $row['StartDateTime'] = strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['StartDateTime']));
   $row['Length'] = gmdate('H:i:s', $row['Length'] );
diff --git a/web/includes/functions.php b/web/includes/functions.php
index bfa4b9746..9ee3f68be 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -264,7 +264,7 @@ function getImageStreamHTML( $id, $src, $width, $height, $title='' ) {
   if ( canStreamIframe() ) {
       return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" '.($width? ' width="'. validInt($width).'"' : '').($height?' height="'.validInt($height).'"' : '' ).'/>';
   } else {
-      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" style="'.($width? 'width:'.$width.';' : '' ).($height ? ' height:'. $height.';' : '' ).'"/>';
+      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" style="'.($width? 'width:'.$width.';' : '' ).($height ? ' height:'. $height.';' : '' ).'" loading="lazy" />';
   }
 }
 
@@ -316,7 +316,7 @@ function outputImageStill($id, $src, $width, $height, $title='') {
 function getImageStill($id, $src, $width, $height, $title='') {
   return '<img id="'.$id.'" src="'.$src.'" alt="'.$title.'"'.
     (validInt($width)?' width="'.$width.'"':'').
-    (validInt($height)?' height="'.$height.'"':'').'/>';
+    (validInt($height)?' height="'.$height.'"':'').' loading="lazy" />';
 }
 
 function getWebSiteUrl($id, $src, $width, $height, $title='') {
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index e49b2c467..cca0c31a2 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -319,7 +319,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
       .$thmbWidth.$thmbHeight. '" stream_src="' .$streamSrc. '" still_src="' .$stillSrc. '"'.
       ($options['width'] ? ' width="'.$options['width'].'"' : '' ).
       ($options['height'] ? ' height="'.$options['height'].'"' : '' ).
-      '/></a></div>';
+      ' loading="lazy" /></a></div>';
   }
 ?>
             <td class="colName">
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index bf434448a..7446a5f37 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -129,6 +129,7 @@ if ($imageData['hasAnalImage']) {
   height="<?php echo reScale($Event->Height(), $Monitor->DefaultScale(), $scale) ?>"
   alt="<?php echo $Frame->EventId().'-'.$Frame->FrameId() ?>"
   class="<?php echo $imageData['imageClass'] ?>"
+  loading="lazy"
 />
 <?php
 if ($imageData['hasAnalImage']) { ?></a><?php } ?>
diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index c938714a2..4df427107 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -695,7 +695,7 @@ foreach ( $monitors as $monitor ) {
         <div class="monitorPanel" style="width:<?php echo 100/count($monitors); ?>%; float:left;">
         <div class="imagePanel"<?php echo count($monitors)==1?' style="width: 50%; float: left;"' :''?>>
             <div class="imageHeight image">
-              <img id="imageSrc<?php echo $monitor->Id() ?>" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
+              <img id="imageSrc<?php echo $monitor->Id() ?>" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>" loading="lazy" />
             </div>
           </div>
           <div id="dataPanel<?php echo $monitor->Id() ?>" class="dataPanel"<?php echo count($monitors)==1?' style="width: 50%; float: left;"' :''?>>

From e4f5f59e8d82ee6c538220adc686ce1bcc395cc7 Mon Sep 17 00:00:00 2001
From: Ben Dailey <bdailey@hs-c02-bd-ubu.bhmsd.org>
Date: Tue, 15 Feb 2022 13:04:56 -0500
Subject: [PATCH 479/501] 3 more img tags

---
 web/skins/classic/includes/export_functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index f34d53546..5b0cffc52 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -153,7 +153,7 @@ function exportEventFrames($event, $exportDetail, $exportImages) {
 <?php
         if ( $exportImages ) {
 ?>
-          <td><a href="<?php echo $imageFile ?>" target="zmExportImage"><img src="<?php echo $imageFile ?>" class="thumb" alt="Frame <?php echo $frame['FrameId'] ?>"/></a></td>
+          <td><a href="<?php echo $imageFile ?>" target="zmExportImage"><img src="<?php echo $imageFile ?>" class="thumb" alt="Frame <?php echo $frame['FrameId'] ?>" loading="lazy" /></a></td>
 <?php
         }
 ?>
@@ -576,7 +576,7 @@ function eventlist_html($Event, $exportDetail, $exportFrames, $exportStructure)
     $html .= '<a href="#" onclick="switchevent(\''.$Event->Id().'/zmEventImages.html\');return false;">
 ';
     if ( ZM_WEB_LIST_THUMBS ) {
-      $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().($exportStructure=='flat'?'_':'/').'snapshot.jpg" alt="'.$Event->Id().'"/>
+      $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().($exportStructure=='flat'?'_':'/').'snapshot.jpg" alt="'.$Event->Id().'" loading="lazy" />
 ';
     }
     $html .= '</a><br/>
@@ -584,7 +584,7 @@ function eventlist_html($Event, $exportDetail, $exportFrames, $exportStructure)
 	} # end if has jpegs
 	if ($Event->DefaultVideo()) {
     $html .= '<a href="'.$Event->Id().'/'.$Event->DefaultVideo() .'">';
-    $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().($exportStructure=='flat'?'_':'/').'snapshot.jpg" alt="'.$Event->Id().'"/>';
+    $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().($exportStructure=='flat'?'_':'/').'snapshot.jpg" alt="'.$Event->Id().'" loading="lazy" />';
     $html .= '</a><br/>'.PHP_EOL;
 	}
   if ($exportDetail) {

From e523777ecea4d6ca06b03076941a2e8d03330a86 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:51:10 -0500
Subject: [PATCH 480/501] Sync up n_frames, frame_count, curr_frame_id on int
 instead of a mix of long int, int and unsigned long int

---
 src/zm_eventstream.cpp | 72 ++++++++++++++++++++++--------------------
 src/zm_eventstream.h   | 12 +++----
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 28a0e50d6..34f693f36 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -68,17 +68,17 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
     curr_frame_id = 1; // curr_frame_id is 1-based
     if (event_time >= event_data->start_time) {
       Debug(2, "event time is after event start");
-      for (unsigned int i = 0; i < event_data->frame_count; i++) {
+      for (int i = 0; i < event_data->frame_count; i++) {
         //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
         if (event_data->frames[i].timestamp >= event_time) {
           curr_frame_id = i + 1;
-          Debug(3, "Set curr_stream_time: %.2f, curr_frame_id: %ld",
+          Debug(3, "Set curr_stream_time: %.2f, curr_frame_id: %d",
                 FPSeconds(curr_stream_time.time_since_epoch()).count(),
                 curr_frame_id);
           break;
         }
       } // end foreach frame
-      Debug(3, "Skipping %ld frames", event_data->frame_count);
+      Debug(3, "Skipping %d frames", event_data->frame_count);
     } else {
       Warning("Requested an event time less than the start of the event. event_time %" PRIi64 " < start_time %" PRIi64,
               static_cast<int64>(std::chrono::duration_cast<Seconds>(event_time.time_since_epoch()).count()),
@@ -90,13 +90,13 @@ bool EventStream::loadInitialEventData(int monitor_id, SystemTimePoint event_tim
 
 bool EventStream::loadInitialEventData(
     uint64_t init_event_id,
-    unsigned int init_frame_id
+    int init_frame_id
     ) {
   loadEventData(init_event_id);
 
   if ( init_frame_id ) {
     if ( init_frame_id >= event_data->frame_count ) {
-      Error("Invalid frame id specified. %d > %lu", init_frame_id, event_data->frame_count);
+      Error("Invalid frame id specified. %d > %d", init_frame_id, event_data->frame_count);
       curr_stream_time = event_data->start_time;
       curr_frame_id = 1;
     } else {
@@ -225,20 +225,24 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   sql = stringtf("SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` "
                  "FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id);
-
   result = zmDbFetch(sql);
   if (!result) {
     exit(-1);
   }
 
   event_data->n_frames = mysql_num_rows(result);
-
   event_data->frames = new FrameData[event_data->frame_count];
+  if (event_data->frame_count < event_data->n_frames) {
+    event_data->frame_count = event_data->n_frames;
+    Warning("Event %" PRId64 " has more frames in the Frames table (%d) than in the Event record (%d)",
+        event_data->event_id, event_data->n_frames, event_data->frame_count);
+  }
+
   int last_id = 0;
   SystemTimePoint last_timestamp = event_data->start_time;
   Microseconds last_delta = Seconds(0);
 
-  while ( ( dbrow = mysql_fetch_row(result) ) ) {
+  while ((dbrow = mysql_fetch_row(result))) {
     int id = atoi(dbrow[0]);
     //timestamp = atof(dbrow[1]);
     Microseconds delta = std::chrono::duration_cast<Microseconds>(FPSeconds(atof(dbrow[2])));
@@ -280,7 +284,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
   // Incomplete events might not have any frame data
   event_data->last_frame_id = last_id;
 
-  if ( mysql_errno(&dbconn) ) {
+  if (mysql_errno(&dbconn)) {
     Error("Can't fetch row: %s", mysql_error(&dbconn));
     exit(mysql_errno(&dbconn));
   }
@@ -310,7 +314,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
     else
       curr_stream_time = event_data->frames[event_data->last_frame_id-1].timestamp;
   }
-  Debug(2, "Event: %" PRIu64 ", Frames: %ld, Last Frame ID (%ld, Duration: %.2f s Frames Duration: %.2f s",
+  Debug(2, "Event: %" PRIu64 ", Frames: %d, Last Frame ID (%d, Duration: %.2f s Frames Duration: %.2f s",
         event_data->event_id,
         event_data->frame_count,
         event_data->last_frame_id,
@@ -342,12 +346,12 @@ void EventStream::processCommand(const CmdMsg *msg) {
         if (
             (mode == MODE_SINGLE || mode == MODE_NONE)
             &&
-            ((unsigned int)curr_frame_id == event_data->last_frame_id)
+            (curr_frame_id == event_data->last_frame_id)
             ) {
           Debug(1, "Was in single or no replay mode, and at last frame, so jumping to 1st frame");
           curr_frame_id = 1;
         } else {
-          Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
+          Debug(1, "mode is %s, current frame is %d, frame count is %d, last frame id is %d",
                 StreamMode_Strings[(int) mode].c_str(),
                 curr_frame_id,
                 event_data->frame_count,
@@ -404,9 +408,9 @@ void EventStream::processCommand(const CmdMsg *msg) {
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = 1;
-        if ( (unsigned int)curr_frame_id < event_data->last_frame_id )
+        if (curr_frame_id < event_data->last_frame_id)
           curr_frame_id += 1;
-        Debug(1, "Got SLOWFWD command new frame id %ld", curr_frame_id);
+        Debug(1, "Got SLOWFWD command new frame id %d", curr_frame_id);
         break;
     case CMD_SLOWREV :
         paused = true;
@@ -414,7 +418,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
         step = -1;
         curr_frame_id -= 1;
         if ( curr_frame_id < 1 ) curr_frame_id = 1;
-        Debug(1, "Got SLOWREV command new frame id %ld", curr_frame_id);
+        Debug(1, "Got SLOWREV command new frame id %d", curr_frame_id);
         break;
     case CMD_FASTREV :
         Debug(1, "Got FAST REV command");
@@ -538,12 +542,12 @@ void EventStream::processCommand(const CmdMsg *msg) {
 
         if ( curr_frame_id < 1 ) {
           curr_frame_id = 1;
-        } else if ( (unsigned long)curr_frame_id > event_data->last_frame_id ) {
+        } else if (curr_frame_id > event_data->last_frame_id) {
           curr_frame_id = event_data->last_frame_id;
         }
 
         curr_stream_time = event_data->frames[curr_frame_id-1].timestamp;
-        Debug(1, "Got SEEK command, to %f s (new current frame id: %ld offset %f s)",
+        Debug(1, "Got SEEK command, to %f s (new current frame id: %d offset %f s)",
               FPSeconds(offset).count(),
               curr_frame_id,
               FPSeconds(event_data->frames[curr_frame_id - 1].offset).count());
@@ -615,11 +619,11 @@ bool EventStream::checkEventLoaded() {
     sql = stringtf(
         "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` < %" PRIu64 " ORDER BY `Id` DESC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
-  } else if ( (unsigned int)curr_frame_id > event_data->last_frame_id ) {
+  } else if (curr_frame_id > event_data->last_frame_id) {
     if (event_data->end_time.time_since_epoch() == Seconds(0)) {
       // We are viewing an in-process event, so just reload it.
       loadEventData(event_data->event_id);
-      if ( (unsigned int)curr_frame_id > event_data->last_frame_id )
+      if (curr_frame_id > event_data->last_frame_id)
         curr_frame_id = event_data->last_frame_id;
       return false;
     }
@@ -628,7 +632,7 @@ bool EventStream::checkEventLoaded() {
         event_data->monitor_id, event_data->event_id);
   } else {
     // No event change required
-    Debug(3, "No event change required, as curr frame %ld <=> event frames %lu",
+    Debug(3, "No event change required, as curr frame %d <=> event frames %d",
         curr_frame_id, event_data->frame_count);
     return false;
   }
@@ -662,7 +666,7 @@ bool EventStream::checkEventLoaded() {
         curr_frame_id = event_data->last_frame_id;
       else
         curr_frame_id = 1;
-      Debug(2, "New frame id = %ld", curr_frame_id);
+      Debug(2, "New frame id = %d", curr_frame_id);
       start = std::chrono::steady_clock::now();
       return true;
     } else {
@@ -689,13 +693,13 @@ bool EventStream::checkEventLoaded() {
 
 Image * EventStream::getImage( ) {
   std::string path = stringtf(staticConfig.capture_file_format.c_str(), event_data->path.c_str(), curr_frame_id);
-  Debug(2, "EventStream::getImage path(%s) from %s frame(%ld) ", path.c_str(), event_data->path.c_str(), curr_frame_id);
+  Debug(2, "EventStream::getImage path(%s) from %s frame(%d) ", path.c_str(), event_data->path.c_str(), curr_frame_id);
   Image *image = new Image(path.c_str());
   return image;
 }
 
 bool EventStream::sendFrame(Microseconds delta_us) {
-  Debug(2, "Sending frame %ld", curr_frame_id);
+  Debug(2, "Sending frame %d", curr_frame_id);
 
   std::string filepath;
   struct stat filestat = {};
@@ -881,7 +885,7 @@ void EventStream::runStream() {
 
     if ( !paused ) {
       // Figure out if we should send this frame
-      Debug(3, "not paused at cur_frame_id (%ld-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
+      Debug(3, "not paused at cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
       // If we are streaming and this frame is due to be sent
       // frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2
       // so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc.
@@ -983,7 +987,7 @@ void EventStream::runStream() {
       if ( (mode == MODE_SINGLE) && (
             (curr_frame_id < 1 )
             ||
-            ((unsigned int)curr_frame_id >= event_data->frame_count)
+            (curr_frame_id >= event_data->frame_count)
             )
          ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
@@ -992,7 +996,7 @@ void EventStream::runStream() {
         start = now;
       }
 
-      if ((unsigned int)curr_frame_id <= event_data->frame_count) {
+      if (curr_frame_id <= event_data->frame_count) {
         frame_data = &event_data->frames[curr_frame_id-1];
 
         // frame_data->delta is the time since last frame as a float in seconds
@@ -1032,7 +1036,7 @@ void EventStream::runStream() {
           }
         } // end if need to sleep
       } else {
-        Debug(1, "invalid curr_frame_id %ld !< %lu", curr_frame_id, event_data->frame_count);
+        Debug(1, "invalid curr_frame_id %d !< %d", curr_frame_id, event_data->frame_count);
       }  // end if not at end of event
     } else {
       // Paused
@@ -1110,12 +1114,12 @@ bool EventStream::send_file(const std::string &filepath) {
   }
   if (!filestat.st_size) {
     fclose(fdj); /* Close the file handle */
-    Info("File size is zero. Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("File size is zero. Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size)) {
     fclose(fdj); /* Close the file handle */
-    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
@@ -1124,7 +1128,7 @@ bool EventStream::send_file(const std::string &filepath) {
     fclose(fdj); /* Close the file handle */
     return true;
   }
-  Warning("Unable to send raw frame %ld: %s rc %d != %d",
+  Warning("Unable to send raw frame %d: %s rc %d != %d",
       curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
 #endif
 
@@ -1134,7 +1138,7 @@ bool EventStream::send_file(const std::string &filepath) {
   int img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
   fclose(fdj); /* Close the file handle */
   if ( !img_buffer_size ) {
-    Info("Unable to read raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to read raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
 
@@ -1143,13 +1147,13 @@ bool EventStream::send_file(const std::string &filepath) {
 
 bool EventStream::send_buffer(uint8_t* buffer, int size) {
   if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", size) ) {
-    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
   int rc = fwrite(buffer, size, 1, stdout);
 
   if ( 1 != rc ) {
-    Error("Unable to send raw frame %ld: %s %d", curr_frame_id, strerror(errno), rc);
+    Error("Unable to send raw frame %d: %s %d", curr_frame_id, strerror(errno), rc);
     return false;
   }
   return true;
@@ -1157,7 +1161,7 @@ bool EventStream::send_buffer(uint8_t* buffer, int size) {
 
 void EventStream::setStreamStart(
     uint64_t init_event_id,
-    unsigned int init_frame_id=0) {
+    int init_frame_id=0) {
   loadInitialEventData(init_event_id, init_frame_id);
 }  // end void EventStream::setStreamStart(init_event_id,init_frame_id=0)
 
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 969e6725d..093bcd0eb 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -49,9 +49,9 @@ class EventStream : public StreamBase {
     struct EventData {
       uint64_t  event_id;
       unsigned int    monitor_id;
-      unsigned long   storage_id;
-      unsigned long   frame_count;    // Value of Frames column in Event
-      unsigned long   last_frame_id;  // Highest frame id known about. Can be < frame_count in incomplete events
+      unsigned int    storage_id;
+      int             frame_count;    // Value of Frames column in Event
+      int             last_frame_id;  // Highest frame id known about. Can be < frame_count in incomplete events
       SystemTimePoint start_time;
       SystemTimePoint end_time;
       Microseconds duration;
@@ -73,7 +73,7 @@ class EventStream : public StreamBase {
     StreamMode mode;
     bool forceEventChange;
 
-    long curr_frame_id;
+    int curr_frame_id;
     SystemTimePoint curr_stream_time;
     bool  send_frame;
     TimePoint start;     // clock time when started the event
@@ -82,7 +82,7 @@ class EventStream : public StreamBase {
 
   protected:
     bool loadEventData(uint64_t event_id);
-    bool loadInitialEventData(uint64_t init_event_id, unsigned int init_frame_id);
+    bool loadInitialEventData(uint64_t init_event_id, int init_frame_id);
     bool loadInitialEventData(int monitor_id, SystemTimePoint event_time);
 
     bool checkEventLoaded();
@@ -118,7 +118,7 @@ class EventStream : public StreamBase {
           ffmpeg_input = nullptr;
         }
     }
-    void setStreamStart(uint64_t init_event_id, unsigned int init_frame_id);
+    void setStreamStart(uint64_t init_event_id, int init_frame_id);
     void setStreamStart(int monitor_id, time_t event_time);
     void setStreamMode(StreamMode p_mode) { mode = p_mode; }
     void runStream() override;

From b32164e99212ba1a49211cc1e302da64d4c97936 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:51:54 -0500
Subject: [PATCH 481/501] Add handling of NOT IN and =\[\] and \!\[\]

---
 web/includes/FilterTerm.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php
index 8a58e2f98..903cce811 100644
--- a/web/includes/FilterTerm.php
+++ b/web/includes/FilterTerm.php
@@ -174,6 +174,7 @@ class FilterTerm {
     case 'IN' :
       return ' IN ';
     case '![]' :
+    case 'NOT IN' :
       return ' NOT IN ';
     case 'EXISTS' :
      return ' EXISTS ';
@@ -303,7 +304,7 @@ class FilterTerm {
     }
     $sql .= $this->sql_operator();
     $values = $this->sql_values();
-    if ( (count($values) > 1) or ($this->op == 'IN') or ($this->op == 'NOT IN') ) {
+    if ((count($values) > 1) or ($this->op == 'IN') or ($this->op == 'NOT IN') or ($this->op == '=[]') or ($this->op == '![]')) {
       $sql .= '('.join(',', $values).')';
     } else {
       $sql .= $values[0];

From 5aef8408a43eb5cd5185560abb80bcf90df7449f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:52:27 -0500
Subject: [PATCH 482/501] serialize form instead of just passing filter id
 because the modal can now handle unsaved filters

---
 web/skins/classic/views/js/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 5765a0e76..e7979db15 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -378,7 +378,7 @@ function delTerm( element ) {
 }
 
 function debugFilter() {
-  getModal('filterdebug', 'fid='+filterid);
+  getModal('filterdebug', $j(form).serialize());
 }
 
 function manageModalBtns(id) {

From 3a2e5a580ba82e77a2cfebf7471f106b775f9eb1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Feb 2022 18:52:40 -0500
Subject: [PATCH 483/501] Debug the contents of REQUEST on every hit.

---
 web/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/index.php b/web/index.php
index 5ace8e9b6..abca33c9f 100644
--- a/web/index.php
+++ b/web/index.php
@@ -55,6 +55,7 @@ if ( 0 and ZM\Logger::fetch()->debugOn() ) {
   ZM\Debug(ob_get_contents());
   ob_end_clean();
 }
+ZM\Debug(print_r($_REQUEST, true));
 
 global $Servers;
 $Servers = ZM\Server::find();

From 2c7e90d61d22e5c27a2714876a8b3e496a416c63 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 07:54:01 -0600
Subject: [PATCH 484/501] bump rpm specfile rtsp commit

anytime the rtsp commit is bumped in packpack, it must also be bumped in the rpm specfile
---
 distros/redhat/zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index f15e60326..37920dcf8 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -9,7 +9,7 @@
 %global ceb_version 1.0-zm
 
 # RtspServer is configured as a git submodule
-%global rtspserver_commit     cd7fd49becad6010a1b8466bfebbd93999a39878
+%global rtspserver_commit     eab32851421ffe54fec0229c3efc44c642bc8d46
 
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key

From b5e2cb42200c5fe1d97bc647c5f272b603ac63ed Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 08:22:37 -0600
Subject: [PATCH 485/501] include arp-scan polkit files in rpm

---
 distros/redhat/zoneminder.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 37920dcf8..042eeb7c3 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -352,7 +352,8 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
 %{_unitdir}/zoneminder.service
-%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/actions/com.zoneminder.*
+%{_datadir}/polkit-1/rules.d/com.zoneminder.arp-scan.rules
 %{_bindir}/zmsystemctl.pl
 
 %{_bindir}/zmaudit.pl

From bcd590aede60fa048e521317ddbdfbe79645fad7 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 16 Feb 2022 08:33:44 -0600
Subject: [PATCH 486/501] use rockylinux:8 container for ci workflow

---
 .github/workflows/ci-centos-8.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-centos-8.yml b/.github/workflows/ci-centos-8.yml
index f01f9929b..8ad222793 100644
--- a/.github/workflows/ci-centos-8.yml
+++ b/.github/workflows/ci-centos-8.yml
@@ -19,7 +19,7 @@ jobs:
           - crypto_backend: gnutls
             jwt_backend: libjwt
     runs-on: ubuntu-latest
-    container: centos:8
+    container: rockylinux:8
 
     steps:
       - name: Enable RPMFusion, EPEL and PowerTools

From cf7b3b9f9fe2ddcf03304125c673535d09a247eb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:28:21 -0500
Subject: [PATCH 487/501] DefaultCodec is for event view, not live

---
 web/lang/en_gb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 623d55571..d8d57d1f3 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -294,10 +294,10 @@ $SLANG = array(
     'Debug'                 => 'Debug',
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
-    'DefaultCodec'          => 'Default Method For Live View',
+    'DefaultCodec'          => 'Default Method For Event View',
     'DefaultView'           => 'Default View',
     'Deinterlacing'         => 'Deinterlacing',
-    'RTSPDescribe'         => 'Use RTSP Response Media URL',
+    'RTSPDescribe'          => 'Use RTSP Response Media URL',
     'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete &amp; Next',
     'DeleteAndPrev'         => 'Delete &amp; Prev',

From 88a68af77517a7d07dc072e82aba9c8b65706d8f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:28:58 -0500
Subject: [PATCH 488/501] DefaultCodec is for event view, not live

---
 web/lang/zh_tw.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lang/zh_tw.php b/web/lang/zh_tw.php
index 642b884e2..601d8609a 100644
--- a/web/lang/zh_tw.php
+++ b/web/lang/zh_tw.php
@@ -278,7 +278,7 @@ $SLANG = array(
     'Debug'                 => '除錯',
     'DefaultRate'           => '預設 Rate',
     'DefaultScale'          => '預設 Scale',
-    'DefaultCodec'          => '預設 Method For Live View',
+    'DefaultCodec'          => '預設 Method For Event View',
     'DefaultView'           => '預設 View',
     'Deinterlacing'         => 'Deinterlacing',
     'RTSPDescribe'          => 'Use RTSP Response Media URL',

From 0da942a14b45ff96508b0abd8c1d00fec8c233ad Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:59:23 -0500
Subject: [PATCH 489/501] rework zm_sendfile to try again if not all bytes were
 sent. According to the docs, this is entirely possible.

---
 src/zm_sendfile.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index fd72e2e61..3568e2fea 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -3,22 +3,25 @@
 
 #ifdef HAVE_SENDFILE4_SUPPORT
 #include <sys/sendfile.h>
-int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-  int err;
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
+  size_t remaining = size;
+  while (remaining) {
+    ssize_t err = sendfile(out_fd, in_fd, offset, remaining);
+    if (err < 0) {
+      return -errno;
+    }
+    remaining -= err;
+    offset += err;
+  }
 
-  err = sendfile(out_fd, in_fd, offset, size);
-  if ( err < 0 )
-    return -errno;
-
-  return err;
+  return size-remaining;
 }
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
-  int err;
-  err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
+  ssize_t err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
   if (err && errno != EAGAIN)
     return -errno;
 

From d7c8e32ec90c75a9da7b774e172b91c204d3fcc3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 09:59:39 -0500
Subject: [PATCH 490/501] Remove non-translations

---
 web/lang/en_gb.php | 254 +++------------------------------------------
 1 file changed, 14 insertions(+), 240 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index d8d57d1f3..c80a37e85 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -78,18 +78,10 @@ define( "STRF_FMT_DATETIME_SHORTER", "%x %H:%M:%S" );
 $SLANG = array(
     'SystemLog'             => 'System Log',
     'DateTime'              => 'Date/Time',
-    'Component'             => 'Component',
     'Pid'                   => 'PID',
-    'Level'                 => 'Level',
-    'Message'               => 'Message',
-    'Line'                  => 'Line',
-    'More'                  => 'More',
-    'Clear'                 => 'Clear',
     '24BitColour'           => '24 bit colour',
     '32BitColour'           => '32 bit colour',
     '8BitGrey'              => '8 bit greyscale',
-    'Action'                => 'Action',
-    'Actual'                => 'Actual',
     'AddNewControl'         => 'Add New Control',
     'AddNewMonitor'         => 'Add',
     'AddMonitorDisabled'    => 'Your user is not allowed to add a new monitor',
@@ -97,7 +89,6 @@ $SLANG = array(
     'AddNewStorage'         => 'Add New Storage',
     'AddNewUser'            => 'Add New User',
     'AddNewZone'            => 'Add New Zone',
-    'Alarm'                 => 'Alarm',
     'AlarmBrFrames'         => 'Alarm<br/>Frames',
     'AlarmFrame'            => 'Alarm Frame',
     'AlarmFrameCount'       => 'Alarm Frame Count',
@@ -106,20 +97,13 @@ $SLANG = array(
     'AlarmPx'               => 'Alarm Px',
     'AlarmRefImageBlendPct' => 'Alarm Reference Image Blend %ge',
     'AlarmRGBUnset'         => 'You must set an alarm RGB colour',
-    'Alert'                 => 'Alert',
-    'All'                   => 'All',
     'AllTokensRevoked'      => 'All Tokens Revoked',
     'AnalysisFPS'           => 'Analysis FPS',
     'AnalysisUpdateDelay'   => 'Analysis Update Delay',
-    'API'                   => 'API',
     'APIEnabled'            => 'API Enabled',
-    'Apply'                 => 'Apply',
     'ApplyingStateChange'   => 'Applying State Change',
     'ArchArchived'          => 'Archived Only',
-    'Archive'               => 'Archive',
-    'Archived'              => 'Archived',
     'ArchUnarchived'        => 'Unarchived Only',
-    'Area'                  => 'Area',
     'AreaUnits'             => 'Area (px/%)',
     'AttrAlarmFrames'       => 'Alarm Frames',
     'AttrAlarmedZone'       => 'Alarmed Zone',
@@ -154,12 +138,8 @@ $SLANG = array(
     'AttrTotalScore'        => 'Total Score',
     'AttrStartWeekday'      => 'Start Weekday',
     'AttrEndWeekday'        => 'End Weekday',
-    'Auto'                  => 'Auto',
     'AutoStopTimeout'       => 'Auto Stop Timeout',
-    'Available'             => 'Available',
     'AvgBrScore'            => 'Avg.<br/>Score',
-    'Available'             => 'Available',
-    'Background'            => 'Background',
     'BackgroundFilter'      => 'Run filter in background',
     'BadAlarmFrameCount'    => 'Alarm frame count must be an integer of one or more',
     'BadAlarmMaxFPS'        => 'Alarm Maximum FPS must be a positive integer or floating point value',
@@ -197,20 +177,14 @@ $SLANG = array(
     'BadWebColour'          => 'Web colour must be a valid web colour string',
     'BadWebSitePath'        => 'Please enter a complete website url, including the http:// or https:// prefix.',
     'BadWidth'              => 'Width must be set to a valid value',
-    'Bandwidth'             => 'Bandwidth',
     'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
     'BlobPx'                => 'Blob Px',
-    'Blobs'                 => 'Blobs',
     'BlobSizes'             => 'Blob Sizes',
-    'Brightness'            => 'Brightness',
-    'Buffer'                => 'Buffer',
-    'Buffers'               => 'Buffers',
     'CanAutoFocus'          => 'Can Auto Focus',
     'CanAutoGain'           => 'Can Auto Gain',
     'CanAutoIris'           => 'Can Auto Iris',
     'CanAutoWhite'          => 'Can Auto White Bal.',
     'CanAutoZoom'           => 'Can Auto Zoom',
-    'Cancel'                => 'Cancel',
     'CancelForcedAlarm'     => 'Cancel Forced Alarm',
     'CanFocusAbs'           => 'Can Focus Absolute',
     'CanFocus'              => 'Can Focus',
@@ -232,7 +206,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Can Move Relative',
     'CanPan'                => 'Can Pan' ,
     'CanReset'              => 'Can Reset',
-	'CanReboot'             => 'Can Reboot',
+    'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Can Set Presets',
     'CanSleep'              => 'Can Sleep',
     'CanTilt'               => 'Can Tilt',
@@ -251,7 +225,6 @@ $SLANG = array(
     'CaptureResolution'     => 'Capture Resolution',
     'CapturePalette'        => 'Capture Palette',
     'CaptureWidth'          => 'Capture Width',
-    'Cause'                 => 'Cause',
     'CheckMethod'           => 'Alarm Check Method',
     'ChooseDetectedCamera'  => 'Choose Detected Camera',
     'ChooseDetectedProfile' => 'Choose Detected Profile',
@@ -260,11 +233,7 @@ $SLANG = array(
     'ChooseLogSelection'    => 'Choose a log selection',
     'ChoosePreset'          => 'Choose Preset',
     'CloneMonitor'          => 'Clone',
-    'Close'                 => 'Close',
-    'Colour'                => 'Colour',
-    'Command'               => 'Command',
     'ConcurrentFilter'      => 'Run filter concurrently',
-    'Config'                => 'Config',
     'ConfigOptions'         => 'ConfigOptions',
     'ConfigType'            => 'Config Type',
     'ConfiguredFor'         => 'Configured for',
@@ -276,47 +245,29 @@ $SLANG = array(
     'ConfirmPassword'       => 'Confirm Password',
     'ConjAnd'               => 'and',
     'ConjOr'                => 'or',
-    'Console'               => 'Console',
     'ContactAdmin'          => 'Please contact your adminstrator for details.',
-    'Continue'              => 'Continue',
-    'Contrast'              => 'Contrast',
     'ControlAddress'        => 'Control Address',
     'ControlCap'            => 'Control Capability',
     'ControlCaps'           => 'Control Capabilities',
-    'Control'               => 'Control',
     'ControlDevice'         => 'Control Device',
     'Controllable'          => 'Controllable',
     'ControlType'           => 'Control Type',
-    'Current'               => 'Current',
-    'Cycle'                 => 'Cycle',
     'CycleWatch'            => 'Cycle Watch',
-    'Day'                   => 'Day',
-    'Debug'                 => 'Debug',
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
     'DefaultCodec'          => 'Default Method For Event View',
     'DefaultView'           => 'Default View',
-    'Deinterlacing'         => 'Deinterlacing',
     'RTSPDescribe'          => 'Use RTSP Response Media URL',
-    'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete &amp; Next',
     'DeleteAndPrev'         => 'Delete &amp; Prev',
-    'Delete'                => 'Delete',
     'DeleteSavedFilter'     => 'Delete saved filter',
-    'Description'           => 'Description',
     'DetectedCameras'       => 'Detected Cameras',
     'DetectedProfiles'      => 'Detected Profiles',
     'DeviceChannel'         => 'Device Channel',
     'DeviceFormat'          => 'Device Format',
     'DeviceNumber'          => 'Device Number',
     'DevicePath'            => 'Device Path',
-    'Device'                => 'Device',
-    'Devices'               => 'Devices',
-    'Dimensions'            => 'Dimensions',
     'DisableAlarms'         => 'Disable Alarms',
-    'Disk'                  => 'Disk',
-    'Display'               => 'Display',
-    'Displaying'            => 'Displaying',
     'DonateAlready'         => 'No, I\'ve already donated',
     'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to <a href="https://zoneminder.com/donate/" target="_blank">https://zoneminder.com/donate/</a> in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on <a href="https://forums.zoneminder.com">ZoneMinder.com</a> for support or suggestions about how to make your ZoneMinder experience even better.',
     'Donate'                => 'Please Donate',
@@ -327,34 +278,23 @@ $SLANG = array(
     'DonateRemindWeek'      => 'Not yet, remind again in 1 week',
     'DonateYes'             => 'Yes, I\'d like to donate now',
     'DoNativeMotionDetection'=> 'Do Native Motion Detection',
-    'Download'              => 'Download',
     'DuplicateMonitorName'  => 'Duplicate Monitor Name',
     'DuplicateRTSPStreamName' =>  'Duplicate RTSP Stream Name',
-    'Duration'              => 'Duration',
-    'Edit'                  => 'Edit',
     'EditControl'           => 'Edit Control',
     'EditLayout'            => 'Edit Layout',
-    'Email'                 => 'Email',
     'EnableAlarms'          => 'Enable Alarms',
-    'Enabled'               => 'Enabled',
     'EnterNewFilterName'    => 'Enter new filter name',
     'ErrorBrackets'         => 'Error, please check you have an equal number of opening and closing brackets',
-    'Error'                 => 'Error',
     'ErrorValidValue'       => 'Error, please check that all terms have a valid value',
     'Etc'                   => 'etc',
-    'Event'                 => 'Event',
     'EventFilter'           => 'Event Filter',
     'EventId'               => 'Event Id',
     'EventName'             => 'Event Name',
     'EventPrefix'           => 'Event Prefix',
-    'Events'                => 'Events',
-    'Exclude'               => 'Exclude',
-    'Execute'               => 'Execute',
     'ExportCompress'        => 'Use Compression',
     'ExportDetails'         => 'Export Event Details',
     'ExportMatches'         => 'Export Matches',
     'Exif'                  => 'Embed EXIF data into image',
-    'Export'                => 'Export',
     'DownloadVideo'         => 'Download Video',
     'GenerateDownload'      => 'Generate Download',
     'ExistsInFileSystem'    => 'Exists In File System',
@@ -370,11 +310,7 @@ $SLANG = array(
     'ExportOptions'         => 'Export Options',
     'ExportSucceeded'       => 'Export Succeeded',
     'ExportVideoFiles'      => 'Export Video Files (if present)',
-    'Far'                   => 'Far',
     'FastForward'           => 'Fast Forward',
-    'Feed'                  => 'Feed',
-    'Ffmpeg'                => 'Ffmpeg',
-    'File'                  => 'File',
     'FilterArchiveEvents'   => 'Archive all matches',
     'FilterUnarchiveEvents' => 'Unarchive all matches',
     'FilterUpdateDiskSpace' => 'Update used disk space',
@@ -390,13 +326,10 @@ $SLANG = array(
     'FilterLog'             => 'Filter log',
     'FilterMessageEvents'   => 'Message details of all matches',
     'FilterPx'              => 'Filter Px',
-    'Filter'                => 'Filter',
-    'Filters'               => 'Filters',
     'FilterUnset'           => 'You must specify a filter width and height',
     'FilterUploadEvents'    => 'Upload all matches',
     'FilterUser'            => 'User to run filter as',
     'FilterVideoEvents'     => 'Create video for all matches',
-    'First'                 => 'First',
     'FlippedHori'           => 'Flipped Horizontally',
     'FlippedVert'           => 'Flipped Vertically',
     'FnNone'                => 'None',            // Added 2013.08.16.
@@ -406,29 +339,17 @@ $SLANG = array(
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
     'FnExtdect'             => 'Extdect',           // Added 2014.12.14.
-    'Focus'                 => 'Focus',
     'ForceAlarm'            => 'Force Alarm',
-    'Format'                => 'Format',
     'FPS'                   => 'fps',
     'FPSReportInterval'     => 'FPS Report Interval',
-    'Frame'                 => 'Frame',
     'FrameId'               => 'Frame Id',
     'FrameRate'             => 'Frame Rate',
-    'Frames'                => 'Frames',
     'FrameSkip'             => 'Frame Skip',
     'MotionFrameSkip'       => 'Motion Frame Skip',
-    'FTP'                   => 'FTP',
-    'Func'                  => 'Func',
-    'Function'              => 'Function',
-    'Gain'                  => 'Gain',
-    'General'               => 'General',
     'GenerateVideo'         => 'Generate Video',
     'GeneratingVideo'       => 'Generating Video',
     'GetCurrentLocation'    => 'Get Current Location',
     'GoToZoneMinder'        => 'Go to ZoneMinder.com',
-    'Grey'                  => 'Grey',
-    'Group'                 => 'Group',
-    'Groups'                => 'Groups',
     'HasFocusSpeed'         => 'Has Focus Speed',
     'HasGainSpeed'          => 'Has Gain Speed',
     'HasHomePreset'         => 'Has Home Preset',
@@ -441,49 +362,17 @@ $SLANG = array(
     'HasWhiteSpeed'         => 'Has White Bal. Speed',
     'HasZoomSpeed'          => 'Has Zoom Speed',
     'HighBW'                => 'High&nbsp;B/W',
-    'High'                  => 'High',
-    'Home'                  => 'Home',
-    'Hostname'				=> 'Hostname',
-    'Hour'                  => 'Hour',
-    'Hue'                   => 'Hue',
-    'Id'                    => 'Id',
-    'Idle'                  => 'Idle',
-    'Ignore'                => 'Ignore',
     'ImageBufferSize'       => 'Image Buffer Size (frames)',
     'MaxImageBufferCount'   => 'Maximum Image Buffer Size (frames)',
-    'Image'                 => 'Image',
-    'Images'                => 'Images',
-    'Include'               => 'Include',
-    'In'                    => 'In',
     'InvalidateTokens'      => 'Invalidate all generated tokens',
-    'Inverted'              => 'Inverted',
-    'Iris'                  => 'Iris',
     'KeyString'             => 'Key String',
-    'Label'                 => 'Label',
-    'Language'              => 'Language',
-    'Last'                  => 'Last',
-    'Layout'                => 'Layout',
-    'Libvlc'                => 'Libvlc',
     'LimitResultsPost'      => 'results only', // This is used at the end of the phrase 'Limit to first N results only'
     'LimitResultsPre'       => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
     'LinkedMonitors'        => 'Linked Monitors',
-    'List'                  => 'List',
     'ListMatches'           => 'List Matches',
-    'Load'                  => 'Load',
-    'Local'                 => 'Local',
-    'Log'                   => 'Log',
-    'Logs'                  => 'Logs',
-    'Logging'               => 'Logging',
     'LoggedInAs'            => 'Logged in as',
     'LoggingIn'             => 'Logging In',
-    'Login'                 => 'Login',
-    'Logout'                => 'Logout',
     'LowBW'                 => 'Low&nbsp;B/W',
-    'Low'                   => 'Low',
-    'Main'                  => 'Main',
-    'Man'                   => 'Man',
-    'Manual'                => 'Manual',
-    'Mark'                  => 'Mark',
     'MaxBandwidth'          => 'Max Bandwidth',
     'MaxBrScore'            => 'Max.<br/>Score',
     'MaxFocusRange'         => 'Max Focus Range',
@@ -496,7 +385,6 @@ $SLANG = array(
     'MaxIrisRange'          => 'Max Iris Range',
     'MaxIrisSpeed'          => 'Max Iris Speed',
     'MaxIrisStep'           => 'Max Iris Step',
-    'Max'                   => 'Max',
     'MaxPanRange'           => 'Max Pan Range',
     'MaxPanSpeed'           => 'Max Pan Speed',
     'MaxPanStep'            => 'Max Pan Step',
@@ -510,7 +398,6 @@ $SLANG = array(
     'MaxZoomSpeed'          => 'Max Zoom Speed',
     'MaxZoomStep'           => 'Max Zoom Step',
     'MediumBW'              => 'Medium&nbsp;B/W',
-    'Medium'                => 'Medium',
     'MetaConfig'            => 'Meta Config',
     'MinAlarmAreaLtMax'     => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'     => 'You must specify the minimum alarm pixel count',
@@ -546,20 +433,13 @@ $SLANG = array(
     'MinZoomRange'          => 'Min Zoom Range',
     'MinZoomSpeed'          => 'Min Zoom Speed',
     'MinZoomStep'           => 'Min Zoom Step',
-    'Misc'                  => 'Misc',
-    'Mode'                  => 'Mode',
     'ModectDuringPTZ'       => 'Do motion detection during PTZ motion',
     'MonitorIds'            => 'Monitor&nbsp;Ids',
-    'Monitor'               => 'Monitor',
     'MonitorPresetIntro'    => 'Select an appropriate preset from the list below.<br/><br/>Please note that this may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'MonitorPreset'         => 'Monitor Preset',
     'MonitorProbeIntro'     => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'MonitorProbe'          => 'Monitor Probe',
-    'Monitors'              => 'Monitors',
-    'Montage'               => 'Montage',
     'MontageReview'         => 'Montage Review',
-    'Month'                 => 'Month',
-    'Move'                  => 'Move',
     'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
@@ -570,35 +450,23 @@ $SLANG = array(
     'MustConfirmPassword'   => 'You must confirm the password',
     'MustSupplyPassword'    => 'You must supply a password',
     'MustSupplyUsername'    => 'You must supply a username',
-    'Name'                  => 'Name',
-    'Near'                  => 'Near',
-    'Network'               => 'Network',
     'NewGroup'              => 'New Group',
     'NewLabel'              => 'New Label',
-    'New'                   => 'New',
     'NewPassword'           => 'New Password',
     'NewState'              => 'New State',
     'NewUser'               => 'New User',
-    'Next'                  => 'Next',
     'NextMonitor'           => 'Next Monitor',
     'NoDetectedCameras'     => 'No Detected Cameras',
     'NoDetectedProfiles'    => 'No Detected Profiles',
     'NoFramesRecorded'      => 'There are no frames recorded for this event',
     'NoGroup'               => 'No Group',
     'NoneAvailable'         => 'None available',
-    'None'                  => 'None',
-    'No'                    => 'No',
-    'Normal'                => 'Normal',
-    'NoSavedFilters'        => 'NoSavedFilters',
+    'NoSavedFilters'        => 'No Saved Filters',
     'NoStatisticsRecorded'  => 'There are no statistics recorded for this event/frame',
-    'Notes'                 => 'Notes',
     'NumPresets'            => 'Num Presets',
-    'Off'                   => 'Off',
-    'On'                    => 'On',
     'OnvifProbe'            => 'ONVIF',
     'OnvifProbeIntro'       => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
     'OnvifCredentialsIntro' => 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>',
-    'Open'                  => 'Open',
     'OpEq'                  => 'equal to',
     'OpGtEq'                => 'greater than or equal to',
     'OpGt'                  => 'greater than',
@@ -619,42 +487,26 @@ $SLANG = array(
     'Options'               => 'Options',
     'Order'                 => 'Order',
     'OrEnterNewName'        => 'or enter new name',
-    'Orientation'           => 'Orientation',
-    'Out'                   => 'Out',
     'OverwriteExisting'     => 'Overwrite Existing',
-    'Paged'                 => 'Paged',
     'PanLeft'               => 'Pan Left',
-    'Pan'                   => 'Pan',
     'PanRight'              => 'Pan Right',
     'PanTilt'               => 'Pan/Tilt',
-    'Parameter'             => 'Parameter',
     'ParentGroup'           => 'Parent Group',
-    'Password'              => 'Password',
     'PasswordsDifferent'    => 'The new and confirm passwords are different',
     'PathToIndex'           => 'Path To Index',
     'PathToZMS'             => 'Path To ZMS',
     'PathToApi'             => 'Path To Api',
-    'Paths'                 => 'Paths',
-    'Pause'                 => 'Pause',
     'PauseCycle'            => 'Pause Cycle',
     'PhoneBW'               => 'Phone&nbsp;B/W',
-    'Phone'                 => 'Phone',
     'PixelDiff'             => 'Pixel Diff',
     'Pixels'                => 'pixels',
     'PlayAll'               => 'Play All',
-    'Play'                  => 'Play',
     'PlayCycle'             => 'Play Cycle',
-    'Plugins'               => 'Plugins',
     'PleaseWait'            => 'Please Wait',
-    'Point'                 => 'Point',
     'PostEventImageBuffer'  => 'Post Event Image Count',
     'PreEventImageBuffer'   => 'Pre Event Image Count',
     'PreserveAspect'        => 'Preserve Aspect Ratio',
-    'Preset'                => 'Preset',
-    'Presets'               => 'Presets',
-    'Prev'                  => 'Prev',
     'PreviousMonitor'       => 'Previous Monitor',
-    'Privacy'               => 'Privacy',
     'PrivacyAbout'          => 'About',
     'PrivacyAboutText'      => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.',
     'PrivacyContact'        => 'Contact',
@@ -694,15 +546,9 @@ $SLANG = array(
     'Probe'                 => 'Probe',
     'ProfileProbe'          => 'Stream Probe',
     'ProfileProbeIntro'     => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
-    'Progress'              => 'Progress',
-    'Protocol'              => 'Protocol',
-    'Rate'                  => 'Rate',
     'RecaptchaWarning'      => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // added Sep 24 2015 - PP
-	'RecordAudio'			=> 'Whether to store the audio stream when saving an event.',
-    'Real'                  => 'Real',
-    'Record'                => 'Record',
+    'RecordAudio'		       	=> 'Whether to store the audio stream when saving an event.',
     'RefImageBlendPct'      => 'Reference Image Blend %ge',
-    'Refresh'               => 'Refresh',
     'RemoteHostName'        => 'Host Name',
     'RemoteHostPath'        => 'Path',
     'RemoteHostSubPath'     => 'SubPath',
@@ -710,30 +556,22 @@ $SLANG = array(
     'RemoteImageColours'    => 'Image Colours',
     'RemoteMethod'          => 'Method',
     'RemoteProtocol'        => 'Protocol',
-    'Remote'                => 'Remote',
-    'Rename'                => 'Rename',
     'ReplayAll'             => 'All Events',
     'ReplayGapless'         => 'Gapless Events',
-    'Replay'                => 'Replay',
     'ReplaySingle'          => 'Single Event',
     'ReportEventAudit'      => 'Audit Events Report',
     'ResetEventCounts'      => 'Reset Event Counts',
-    'Reset'                 => 'Reset',
-    'Restarting'            => 'Restarting',
-    'Restart'               => 'Restart',
     'RestrictedCameraIds'   => 'Restricted Camera Ids',
     'RestrictedMonitors'    => 'Restricted Monitors',
     'ReturnDelay'           => 'Return Delay',
     'ReturnLocation'        => 'Return Location',
-    'RevokeAllTokens'       =>  'Revoke All Tokens',
-    'Rewind'                => 'Rewind',
+    'RevokeAllTokens'       => 'Revoke All Tokens',
     'RotateLeft'            => 'Rotate Left',
     'RotateRight'           => 'Rotate Right',
     'RTSPTransport'         => 'RTSP Transport Protocol',
     'RunAudit'              => 'Run Audit Process',
     'RunLocalUpdate'        => 'Please run zmupdate.pl to update',
     'RunMode'               => 'Run Mode',
-    'Running'               => 'Running',
     'RunState'              => 'Run State',
     'RunStats'              => 'Run Stats Process',
     'RunTrigger'            => 'Run Trigger Process',
@@ -741,45 +579,29 @@ $SLANG = array(
     'SaveAs'                => 'Save as',
     'SaveFilter'            => 'Save Filter',
     'SaveJPEGs'             => 'Save JPEGs',
-    'Save'                  => 'Save',
-    'Scale'                 => 'Scale',
-    'Score'                 => 'Score',
-    'Secs'                  => 'Secs',
     'Sectionlength'         => 'Section length',
     'SelectMonitors'        => 'Select Monitors',
-    'Select'                => 'Select',
     'SelectFormat'          => 'Select Format',
     'SelectLog'             => 'Select Log',
     'SelfIntersecting'      => 'Polygon edges must not intersect',
     'SetNewBandwidth'       => 'Set New Bandwidth',
     'SetPreset'             => 'Set Preset',
-    'Set'                   => 'Set',
-    'Settings'              => 'Settings',
     'ShowFilterWindow'      => 'Show Filter Window',
     'ShowTimeline'          => 'Show Timeline',
-    'Shutdown'              => 'Shutdown',
     'SignalCheckColour'     => 'Signal Check Colour',
     'SignalCheckPoints'     => 'Signal Check Points',
-    'Size'                  => 'Size',
     'SkinDescription'       => 'Change the skin for this session',
     'CSSDescription'        => 'Change the css for this session',
-    'Sleep'                 => 'Sleep',
     'SortAsc'               => 'Asc',
     'SortBy'                => 'Sort by',
     'SortDesc'              => 'Desc',
-    'Source'                => 'Source',
     'SourceColours'         => 'Source Colours',
     'SourcePath'            => 'Source Path',
     'SourceType'            => 'Source Type',
     'SpeedHigh'             => 'High Speed',
     'SpeedLow'              => 'Low Speed',
     'SpeedMedium'           => 'Medium Speed',
-    'Speed'                 => 'Speed',
     'SpeedTurbo'            => 'Turbo Speed',
-    'Start'                 => 'Start',
-    'State'                 => 'State',
-    'Stats'                 => 'Stats',
-    'Status'                => 'Status',
     'StatusUnknown'         => 'Unknown',
     'StatusConnected'       => 'Capturing',
     'StatusNotRunning'      => 'Not Running',
@@ -790,23 +612,12 @@ $SLANG = array(
     'StepMedium'            => 'Medium Step',
     'StepNone'              => 'No Step',
     'StepSmall'             => 'Small Step',
-    'Step'                  => 'Step',
-    'Stills'                => 'Stills',
-    'Stopped'               => 'Stopped',
-    'Stop'                  => 'Stop',
     'StorageArea'           => 'Storage Area',
     'StorageDoDelete'       => 'Do Deletes',
     'StorageScheme'         => 'Scheme',
     'StreamReplayBuffer'    => 'Stream Replay Image Buffer',
-    'Stream'                => 'Stream',
-    'Submit'                => 'Submit',
-    'System'                => 'System',
     'TargetColorspace'      => 'Target colorspace',
-    'Tele'                  => 'Tele',
-    'Thumbnail'             => 'Thumbnail',
-    'Tilt'                  => 'Tilt',
     'TimeDelta'             => 'Time Delta',
-    'Timeline'              => 'Timeline',
     'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
     'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
     'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
@@ -815,44 +626,25 @@ $SLANG = array(
     'TimestampLabelX'       => 'Timestamp Label X',
     'TimestampLabelY'       => 'Timestamp Label Y',
     'TimestampLabelSize'    => 'Font Size',
-    'Timestamp'             => 'Timestamp',
     'TimeStamp'             => 'Time Stamp',
-    'Time'                  => 'Time',
-    'Today'                 => 'Today',
-    'Tools'                 => 'Tools',
-    'Total'                 => 'Total',
     'TotalBrScore'          => 'Total<br/>Score',
     'TrackDelay'            => 'Track Delay',
     'TrackMotion'           => 'Track Motion',
-    'Triggers'              => 'Triggers',
     'TurboPanSpeed'         => 'Turbo Pan Speed',
     'TurboTiltSpeed'        => 'Turbo Tilt Speed',
-    'Type'                  => 'Type',
     'TZUnset'               => 'Unset - use value in php.ini',
-    'Unarchive'             => 'Unarchive',
-    'Undefined'             => 'Undefined',
-    'Units'                 => 'Units',
-    'Unknown'               => 'Unknown',
     'UpdateAvailable'       => 'An update to ZoneMinder is available.',
     'UpdateNotNecessary'    => 'No update is necessary.',
-    'Update'                => 'Update',
-    'Upload'                => 'Upload',
-    'Updated'               => 'Updated',
-    'UsedPlugins'	        => 'Used Plugins',
+    'UsedPlugins'	          => 'Used Plugins',
     'UseFilterExprsPost'    => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'     => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
     'UseFilter'             => 'Use Filter',
-    'Username'              => 'Username',
-    'Users'                 => 'Users',
-    'User'                  => 'User',
-    'Value'                 => 'Value',
     'VersionIgnore'         => 'Ignore this version',
     'VersionRemindDay'      => 'Remind again in 1 day',
     'VersionRemindHour'     => 'Remind again in 1 hour',
     'VersionRemindNever'    => 'Don\'t remind about new versions',
     'VersionRemindWeek'     => 'Remind again in 1 week',
     'VersionRemindMonth'    => 'Remind again in 1 month',
-    'Version'               => 'Version',
     'ViewMatches'           => 'View Matches',
     'VideoFormat'           => 'Video Format',
     'VideoGenFailed'        => 'Video Generation Failed!',
@@ -862,31 +654,19 @@ $SLANG = array(
     'VideoGenSucceeded'     => 'Video Generation Succeeded!',
     'VideoSize'             => 'Video Size',
     'VideoWriter'           => 'Video Writer',
-    'Video'                 => 'Video',
     'ViewAll'               => 'View All',
     'ViewEvent'             => 'View Event',
     'ViewPaged'             => 'View Paged',
-    'View'                  => 'View',
-	'V4LCapturesPerFrame'	=> 'Captures Per Frame',
-	'V4LMultiBuffer'		=> 'Multi Buffering',
-    'Wake'                  => 'Wake',
+    'V4LCapturesPerFrame'  	=> 'Captures Per Frame',
+    'V4LMultiBuffer'		    => 'Multi Buffering',
     'WarmupFrames'          => 'Warmup Frames',
-    'Watch'                 => 'Watch',
     'WebColour'             => 'Web Colour',
-    'Web'                   => 'Web',
     'WebSiteUrl'            => 'Website URL',
-    'Week'                  => 'Week',
     'WhiteBalance'          => 'White Balance',
-    'White'                 => 'White',
-    'Wide'                  => 'Wide',
     'X10ActivationString'   => 'X10 Activation String',
     'X10InputAlarmString'   => 'X10 Input Alarm String',
     'X10OutputAlarmString'  => 'X10 Output Alarm String',
-    'X10'                   => 'X10',
-    'X'                     => 'X',
-    'Yes'                   => 'Yes',
     'YouNoPerms'            => 'You do not have permissions to access this resource.',
-    'Y'                     => 'Y',
     'ZoneAlarmColour'       => 'Alarm Colour (Red/Green/Blue)',
     'ZoneArea'              => 'Zone Area',
     'ZoneFilterSize'        => 'Filter Width/Height (pixels)',
@@ -898,11 +678,8 @@ $SLANG = array(
     'ZoneMinMaxPixelThres'  => 'Min/Max Pixel Threshold (0-255)',
     'ZoneOverloadFrames'    => 'Overload Frame Ignore Count',
     'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
-    'Zones'                 => 'Zones',
-    'Zone'                  => 'Zone',
     'ZoomIn'                => 'Zoom In',
     'ZoomOut'               => 'Zoom Out',
-    'Zoom'                  => 'Zoom',
 );
 
 // Complex replacements with formatting and/or placements, must be passed through sprintf
@@ -960,17 +737,14 @@ $VLANG = array(
 //
 // In languages such as English this is fairly simple
 // Note this still has to be used with printf etc to get the right formatting
-function zmVlang( $langVarArray, $count )
-{
-    krsort( $langVarArray );
-    foreach ( $langVarArray as $key=>$value )
-    {
-        if ( abs($count) >= $key )
-        {
-            return( $value );
-        }
+function zmVlang($langVarArray, $count) {
+  krsort($langVarArray);
+  foreach ($langVarArray as $key=>$value) {
+    if (abs($count) >= $key) {
+      return $value;
     }
-    die( 'Error, unable to correlate variable language string' );
+  }
+  ZM\Error('Unable to correlate variable language string');
 }
 
 // This is an version that could be used in the Russian example above

From 00b4ed9c5368f0b4d474a9dda7404846c0cadd9c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:01 -0500
Subject: [PATCH 491/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed. Use new reworked zm_sendfile and
 handle if not all bytes are sent. Fixes #3437.

---
 src/zm_eventstream.cpp | 47 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 34f693f36..4521aaf89 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -799,7 +799,13 @@ bool EventStream::sendFrame(Microseconds delta_us) {
       }
 
       Image *send_image = prepareImage(image);
-      static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+      if (temp_img_buffer_size < send_image->Size()) {
+        Debug(1, "Resizing image buffer from %zu to %u",
+            temp_img_buffer_size, send_image->Size());
+        delete[] temp_img_buffer;
+        temp_img_buffer = new uint8_t[send_image->Size()];
+        temp_img_buffer_size = send_image->Size();
+      }
       int img_buffer_size = 0;
       uint8_t *img_buffer = temp_img_buffer;
 
@@ -1098,14 +1104,12 @@ void EventStream::runStream() {
 } // end void EventStream::runStream()
 
 bool EventStream::send_file(const std::string &filepath) {
-  FILE *fdj = nullptr;
-  fdj = fopen(filepath.c_str(), "rb");
+  FILE *fdj = fopen(filepath.c_str(), "rb");
   if (!fdj) {
     Error("Can't open %s: %s", filepath.c_str(), strerror(errno));
     std::string error_message = stringtf("Can't open %s: %s", filepath.c_str(), strerror(errno));
     return sendTextFrame(error_message.c_str());
   }
-#if HAVE_SENDFILE
   static struct stat filestat;
   if (fstat(fileno(fdj), &filestat) < 0) {
     fclose(fdj); /* Close the file handle */
@@ -1117,33 +1121,30 @@ bool EventStream::send_file(const std::string &filepath) {
     Info("File size is zero. Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  if (0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size)) {
+  if (0 > fprintf(stdout, "Content-Length: %jd\r\n\r\n", filestat.st_size)) {
     fclose(fdj); /* Close the file handle */
     Info("Unable to send raw frame %d: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
-  if (rc == (int)filestat.st_size) {
+  ssize_t remaining = filestat.st_size;
+
+  while (remaining > 0) {
+    ssize_t rc = zm_sendfile(fileno(stdout), fileno(fdj), nullptr, remaining);
+    if (rc < 0) break;
+    if (rc > 0) {
+      remaining -= rc;
+    } 
+  }  // end while remaining
+
+  if (!remaining) {
     // Success
     fclose(fdj); /* Close the file handle */
     return true;
   }
-  Warning("Unable to send raw frame %d: %s rc %d != %d",
-      curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
-#endif
-
-  static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
-
-  uint8_t *img_buffer = temp_img_buffer;
-  int img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
-  fclose(fdj); /* Close the file handle */
-  if ( !img_buffer_size ) {
-    Info("Unable to read raw frame %d: %s", curr_frame_id, strerror(errno));
-    return false;
-  }
-
-  return send_buffer(img_buffer, img_buffer_size);
-}
+  Warning("Unable to send raw frame %d: %s %zu remaining",
+      curr_frame_id, strerror(errno), remaining);
+  return false;
+}  // end bool EventStream::send_file(const std::string &filepath)
 
 bool EventStream::send_buffer(uint8_t* buffer, int size) {
   if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", size) ) {

From e9b326927819ad23cfe669e02ca2aa86723b86d9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:25 -0500
Subject: [PATCH 492/501] cleanup and add fallback to read/write if no sendfile
 support.

---
 src/zm_sendfile.h | 51 +++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index 3568e2fea..4edabccab 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -3,37 +3,44 @@
 
 #ifdef HAVE_SENDFILE4_SUPPORT
 #include <sys/sendfile.h>
-ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-  size_t remaining = size;
-  while (remaining) {
-    ssize_t err = sendfile(out_fd, in_fd, offset, remaining);
-    if (err < 0) {
-      return -errno;
-    }
-    remaining -= err;
-    offset += err;
-  }
-
-  return size-remaining;
-}
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
+#else
+#include <unistd.h>
+#endif
+
+/* Function to send the contents of a file. Will use sendfile or fall back to reading/writing */
+
+ssize_t zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
+#ifdef HAVE_SENDFILE4_SUPPORT
+  ssize_t err = sendfile(out_fd, in_fd, offset, size);
+  if (err < 0) {
+    return -errno;
+  }
+  return err;
+
+#elif HAVE_SENDFILE7_SUPPORT
   ssize_t err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
   if (err && errno != EAGAIN)
     return -errno;
-
-  if (size) {
-    *offset += size;
-    return size;
+  return size;
+#else
+  uint8_t buffer[size];
+  ssize_t err = read(in_fd, buffer, size);
+  if (err < 0) {
+    Error("Unable to read %zu bytes: %s", size, strerror(errno));
+    return -errno;
   }
 
-  return -EAGAIN;
-}
-#else
-#error "Your platform does not support sendfile. Sorry."
+  err = fwrite(out_fd, buffer, size);
+  if (err < 0) {
+    Error("Unable to write %zu bytes: %s", size, strerror(errno));
+    return -errno;
+  }
+  return err;
 #endif
+}
 
 #endif // ZM_SENDFILE_H

From 26d89292d72f88af411bbc7c2d95ec0895daa219 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:16:46 -0500
Subject: [PATCH 493/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed.

---
 src/zm_stream.cpp | 6 ++----
 src/zm_stream.h   | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 084bd6754..b3b3aa120 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -31,10 +31,8 @@ constexpr Seconds StreamBase::MAX_STREAM_DELAY;
 constexpr Milliseconds StreamBase::MAX_SLEEP;
 
 StreamBase::~StreamBase() {
-  if (vid_stream) {
-    delete vid_stream;
-    vid_stream = nullptr;
-  }
+  delete vid_stream;
+  delete temp_img_buffer;
   closeComms();
 }
 
diff --git a/src/zm_stream.h b/src/zm_stream.h
index d89d97e7f..de58fcf7b 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -144,6 +144,9 @@ protected:
 
   CmdMsg msg;
 
+  unsigned char *temp_img_buffer;     // Used when encoding or sending file data
+  size_t temp_img_buffer_size;
+
 protected:
   bool loadMonitor(int monitor_id);
   bool checkInitialised();
@@ -182,7 +185,9 @@ public:
     actual_fps(0.0),
     frame_count(0),
     last_frame_count(0),
-    frame_mod(1)
+    frame_mod(1),
+    temp_img_buffer(nullptr),
+    temp_img_buffer_size(0)
   {
     memset(&loc_sock_path, 0, sizeof(loc_sock_path));
     memset(&loc_addr, 0, sizeof(loc_addr));

From 968acc2d439996fc7d6aa16c96cd8ce37263bcef Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 14:18:37 -0500
Subject: [PATCH 494/501] Rework to remove static temp_img_buffer.  Is now a
 class member.  Must be allocated as needed.

---
 src/zm_monitorstream.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index a6232a23e..2bb82d360 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -422,12 +422,17 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
 
     /* double pts = */ vid_stream->EncodeFrame(send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_time.count());
   } else {
-    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+    if (temp_img_buffer_size < send_image->Size()) {
+      Debug(1, "Resizing image buffer from %zu to %u",
+          temp_img_buffer_size, send_image->Size());
+      delete[] temp_img_buffer;
+      temp_img_buffer = new uint8_t[send_image->Size()];
+      temp_img_buffer_size = send_image->Size();
+    }
 
     int img_buffer_size = 0;
     unsigned char *img_buffer = temp_img_buffer;
 
-
     switch ( type ) {
       case STREAM_JPEG :
         send_image->EncodeJpeg(img_buffer, &img_buffer_size);

From 347d3c08b6f51c58f7f72fb64f324c9dd01b7006 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 16 Feb 2022 17:27:12 -0500
Subject: [PATCH 495/501] Spacing, remove dead code, add comments.  When
 implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count
 instead of 0.

---
 src/zm_monitor.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c094aecff..026fad766 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1747,7 +1747,7 @@ bool Monitor::Analyse() {
       Event::StringSetMap noteSetMap;
 
 #ifdef WITH_GSOAP
-      if (onvif_event_listener  && Event_Poller_Healthy) {
+      if (onvif_event_listener && Event_Poller_Healthy) {
         if (Poll_Trigger_State) {
           score += 9;
           Debug(1, "Triggered on ONVIF");
@@ -1856,9 +1856,6 @@ bool Monitor::Analyse() {
               // So... 
               Debug(1, "Waiting for decode");
               packet_lock->wait();
-              //packetqueue.unlock(packet_lock); // This will delete packet_lock and notify_all
-              //packetqueue.wait();
-              ////packet_lock->lock();
             }  // end while ! decoded
             if (zm_terminate or analysis_thread->Stopped()) {
               delete packet_lock;
@@ -1890,7 +1887,7 @@ bool Monitor::Analyse() {
                   Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
                   ref_image.Assign(v_image);
                 } else {
-            Debug(1, "assigning refimage from snap->image");
+                  Debug(1, "assigning refimage from snap->image");
                   ref_image.Assign(*(snap->image));
                 }
                 alarm_image.Assign(*(snap->image));
@@ -1956,7 +1953,7 @@ bool Monitor::Analyse() {
             if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
               // If we should end then previous continuous event and start a new non-continuous event
               if (event && event->Frames()
-                  && !event->AlarmFrames()
+                  && (event->AlarmFrames() < alarm_frame_count)
                   && (event_close_mode == CLOSE_ALARM)
                   // FIXME since we won't be including this snap in the event if we close it, we should be looking at event->duration() instead
                   && (event->Duration() >= min_section_length)
@@ -2016,7 +2013,7 @@ bool Monitor::Analyse() {
               if (
                   ((analysis_image_count - last_alarm_count) > post_event_count)
                   &&
-                 (event->Duration() >= min_section_length)) {
+                  (event->Duration() >= min_section_length)) {
                 Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                     name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
                 if (
@@ -2051,6 +2048,7 @@ bool Monitor::Analyse() {
               Event::EmptyPreAlarmFrames();
           } // end if score or not
 
+          // At this point, snap ONLY has motion score, so this adds other sources
           if (score > snap->score)
             snap->score = score;
 

From 959b08f46ad5cf18b71a2b52a5ff0d08025e0c51 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:30:01 -0500
Subject: [PATCH 496/501] Include EndDateTimeShort in event ajax response

---
 web/ajax/status.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/ajax/status.php b/web/ajax/status.php
index 0d17213a5..b37a3bda6 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -113,6 +113,7 @@ $statusData = array(
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
+      'EndDateTimeShort' => array( 'sql' => 'date_format( EndDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'Width' => true,
       'Height' => true,
       'Length' => true,
@@ -141,6 +142,7 @@ $statusData = array(
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
+      'EndDateTimeShort' => array( 'sql' => 'date_format( EndDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'Width' => true,
       'Height' => true,
       'Length' => true,

From dfb6a96b420a6dc2cc02a916bb75fcc9bc0e8993 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:30:50 -0500
Subject: [PATCH 497/501] Handle empty endtime more gracefully.  If there is a
 next event just jump to it.

---
 web/skins/classic/views/js/event.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 31363e154..1c7a11954 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -52,14 +52,19 @@ function vjsReplay() {
         var overLaid = $j("#videoobj");
         overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
       } else {
-        var endTime = (Date.parse(eventData.EndDateTime)).getTime();
+        if (!eventData.EndDateTime) {
+          // No EndTime but have a next event, just go to it.
+          streamNext(true);
+          return;
+        }
+        var endTime = Date.parse(eventData.EndDateTime).getTime();
         var nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
         if ( nextStartTime <= endTime ) {
           streamNext(true);
           return;
         }
-        var overLaid = $j("#videoobj");
         vid.pause();
+        var overLaid = $j("#videoobj");
         overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>');
         var gapDuration = (new Date().getTime()) + (nextStartTime - endTime);
         var messageP = $j('.vjsMessage');

From 831dca814fe09feb053a429f449c041e6f31e87e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Feb 2022 13:31:25 -0500
Subject: [PATCH 498/501] Include EndDateTimeShort in event stats

---
 web/skins/classic/views/js/event.js.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index c2b61f395..700558cca 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -52,6 +52,7 @@ var eventData = {
     StartDateTime: '<?php echo $Event->StartDateTime() ?>',
     StartDateTimeShort: '<?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartDateTime())) ?>',
     EndDateTime: '<?php echo $Event->EndDateTime() ?>',
+    EndDateTimeShort: '<?php echo $Event->EndDateTime()? strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->EndDateTime())) : '' ?>',
     Frames: '<?php echo $Event->Frames() ?>',
     AlarmFrames: '<?php echo $Event->AlarmFrames() ?>',
     TotScore: '<?php echo $Event->TotScore() ?>',
@@ -75,6 +76,7 @@ var eventDataStrings = {
     Cause: '<?php echo translate('Cause') ?>',
     Notes: '<?php echo translate('Notes') ?>',
     StartDateTimeShort: '<?php echo translate('AttrStartTime') ?>',
+    EndDateTimeShort: '<?php echo translate('AttrEndTime') ?>',
     Length: '<?php echo translate('Duration') ?>',
     Frames: '<?php echo translate('AttrFrames') ?>',
     AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',

From 813fd36b0acc8dcce04c306facca7b3bd72cc9e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 25 Feb 2022 14:13:18 -0500
Subject: [PATCH 499/501] clearInterval when location.replacing so that timer
 stops. Prevents infinite loop

---
 web/skins/classic/views/js/watch.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 4af160389..2a2d1d8d5 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -965,6 +965,7 @@ var secondsToCycle = 0;
 function nextCycleView() {
   secondsToCycle --;
   if (secondsToCycle<=0) {
+    secondsToCycle = 0;
     window.location.replace('?view=watch&mid='+nextMid+'&mode='+mode+'&cycle=true');
   }
   $j('#secondsToCycle').text(secondsToCycle);
@@ -991,6 +992,7 @@ function cycleNext() {
   if (!monitorData[monIdx]) {
     console.log('No monitorData for ' + monIdx);
   }
+  clearInterval(intervalId);
   window.location.replace('?view=watch&cycle=true&mid='+monitorData[monIdx].id+'&mode='+mode);
 }
 
@@ -1002,6 +1004,7 @@ function cyclePrev() {
   if (!monitorData[monIdx]) {
     console.log('No monitorData for ' + monIdx);
   }
+  clearInterval(intervalId);
   window.location.replace('?view=watch&cycle=true&mid='+monitorData[monIdx].id+'&mode='+mode);
 }
 

From 9b0714d20ddc5cd92b1e7fcddcbd8f2e122c116a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 25 Feb 2022 14:14:02 -0500
Subject: [PATCH 500/501] Fix use of value instead of val in filter term

---
 web/includes/Filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 2b599fe36..2d00da12f 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -129,7 +129,7 @@ class Filter extends ZM_Object {
     foreach ( $this->Terms as $term ) {
       if ( $term->attr == 'StorageId' ) {
         # TODO handle other operators like !=
-        $storage_ids[] = $term->value;
+        $storage_ids[] = $term->val;
       }
     }
     if ( count($storage_ids) ) {

From 6fc5803e16279c037363e411d468199b963071f2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 25 Feb 2022 15:54:56 -0500
Subject: [PATCH 501/501] Add another clearInterval to prevent looping during
 window.location

---
 web/skins/classic/views/js/watch.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 2a2d1d8d5..e9d383231 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -965,6 +965,7 @@ var secondsToCycle = 0;
 function nextCycleView() {
   secondsToCycle --;
   if (secondsToCycle<=0) {
+    clearInterval(intervalId);
     secondsToCycle = 0;
     window.location.replace('?view=watch&mid='+nextMid+'&mode='+mode+'&cycle=true');
   }