添加农村事件开关

Hu Chunming
1 parent c9cf03be
Showing 4 changed files with 13 additions and 7 deletions
src/ai_platform/MultiSourceProcess.cpp
src/decoder/dvpp/DvppDecoder.cpp
src/decoder/dvpp/FFRecoderTaskManager.cpp
src/demo/demo.cpp
@@ -736,8 +736,6 @@ int CMultiSourceProcess::algorthim_vpt(vector&lt;DeviceMemory*&gt; vec_gpuMem){
     /* for pedestrian safety det. 行人安全分析算法模块 */
     // algorthim_pedestrian_safety(vpt_interest_task_id, vpt_interest_imgs,vptResult);
-    // 农村违法分析的快照缓存
-    m_snapshot_reprocessing->update_village_bestsnapshot(vec_vptMem, vptResult, deleteObjectID);
     // 逆行
     algorthim_retrograde(vpt_interest_task_id, vec_vptMem, vptResult);
     retrograde_snapshot(vpt_interest_task_id, deleteObjectID);
@@ -745,6 +743,11 @@ int CMultiSourceProcess::algorthim_vpt(vector&lt;DeviceMemory*&gt; vec_gpuMem){
     algorthim_trespass(vpt_interest_task_id, vec_vptMem, vptResult, deleteObjectID);
     trespass_snapshot(vpt_interest_task_id, deleteObjectID);
+// #endif
+
+#ifdef USE_VILLAGE
+    // 农村违法分析的快照缓存
+    m_snapshot_reprocessing->update_village_bestsnapshot(vec_vptMem, vptResult, deleteObjectID);
     // 三轮车载人
     algorithm_tricycle_manned(vpt_interest_task_id, vec_vptMem, vptResult);
     // 货车载人
@@ -752,8 +755,7 @@ int CMultiSourceProcess::algorthim_vpt(vector&lt;DeviceMemory*&gt; vec_gpuMem){
     // 二轮车超员/未戴盔
     algorithm_motor_hs_process(vpt_interest_task_id, vec_vptMem, vptResult);
     manned_snapshot(vpt_interest_task_id, vec_vptMem, deleteObjectID);
-
-// #endif
+#endif
       // if(vptResult.size() > 0){
       //     cout << vptResult[0].obj_count<< endl;
@@ -150,7 +150,9 @@ AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
 		pix_fmt = (AVPixelFormat)codecpar->format;
 		m_fps = av_q2d(stream ->avg_frame_rate);
+#ifdef USE_VILLAGE
         m_recoderManager.init(stream, avctx);
+#endif
         LOG_INFO("[{}]- init ffmpeg success! input:{} frame_width:{} frame_height:{} fps:{} ", m_dec_name, input_file, frame_width, frame_height, m_fps);
@@ -397,7 +399,9 @@ void DvppDecoder::read_thread() {
 				}
                 frame_nb++;
+#ifdef USE_VILLAGE
                 m_recoderManager.cache_pkt(pkt, frame_nb);
+#endif
                 m_pktQueue_mutex.lock();
                 DataPacket* data_pkt = new DataPacket();
@@ -30,7 +30,7 @@ static bool is_key_frame(AVPacket *pkt) {
 }
 FFRecoderTaskManager::FFRecoderTaskManager(){
-
+    m_recoder_thread = nullptr;
 }
 FFRecoderTaskManager::~FFRecoderTaskManager(){
@@ -743,8 +743,8 @@ void test_gpu(int gpuID){
     // string task_id = createTask(handle, algor_vec, 3 + gpuID * 10);  
-    // string task_id1 = createTask(handle, algor_vec2, 5);  
-    string task_id2 = createTask(handle, algor_vec, 1);  
+    string task_id1 = createTask(handle, algor_vec2, 5);  
+    // string task_id2 = createTask(handle, algor_vec, 1);  
     // test_snapshot(handle);