Merge branch 'speed_ai' of github.com:ZoneMinder/zoneminder into spee…

…d_ai
ZoneMinder · Feb 27, 2025 · 56d0079 · 56d0079
2 parents 42cc082 + 5724079
commit 56d0079
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 2 deletions.
diff --git a/src/netint_network.cpp b/src/netint_network.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 /*
  * Copyright (c) 2010 Nicolas George
  * Copyright (c) 2011 Stefano Sabatini
@@ -545,3 +546,4 @@ int ni_convert_to_tensors(NiNetworkContext *network_ctx, NiNetworkFrame *frame,
     }
     return 0;
 }
+#endif
diff --git a/src/ni_yolo_utils.cpp b/src/ni_yolo_utils.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 #include "ni_yolo_utils.h"
 #include "zm_logger.h"
 
@@ -405,3 +406,4 @@ void ni_resize_coords_padding_mode(detection *det, struct roi_box *roi_box,
     roi_box->objectness = det->objectness;
     roi_box->prob       = det->max_prob;
 }
+#endif
diff --git a/src/yolov4_postprocess.cpp b/src/yolov4_postprocess.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -441,3 +442,4 @@ YoloModel yolov4 = {
   .ni_get_boxes  = ni_yolov4_get_boxes,
 };
 
+#endif
diff --git a/src/yolov5_postprocess.cpp b/src/yolov5_postprocess.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -197,3 +198,4 @@ YoloModel yolov5 = {
     .ni_get_boxes  = ni_yolov5_get_boxes,
 };
 
+#endif
diff --git a/src/yolov8_postprocess.cpp b/src/yolov8_postprocess.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -197,3 +198,4 @@ YoloModel yolov8 = {
     .ni_get_boxes  = ni_yolov8_get_boxes,
 };
 
+#endif
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
@@ -48,7 +48,9 @@
 #include "zm_libvnc_camera.h"
 #endif  // HAVE_LIBVNC
 
+#ifdef HAVE_QUADRA
 #include "libavutil/hwcontext_ni_quad.h"
+#endif
 
 #include <algorithm>
 #include <cstring>
@@ -338,8 +340,10 @@ Monitor::Monitor() :
 #ifdef HAVE_UNTETHER_H
   speedai(nullptr),
 #endif
+#ifdef HAVE_QUADRA
   quadra(nullptr),
   quadra_yolo(nullptr),
+#endif
   red_val(0),
   green_val(0),
   blue_val(0),
@@ -1369,8 +1373,10 @@ Monitor::~Monitor() {
     delete Amcrest_Manager;
   }
   if (onvif) delete onvif;
+#ifdef HAVE_QUADRA
   if (quadra) delete quadra;
   if (quadra_yolo) delete quadra_yolo;
+#endif
 }  // end Monitor::~Monitor()
 
 void Monitor::AddPrivacyBitmask() {
@@ -2154,6 +2160,7 @@ int Monitor::Analyse() {
             }
           }  // end if decoding enabled
 
+#ifdef HAVE_QUADRA
           if (objectdetection == OBJECT_DETECTION_QUADRA) {
             if (!quadra_yolo and packet->hw_frame) {
               quadra_yolo = new Quadra_Yolo(this, packet->hw_frame ? true : false);
@@ -2278,6 +2285,7 @@ int Monitor::Analyse() {
             } // end if delayed_packet
           } // end yolo
           packet->hw_frame = nullptr; // Free it?
+#endif
 
 #ifdef HAVE_UNTETHER_H
           if (speedai) {

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
@@ -52,11 +52,13 @@
 #include "zm_untether_speedai.h"
 #endif
 
+#ifdef HAVE_QUADRA
 extern "C" {
 #include <ni_device_api.h>
 #include <ni_av_codec.h>
 #include <ni_util.h>
 }
+#endif
 
 class Group;
 class MonitorLinkExpression;
@@ -65,7 +67,9 @@ class MonitorLinkExpression;
 #define MOTION_CAUSE "Motion"
 #define LINKED_CAUSE "Linked"
 
+#ifdef HAVE_QUADRA
 #include "zm_netint_yolo.h"
+#endif
 
 //
 // This is the main class for monitors. Each monitor is associated
@@ -350,6 +354,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
  protected:
 
 
+#ifdef HAVE_QUADRA
   class Quadra {
    public:
     explicit Quadra(Monitor *p_monitor);
@@ -368,6 +373,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
 
     Monitor *monitor;
   };
+#endif
 
   class ONVIF {
    protected:
@@ -717,8 +723,10 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
 #ifdef HAVE_UNTETHER_H
   SpeedAI *speedai;
 #endif
+#ifdef HAVE_QUADRA
   Quadra *quadra;
   Quadra_Yolo *quadra_yolo;
+#endif
 
   // Used in check signal
   uint8_t red_val;

diff --git a/src/zm_netint_ai.cpp b/src/zm_netint_ai.cpp
@@ -1,4 +1,5 @@
 
+#ifdef HAVE_QUADRA
 #include "zm_monitor.h"
 #include "zm_signal.h"
 #include "zm_time.h"
@@ -123,3 +124,4 @@ bool Monitor::Quadra::detect(AVFrame *in_frame) {
 
   return true;
 }
+#endif
diff --git a/src/zm_netint_yolo.cpp b/src/zm_netint_yolo.cpp
@@ -1,3 +1,4 @@
+#ifdef HAVE_QUADRA
 
 #include "zm_logger.h"
 #include "zm_ffmpeg.h"
@@ -793,5 +794,4 @@ int Quadra_Yolo::ni_read_roi(AVFrame *out, int frame_count) {
   return ret;
 }
 
-
-
+#endif