kangjun/SL100_FactoryTestTool
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 增加猫眼镜头切换IRCUT; 2. 优化连续多次打开视频获取视频流导致的内存问题

Browse Source
This commit is contained in:
钟富强
2024-09-02 18:37:24 +08:00
parent 09c5843358
commit 15eb213578
19 changed files with 153 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FactoryTestTool/SourceCode/RecvDataHandler/RecvDataHandler.cpp
View File

@@ -3,6 +3,7 @@
#include "../Network/ClientHandler.h"
DataHandler::DataHandler(QLabel* leftLens_imageLabel, QLabel* rightLens_imageLabel, QLabel* videoLabel,
QLineEdit* VideoResolutionEdit,
QTextEdit* licenseHwInfoEdit, QMap<QString, QLineEdit*>* devInfoLineEdits,
QJsonArray frontBoardOneClickTest, QJsonArray frontBoardTest, QJsonArray frontBoardFuncConfig,
QJsonArray frontBoardDevInfoJson, QJsonArray frontBoardLicenseJson,
@@ -13,6 +14,7 @@ DataHandler::DataHandler(QLabel* leftLens_imageLabel, QLabel* rightLens_imageLab
leftLens_m_imageLabel(leftLens_imageLabel),
rightLens_m_imageLabel(rightLens_imageLabel),
videoLabel(videoLabel),
VideoResolutionEdit(VideoResolutionEdit),
licenseHwInfoEdit(licenseHwInfoEdit),
devInfoLineEdits(devInfoLineEdits),
frontBoardOneClickTest(frontBoardOneClickTest), frontBoardTest(frontBoardTest),
@@ -48,6 +50,7 @@ DataHandler::~DataHandler()
void DataHandler::handleOpenFocusWindow(int itemIndex)
{
if (ffmpegDecoder) {
qDebug() << "------- handleOpenFocusWindow";
ffmpegDecoder->processVideo(itemIndex); // 调用 FFmpegDecoder 的处理函数
}
}
@@ -86,7 +89,7 @@ void DataHandler::showVideo(const QString& client, const QByteArray& valData)
if (!start_run) {
start_run = 1;
ffmpegDecoder->decodeFile(h264filePath, videoLabel);
ffmpegDecoder->decodeFile(h264filePath, videoLabel, VideoResolutionEdit);
}
//ffmpegDecoder->decodeFile(filePath_1, videoLabel);
}

2
FactoryTestTool/SourceCode/RecvDataHandler/RecvDataHandler.h
View File

@@ -34,6 +34,7 @@ class DataHandler : public QObject
public:
explicit DataHandler(QLabel* leftLens_imageLabel, QLabel* rightLens_imageLabel, QLabel* videoLabel,
QLineEdit* VideoResolutionEdit,
QTextEdit* licenseHwInfoEdit, QMap<QString, QLineEdit*>* devInfoLineEdits,
QJsonArray frontBoardOneClickTest, QJsonArray frontBoardTest, QJsonArray frontBoardFuncConfig,
QJsonArray frontBoardDevInfoJson, QJsonArray frontBoardLicenseJson,
@@ -69,6 +70,7 @@ private:
QLabel* leftLens_m_imageLabel;
QLabel* rightLens_m_imageLabel;
QLabel* videoLabel;
QLineEdit* VideoResolutionEdit;
QTextEdit* licenseHwInfoEdit;
QByteArray allRecvData; // 完整的一帧数据
int remain = 0;