Make it not require untether

Author: connortechnology

CMakeLists.txt

@@ -343,9 +343,12 @@ if(NOT ZM_NO_CURL)
   endif()
 endif()
 
-include_directories(/opt/untether/speedai/include/)
-list(APPEND ZM_BIN_LIBS untether)
-link_directories(/opt/untether/speedai/lib)
+find_file(HAVE_UNTETHER_H uai_untether.h)
+if(HAVE_UNTETHER_H)
+  include_directories(/opt/untether/speedai/include/)
+  list(APPEND ZM_BIN_LIBS untether)
+  link_directories(/opt/untether/speedai/lib)
+endif()
 
 list(APPEND ZM_BIN_LIBS xcoder)
 

src/zm_monitor.cpp

@@ -332,7 +332,9 @@ Monitor::Monitor() :
   Janus_Manager(nullptr),
   Amcrest_Manager(nullptr),
   onvif(nullptr),
+#ifdef HAVE_UNTETHER_H
   speedai(nullptr),
+#endif
   quadra(nullptr),
   quadra_yolo(nullptr),
   red_val(0),
@@ -1214,12 +1216,14 @@ bool Monitor::connect() {
       Debug(1, "Not Starting ONVIF");
     }  //End ONVIF Setup
 
+#ifdef HAVE_UNTETHER_H
     if (objectdetection == OBJECT_DETECTION_SPEEDAI) {
       speedai = new SpeedAI(this);
       if (!speedai->setup()) {
         delete speedai;
       }
     }
+#endif
 
 #if MOSQUITTOPP_FOUND
     if (mqtt_enabled) {
@@ -1323,7 +1327,9 @@ Monitor::~Monitor() {
   analysis_it = nullptr;
   decoder_it = nullptr;
 
+#ifdef HAVE_UNTETHER_H
   delete speedai;
+#endif
   delete storage;
   delete linked_monitors;
   linked_monitors = nullptr;
@@ -2162,13 +2168,15 @@ bool Monitor::Analyse() {
             }
           }
 
+#ifdef HAVE_UNTETHER_H
           if (speedai) {
             if ((analysis_image == ANALYSISIMAGE_YCHANNEL) && packet->y_image) {
               speedai->detect(*(packet->y_image));
             } else {
               speedai->detect(*(packet->y_image));
             }
           }
+#endif
 
           // Ready means that we have captured the warmup # of frames
           if ((shared_data->analysing > ANALYSING_NONE) && Ready()) {

src/zm_monitor.h

@@ -47,8 +47,11 @@
 #include <openssl/err.h>
 #endif
 
+#ifdef HAVE_UNTETHER_H
 // Untether runtime API header
 #include "uai_untether.h"
+#endif
+
 extern "C" {
 #include <ni_device_api.h>
 #include <ni_av_codec.h>
@@ -340,6 +343,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
   };
  protected:
 
+#ifdef HAVE_UNTETHER_H
   class SpeedAI {
     private:
       Monitor *monitor;
@@ -356,6 +360,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
       bool setup();
       bool detect(const Image &image);
   };
+#endif
 
   class Quadra {
    public:
@@ -712,7 +717,9 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
   JanusManager *Janus_Manager;
   AmcrestAPI *Amcrest_Manager;
   ONVIF *onvif;
+#ifdef HAVE_UNTETHER_H
   SpeedAI *speedai;
+#endif
   Quadra *quadra;
   Quadra_Yolo *quadra_yolo;
 

src/zm_monitor_speedai.cpp

@@ -17,6 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
+#ifdef HAVE_UNTETHER_H
 #include "zm_monitor.h"
 // Untether runtime API header
 #include "uai_untether.h"
@@ -101,3 +102,4 @@ bool Monitor::SpeedAI::detect(const Image &image) {
   }
   return true;
 }
+#endif

zoneminder-config.cmake

@@ -8,6 +8,7 @@
 #cmakedefine SOLARIS 1
 #cmakedefine HAVE_LINUX_VIDEODEV2_H 1
 #cmakedefine HAVE_EXECINFO_H 1
+#cmakedefine HAVE_UNTETHER_H 1
 #cmakedefine HAVE_UCONTEXT_H 1
 #cmakedefine HAVE_SYS_SENDFILE_H 1
 #cmakedefine HAVE_SYS_SYSCALL_H 1