From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
index 235cbed..a7dbb3f 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
@@ -37,6 +37,7 @@
}
#include <mutex>
+#include <basic/pipe/TimerElement.h>
namespace BASICGB28181 {
@@ -48,6 +49,11 @@
static void initFFmpeg();
+ /***
+ * AVframe杞琧vmat
+ * @param frame
+ * @return
+ */
static cv::Mat avframe_to_cvmat(AVFrame *frame);
typedef struct _buffInfo {
@@ -56,6 +62,7 @@
std::string camIdx;
} frameBuffInfo;
+ //************褰曞儚妯″潡浣跨敤鐨勭粨鏋勪綋********************//
struct FrameIdPackage_s_t {
int64_t m_frameId;
AVPacket m_packet;
@@ -82,6 +89,7 @@
RECORDING_VIDEO,
STOP_RECORD,
};
+ //********************************//
// std::map<std::string, MyQueue<frameBuffInfo *> > MapMyQueue;
static std::mutex g_mutex;
@@ -199,7 +207,8 @@
int stopWrite();
//瀵筽acket鍋氳浆鎹�
- void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream, unsigned long int frame_index = 0);
+ 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 +235,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