From 9bbbe29c81aa9cd183e840232f2bd973937d1ef4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 15 一月 2019 17:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
index 280ce50..0ba53a9 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
@@ -10,7 +10,8 @@
// basicPath();
m_cutPath= appPref.getStringData("user.loop.absolute.path");
- recordInit(60,360);
+
+ recordInit(appPref.getIntData("n_cut_min_duration"),appPref.getIntData("n_cut_max_duration"));
}
NewRecordVideoElement::~NewRecordVideoElement() {
@@ -27,7 +28,7 @@
getImg(info);
std::string srcPath= getFileName(info.time);
m_filename=srcPath;
- DBG("m_filename: " << m_filename);
+ // DBG("m_filename: " << m_filename);
m_hiredisTool.pushImageBuf(m_filename,info.img);
m_hiredisTool.addFileInfo(m_filename,RECORD_DOING);
@@ -38,10 +39,10 @@
ImgInfo info;
getImg(info);
- DBG("m_filename: " << m_filename);
- DBG("recordDelay:" << recordDelay);
- DBG("videoLength:" << videoLength);
- DBG("sdkTrigger:" << sdkTrigger);
+// DBG("m_filename: " << m_filename);
+// DBG("recordDelay:" << recordDelay);
+// DBG("videoLength:" << videoLength);
+// DBG("sdkTrigger:" << sdkTrigger);
m_hiredisTool.pushImageBuf(m_filename,info.img);
m_hiredisTool.addFileInfo(m_filename,RECORD_ENDING);
}
@@ -80,7 +81,7 @@
QDateTime dt = QDateTime::fromString(QString::fromStdString(timeStamp), "yyyy-MM-dd hh:mm:ss:zzz");
std::string t_strTime=dt.toString("yyyyMMddhh").toStdString();
- DBG("t_strTime="<<t_strTime);
+ // DBG("t_strTime="<<t_strTime);
t_FilePath.append(camID + "/" + t_strTime.substr(0, 6)+ "/" +t_strTime.substr(6, 2) + "/");
//YYYYMMDDHH
t_FilePath.append(t_strTime.substr(0,10)+ "/");
@@ -105,7 +106,7 @@
{
info=m_imgBufQue.front();
int size=m_imgBufQue.size();
- DBG("m_imgBufQue size="<<size<<" camId="<<camID<<" fileMin="<<fileMin/2);
+// DBG("m_imgBufQue size="<<size<<" camId="<<camID<<" fileMin="<<fileMin/2);
if(size>fileMin/2)
{
m_imgBufQue.pop();
@@ -195,7 +196,7 @@
void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
if(isTrigger)
{
- DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
+// DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
triggerDelay = 0;
sdkTrigger = true;
}
@@ -213,8 +214,8 @@
void NewRecordVideoElement::recordInit(int videoMin, int videoMax) {
sdkTrigger = false;
- fileMin = videoMin;
- fileMax = videoMax;
+ fileMin = videoMin*8;//fps=8
+ fileMax = videoMax*8;
triggerDelay = fileMin/2;
recordStatus = RECORD_STOP;
--
Gitblit v1.8.0