Merge new logic from master. We now delete a non-keyframe from head instead of waiting in capture.

src/zm_packetqueue.cpp

@@ -24,7 +24,6 @@
 #include "zm_ffmpeg.h"
 #include "zm_packet.h"
 #include "zm_signal.h"
-#include <sys/time.h>
 
 PacketQueue::PacketQueue():
   video_stream_id(-1),
@@ -87,38 +86,63 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
   {
     std::unique_lock<std::mutex> lck(mutex);
 
-    if (add_packet->packet.stream_index == video_stream_id) {
-      if ((max_video_packet_count > 0) and (packet_counts[video_stream_id] > max_video_packet_count)) {
-        Warning("You have set the max video packets in the queue to %u."
-            " The queue is full. Either Analysis is not keeping up or"
-            " your camera's keyframe interval is larger than this setting."
-            " We are dropping packets.", max_video_packet_count);
-        if (add_packet->keyframe) {
-          // Have a new keyframe, so delete everything
-          while ((*pktQueue.begin() != add_packet) and (packet_counts[video_stream_id] > max_video_packet_count)) {
-            std::shared_ptr <ZMPacket>zm_packet = *pktQueue.begin();
-            ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
-            if (!lp->trylock()) {
-              Debug(1, "Found locked packet when trying to free up video packets. Can't continue");
-              delete lp;
-              break;
-            }
-            delete lp;
+    pktQueue.push_back(add_packet);
+    packet_counts[add_packet->packet.stream_index] += 1;
+    Debug(2, "packet counts for %d is %d",
+        add_packet->packet.stream_index,
+        packet_counts[add_packet->packet.stream_index]);
 
     for (
-                std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+        auto iterators_it = iterators.begin();
         iterators_it != iterators.end();
         ++iterators_it
         ) {
       packetqueue_iterator *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");
-                ++(*iterators_it);
+      if (*iterator_it == pktQueue.end()) {
+        --(*iterator_it);
       }
     }  // end foreach iterator
 
-            pktQueue.pop_front();
+    if (
+        (add_packet->packet.stream_index == video_stream_id)
+        and
+        (max_video_packet_count > 0)
+        and
+        (packet_counts[video_stream_id] > max_video_packet_count)
+       ) {
+      Warning("You have set the max video packets in the queue to %u."
+          " The queue is full. Either Analysis is not keeping up or"
+          " your camera's keyframe interval is larger than this setting."
+          , max_video_packet_count);
+
+      for (
+      auto it = ++pktQueue.begin();
+      it != pktQueue.end() and *it != add_packet;
+      ) {
+        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");
+          delete lp;
+          ++it;
+          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!=pktQueue.end()) and (*(*iterator_it) == zm_packet)) {
+            Debug(1, "Bumping IT because it is at the front that we are deleting");
+            ++(*iterator_it);
+          }
+        }  // end foreach iterator
+
+        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",
@@ -128,39 +152,13 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
             packet_counts[video_stream_id],
             max_video_packet_count,
             pktQueue.size());
+
+        delete lp;
+
+        if (zm_packet->packet.stream_index == video_stream_id)
+          break;
       }  // end while
-        }
-      }  // end if too many video packets
-      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;
-        }
-      }
-    }  // end if this packet is a video packet
-
-    pktQueue.push_back(add_packet);
-    packet_counts[add_packet->packet.stream_index] += 1;
-    Debug(2, "packet counts for %d is %d",
-        add_packet->packet.stream_index,
-        packet_counts[add_packet->packet.stream_index]);
-
-    for (
-        std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
-        iterators_it != iterators.end();
-        ++iterators_it
-        ) {
-      packetqueue_iterator *iterator_it = *iterators_it;
-      if (*iterator_it == pktQueue.end()) {
-        Debug(4, "pointing it %p to back", iterator_it);
-        --(*iterator_it);
-      } else {
-        Debug(4, "it %p not at end", iterator_it);
-      }
-    }  // end foreach iterator
+    }  // end if not able catch up
   }  // end lock scope
   // We signal on every packet because someday we may analyze sound
   Debug(4, "packetqueue queuepacket, unlocked signalling");
@@ -241,8 +239,8 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
     return;
   }
 
-  packetqueue_iterator it = pktQueue.begin();
-  packetqueue_iterator next_front = pktQueue.begin();
+  auto it = pktQueue.begin();
+  auto next_front = pktQueue.begin();
 
   // First packet is special because we know it is a video keyframe and only need to check for lock
   std::shared_ptr<ZMPacket> zm_packet = *it;
@@ -250,11 +248,10 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
     return;
   }
 
-  Debug(1, "trying lock on first packet");
   ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
   if (lp->trylock()) {
     int video_packets_to_delete = 0;    // This is a count of how many packets we will delete so we know when to stop looking
-    Debug(1, "Have lock on first packet");
+    Debug(4, "Have lock on first packet");
     ++it;
     delete lp;
 
@@ -269,10 +266,14 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
       }
       delete lp;
 
-      if (is_there_an_iterator_pointing_to_packet(zm_packet) and (pktQueue.begin() == next_front)) {
+#if 0
+      // There are no threads that follow analysis thread.  So there cannot be an it pointing here
+      if (is_there_an_iterator_pointing_to_packet(zm_packet)) {
+        if (pktQueue.begin() == next_front)
           Warning("Found iterator at beginning of queue. Some thread isn't keeping up");
         break;
       }
+#endif
 
       if (zm_packet->packet.stream_index == video_stream_id) {
         if (zm_packet->keyframe) {