diff --git a/bin/logs/main_2023_08_10.log b/bin/logs/main_2023_08_10.log deleted file mode 100644 index eee368e..0000000 --- a/bin/logs/main_2023_08_10.log +++ /dev/null @@ -1,121 +0,0 @@ -MultiSourceProcess.cpp(86): [I 08/10/23 15:01:27.944 4109495 4109495 InitAlgorthim] 编译时间：Aug 10 2023 14:48:49 -VPTProcess.cpp(30): [I 08/10/23 15:01:28.839 4109495 4109495 init] vpt 版本：vpt_vdec_arm_310p_v0.0.2.20230613_without_timelimit 模型路径：./models/vpt230323_310p.om -MultiSourceProcess.cpp(585): [I 08/10/23 15:01:29.145 4109495 4109723 algorthim_process_thread] algorthim_process_thread start... -MultiSourceProcess.cpp(955): [I 08/10/23 15:01:29.146 4109495 4109725 timing_snapshot_thread] timing_snapshot_thread start. -MultiSourceProcess.cpp(181): [I 08/10/23 15:01:29.146 4109495 4109495 InitAlgorthim] InitAlgorthim succeed ! -MultiSourceProcess.cpp(190): [I 08/10/23 15:01:29.146 4109495 4109495 AddMqConn] 初始化MQ队列 -MultiSourceProcess.cpp(202): [I 08/10/23 15:01:29.225 4109495 4109495 AddMqConn] 为报警类 绑定MQ回调 -MultiSourceProcess.cpp(207): [I 08/10/23 15:01:29.225 4109495 4109495 AddMqConn] 为报警类 绑定MQ回调 成功！ -MultiSourceProcess.cpp(210): [I 08/10/23 15:01:29.225 4109495 4109495 AddMqConn] 初始化MQ队列成功！ -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:34.059 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:34.059 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:34.059 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:34.059 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:34.059 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:35.359 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:35.359 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:35.359 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:35.359 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:35.423 4109495 4109988 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:35.460 4109495 4109989 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:35.461 4109495 4109988 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:35.461 4109495 4109987 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:35.471 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:35.471 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:35.471 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:35.472 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:35.472 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:35.472 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:35.472 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:36.985 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:36.985 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:36.986 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:36.986 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:37.043 4109495 4110068 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:37.083 4109495 4110069 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:37.085 4109495 4110068 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:37.085 4109495 4110067 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:37.094 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:37.094 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:37.094 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:37.094 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:37.094 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:37.094 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:37.094 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:38.391 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:38.391 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:38.393 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:38.393 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:38.439 4109495 4110116 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:38.475 4109495 4110117 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:38.477 4109495 4110116 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:38.477 4109495 4110115 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:38.490 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:38.491 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:38.491 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:38.491 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:38.491 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:38.491 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:38.491 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:39.817 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:39.817 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:39.818 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:39.818 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:39.883 4109495 4110159 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:39.900 4109495 4110160 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:39.901 4109495 4110159 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:39.901 4109495 4110158 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:39.911 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:39.911 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:39.911 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:39.911 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:39.911 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:39.911 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:39.911 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:41.207 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:41.207 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:41.208 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:41.208 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:41.263 4109495 4110226 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:41.308 4109495 4110227 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:41.309 4109495 4110226 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:41.310 4109495 4110225 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:41.319 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:41.319 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:41.319 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:41.319 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:41.319 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:41.319 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:41.319 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:42.606 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:42.606 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:42.606 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:42.607 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:42.671 4109495 4110277 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:42.683 4109495 4110278 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:42.685 4109495 4110277 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:42.685 4109495 4110276 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:42.694 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:42.695 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success -MultiSourceProcess.cpp(467): [I 08/10/23 15:01:42.695 4109495 4109495 SnapShot] begin SnapShot task: test_task_id_default -MultiSourceProcess.cpp(430): [I 08/10/23 15:01:42.695 4109495 4109495 snapshot_task] snap in task -DecoderManager.cpp(467): [E 08/10/23 15:01:42.695 4109495 4109495 snapshot_in_task] 没有找到name为test_task_id_default的解码器 -MultiSourceProcess.cpp(462): [E 08/10/23 15:01:42.695 4109495 4109495 snapshot_task] failed! - -MultiSourceProcess.cpp(433): [I 08/10/23 15:01:42.695 4109495 4109495 snapshot_task] snap out task -DvppDecoder.cpp(151): [I 08/10/23 15:01:44.031 4109495 4109495 init_FFmpeg] []- init ffmpeg success! input:rtsp://admin:ad123456@192.168.60.165:554/cam/realmonitor?channel=1&subtype=0 frame_width:1920 frame_height:1080 fps:25 -DvppDecoder.cpp(165): [I 08/10/23 15:01:44.031 4109495 4109495 init_vdpp] []- Init device start... -DvppDecoder.cpp(210): [I 08/10/23 15:01:44.032 4109495 4109495 init_vdpp] []- init vdpp success! device:0 channel:0 -DecoderManager.cpp(509): [I 08/10/23 15:01:44.032 4109495 4109495 snapshot_out_task] snapshot 解码器初始化成功 -DvppDecoder.cpp(852): [I 08/10/23 15:01:44.089 4109495 4110331 sendVdecEos] []- send eos -DvppDecoder.cpp(474): [I 08/10/23 15:01:44.128 4109495 4110332 doProcessReport] doProcessReport exit. -DvppDecoder.cpp(698): [I 08/10/23 15:01:44.129 4109495 4110331 decode_thread] []- decode thread exit. -DvppDecoder.cpp(432): [I 08/10/23 15:01:44.129 4109495 4110330 read_thread] []- read thread exit. -MultiSourceProcess.cpp(458): [I 08/10/23 15:01:44.139 4109495 4109495 snapshot_task] snap successed! -MultiSourceProcess.cpp(496): [I 08/10/23 15:01:44.139 4109495 4109495 SnapShot] SnapShot task: test_task_id_default success diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650894059.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650894059.jpg deleted file mode 100644 index a2c52e2..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650894059.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650895472.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650895472.jpg deleted file mode 100644 index 1f7ea59..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650895472.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650897094.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650897094.jpg deleted file mode 100644 index bc755d9..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650897094.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650898491.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650898491.jpg deleted file mode 100644 index 6ce2a9a..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650898491.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650899911.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650899911.jpg deleted file mode 100644 index a09067d..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650899911.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650901319.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650901319.jpg deleted file mode 100644 index 7b829c7..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650901319.jpg +++ /dev/null diff --git a/bin/res/video_snapshot/test_task_id_default_snap_1691650902695.jpg b/bin/res/video_snapshot/test_task_id_default_snap_1691650902695.jpg deleted file mode 100644 index 57a9e6b..0000000 --- a/bin/res/video_snapshot/test_task_id_default_snap_1691650902695.jpg +++ /dev/null diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp index f702080..4a04af7 100755 --- a/src/ai_platform/MultiSourceProcess.cpp +++ b/src/ai_platform/MultiSourceProcess.cpp @@ -156,11 +156,18 @@ int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){ pVpcUtil->init(m_devId); m_pAlgorthimThread = new thread([](void* arg) { - CMultiSourceProcess* process = (CMultiSourceProcess*)arg ; - process->algorthim_process_thread(); - return (void*)0; - } - , this); + CMultiSourceProcess* process = (CMultiSourceProcess*)arg ; + process->algorthim_process_thread(); + return (void*)0; + } + , this); + + m_recode_thread = new thread([](void* arg) { + CMultiSourceProcess* process = (CMultiSourceProcess*)arg ; + process->recode_thread(); + return (void*)0; + } + , this); m_timing_snapshot_thread = new std::thread( [](void* arg) @@ -296,6 +303,10 @@ bool CMultiSourceProcess::AddTask(task_param _cur_task_param){ return false; } +#ifdef POST_USE_RABBITMQ + pDecManager->set_mq_callback(config.name, std::bind(&mq::Manager::publish, mq_manager_, mq_type, std::placeholders::_1, true)); +#endif + // 人车物跟踪 if (task_has_vpt_algor(task_id)) vpt_process.addTaskTracker(task_id, 1, 1, skip_frame_); @@ -510,6 +521,11 @@ void CMultiSourceProcess::CloseAllTask(){ m_pAlgorthimThread = nullptr; } + if(m_recode_thread){ + m_recode_thread->join(); + m_recode_thread = nullptr; + } + if(m_timing_snapshot_thread != nullptr && m_timing_snapshot_thread->joinable()){ m_timing_snapshot_thread->join(); m_timing_snapshot_thread = nullptr; @@ -1298,4 +1314,31 @@ void CMultiSourceProcess::face_locus_finished(const OBJ_KEY obj_key) { m_save_snapshot_reprocessing->reprocessing_process_wo_locus_async(roi_save_info); _total_face_snapshot_info.erase(obj_key); +} + +int CMultiSourceProcess::recode_thread() { + LOG_INFO("recode_thread start..."); + + while(true) { + + if(m_bfinish){ + break; + } + + m_recoderinfo_queue_mtx.lock(); + if(m_recoderinfo_queue.size() <= 0) { + m_recoderinfo_queue_mtx.unlock(); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); + continue; + } + + RecoderInfo info = m_recoderinfo_queue.front(); + m_recoderinfo_queue.pop_front(); + m_recoderinfo_queue_mtx.unlock(); + + DecoderManager* pDecManager = DecoderManager::getInstance(); + pDecManager->doRecode(info); + } + + LOG_INFO("recode_thread end."); } \ No newline at end of file diff --git a/src/ai_platform/MultiSourceProcess.h b/src/ai_platform/MultiSourceProcess.h index 2c802e2..4edb716 100755 --- a/src/ai_platform/MultiSourceProcess.h +++ b/src/ai_platform/MultiSourceProcess.h @@ -51,6 +51,8 @@ public: void task_finished(const string task_id); void decoded_cbk(DeviceMemory* devFrame); void timing_snapshot_thread(); + // 发送录制消息给任务 + int recode_thread(); private: // 算法相关 @@ -120,4 +122,8 @@ private: face_det_ai_engine m_face_det_ai_engine; // 人脸检测 + deque m_recoderinfo_queue; + mutex m_recoderinfo_queue_mtx; + thread* m_recode_thread {nullptr}; + }; \ No newline at end of file diff --git a/src/ai_platform/common_header.h b/src/ai_platform/common_header.h index 88f1dea..5c465a7 100755 --- a/src/ai_platform/common_header.h +++ b/src/ai_platform/common_header.h @@ -36,6 +36,7 @@ struct RecoderInfo { std::string task_id; std::string object_id; unsigned long long frame_nb; + std::string mq_info; }; #endif // ___COMMON_HEADER_H__ \ No newline at end of file diff --git a/src/decoder/dvpp/DvppDecoder.cpp b/src/decoder/dvpp/DvppDecoder.cpp index 19a364a..00a826d 100755 --- a/src/decoder/dvpp/DvppDecoder.cpp +++ b/src/decoder/dvpp/DvppDecoder.cpp @@ -245,6 +245,8 @@ void DvppDecoder::close(){ if(m_read_thread != 0){ pthread_join(m_read_thread,0); } + + m_recoderManager.close(); } void DvppDecoder::setPostDecArg(const void* postDecArg){ @@ -886,4 +888,8 @@ void DvppDecoder::release_dvpp(){ void DvppDecoder::doRecode(RecoderInfo& recoderInfo) { m_recoderManager.create_recode_task2(recoderInfo); +} + +void DvppDecoder::set_mq_callback(mq_callback_t cb) { + m_recoderManager.set_mq_callback(cb); } \ No newline at end of file diff --git a/src/decoder/dvpp/DvppDecoder.h b/src/decoder/dvpp/DvppDecoder.h index b460ead..8d9f33f 100755 --- a/src/decoder/dvpp/DvppDecoder.h +++ b/src/decoder/dvpp/DvppDecoder.h @@ -54,6 +54,8 @@ public: void doRecode(RecoderInfo& recoderInfo); + void set_mq_callback(mq_callback_t cb); + public: void doVdppVdecCallBack(acldvppStreamDesc *input, acldvppPicDesc *output, unsigned long long frame_nb); void doProcessReport(); diff --git a/src/decoder/dvpp/DvppDecoderApi.cpp b/src/decoder/dvpp/DvppDecoderApi.cpp index 0a2e526..f9b5ff5 100755 --- a/src/decoder/dvpp/DvppDecoderApi.cpp +++ b/src/decoder/dvpp/DvppDecoderApi.cpp @@ -136,4 +136,10 @@ void DvppDecoderApi::doRecode(RecoderInfo& recoderInfo) { if(m_pDecoder != nullptr){ return m_pDecoder->doRecode(recoderInfo); } +} + +void DvppDecoderApi::set_mq_callback(std::function mq_publish) { + if(m_pDecoder != nullptr){ + return m_pDecoder->set_mq_callback(mq_publish); + } } \ No newline at end of file diff --git a/src/decoder/dvpp/DvppDecoderApi.h b/src/decoder/dvpp/DvppDecoderApi.h index 5c02823..496d394 100755 --- a/src/decoder/dvpp/DvppDecoderApi.h +++ b/src/decoder/dvpp/DvppDecoderApi.h @@ -41,6 +41,8 @@ public: void setFinishedDecArg(const void* finishedDecArg); void doRecode(RecoderInfo& recoderInfo); + + void set_mq_callback(std::function mq_publish); private: DvppDecoder* m_pDecoder; }; \ No newline at end of file diff --git a/src/decoder/dvpp/FFRecoder.cpp b/src/decoder/dvpp/FFRecoder.cpp index 13546cc..ebed6a7 100644 --- a/src/decoder/dvpp/FFRecoder.cpp +++ b/src/decoder/dvpp/FFRecoder.cpp @@ -123,7 +123,7 @@ bool FFRecoder::init(int w, int h, AVRational time_base, AVCodecContext* avctx, bool FFRecoder::init(AVRational time_base, AVCodecContext* avctx, const char* outfile_name) { - codec_ctx_ = new AVCodecContext(); + codec_ctx_ = (AVCodecContext*)av_malloc(sizeof(AVCodecContext)); avcodec_copy_context(codec_ctx_, avctx); codec_ctx_->time_base = time_base; @@ -244,6 +244,11 @@ void FFRecoder::update_pts(AVPacket* pkt) { bool FFRecoder::write_pkt(AVPacket *pkt) { char errbuf[64]{ 0 }; + // frame_number++; + // pkt->pts = av_rescale_q(frame_number, codec_ctx_->time_base, out_stream_->time_base); + // pkt->dts = pkt->pts; + // pkt->duration = av_rescale_q(1, codec_ctx_->time_base, out_stream_->time_base); + av_packet_rescale_ts(pkt, codec_ctx_->time_base, out_stream_->time_base); pkt->stream_index = out_stream_->index; update_pts(pkt); diff --git a/src/decoder/dvpp/FFRecoder.h b/src/decoder/dvpp/FFRecoder.h index 8dbcd71..001b2d6 100644 --- a/src/decoder/dvpp/FFRecoder.h +++ b/src/decoder/dvpp/FFRecoder.h @@ -49,4 +49,6 @@ private: bool bFirstFrame; int64_t last_src_pts; int64_t last_pts; + + int64_t frame_number{0}; }; \ No newline at end of file diff --git a/src/decoder/dvpp/FFRecoderTaskManager.cpp b/src/decoder/dvpp/FFRecoderTaskManager.cpp index 6523a63..7328d84 100644 --- a/src/decoder/dvpp/FFRecoderTaskManager.cpp +++ b/src/decoder/dvpp/FFRecoderTaskManager.cpp @@ -56,6 +56,11 @@ bool FFRecoderTaskManager::init(AVRational time_base, AVCodecContext* avctx){ } void FFRecoderTaskManager::cache_pkt(AVPacket* pkt, long long frame_nb){ + if(m_bExit) { + // 任务退出了就不再缓存数据了 + return; + } + std::lock_guard l_pkt(m_pkt_list_mtx); // 考虑到一个AVPacket中的数据并不很大，为减少与解码模块的耦合度，方便管理，这里做一个clone @@ -131,6 +136,14 @@ list::iterator FFRecoderTaskManager::getStartIterator(unsigned long return it_first; } + // auto it_second = m_pkt_list.begin(); + // for(;it_second != m_pkt_list.end(); it_second++) { + // DataPacket* dataPkt = *it_second; + // if (dataPkt->frame_nb >= start_frame_nb){ + // return it_second; + // } + // } + auto it_second = m_pkt_list.begin(); for(;it_second != m_pkt_list.end(); it_second++) { DataPacket* dataPkt = *it_second; @@ -179,6 +192,10 @@ void FFRecoderTaskManager::create_recode_task(AVRational time_base, AVCodecConte } void FFRecoderTaskManager::create_recode_task2(RecoderInfo& recoderInfo) { + if(m_bExit) { + // 任务退出了就不再接收录制任务 + return; + } save_intask_recoderinfo(recoderInfo); } @@ -219,8 +236,12 @@ void FFRecoderTaskManager::recode_thread(RecodeParam recodeParam){ } void FFRecoderTaskManager::recode_thread2() { - + LOG_INFO("recode_thread2 start..."); while(true) { + if(m_bExit) { + break; + } + m_recoderinfo_list_mtx.lock(); if(m_recoderinfo_list.size() <= 0){ m_recoderinfo_list_mtx.unlock(); @@ -258,6 +279,7 @@ void FFRecoderTaskManager::recode_thread2() { bool bInit = ffrecoder.init(m_time_base, m_avctx, file_name.c_str()); if (!bInit) { LOG_ERROR("ffrecoder init error : {} {} {}", recoderinfo.task_id, recoderinfo.object_id, recoderinfo.frame_nb); + ffrecoder.uninit(); continue; } LOG_INFO("record start, pkt_list size: {} id: {}", m_pkt_list.size(), id); @@ -277,7 +299,34 @@ void FFRecoderTaskManager::recode_thread2() { // ffrecoder.flush(); ffrecoder.uninit(); + // 发送mq消息 + if(mq_publish_func) { + mq_publish_func(recoderinfo.mq_info.c_str()); + } + LOG_INFO("record end, total save: {} start_frame_nb: {} end_frame_nb: {} file_path: {}", count, start_frame_nb, end_frame_nb, file_name); } + LOG_INFO("recode_thread2 end."); +} + +void FFRecoderTaskManager::close() { + m_bExit = true; + + if (m_recoder_thread) { + m_recoder_thread->join(); + m_recoder_thread = nullptr; + } + + // 清空数据 + while(!m_pkt_list.empty()) { + DataPacket* dataPkt = m_pkt_list.front(); + delete dataPkt; + dataPkt = nullptr; + m_pkt_list.pop_front(); + } +} + +void FFRecoderTaskManager::set_mq_callback(mq_callback_t cb) { + mq_publish_func = cb; } \ No newline at end of file diff --git a/src/decoder/dvpp/FFRecoderTaskManager.h b/src/decoder/dvpp/FFRecoderTaskManager.h index b338f7d..a750e82 100644 --- a/src/decoder/dvpp/FFRecoderTaskManager.h +++ b/src/decoder/dvpp/FFRecoderTaskManager.h @@ -18,6 +18,8 @@ struct RecodeParam { AVCodecContext* avctx; }; +typedef std::function mq_callback_t; + class FFRecoderTaskManager { public: FFRecoderTaskManager(); @@ -29,6 +31,10 @@ public: bool init(AVRational time_base, AVCodecContext* avctx); void create_recode_task2(RecoderInfo& recoderInfo); + void close(); + + void set_mq_callback(mq_callback_t cb); + public: void recode_thread(RecodeParam param); list::iterator getStartIterator(unsigned long long frame_nb); @@ -59,5 +65,7 @@ private: AVRational m_time_base; AVCodecContext* m_avctx; - thread* m_recoder_thread {nullptr}; + thread* m_recoder_thread{nullptr}; + + mq_callback_t mq_publish_func; }; \ No newline at end of file diff --git a/src/decoder/interface/AbstractDecoder.h b/src/decoder/interface/AbstractDecoder.h index 3ee91a4..38d9841 100755 --- a/src/decoder/interface/AbstractDecoder.h +++ b/src/decoder/interface/AbstractDecoder.h @@ -5,6 +5,8 @@ #include "../../ai_platform/common_header.h" +#include + using namespace std; class AbstractDecoder{ @@ -42,6 +44,8 @@ public: virtual void doRecode(RecoderInfo& recoderInfo) = 0; + virtual void set_mq_callback(std::function mq_publish) = 0; + public: bool isSnapTime(); diff --git a/src/decoder/interface/DecoderManager.cpp b/src/decoder/interface/DecoderManager.cpp index 469a43c..d04e68f 100755 --- a/src/decoder/interface/DecoderManager.cpp +++ b/src/decoder/interface/DecoderManager.cpp @@ -536,4 +536,22 @@ void DecoderManager::doRecode(RecoderInfo& recoderInfo) { LOG_ERROR("没有找到name为{}的解码器",name); return; +} + +void DecoderManager::set_mq_callback(const string name, std::function mq_publish) { + if (name.empty()){ + LOG_ERROR("name 为空!"); + return; + } + + std::lock_guard l(m_mutex); + + auto dec = decoderMap.find(name); + if (dec != decoderMap.end()){ + dec->second->set_mq_callback(mq_publish); + return; + } + + LOG_ERROR("没有找到name为{}的解码器",name); + return; } \ No newline at end of file diff --git a/src/decoder/interface/DecoderManager.h b/src/decoder/interface/DecoderManager.h index 676c725..735fb9d 100755 --- a/src/decoder/interface/DecoderManager.h +++ b/src/decoder/interface/DecoderManager.h @@ -275,6 +275,8 @@ public: void doRecode(RecoderInfo& recoderInfo); + void set_mq_callback(const string name, std::function mq_publish); + private: DecoderManager(){} diff --git a/src/decoder/test_recoder.cpp b/src/decoder/test_recoder.cpp index 85f2e1a..769ca5e 100644 --- a/src/decoder/test_recoder.cpp +++ b/src/decoder/test_recoder.cpp @@ -15,13 +15,18 @@ deque m_RgbDataList; mutex m_DataListMtx; thread* m_pAlgorthimThread{nullptr}; +thread* m_recodeThread{nullptr}; bool m_bfinish{false}; int m_devId = 0; const char* task_id = "test0"; int skip_frame_ = 5; int m_batch_size = 20; +deque m_recoderinfo_queue; +mutex m_recoderinfo_queue_mtx; + void algorthim_process_thread(); +void recode_thread(); void algorthim_face_detect(vector vec_gpuMem); void post_decod_cbk(const void * userPtr, DeviceMemory* devFrame){ @@ -90,6 +95,12 @@ int main(){ } , nullptr); + m_recodeThread = new thread([](void* arg) { + recode_thread(); + return (void*)0; + } + , nullptr); + pDecManager->startDecodeByName(config.name); while (getchar() != 'q'); @@ -162,10 +173,31 @@ void algorthim_face_detect(vector vec_gpuMem) { recoderInfo.object_id = std::to_string(obj_id); recoderInfo.recoderDir = "./res/recode"; recoderInfo.frame_nb = mem->getFrameNb(); - DecoderManager* pDecManager = DecoderManager::getInstance(); - pDecManager->doRecode(recoderInfo); + + m_recoderinfo_queue_mtx.lock(); + m_recoderinfo_queue.push_back(recoderInfo); + m_recoderinfo_queue_mtx.unlock(); obj_id++; } +} + +void recode_thread() { + while(true) { + + m_recoderinfo_queue_mtx.lock(); + if(m_recoderinfo_queue.size() <= 0) { + m_recoderinfo_queue_mtx.unlock(); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); + continue; + } + + RecoderInfo info = m_recoderinfo_queue.front(); + m_recoderinfo_queue.pop_front(); + m_recoderinfo_queue_mtx.unlock(); + + DecoderManager* pDecManager = DecoderManager::getInstance(); + pDecManager->doRecode(info); + } } \ No newline at end of file