Merge branch 'master' of github.com:ZoneMinder/zoneminder

src/zm_packetqueue.cpp

@@ -177,50 +177,13 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
           continue;
         }
 
-        for (
-          auto iterators_it = iterators.begin();
-          iterators_it != iterators.end();
-          ++iterators_it
-        ) {
-          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) == zm_packet) {
-            Debug(1, "Bumping IT because it is at the front that we are deleting");
-            ++(*iterator_it);
-          }
-        }  // end foreach iterator
-
         if (zm_packet->packet->stream_index == video_stream_id and zm_packet->keyframe) {
           for ( it = pktQueue.begin(); *it !=zm_packet; ) {
-            std::shared_ptr <ZMPacket>packet_to_delete = *it;
-            packet_to_delete->decoded = true;
-            packet_to_delete->notify_all();
-            it = pktQueue.erase(it);
-          packet_counts[packet_to_delete->packet->stream_index] -= 1;
-          Debug(1,
-                "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
-                packet_to_delete->packet->stream_index,
-                packet_to_delete->image_index,
-                packet_to_delete->keyframe,
-                packet_counts[video_stream_id],
-                max_video_packet_count,
-                pktQueue.size());
+            it = this->deletePacket(it);
           }
           break;
         } else {
-          zm_packet->decoded = true; // Have to in case analysis is waiting on it
-          zm_packet->notify_all();
-
-          it = pktQueue.erase(it);
-          packet_counts[zm_packet->packet->stream_index] -= 1;
-          Debug(1,
-                "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
-                zm_packet->packet->stream_index,
-                zm_packet->image_index,
-                zm_packet->keyframe,
-                packet_counts[video_stream_id],
-                max_video_packet_count,
-                pktQueue.size());
+          this->deletePacket(it);
 
           if (zm_packet->packet->stream_index == video_stream_id)
             break;
@@ -237,6 +200,37 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
   return true;
 }  // end bool PacketQueue::queuePacket(ZMPacket* zm_packet)
 
+packetqueue_iterator PacketQueue::deletePacket(packetqueue_iterator it) {
+  auto zm_packet = *it;
+  for (
+      auto iterators_it = iterators.begin();
+      iterators_it != iterators.end();
+      ++iterators_it
+      ) {
+    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) == zm_packet) {
+      Debug(1, "Bumping IT because it is at the front that we are deleting");
+      ++(*iterator_it);
+    } else {
+      Debug(1, "Not Bumping IT because it is pointing at %d and we are %d", (*(*iterator_it))->image_index, zm_packet->image_index);
+    }
+  }  // end foreach iterator
+  zm_packet->decoded = true;
+  zm_packet->notify_all();
+
+  packet_counts[zm_packet->packet->stream_index] -= 1;
+  Debug(1,
+      "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
+      zm_packet->packet->stream_index,
+      zm_packet->image_index,
+      zm_packet->keyframe,
+      packet_counts[video_stream_id],
+      max_video_packet_count,
+      pktQueue.size());
+  return pktQueue.erase(it);
+}
+
 void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
   // Only do queueCleaning if we are adding a video keyframe, so that we guarantee that there is one.
   // No good.  Have to satisfy two conditions:

src/zm_packetqueue.h

@@ -91,6 +91,8 @@ class PacketQueue {
   void unlock(ZMLockedPacket *lp);
   void notify_all();
   void wait();
+ private:
+  packetqueue_iterator deletePacket(packetqueue_iterator it);
 };
 
 #endif /* ZM_PACKETQUEUE_H */

web/skins/classic/views/js/watch.js

@@ -824,7 +824,11 @@ function streamPrepareStart(monitor=null) {
   }
 
   const i = setInterval(function() {
-    if (document.querySelector('[id ^= "liveStream"]').offsetHeight > 20) {
+    const livestream = document.querySelector('[id ^= "liveStream"]');
+
+    if (!livestream) {
+      console.log("No id matching liveStream");
+    } else if (livestream.offsetHeight > 20) {
       //You need to wait until the image appears.
       clearInterval(i);
       document.getElementById('monitor').classList.remove('hidden-shift');
@@ -1060,26 +1064,28 @@ function initPage() {
   });
   if (currentMonitor) {
     applyMonitorControllable();
+    streamPrepareStart(currentMonitor);
+
+    // Creating a ResizeObserver Instance
+    observer = new ResizeObserver((objResizes) => {
+      updateScale = true;
+    });
+
+    // Registering an observer on an element
+    $j('[id ^= "liveStream"]').each(function() {
+      observer.observe(this);
+    });
+
+    // Event listener for double click
+    //var elStream = document.querySelectorAll('[id ^= "liveStream"], [id ^= "evtStream"]');
+    var elStream = document.querySelectorAll('[id = "wrapperMonitor"]');
+    Array.prototype.forEach.call(elStream, (el) => {
+      el.addEventListener('touchstart', doubleTouch);
+      el.addEventListener('dblclick', doubleClickOnStream);
+    });
+  } else {
+    alert("No monitor found for id "+monitorId);
   }
-  streamPrepareStart(currentMonitor);
-
-  // Creating a ResizeObserver Instance
-  observer = new ResizeObserver((objResizes) => {
-    updateScale = true;
-  });
-
-  // Registering an observer on an element
-  $j('[id ^= "liveStream"]').each(function() {
-    observer.observe(this);
-  });
-
-  // Event listener for double click
-  //var elStream = document.querySelectorAll('[id ^= "liveStream"], [id ^= "evtStream"]');
-  var elStream = document.querySelectorAll('[id = "wrapperMonitor"]');
-  Array.prototype.forEach.call(elStream, (el) => {
-    el.addEventListener('touchstart', doubleTouch);
-    el.addEventListener('dblclick', doubleClickOnStream);
-  });
 } // initPage
 
 function watchFullscreen() {