Hu Chunming / vpt_ascend_arm

Commit af3f87b8280695da788a01b4e13bf15c6133b56a

Authored by Hu Chunming
1 parent e6fa5f85

recoderDir改为recoderPath

Inline Side-by-side
Showing 4 changed files with 9 additions and 9 deletions
src/ai_platform/MultiSourceProcess.cpp
  View file @af3f87b
... ... @@ -1303,7 +1303,7 @@ void CMultiSourceProcess::manned_snapshot(vector<string>& vpt_interest_task_id,
1303 1303 RecoderInfo recoderInfo;
1304 1304 recoderInfo.task_id = task_id;
1305 1305 recoderInfo.object_id = std::to_string(j);
1306   - recoderInfo.recoderDir = "./res/recode";
  1306 + recoderInfo.recoderPath = "./res/recode";
1307 1307 recoderInfo.frame_nb = mem->getFrameNb();
1308 1308  
1309 1309 m_recoderinfo_queue_mtx.lock();
... ...
src/ai_platform/common_header.h
  View file @af3f87b
... ... @@ -32,7 +32,7 @@ struct box_t {
32 32 };
33 33  
34 34 struct RecoderInfo {
35   - std::string recoderDir;
  35 + std::string recoderPath;
36 36 std::string task_id;
37 37 std::string object_id;
38 38 unsigned long long frame_nb;
... ...
src/decoder/dvpp/FFRecoderTaskManager.cpp
  View file @af3f87b
... ... @@ -300,7 +300,7 @@ void FFRecoderTaskManager::recode_thread(RecodeParam recodeParam){
300 300 RecoderInfo recoderInfo;
301 301 recoderInfo = recodeParam.recoderInfo;
302 302 std::string id = recoderInfo.task_id + "_" + recoderInfo.object_id + "_" + std::to_string(recoderInfo.frame_nb);
303   - string file_name = recoderInfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
  303 + string file_name = recoderInfo.recoderPath;
304 304 FFRecoder ffrecoder;
305 305 bool bInit = ffrecoder.init(m_inStream, recodeParam.avctx, file_name.c_str());
306 306 if (!bInit) {
... ... @@ -369,7 +369,7 @@ void FFRecoderTaskManager::recode_thread2() {
369 369 m_pkt_list_mtx.unlock();
370 370  
371 371 std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
372   - string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
  372 + string file_name = recoderinfo.recoderPath;
373 373 FFRecoder ffrecoder;
374 374 bool bInit = ffrecoder.init(m_inStream, m_avctx, file_name.c_str());
375 375 if (!bInit) {
... ... @@ -377,7 +377,7 @@ void FFRecoderTaskManager::recode_thread2() {
377 377 ffrecoder.uninit();
378 378 continue;
379 379 }
380   - LOG_DEBUG("record start, pkt_list size: {} id: {}", m_pkt_list.size(), id);
  380 + 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);
381 381  
382 382 int count = 0;
383 383 auto it_save = it_data;
... ... @@ -448,7 +448,7 @@ void FFRecoderTaskManager::recode_thread3() {
448 448 m_frame_list_mtx.unlock();
449 449  
450 450 std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
451   - string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
  451 + string file_name = recoderinfo.recoderPath;
452 452 FFRecoder ffrecoder;
453 453 bool bInit = ffrecoder.init(m_avctx->width, m_avctx->height, m_time_base, m_avctx, file_name.c_str());
454 454 if (!bInit) {
... ... @@ -523,7 +523,7 @@ void FFRecoderTaskManager::recode_thread4() {
523 523 m_pkt_list_mtx.unlock();
524 524  
525 525 std::string id = recoderinfo.task_id + "_" + recoderinfo.object_id + "_" + std::to_string(recoderinfo.frame_nb);
526   - string file_name = recoderinfo.recoderDir + "/recoder_" + id + "_" + std::to_string(get_cur_time()) + ".mp4";
  526 + string file_name = recoderinfo.recoderPath;
527 527 FFRecoder ffrecoder;
528 528 bool bInit = ffrecoder.init(m_inStream, m_avctx, file_name.c_str());
529 529 if (!bInit) {
... ...
src/decoder/test_recoder.cpp
  View file @af3f87b
... ... @@ -179,7 +179,7 @@ void algorthim_face_detect(vector<DeviceMemory*> vec_gpuMem) {
179 179 RecoderInfo recoderInfo;
180 180 recoderInfo.task_id = task_id;
181 181 recoderInfo.object_id = std::to_string(obj_id);
182   - recoderInfo.recoderDir = "./res/recode";
  182 + recoderInfo.recoderPath = "./res/recode";
183 183 recoderInfo.frame_nb = mem->getFrameNb();
184 184  
185 185 m_recoderinfo_queue_mtx.lock();
... ... @@ -211,7 +211,7 @@ void test_recode_thread() {
211 211 RecoderInfo recoderInfo;
212 212 recoderInfo.task_id = gpuMem->getId();
213 213 recoderInfo.object_id = std::to_string(obj_id);
214   - recoderInfo.recoderDir = "./res/recode";
  214 + recoderInfo.recoderPath = "./res/recode";
215 215 recoderInfo.frame_nb = gpuMem->getFrameNb();
216 216  
217 217 DecoderManager* pDecManager = DecoderManager::getInstance();
... ...