Move clear packetqueue logic to it's own function and call it from the analysis thread.

src/zm_monitor.cpp

@@ -1950,7 +1950,7 @@ bool Monitor::Analyse() {
           // If doing record, check to see if we need to close the event or not.
 
           if ( event ) {
-            Debug(2, "Have event in mocord");
+            Debug(2, "Have event %" PRIu64 " in mocord", event->Id());
             if ( section_length
                 && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
                 && ( (function == MOCORD && (event_close_mode != CLOSE_TIME)) || ! ( timestamp->tv_sec % section_length ) )
@@ -2229,6 +2229,7 @@ bool Monitor::Analyse() {
   shared_data->last_read_time = time(nullptr);
   analysis_image_count++;
   UpdateAnalysisFPS();
+  packetqueue.clearPackets(snap);
 
   return true;
 } // end Monitor::Analyse

src/zm_packetqueue.cpp

@@ -99,7 +99,15 @@ bool PacketQueue::queuePacket(ZMPacket* add_packet) {
       --(*iterator_it);
     }
   }  // end foreach iterator
+  mutex.unlock();
+  // We signal on every packet because someday we may analyze sound
+  Debug(4, "packetqueue queuepacket, unlocked signalling");
+  condition.notify_all();
 
+	return true;
+} // end bool PacketQueue::queuePacket(ZMPacket* zm_packet)
+
+void PacketQueue::clearPackets(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: 
   // 1. packetqueue starts with a video keyframe
@@ -109,14 +117,20 @@ bool PacketQueue::queuePacket(ZMPacket* add_packet) {
   //
   // So start at the beginning, counting video packets until the next keyframe.  
   // Then if deleting those packets doesn't break 1 and 2, then go ahead and delete them.
-  if ( add_packet->packet.stream_index == video_stream_id
+  if ( ! (
+        add_packet->packet.stream_index == video_stream_id
       and
       add_packet->keyframe
       and
       (packet_counts[video_stream_id] > max_video_packet_count)
       and 
       *(pktQueue.begin()) != add_packet
+      )
      ) {
+    return;
+  }
+  std::unique_lock<std::mutex> lck(mutex);
+
   packetqueue_iterator it = pktQueue.begin();
   packetqueue_iterator next_front = pktQueue.begin();
 
@@ -171,15 +185,10 @@ bool PacketQueue::queuePacket(ZMPacket* add_packet) {
       delete zm_packet;
     }
   }  // end if have at least max_video_packet_count video packets remaining
-  }  // end if this is a video keyframe
-
-  mutex.unlock();
   // We signal on every packet because someday we may analyze sound
-  Debug(4, "packetqueue queuepacket, unlocked signalling");
-  condition.notify_all();
 
-	return true;
+	return;
-} // end bool PacketQueue::queuePacket(ZMPacket* zm_packet)
+} // end voidPacketQueue::clearPackets(ZMPacket* zm_packet)
 
 ZMPacket* PacketQueue::popPacket( ) {
   Debug(4, "pktQueue size %d", pktQueue.size());

src/zm_packetqueue.h

@@ -63,6 +63,7 @@ class PacketQueue {
     unsigned int get_packet_count(int stream_id) const { return packet_counts[stream_id]; };
 
     void clear_unwanted_packets(timeval *recording, int pre_event_count, int mVideoStreamId);
+    void clearPackets(ZMPacket *);
     int packet_count(int stream_id);
 
     bool increment_it(packetqueue_iterator *it);