From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
index 6897343..3b8498f 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
@@ -5,11 +5,12 @@
//#todo index int -> string
NewRecordVideoElement::NewRecordVideoElement(std::string camid) :
//videoEncoderElement(cv::Size(1920, 1080), 5, 0),
-camID(camid)
+camID(camid),
+m_bSaveWH(false)
{
// basicPath();
- isRecord=false;
+ //isRecord=false;
m_cutPath= appPref.getStringData("user.loop.absolute.path");
recordInit(appPref.getIntData("n_cut_min_duration"),appPref.getIntData("n_cut_max_duration"));
@@ -19,18 +20,23 @@
std::queue<ImgInfo> empty;
empty.swap(m_imgBufQue);
-//m_imgBufQue.clear();
+
}
std::string NewRecordVideoElement::startRecord() {
-// ImgInfo info=m_HiredisTool.getImage(camID);
- //isRecord=true;
+
+
ImgInfo info;
getImg(info);
std::string srcPath= getFileName(info.time);
m_filename=srcPath;
// DBG("m_filename: " << m_filename);
+ if(!m_bSaveWH)
+ {
+ m_bSaveWH=m_hiredisTool.hashSet(camID,"width",info.img.cols) && m_hiredisTool.hashSet(camID,"height",info.img.rows);
+ DBG("m_bSaveWH="<<m_bSaveWH);
+ }
m_hiredisTool.pushImageBuf(m_filename,info.img);
m_hiredisTool.addFileInfo(m_filename,RECORD_DOING);
@@ -47,7 +53,7 @@
// DBG("sdkTrigger:" << sdkTrigger);
m_hiredisTool.pushImageBuf(m_filename,info.img);
m_hiredisTool.addFileInfo(m_filename,RECORD_ENDING);
- // isRecord=false;
+
}
void NewRecordVideoElement::doRecord() {
@@ -97,6 +103,8 @@
}
void NewRecordVideoElement::pushImgBuf(const std::string& time,cv::Mat& img)
{
+// std::string tmp="camId="+camID+"pushImgBuf";
+// ClockTimer cl(tmp);
ImgInfo info;
img.copyTo(info.img);
// info.img=img;
@@ -109,6 +117,8 @@
}
void NewRecordVideoElement::getImg(ImgInfo& info)
{
+// std::string tmp="camId="+camID+"getImg";
+// ClockTimer cl(tmp);
info=m_imgBufQue.front();
int size=m_imgBufQue.size();
// DBG("m_imgBufQue size="<<size<<" camId="<<camID<<" fileMin="<<fileMin/2);
@@ -200,6 +210,8 @@
}
}
void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
+// std::string tmp="camId="+camID+"setSdkTrigger";
+// ClockTimer cl(tmp);
if(isTrigger)
{
// DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
--
Gitblit v1.8.0