From e15c4888f720b8781260b901ac82d058f8f7c3b5 Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期三, 27 三月 2019 14:34:37 +0800 Subject: [PATCH] 移植nsq到项目中,将最短最长时长的参数修改成nsq配置 --- QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h index 65a7dfa..dcfa1d2 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h +++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h @@ -199,7 +199,8 @@ int stopWrite(); //瀵筽acket鍋氳浆鎹� - void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream); + void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream, + unsigned long int frame_index = 0); bool m_bstartWrite = {false}; bool m_bFirstKeyFrame = {false}; @@ -226,6 +227,7 @@ int m_gpuIdx; int m_fps; bool m_PackageState; + bool m_SnapshotNotSaveRet{true}; std::string m_camIdx; MyQueue<frameBuffInfo *> m_rtpQueue; -- Gitblit v1.8.0