优化各个数据源逻辑

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-27 14:22:13
+ * @LastEditTime: 2021-12-28 09:03:34
  */
 #pragma once
 #include <iostream>
@@ -41,7 +41,6 @@
 #include <mutex>
 #include <cuda_runtime.h>
 
-
 // opencv
 #include <opencv2/core.hpp>
 #include <opencv2/videoio.hpp>
@@ -145,7 +144,6 @@ namespace MIVA{
         int32_t RestartTask();
 
         
-        
     public:
 
         /**
@@ -158,6 +156,7 @@ namespace MIVA{
          */        
         static GstPadProbeReturn pgie_src_pad_buffer_probe(GstPad * pad, GstPadProbeInfo * info, gpointer u_data);
         
+        
         static GstPadProbeReturn tiler_sink_pad_buffer_probe (GstPad * pad, GstPadProbeInfo * probe_info, gpointer u_data);
 
         /**

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-27 14:36:59
+ * @LastEditTime: 2021-12-28 09:01:07
  */
 #include "inference.h"
 
@@ -255,7 +255,9 @@ namespace MIVA{
                 g_main_loop_run(this->loop);
             });
         }
-        if(m_recorder != nullptr) m_recorder->enable = true;
+        if(m_recorder != nullptr){
+            m_recorder->Start();
+        } 
         pool.start();
         return OK;
     }
@@ -286,7 +288,7 @@ namespace MIVA{
     void Inference::StopTask()
     {
         int sourceId = 0;
-        // gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
         GstStateChangeReturn state_return;
         std::vector<DataSource>::iterator iter;
         for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
@@ -311,9 +313,27 @@ namespace MIVA{
             }
             sourceId++;
         }
+        
+        state_return = gst_element_set_state(this->queue1, GST_STATE_NULL);
+        switch (state_return) {
+            case GST_STATE_CHANGE_SUCCESS:
+                InfoL << "queue1 STATE CHANGE SUCCESS";
+                break;
+            case GST_STATE_CHANGE_FAILURE:
+                ErrorL << "queue1 STATE CHANGE FAILURE";
+                break;
+            case GST_STATE_CHANGE_ASYNC:
+                InfoL << "queue1 STATE CHANGE ASYNC";
+                break;
+            case GST_STATE_CHANGE_NO_PREROLL:
+                InfoL << "queue1 STATE CHANGE NO PREROLL";
+                break;
+            default:
+                break;
+        }
+
         if(m_recorder != nullptr){
             m_recorder->Finish();
-            m_recorder->enable = true;
         }
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
@@ -341,7 +361,7 @@ namespace MIVA{
                 gst_element_set_state(iter->source_bin, GST_STATE_PLAYING);
             }
         }
-        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        //gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
         gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
         return OK;
     }
@@ -398,7 +418,7 @@ namespace MIVA{
                     num++;
                 }
             }
-         
+            
             // 绘制识别区域
             std::string json = g_InferInfo->DataSources[frame_meta->source_id].range;
             InferRange inferRange;
@@ -460,7 +480,7 @@ namespace MIVA{
         if(i == interNum) NoticeCenter::Instance().emitEvent(NOTICE_INFEREPER);
         return GST_PAD_PROBE_OK;
     }
-    
+
     /**
      * @description: osd_sink探头
      * @param {GstPad *} pad
@@ -481,7 +501,7 @@ namespace MIVA{
                 g_print ("Error: Failed to map gst buffer\n");
                 gst_buffer_unmap (buf, &in_map_info);
                 return GST_PAD_PROBE_OK;
-         }
+        }
         NvBufSurface *surface = (NvBufSurface *)in_map_info.data;
 
         NvDsBatchMeta *batch_meta = gst_buffer_get_nvds_batch_meta (buf);
@@ -528,6 +548,18 @@ namespace MIVA{
             cv::Mat out_mat = cv::Mat (cv::Size(frame_width, frame_height), CV_8UC3);
             cv::cvtColor(frame, out_mat, CV_RGBA2BGR);
             
+            //WarnL << "buf_pts" << frame_meta->source_id << ":" << frame_meta->buf_pts << endl;
+            //WarnL << "ntp_timestamp" << frame_meta->source_id << ":" << frame_meta->ntp_timestamp << endl;
+
+            // time_t t;
+            // struct tm *p;
+            // t=frame_meta->buf_pts;
+            // p=gmtime(&t);
+            // char s[80];
+            // strftime(s, 80, "%Y-%m-%d %H:%M:%S", p);
+            // // printf("%d: %s\n", (int)t, s);
+            // WarnL << "time:" << s << endl;
+
             std::shared_ptr<recorder> m_recorder = recorder::CreateNew();
             if(m_recorder != nullptr){
                 m_recorder->ConsumerData(frame_meta->source_id, out_mat);

modules/recorder/include/recorder.h

@@ -3,14 +3,21 @@
 #include <iostream>
 #include <map>
 #include <time.h>
-
+#include <dirent.h>
+#include <time.h>
+#include <cstdlib>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 // opencv
 #include <opencv2/core.hpp>
 #include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/types_c.h>
+#include "Util/logger.h"
 
+using namespace toolkit;
 using namespace std;
 //using namespace cv;
 
@@ -25,14 +32,17 @@ namespace MIVA
 
         static std::shared_ptr<recorder> CreateNew();
 
+        void Start();
+
+        void Finish();
+
         void ConsumerData(int sourceId,cv::Mat& frame);
 
         std::string GetFileName(int sourceId);
 
         std::shared_ptr<cv::VideoWriter> GetVideoWriter(int sourceId);
 
-        void Finish();
-        
+
     private:
         struct Writer{
             std::string fileName = "";
@@ -42,5 +52,7 @@ namespace MIVA
 
     public:
         bool enable = true;
+        std::string outDir = "";
+        std::string Dir = "./video/";
     };
 } // namespace name

modules/recorder/src/recorder.cpp

@@ -33,8 +33,9 @@ namespace MIVA
                 time(&rawtime);
                 info = localtime(&rawtime);
                 strftime(ctime, 80, "%Y-%m-%d_%H:%M:%S", info);
-                string fileName = ctime;
-                fileName += "_" + std::to_string(sourceId) + ".mp4";
+                string fileName = this->outDir;
+                string time1 = ctime;
+                fileName += time1 + "_" + std::to_string(sourceId) + ".mp4";
                 iter->second.videoWriter = std::make_shared<cv::VideoWriter>("appsrc ! autovideoconvert ! omxh264enc  ! matroskamux ! filesink location=" + fileName + " sync=false", 0, (double)30, cv::Size(1920, 1080), true);
                 iter->second.fileName = fileName;
             }
@@ -48,8 +49,9 @@ namespace MIVA
             time(&rawtime);
             info = localtime(&rawtime);
             strftime(ctime, 80, "%Y-%m-%d_%H:%M:%S", info);
-            string fileName = ctime;
-            fileName += "_" + std::to_string(sourceId) + ".mp4";
+            string fileName = this->outDir;
+            string time1 = ctime;
+            fileName += time1 + "_" + std::to_string(sourceId) + ".mp4";
             writer.fileName = fileName;
             writer.videoWriter = std::make_shared<cv::VideoWriter>("appsrc ! autovideoconvert ! omxh264enc  ! matroskamux ! filesink location=" + fileName + " sync=false", 0, (double)30, cv::Size(1920, 1080), true);
             this->videoWriters[sourceId] = writer;
@@ -58,6 +60,33 @@ namespace MIVA
     }
 
     /**
+     * @description: 启动
+     * @param {*}
+     * @return {*}
+     */    
+    void recorder::Start()
+    {
+        time_t rawtime;
+        char ctime[80];
+        struct tm *info;
+        time(&rawtime);
+        info = localtime(&rawtime);
+        strftime(ctime, 80, "%Y-%m-%d_%H:%M:%S", info);
+        this->outDir = ctime;
+        this->outDir = this->Dir + this->outDir.substr(0, 7);
+
+        if(opendir(this ->outDir.c_str()) == NULL){
+            mkdir((this->outDir).c_str(),S_IRWXU|S_IRWXG|S_IRWXO);
+        }
+        this->outDir = this->outDir + "/" + ctime + "/";
+        if(opendir(this ->outDir.c_str()) == NULL){
+            mkdir((this->outDir).c_str(),S_IRWXU|S_IRWXG|S_IRWXO);
+        }
+
+        m_recorder->enable = true;
+    }
+
+    /**
      * @description: 结束数据
      * @param {*}
      * @return {*}
@@ -71,6 +100,7 @@ namespace MIVA
             }
             videowriter->second.fileName = "";
         }
+        m_recorder->enable = true;
     }
 
     /**