From abd9036f024a77d22b47a108bc88b27b9732e3c5 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:27:27 +0800
Subject: [PATCH] 

---
 QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
index 280ce50..6897343 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
@@ -9,8 +9,10 @@
 {
 
    // basicPath();
+    isRecord=false;
     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() {
@@ -23,11 +25,12 @@
 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);
+   // DBG("m_filename: " << m_filename);
 
     m_hiredisTool.pushImageBuf(m_filename,info.img);
      m_hiredisTool.addFileInfo(m_filename,RECORD_DOING);
@@ -38,12 +41,13 @@
 
     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);
+   // isRecord=false;
 }
 
 void NewRecordVideoElement::doRecord() {
@@ -80,7 +84,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)+ "/");
@@ -98,6 +102,8 @@
 //     info.img=img;
      info.time=time;
      m_imgBufQue.push(info);
+    // if(isRecord)
+    // DBG("camId="<<camID<<"pushtime="<<info.time);
 //     int size=m_imgBufQue.size();
 //     DBG("m_imgBufQue size="<<size);
 }
@@ -105,24 +111,25 @@
  {
         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();
         }
-
-
-
- }
- void NewRecordVideoElement::threadFunc()
- {
-//        Record();
- }
- void NewRecordVideoElement::threadInitial()
- {
+//        if(isRecord)
+//        DBG("camId="<<camID<<"gettime="<<info.time);
 
 
  }
+// void NewRecordVideoElement::threadFunc()
+// {
+//       Record();
+// }
+// void NewRecordVideoElement::threadInitial()
+// {
+
+
+// }
 
  void NewRecordVideoElement::Record() {
      switch(recordStatus)
@@ -195,7 +202,7 @@
  void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
      if(isTrigger)
      {
-         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
+//         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
          triggerDelay = 0;
          sdkTrigger = true;
      }
@@ -213,8 +220,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