From 25928e3093a7c0257128192d7785ec3f74e89e81 Mon Sep 17 00:00:00 2001 From: pans <pansen626@sina.com> Date: 星期六, 30 三月 2019 12:46:20 +0800 Subject: [PATCH] 添加注释 --- QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h index 65a7dfa..cdfe87e 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h +++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h @@ -48,6 +48,11 @@ static void initFFmpeg(); + /*** + * AVframe杞琧vmat + * @param frame + * @return + */ static cv::Mat avframe_to_cvmat(AVFrame *frame); typedef struct _buffInfo { @@ -56,6 +61,7 @@ std::string camIdx; } frameBuffInfo; + //************褰曞儚妯″潡浣跨敤鐨勭粨鏋勪綋********************// struct FrameIdPackage_s_t { int64_t m_frameId; AVPacket m_packet; @@ -82,6 +88,7 @@ RECORDING_VIDEO, STOP_RECORD, }; + //********************************// // std::map<std::string, MyQueue<frameBuffInfo *> > MapMyQueue; static std::mutex g_mutex; @@ -199,7 +206,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 +234,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