zhunk 2 mesi fa
parent
commit
cddbf2dd21

+ 6 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,4 +1,10 @@
 ## 20260905
+    #define APP_VERSION "1.13.49"
+    1、【修复】拍照过程偶发取流超时(GetOneFrameTimeout):根因是全局线程池被多个重CPU锐化任务
+       占满,挤占取流线程导致MV_CC_GetImageBuffer取帧延迟/缓冲溢出丢帧。
+       修复:新增专用串行线程池m_sharpPool(单线程),锐化+对比度+水印+保存任务全部提交到该池
+       排队执行,不再占用全局线程池,取流线程响应稳定
+## 20260905
     #define APP_VERSION "1.13.48"
     1、【修复】GPS经纬度精度不足:QString::number默认6位有效数字导致经纬度被截断到小数点后3位(约百米误差),
        改为保留7位小数(约1厘米精度),日志同步打印完整精度

+ 5 - 0
q6_felgo_iot/header/cameramanager.h

@@ -20,6 +20,7 @@
 #include <m_json.h>
 #include <m_loger.h>
 #include <QFuture>
+#include <QThreadPool>
 #include <ImageStitcher.h>
 #include <QSemaphore>
 #include <QQuickImageProvider>
@@ -305,6 +306,10 @@ private:
     //saveMatAsJpeg 由 QtConcurrent 线程池并发调用,无锁会导致重号覆盖、序号跳变、轴重复移动
     mutable QMutex m_saveMutex;
 
+    //锐化/对比度专用串行线程池(单线程):避免多个重CPU锐化任务同时抢占全局线程池,
+    //导致取流线程(handleGrab)被挤占、MV_CC_GetImageBuffer 取流超时
+    QThreadPool m_sharpPool;
+
     //图片归档路径
     QString picture_path_floader;
     QVector<cv::Mat> m_frame_buffer;

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "1.13.48"
+#define APP_VERSION "1.13.49"
 
 using namespace std;
 

+ 8 - 2
q6_felgo_iot/src/cameramanager.cpp

@@ -120,6 +120,11 @@ Frames::Frames(QObject * parent)
     image_num = 1;
     m_width = 0;
     m_height = 0;
+
+    //锐化/对比度专用串行线程池:单线程,锐化任务排队执行,避免重CPU任务占满全局线程池挤占取流
+    m_sharpPool.setMaxThreadCount(1);
+    m_sharpPool.setExpiryTimeout(30000);
+
     connect( m_1s, &QTimer::timeout, this, &Frames::timer);
     m_1s->setInterval( 500 );   //1000
     m_1s->stop();
@@ -740,8 +745,9 @@ Frames::saveMatAsJpeg(const QVideoFrame &frame){
             image_num++;
             mov_x_z_run();      //原图已保存,立即移动电机,不被锐化/对比度阻塞
             locker.unlock();    //锐化在后台执行,无需继续持锁
-            //图像锐化+对比度增强+保存 sharp,异步后台处理,不阻塞抓图与电机移动
-            QtConcurrent::run([=](){
+            //图像锐化+对比度增强+保存 sharp,提交到专用串行线程池(单线程)执行:
+            //既保证重CPU锐化任务不占满全局线程池挤占取流线程,又避免瞬时多张锐化并发抢CPU
+            QtConcurrent::run(&m_sharpPool, [=](){
                 //图像锐化
                 Mat image = imread(name.toStdString());
                 cv::Mat fused_sharp = m_opencvfunc.unsharpMask(image, 2.0, 3.0);