init

opencv-motion-detect/Makefile

@@ -4,7 +4,7 @@ CPPFLAGS = -g -Wall -std=gnu++1z
 CFLAGS = -g -Wall
 
 LIBOPENCV = `pkg-config opencv --cflags --libs`
-LIBFFMPEG = `pkg-config libavformat libavutil libavcodec --cflags --libs`
+LIBFFMPEG = `pkg-config libavformat libavutil libavcodec libswscale --cflags --libs`
 LIBS=-lpthread
 SQLITE=vendor/sqlite/sqlite3.c
 HEADERS=-Iinc
@@ -33,7 +33,7 @@ evpusher: evpusher.cpp inc/common.hpp inc/tinythread.hpp database.cpp sqlite3.o
 evslicer: evslicer.cpp inc/common.hpp inc/tinythread.hpp database.cpp sqlite3.o
 	$(CPP) $(CPPFLAGS) -o evslicer evslicer.cpp database.cpp sqlite3.o $(LIBFFMPEG) $(HEADERS) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc` $(LIBS)
 
-evmlmotion: evmlmotion.cpp inc/common.hpp inc/tinythread.hpp database.cpp sqlite3.o
+evmlmotion: evmlmotion.cpp inc/common.hpp inc/avcvhelpers.hpp inc/tinythread.hpp database.cpp sqlite3.o
 	$(CPP) $(CPPFLAGS) -o evmlmotion evmlmotion.cpp database.cpp sqlite3.o $(LIBFFMPEG) $(HEADERS) $(LIBOPENCV) `pkg-config --cflags --libs vendor/lib/pkgconfig/libzmq.pc`  $(LIBS)
 
 rtspr: rtsp-relay.cpp

opencv-motion-detect/database.cpp

@@ -193,7 +193,7 @@ namespace DB {
 }
 */
 
-// tables: device, evmgr, evpuller, evpusher, evslice, evml, ipc, log
+// tables: info, evmgr, evpuller, evpusher, evslice, evml, ipc, log
 // schemas:
 // info: id, cls text, value text, version, update datetime
 //   ex: 1, sn,  ILS112233, NULL, NULL
@@ -203,11 +203,11 @@ namespace DB {
 
 // ipc: id, user, passwd, addr, status
 //   ex: 1, admin, FWBWTU, 172.31.0.51, 0
-// evmgr:
-// evpuller: iid, cid, addr, pub, rep, status;
-// evpusher: iid, cid, addr, urldest, enabled, status;
-// evslicer: iid, cid, addr, urldest, days, miniutes, status;
-// evml:     iid, cid, type, addr, enabled, status
+// evmgr: iid integer, cid <id_of_ipc>, addr text, status 
+// evpuller: iid, cid <id_of_ipc>, addr, pub, rep, status;
+// evpusher: iid, pid <id_of_puller>, urldest, enabled, status;
+// evslicer: iid, pid, urldest, days, miniutes, status;
+// evml:     iid, pid, cls, enabled, status
 //
 //
 

opencv-motion-detect/evmlmotion.cpp

@@ -14,10 +14,10 @@
 namespace fs = std::filesystem;
 #endif
 #include <cstdlib>
-#include <opencv2/opencv.hpp>
 #include "vendor/include/zmq.h"
 #include "tinythread.hpp"
 #include "common.hpp"
+#include "avcvhelpers.hpp"
 #include "database.h"
 
 using namespace std;
@@ -261,25 +261,17 @@ private:
 
     
                 // save a grayscale frame into a .pgm file
-                string name = urlOut + "/"+ to_string(chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count()) + ".pgm";
-                save_gray_frame(pFrame->data[0], pFrame->linesize[0], pFrame->width, pFrame->height, const_cast<char*>( name.c_str()));
+                // string name = urlOut + "/"+ to_string(chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count()) + ".pgm";
+                detectMotion(pFrame);
             }
             spdlog::debug("ch4");
         }
         return 0;
     }
 
-    void save_gray_frame(unsigned char *buf, int wrap, int xsize, int ysize, char *filename)
+    void detectMotion(AVFrame *pFrame)
     {
-        FILE *f;
-        int i;
-        f = fopen(filename,"w");
-        fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255);
-
-        // writing line by line
-        for (i = 0; i < ysize; i++)
-            fwrite(buf + i * wrap, 1, xsize, f);
-        fclose(f);
+
     }
 protected:
     void run()
@@ -329,6 +321,7 @@ protected:
                     break;
             }
 
+            av_frame_free(&pFrame);
             av_packet_unref(&packet);
             if (ret < 0) {
                 spdlog::error("error muxing packet");

opencv-motion-detect/inc/common.hpp

@@ -5,6 +5,7 @@ extern "C"
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
 }
+
 #include <libavutil/timestamp.h>
 #include <spdlog/spdlog.h>
 #include <json.hpp>