From 0717e9fd0a2722687b1b8a08c7e05f363950eb73 Mon Sep 17 00:00:00 2001
From: Hu Chunming <2657262686@qq.com>
Date: Thu, 1 Aug 2024 14:56:21 +0800
Subject: [PATCH] 代码同步

---
 src/ai_engine_module/VPTProcess.cpp    |  2 +-
 src/ai_platform/MultiSourceProcess.cpp |  2 +-
 src/decoder/dvpp/DvppDecoder.cpp       | 23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/ai_engine_module/VPTProcess.cpp b/src/ai_engine_module/VPTProcess.cpp
index 4fb90cc..40d276e 100755
--- a/src/ai_engine_module/VPTProcess.cpp
+++ b/src/ai_engine_module/VPTProcess.cpp
@@ -46,7 +46,7 @@ int VPTProcess::init(VPTProcess_PARAM vparam){
 
     int ret = vpt_init(&m_det_handle, param);
     if(ret != 0){
-        LOG_DEBUG("vpt init error.");
+        LOG_ERROR("vpt init error.");
         return -1;
     }
 
diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp
index 79e1176..60d1d74 100755
--- a/src/ai_platform/MultiSourceProcess.cpp
+++ b/src/ai_platform/MultiSourceProcess.cpp
@@ -2210,7 +2210,7 @@ bool CMultiSourceProcess::CheckTime() {
     nYear = info->tm_year + 1900;
     nMonth = info->tm_mon + 1;
     nDay = info->tm_mday;
-    if ((nYear == 2023 && nMonth <= 12) || (nYear == 2024 && nMonth <= 7))
+    if (nYear == 2024 && nMonth <= 12)
     {
         return true;
     }
diff --git a/src/decoder/dvpp/DvppDecoder.cpp b/src/decoder/dvpp/DvppDecoder.cpp
index 8f17bb1..b5eab57 100644
--- a/src/decoder/dvpp/DvppDecoder.cpp
+++ b/src/decoder/dvpp/DvppDecoder.cpp
@@ -107,18 +107,25 @@ bool DvppDecoder::init(FFDecConfig cfg){
         return false;
     }
 
-    bool bRet = init_dvpp(cfg);
-    if(!bRet){
-        return false;
-    }
+    do
+    {
+        bool bRet = init_dvpp(cfg);
+        if(!bRet){
+            break;
+        }
 
-    m_cfg = cfg;
+        m_cfg = cfg;
 
-    decode_finished_cbk = cfg.decode_finished_cbk;
+        decode_finished_cbk = cfg.decode_finished_cbk;
 
-    m_bFinished = false;
+        m_bFinished = false;
 
-    return true;
+        return true;
+    } while (0);
+    
+    release_ffmpeg();
+    
+    return false;
 }
 
 AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
--
libgit2 0.21.4