修补bug

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-31 13:44:18
+ * @LastEditTime: 2021-12-31 15:45:33
  */
 #pragma once
 #include <iostream>
@@ -64,8 +64,9 @@ namespace MIVA{
         // Deepstream
         GMainLoop *loop = NULL;
         GstElement *pipeline = NULL,*streammux =NULL, *sink = NULL, *pgie = NULL,
-        *queue1, *queue2, *queue3, *queue4, *nvvidconv = NULL,
-        *nvosd = NULL;
+        *queue1, *queue2, *queue3, *queue4, *queue5, *nvvidconv = NULL,
+        *nvosd = NULL,*tiler = NULL;
+        GstElement *transform = NULL;
         GstBus *bus = NULL;
         guint bus_watch_id;
         GstPad *pgie_src_pad = NULL;

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-31 14:59:34
+ * @LastEditTime: 2021-12-31 16:39:33
  */
 #include "inference.h"
 
@@ -97,7 +97,7 @@ namespace MIVA{
         // init
         this->loop = g_main_loop_new (NULL, FALSE);
         // 创建管道
-        this->pipeline = gst_pipeline_new("MIVA-pipeline");
+        this->pipeline = gst_pipeline_new("dstest3-pipeline");
 
         // 创建批处理器
         this->streammux = gst_element_factory_make ("nvstreammux", "stream-muxer");
@@ -134,18 +134,35 @@ namespace MIVA{
         this->queue2 = gst_element_factory_make ("queue", "queue2");
         this->queue3 = gst_element_factory_make ("queue", "queue3");
         this->queue4 = gst_element_factory_make ("queue", "queue4");
+        this->queue5 = gst_element_factory_make ("queue", "queue5");
+
+
+        /* Use nvtiler to composite the batched frames into a 2D tiled array based
+         * on the source of the frames. */
+        this->tiler = gst_element_factory_make ("nvmultistreamtiler", "nvtiler");
 
         /* Use convertor to convert from NV12 to RGBA as required by nvosd */
         this->nvvidconv = gst_element_factory_make ("nvvideoconvert", "nvvideo-converter");
 
         this->nvosd = gst_element_factory_make ("nvdsosd", "nv-onscreendisplay");
 
+        #ifdef PLATFORM_TEGRA
+            this->transform = gst_element_factory_make ("nvegltransform", "nvegl-transform");
+        #endif
+
         this->sink = gst_element_factory_make ("fakesink", "nvvideo-renderer");
         
-        if (!this->pgie || !this->nvvidconv || !this->nvosd || !this->sink) {
+        if (!this->pgie || !this->tiler || !this->nvvidconv || !this->nvosd || !this->sink) {
             ErrorL << "One element could not be created. Exiting.";
             return -1;
         }
+
+        #ifdef PLATFORM_TEGRA
+            if(!this->transform) {
+                ErrorL << "One tegra element could not be created. Exiting.";
+                return -1;
+            }
+        #endif
    
         g_object_set(G_OBJECT(streammux), "batch-size", g_num_sources, NULL);
 
@@ -166,20 +183,29 @@ namespace MIVA{
             g_object_set (G_OBJECT (this->pgie), "batch-size", g_num_sources, NULL);
         }
 
+        this->tiler_rows = (guint) sqrt (g_num_sources);
+        this->tiler_columns = (guint) ceil (1.0 * g_num_sources / this->tiler_rows);
+
+        /* we set the tiler properties here */
+        g_object_set (G_OBJECT (this->tiler), "rows", this->tiler_rows, "columns", this->tiler_columns,
+            "width", TILED_OUTPUT_WIDTH, "height", TILED_OUTPUT_HEIGHT, NULL);
+
+
         g_object_set (G_OBJECT (this->nvosd), "process-mode", OSD_PROCESS_MODE,
             "display-text", OSD_DISPLAY_TEXT, NULL);
 
         g_object_set (G_OBJECT (this->sink), "qos", 0, NULL);
-            
+
+
         this->bus = gst_pipeline_get_bus (GST_PIPELINE (this->pipeline));
         this->bus_watch_id = gst_bus_add_watch (this->bus, bus_call, this->loop);
         gst_object_unref (this->bus);
         
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->nvvidconv, this->queue3,
-                this->nvosd, this->queue4, this->sink, NULL);
+                this->tiler, this->queue4,this->nvosd, this->queue5, this->sink, NULL);
 
         if (!gst_element_link_many (streammux, this->queue1, this->pgie, this->queue2, this->nvvidconv, this->queue3,
-                    this->nvosd, this->queue4, this->sink, NULL)) {
+                    this->tiler, this->queue4,this->nvosd, this->queue5, this->sink, NULL)) {
             ErrorL << "Elements could not be linked. Exiting.";
             return -1;
         }
@@ -216,7 +242,7 @@ namespace MIVA{
         InfoL << "Now palying";
         pool.async([&](){
             this->RestartTask();
-            if(m_recorder != nullptr) m_recorder->Start();
+            // if(m_recorder != nullptr) m_recorder->Start();
         });
         pool.start();
         return OK;
@@ -261,20 +287,20 @@ namespace MIVA{
         GstStateChangeReturn state_return;
         std::vector<DataSource>::iterator iter;
         for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
-            if(iter->Play && iter->source_bin != NULL){
+            if(iter->source_bin != NULL){
                 state_return = gst_element_set_state(iter->source_bin, GST_STATE_NULL);
                 switch (state_return) {
                     case GST_STATE_CHANGE_SUCCESS:
                         InfoL << "STATE CHANGE SUCCESS";
                         break;
                     case GST_STATE_CHANGE_FAILURE:
-                        ErrorL << "STATE CHANGE FAILURE";
+                        WarnL << "STATE CHANGE FAILURE";
                         break;
                     case GST_STATE_CHANGE_ASYNC:
-                        InfoL << "STATE CHANGE ASYNC";
+                        ErrorL << "STATE CHANGE ASYNC";
                         break;
                     case GST_STATE_CHANGE_NO_PREROLL:
-                        InfoL << "STATE CHANGE NO PREROLL";
+                        ErrorL << "STATE CHANGE NO PREROLL";
                         break;
                     default:
                         break;
@@ -287,7 +313,6 @@ namespace MIVA{
             m_recorder->Finish();
         }
         this->Play = false;
-        m_frames.clear();
         NoticeCenter::Instance().emitEvent(NOTICE_RELEASE);
     }
 
@@ -310,7 +335,13 @@ namespace MIVA{
             return ERR;
         }
         DebugL << "RestartTask" << endl;
-        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+
+        GstState state;
+        gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
+        DebugL << "state:" << state << endl;
+        
+        if(state == GST_STATE_PLAYING) gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+
         gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
         m_frames.clear();
         this->Play = true;

modules/userApp/src/user_app.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:42
  * @LastEditors: lishengyin
- * @LastEditTime: 2021-12-31 14:44:15
+ * @LastEditTime: 2021-12-31 15:59:14
  */
 #include "user_app.h"
 
@@ -288,7 +288,7 @@ namespace MIVA
             this->m_Infer->StopTask();
             // 推理结束发布InferData事件
             NoticeCenter::Instance().emitEvent(NOTICE_INFERDATA);
-            //this->m_Infer->Recorder();
+            this->m_Infer->Recorder();
         }
     }