init

opencv-motion-detect/Makefile

@@ -38,7 +38,8 @@ mux: demuxing_decoding.c
 	$(CC) $(CFLAGS) -o mux demuxing_decoding.c $(LIBFFMPEG)
 
 clean:
-	mkdir -p vendor/lib/pkgconfig/bak
-	mv vendor/lib/pkgconfig/*.pc vendor/lib/pkgconfig/bak
+	#mkdir -p vendor/lib/pkgconfig/bak
+	rm -fr *.dSYM
+	#mv vendor/lib/pkgconfig/*.pc vendor/lib/pkgconfig/bak
 	rm -fr rtspr evmgr evpusher *.dSYM vendor/lib/pkgconfig/*.pc
 	#cd vendor/libzmq && make clean
\ No newline at end of file

opencv-motion-detect/evmgr.cpp

@@ -14,13 +14,11 @@ namespace fs = std::filesystem;
 #endif
 
 #include "vendor/include/zmq.h"
-#include "json.hpp"
 #include "tinythread.hpp"
 #include "common.hpp"
 #include "database.h"
 
 using namespace std;
-using json = nlohmann::json;
 
 class PacketProducer: public TinyThread {
 private:

opencv-motion-detect/evpusher.cpp

@@ -15,7 +15,6 @@ namespace fs = std::filesystem;
 #endif
 
 #include "vendor/include/zmq.h"
-#include "json.hpp"
 #include "tinythread.hpp"
 #include "common.hpp"
 #include "database.h"
@@ -23,7 +22,6 @@ namespace fs = std::filesystem;
 #define MAX_ZMQ_MSG_SIZE 1204 * 1024 * 2
 
 using namespace std;
-using json = nlohmann::json;
 
 class PacketPusher: public TinyThread {
 private:

opencv-motion-detect/inc/common.hpp

@@ -6,6 +6,8 @@ extern "C" {
 }
 #include <libavutil/timestamp.h>
 #include <spdlog/spdlog.h>
+#include <json.hpp>
+using json = nlohmann::json;
 
 #undef av_err2str
 #define av_err2str(errnum) av_make_error_string((char*)__builtin_alloca(AV_ERROR_MAX_STRING_SIZE), AV_ERROR_MAX_STRING_SIZE, errnum)
@@ -217,5 +219,15 @@ namespace AVFormatCtxSerializer {
     }
 }
 
+namespace cloudutils {
+    json registry(const char *scn) {
+        json jret;
+        // find local info
+        // request cloud info
+
+        return jret;
+    }
+}
+
 #endif