Merge branch 'ai_server' of github.com:connortechnology/zoneminder into ai_server

Author: connortechnology

src/zm_monitor.cpp

@@ -2582,12 +2582,17 @@ std::pair<int, std::string> Monitor::Analyse_MxAccl(std::shared_ptr<ZMPacket> pa
         packet->ai_frame = av_frame_ptr(av_frame_alloc());
         ai_image->PopulateFrame(packet->ai_frame.get());
         packet->detections = detections;
+        last_detections = detections;
       }
     } else { // skipping
-      if (last_detection_count>0) {
+      if (last_detection_count >0 and last_detections.size()) {
+        Image *ai_image = new Image(packet->in_frame.get(), packet->in_frame->width, packet->in_frame->height); //copies
+        ai_image->draw_boxes(last_detections, LabelSize(), LabelSize());
+        packet->ai_image = ai_image;
+        // Populate ai_frame as well
+        packet->ai_frame = av_frame_ptr(av_frame_alloc());
+        ai_image->PopulateFrame(packet->ai_frame.get());
         last_detection_count --;
-        //TODO last_detection shouldn't be AI specific
-        //quadra_yolo->draw_last_roi(packet);
       }
     } // end if skip_frame
   } // end if has input_frame/hw_frame

src/zm_mx_accl.cpp

@@ -85,7 +85,7 @@ bool MxAccl::setup(
   // Load and launch module_
   Debug(1, "MxAccl: Loading model %s", model_file.c_str());
 
-  std::vector<int> device_ids = {0};
+  std::vector<int> device_ids = {-1};
   std::array<bool, 2> use_model_shape = {false, false};
 
   std::string model_file_lower = model_file;
@@ -224,20 +224,16 @@ int MxAccl::send_frame(MxAccl::Job *job, AVFrame *avframe) {
 
   job->m_width_rescale = ((float)input_width / (float)avframe->width);
   job->m_height_rescale = ((float)input_height / (float)avframe->height);
-  Debug(1, "Locking");
   job->lock();
   {
     std::lock_guard<std::mutex> lck(mutex_);
-  Debug(1, "Have Locking");
     send_queue.push_back(job);
     condition_.notify_all();
   }
-  Debug(1, "Waiting for inference");
   job->wait();
   endtime = std::chrono::system_clock::now();
   Debug(1, "waiting took: %.3f seconds", FPSeconds(endtime - starttime).count());
   job->unlock();
-  Debug(4, "Done Waiting");
 
   endtime = std::chrono::system_clock::now();
   if (endtime - starttime > Milliseconds(60)) {
@@ -292,7 +288,7 @@ bool MxAccl::in_callback_func(vector<const MX::Types::FeatureMap *> dst, int cha
   Job *job = nullptr;
   {
     std::unique_lock<std::mutex> lck(mutex_);
-    while (!send_queue.size() and ! zm_terminate) {
+    while (!send_queue.size() and !zm_terminate) {
       Debug(1, "MxAccl waiting, queue size %zu", send_queue.size());
       condition_.wait(lck);
     }
@@ -316,13 +312,10 @@ bool MxAccl::in_callback_func(vector<const MX::Types::FeatureMap *> dst, int cha
     Debug(1, "in_callback took: %.3f seconds", FPSeconds(endtime - starttime).count());
   }
   {
-    Debug(1, "Locking");
     std::lock_guard<std::mutex> lck(mutex_);
-    Debug(1, "Pushing");
     receive_queue.push_back(job);
   }
-  Debug(1, "Notifying");
-  condition_.notify_one();
+  condition_.notify_all();
   return true;
 }
 

web/skins/classic/views/console.php

@@ -111,7 +111,9 @@
 $maxWidth = 0;
 $maxHeight = 0;
 $zoneCount = 0;
-$total_capturing_bandwidth=0;
+$total_capturing_bandwidth = 0;
+$total_fps = 0;
+$total_analysis_fps = 0;
 
 $status_counts = array();
 for ( $i = 0; $i < count($displayMonitors); $i++ ) {
@@ -430,11 +432,13 @@
     if ( isset($monitor['AnalysisFPS'])) {
      // and ($monitor['Analysing'] != 'None')) {
       $fps_string .= '/' . $monitor['AnalysisFPS'];
+    $total_analysis_fps += $monitor['AnalysisFPS'];
     }
     if ($fps_string) $fps_string .= ' fps';
     if (!empty($monitor['CaptureBandwidth']))
       $fps_string .= ' ' . human_filesize($monitor['CaptureBandwidth']).'/s';
     $total_capturing_bandwidth += $monitor['CaptureBandwidth'];
+    $total_fps += $monitor['CaptureFPS'];
     echo $fps_string;
     echo '</div>';
   } # end if offline
@@ -471,7 +475,8 @@
             <td class="colId"><?php echo translate('Total').":".count($displayMonitors) ?></td>
 <?php } ?>
             <td class="colName"></td>
-            <td class="colFunction"><?php echo human_filesize($total_capturing_bandwidth ).'/s' ?></td>
+            <td class="colFunction"><?php echo human_filesize($total_capturing_bandwidth ).'/s '.
+$total_fps.' fps / '.$total_analysis_fps.' fps' ?></td>
 <?php if ( count($Servers) ) { ?>
             <td class="colServer"></td>
 <?php } ?>

web/skins/classic/views/monitor.php

@@ -1087,7 +1087,7 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
           $od_options['quadra'] = 'NetInt Quadra';
         if (defined('HAVE_MEMX'))
           $od_options['memx'] = 'MemryX Local MX3';
-        if (defined('HAVE_MEMX'))
+        if (defined('HAVE_MX_ACCL'))
           $od_options['mx_accl'] = 'MemryX MxAccl';
 
         echo htmlSelect('newMonitor[ObjectDetection]', $od_options, $monitor->ObjectDetection(), [ 'data-on-change-this'=>'ObjectDetection_onChange']);