添加动态拉流前

CMakeLists.txt

@@ -167,7 +167,7 @@ include_directories(/opt/nvidia/deepstream/deepstream-5.0/sources/includes/)
 aux_source_directory(./source/src DIR_SRCS)
 
 # 添加编译参数
-add_compile_options(-Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -DPLATFORM_TEGRA)
+add_compile_options(-Wall -std=c++11 -O2 -g -DPLATFORM_TEGRA -DPLATFORM_TEGRA )
 
 link_directories(${PROJECT_SOURCE_DIR}/lib)
 link_directories(/opt/nvidia/deepstream/deepstream-5.0/lib/)

modules/inference/src/inference.cpp

@@ -75,7 +75,7 @@ namespace MIVA{
             gchar pad_name[16] = { };
             
             GstElement *source_bin = create_source_bin ((*iter).Id, (gchar*)((*iter).uri).c_str());
-    
+
             if (!source_bin) {
                 ErrorL << "Failed to create source bin. Exiting."; 
                 return ERR;
@@ -87,7 +87,6 @@ namespace MIVA{
                 ErrorL << "Streammux request sink pad failed. Exiting.";
                 return ERR;
             }
-
             srcpad = gst_element_get_static_pad(source_bin, "src");
             if(!srcpad){
                 ErrorL << "Failed to get src pad of source bin. Exiting.";
@@ -112,6 +111,8 @@ namespace MIVA{
         this->queue4 = gst_element_factory_make ("queue", "queue4");
         this->queue5 = gst_element_factory_make ("queue", "queue5");
 
+        // g_object_set (G_OBJECT(this->queue1), "max-size-buffers",  20, NULL);
+
         /* 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");
@@ -176,22 +177,22 @@ namespace MIVA{
         gst_bin_add_many (GST_BIN (this->pipeline), this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
             this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL);
 
-        // gst_bin_add_many (GST_BIN (this->pipeline), this->queue2, this->tiler, this->queue3,
-        //     this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL);
+        gst_bin_add_many (GST_BIN (this->pipeline), this->queue2, this->tiler, this->queue3,
+            this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL);
 
         //     /* we link the elements together
         //     * nvstreammux -> nvinfer -> nvtiler -> nvvidconv -> nvosd -> video-renderer */
 
-        // if (!gst_element_link_many (this->streammux, this->queue2, this->tiler, this->queue3,
-        //         this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL)) {
-        //     ErrorL << "Elements could not be linked. Exiting.";
-        //     return -1;
-        // }
-        if (!gst_element_link_many (this->streammux, this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
+        if (!gst_element_link_many (this->streammux, this->queue2, this->tiler, this->queue3,
                 this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL)) {
             ErrorL << "Elements could not be linked. Exiting.";
             return -1;
         }
+        // if (!gst_element_link_many (this->streammux, this->queue1, this->pgie, this->queue2, this->tiler, this->queue3,
+        //         this->nvvidconv, this->queue4, this->nvosd, this->queue5, this->transform, this->sink, NULL)) {
+        //     ErrorL << "Elements could not be linked. Exiting.";
+        //     return -1;
+        // }
 
         this->tiler_src_pad = gst_element_get_static_pad(this->pgie, "src");
         if (!this->tiler_src_pad)

modules/userApp/src/user_app.cpp

@@ -169,10 +169,8 @@ namespace MIVA
     void UserApp::ListenInfer(int Source_id, int num)
     {   
         if(this->play == true){
-            this->m_timer2 = std::make_shared<Timer>(20.0f,[&](){
-                // 暂停任务
+            this->m_timer2 = std::make_shared<Timer>(3.0f,[&](){
                 this->m_Infer->PauseTask();
-
                 // 推理结束发布InferData事件
                 NoticeCenter::Instance().emitEvent(NOTICE_INFERDATA);
                 return false;
@@ -237,6 +235,8 @@ namespace MIVA
     void UserApp::ListenNettyData(const Buffer::Ptr &pBuf)
     {
         // 对Netty端的接口
+        
+
     }
     // 处理PIS系统的数据
     void UserApp::ListenPISData(const Buffer::Ptr &buf, struct sockaddr *addr)
@@ -295,7 +295,6 @@ namespace MIVA
         // 监听推理结束
         // 获取CarId、空载荷值、动态载荷值
         std::map<int, CarData> carDatas;
-
         vector<vector<string>> sqlRet;
         SqlWriter sqlSelect0("SELECT CarId,NoLoad,DynamicLoad FROM MIVA_DB.`CarData`");
         sqlSelect0 << sqlRet;
@@ -347,7 +346,6 @@ namespace MIVA
         uint32_t result = 0;
         
 
-
         return result;
     }
 
@@ -358,6 +356,7 @@ namespace MIVA
         uint8_t grade = 1;
 
 
+
         return grade;
     }