Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp

@@ -38,10 +38,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);
}
@@ -105,7 +105,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 +195,7 @@
 void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
     if(isTrigger)
     {
         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
//         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
         triggerDelay = 0;
         sdkTrigger = true;
     }