合并分支

Zhao Shuaihua
2 parents 29a1cd95 c4e50858
Showing 5 changed files with 16 additions and 9 deletions
.gitignore
src/ai_platform/MultiSourceProcess.cpp
src/ai_platform/common_header.h
src/decoder/dvpp/FFRecoderTaskManager.cpp
src/decoder/test_recoder.cpp
@@ -4,4 +4,7 @@ bin/logs/*
 bin/res/*
 bin/vpt_proj
 bin/libvpt_ascend.so
+<<<<<<< HEAD
 data/*
+=======
+>>>>>>> c4e50858604d927a3467ae4d0c3b3c63b4a35afb
@@ -1418,8 +1418,12 @@ void CMultiSourceProcess::manned_snapshot(vector&lt;string&gt;&amp; vpt_interest_task_id, 
         RecoderInfo recoderInfo;
         recoderInfo.task_id = task_id;
         recoderInfo.object_id = std::to_string(j);
+<<<<<<< HEAD
         recoderInfo.recoderDir = video_folder;
         // recoderInfo.recoderDir = video_file_name;
+=======
+        recoderInfo.recoderPath = "./res/recode";
+>>>>>>> c4e50858604d927a3467ae4d0c3b3c63b4a35afb
         recoderInfo.frame_nb = mem->getFrameNb();
         recoderInfo.mq_info = json_str;
  
@@ -32,7 +32,7 @@ struct box_t {
 };
  
 struct RecoderInfo {
-  std::string recoderDir;
+  std::string recoderPath;
   std::string task_id;
   std::string object_id;
   unsigned long long frame_nb;
@@ -300,7 +300,7 @@ void FFRecoderTaskManager::recode_thread(RecodeParam recodeParam){
     RecoderInfo recoderInfo;
     recoderInfo = recodeParam.recoderInfo;
     std::string id = recoderInfo.task_id + "_" + recoderInfo.object_id + "_" + std::to_string(recoderInfo.frame_nb);
-    string file_name = recoderInfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
+    string file_name = recoderInfo.recoderPath;
     FFRecoder ffrecoder;
     bool bInit = ffrecoder.init(m_inStream, recodeParam.avctx, file_name.c_str());
     if (!bInit) {
@@ -369,7 +369,7 @@ void FFRecoderTaskManager::recode_thread2() {
         m_pkt_list_mtx.unlock();
  
         std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
-        string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
+        string file_name = recoderinfo.recoderPath;
         FFRecoder ffrecoder;
         bool bInit = ffrecoder.init(m_inStream, m_avctx, file_name.c_str());
         if (!bInit) {
@@ -377,7 +377,7 @@ void FFRecoderTaskManager::recode_thread2() {
             ffrecoder.uninit();
             continue;
         }
-        LOG_DEBUG("record start, pkt_list size: {} id: {}", m_pkt_list.size(), id);
+        LOG_DEBUG("record start, pkt_list size: {} task_id: {}  object_id:{}  frame_nb: {}", m_pkt_list.size(), recoderinfo.task_id, recoderinfo.object_id, recoderinfo.frame_nb);
  
         int count = 0;
         auto it_save = it_data;
@@ -448,7 +448,7 @@ void FFRecoderTaskManager::recode_thread3() {
         m_frame_list_mtx.unlock();
  
         std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
-        string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
+        string file_name = recoderinfo.recoderPath;
         FFRecoder ffrecoder;
         bool bInit = ffrecoder.init(m_avctx->width, m_avctx->height, m_time_base, m_avctx, file_name.c_str());
         if (!bInit) {
@@ -523,7 +523,7 @@ void FFRecoderTaskManager::recode_thread4() {
         m_pkt_list_mtx.unlock();
  
         std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
-        string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
+        string file_name = recoderinfo.recoderPath;
         FFRecoder ffrecoder;
         bool bInit = ffrecoder.init(m_inStream, m_avctx, file_name.c_str());
         if (!bInit) {
@@ -578,4 +578,4 @@ void FFRecoderTaskManager::close() {
  
 void FFRecoderTaskManager::set_mq_callback(mq_callback_t cb) {
     mq_publish_func = cb;
-}
 \ No newline at end of file
+}
@@ -179,7 +179,7 @@ void algorthim_face_detect(vector&lt;DeviceMemory*&gt; vec_gpuMem) {
     RecoderInfo recoderInfo;
     recoderInfo.task_id = task_id;
     recoderInfo.object_id = std::to_string(obj_id);
-    recoderInfo.recoderDir = "./res/recode";
+    recoderInfo.recoderPath = "./res/recode";
     recoderInfo.frame_nb = mem->getFrameNb();
  
     m_recoderinfo_queue_mtx.lock();
@@ -211,7 +211,7 @@ void test_recode_thread() {
             RecoderInfo recoderInfo;
             recoderInfo.task_id = gpuMem->getId();
             recoderInfo.object_id = std::to_string(obj_id);
-            recoderInfo.recoderDir = "./res/recode";
+            recoderInfo.recoderPath = "./res/recode";
             recoderInfo.frame_nb = gpuMem->getFrameNb();
  
             DecoderManager* pDecManager = DecoderManager::getInstance();