Bladeren bron

增加coreobject.cpp中的503和516~521,对可能的因视频临时文件关闭不全导致程序功能异常

yaoqiang 4 jaren geleden
bovenliggende
commit
2b4dfc70ea
2 gewijzigde bestanden met toevoegingen van 11 en 1 verwijderingen
  1. 10 0
      CamCore/coreobject.cpp
  2. 1 1
      YtCam.pro.user

+ 10 - 0
CamCore/coreobject.cpp

@@ -500,6 +500,9 @@ BOOL InputStreamData(QString deviceid, BYTE byDataType, char* pBuffer, int iData
             if(ytShm->eHomeDevice[i].io[0]==0x01){
                 ytShm->eHomeDevice[i].time[0] = t;
                 if(ytShm->eHomeDevice[i].savetmp==0x00){
+                    if(ytShm->eHomeDevice[i].tmpfile!=NULL){
+                        fclose(ytShm->eHomeDevice[i].tmpfile);
+                    }
                     QString tmpfile = QString("/tmp/%1.mp4").arg(ytShm->eHomeDevice[i].deviceID).replace(" ","_");
                     sprintf(ytShm->eHomeDevice[i].filename,"%s",tmpfile.toUtf8().data());
                     setFullTime(&(ytShm->eHomeDevice[i].onLinetime),QDateTime::currentDateTime());
@@ -509,6 +512,13 @@ BOOL InputStreamData(QString deviceid, BYTE byDataType, char* pBuffer, int iData
                 }else{
                     if(ytShm->eHomeDevice[i].tmpfile!=NULL){
                         fwrite(pBuffer,iDataLen,1,ytShm->eHomeDevice[i].tmpfile);
+                    }else{
+                        QString tmpfile = QString("/tmp/%1.mp4").arg(ytShm->eHomeDevice[i].deviceID).replace(" ","_");
+                        sprintf(ytShm->eHomeDevice[i].filename,"%s",tmpfile.toUtf8().data());
+                        setFullTime(&(ytShm->eHomeDevice[i].onLinetime),QDateTime::currentDateTime());
+//                        ytShm->eHomeDevice[i].savetmp = 0x01;
+                        ytShm->eHomeDevice[i].tmpfile  = fopen(tmpfile.toUtf8().data(),"wb");
+                        fwrite(pBuffer,iDataLen,1,ytShm->eHomeDevice[i].tmpfile);
                     }
                 }
             }else{

+ 1 - 1
YtCam.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.7.2, 2021-05-11T17:47:33. -->
+<!-- Written by QtCreator 4.7.2, 2021-05-13T17:43:15. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>