解决编译问题。

pansen

2018-12-19 373aaa44390761f0a2bd1800e49c678df3d68a8b

解决编译问题。

 QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp

@@ -3,16 +3,14 @@

//#todo index int -> string
NewRecordVideoElement::NewRecordVideoElement(std::string camid) :
videoEncoderElement(cv::Size(1920, 1080), 5, 0),
camID(camid)
{
    videoEncoderElement(cv::Size(1920, 1080), 5, 0), camID(camid) {

   // basicPath();
    m_cutPath= appPref.getStringData("user.loop.absolute.path");
}

NewRecordVideoElement::~NewRecordVideoElement() {
    queue<ImgInfo> empty;
    std::queue<ImgInfo> empty;
    empty.swap(m_imgBufQue);

//m_imgBufQue.clear();
@@ -44,7 +42,6 @@

void NewRecordVideoElement::doRecord() {


  //  ImgInfo info=m_HiredisTool.getImage(camID);
     ImgInfo info;
     getImg(info);
@@ -53,8 +50,7 @@
    videoEncoderElement.doFunc(info.img);
}

 std::string NewRecordVideoElement::getFileName(std::string timeStamp)
{
std::string NewRecordVideoElement::getFileName(std::string timeStamp) {
    std::string dirPath=makeDir();

    char szDateTime[256] = {0};
@@ -89,8 +85,8 @@

    return t_FilePath;
}
void NewRecordVideoElement::pushImgBuf(const std::string& time,cv::Mat& img)
{

void NewRecordVideoElement::pushImgBuf(const std::string &time, cv::Mat &img) {
     ImgInfo info;
     img.copyTo(info.img);
//     info.img=img;
@@ -99,33 +95,30 @@
//     int size=m_imgBufQue.size();
//     DBG("m_imgBufQue size="<<size);
}
 void NewRecordVideoElement::getImg(ImgInfo& info)
 {

void NewRecordVideoElement::getImg(ImgInfo &info) {
        //todo
        int len=20;
         info=m_imgBufQue.front();
        int size=m_imgBufQue.size();
//        DBG("m_imgBufQue size="<<size<<" time="<<info.time);
        if(size>len)
        {
    if (size > len) {
             m_imgBufQue.pop();
        }



 }
 void NewRecordVideoElement::threadFunc()
 {

void NewRecordVideoElement::threadFunc() {
        Record();
 }
 void NewRecordVideoElement::threadInitial()
 {

void NewRecordVideoElement::threadInitial() {
     recordInit(40,100);
 }

 void NewRecordVideoElement::Record() {
     switch(recordStatus)
     {
    switch (recordStatus) {
         case RECORD_STOP:
 //        DBG("recordDelay:" << recordDelay);
 //        DBG("videoLength:" << videoLength);
@@ -135,9 +128,7 @@
             if(sdkTrigger){
                 recordStatus = RECORD_DOING;
                 startRecord();
             }
             else
             {
            } else {
                 ImgInfo info;
                 getImg(info);
             }
@@ -148,15 +139,11 @@
             if(sdkTrigger){
                 if(videoLength < fileMax){
                     doRecord();
                 }
                 else
                 {
                } else {
                     recordStatus = RECORD_STOP;
                     endRecord();
                 }
             }
             else
             {
            } else {
                 recordStatus = RECORD_ENDING;
                 doRecord();
             }
@@ -191,22 +178,20 @@
             break;
     }
 }

 void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
     if(isTrigger)
     {
    if (isTrigger) {
         triggerDelay = 0;
         sdkTrigger = true;
     }
     else
     {
    } else {
         if(triggerDelay++ >= fileMin/2) {
             sdkTrigger = false;
         }
         else{
        } else {
             sdkTrigger = true;
         }
     }
 }

 void NewRecordVideoElement::recordInit(int videoMin, int videoMax) {
     sdkTrigger = false;
     fileMin = videoMin;