Grabber benchmark support for flatbuffers

awawa-dev · awawa-dev · Nov 8, 2024 · Feb 4, 2024 · Feb 11, 2024 · Aug 12, 2024
commit 8f48dcefbdebf0aa995acf22b2f302adef042610
diff --git a/include/base/Grabber.h b/include/base/Grabber.h
@@ -117,9 +117,7 @@ class Grabber : public DetectionAutomatic, public DetectionManual, protected Lut
 
 	void setSignalDetectionEnable(bool enable);
 
-	void setAutoSignalDetectionEnable(bool enable);
-
-	void benchmarkCapture(int status, QString message);
+	void setAutoSignalDetectionEnable(bool enable);	
 
 	QList<Grabber::DevicePropertiesItem> getVideoDeviceModesFullInfo(const QString& devicePath);
 
@@ -270,9 +268,6 @@ public slots:
 	bool		_signalDetectionEnabled;
 	bool		_signalAutoDetectionEnabled;
 	QSemaphore  _synchro;
-
-	int			_benchmarkStatus;
-	QString		_benchmarkMessage;
 };
 
 bool sortDevicePropertiesItem(const Grabber::DevicePropertiesItem& v1, const Grabber::DevicePropertiesItem& v2);
diff --git a/include/base/GrabberWrapper.h b/include/base/GrabberWrapper.h
@@ -39,8 +39,6 @@ public slots:
 	void stop();
 	void revive();
 
-	void benchmarkCapture(int status, QString message);
-
 	QJsonObject getJsonInfo();
 
 	QJsonDocument startCalibration();
@@ -57,7 +55,6 @@ private slots:
 	void SignalNewVideoImage(const QString& name, const Image<ColorRgb>& image);
 	void SignalVideoStreamChanged(QString device, QString videoMode);
 	void SignalCecKeyPressed(int key);
-	void SignalBenchmarkUpdate(int status, QString message);
 	void SignalInstancePauseChanged(int instance, bool isEnabled);
 	void SignalSetNewComponentStateToAllInstances(hyperhdr::Components component, bool enable);
 	void SignalSaveCalibration(QString saveData);

diff --git a/include/base/HyperHdrManager.h b/include/base/HyperHdrManager.h
@@ -6,6 +6,7 @@
 #endif
 
 #include <image/ColorRgb.h>
+#include <utils/VideoBenchmark.h>
 #include <utils/Logger.h>
 #include <utils/settings.h>
 #include <utils/Components.h>
@@ -101,6 +102,9 @@ public slots:
 
 	void SignalInstancePauseChanged(int instance, bool isEnabled);
 
+	void SignalBenchmarkUpdate(int status, QString message);
+	void SignalBenchmarkCapture(int status, QString message);
+
 private slots:
 	void handleInstanceJustStarted();
 
@@ -126,4 +130,5 @@ private slots:
 	int		_fireStarter;
 
 	QMap<quint8, PendingRequests> _pendingRequests;
+	VideoBenchmark	_videoBenchmark;
 };
diff --git a/include/lut-calibrator/BoardUtils.h b/include/lut-calibrator/BoardUtils.h
@@ -90,10 +90,11 @@ namespace BoardUtils
 		bool isCaptured(int index) const;
 		bool areAllCaptured();
 		void finilizeBoard();
-		void correctYRange(double3& yuv);
+		static void correctYRange(double3& yuv, double yRange, double upYLimit, double downYLimit, double yShift);
+		void getSignalParams(double& yRange, double& upYLimit, double& downYLimit, double& yShift);
 		void setCaptured(int index);
 		void setRange(YuvConverter::COLOR_RANGE range);
 		YuvConverter::COLOR_RANGE getRange() const;
-		bool saveResult(const char* filename = "D:/result.txt");
+		bool saveResult(const char* filename = "D:/result.txt", const std::string& result = "");
 	};
 };
diff --git a/include/lut-calibrator/ColorSpace.h b/include/lut-calibrator/ColorSpace.h
@@ -152,5 +152,19 @@ namespace ColorSpaceMath
 	QString matToString(double4x4 m);
 
 	QString matToString(double3x3 m);
+
+
+
+	void serialize(std::stringstream& out, const double2& v);
+
+	void serialize(std::stringstream& out, const double3& v);
+
+	void serialize(std::stringstream& out, const double4& v);
+
+
+	void serialize(std::stringstream& out, const double4x4& m);
+
+	void serialize(std::stringstream& out, const double3x3& m);
+
 };
 
diff --git a/include/lut-calibrator/LutCalibrator.h b/include/lut-calibrator/LutCalibrator.h
@@ -91,7 +91,6 @@ public slots:
 	void notifyCalibrationMessage(QString message, bool started = false);
 	void error(QString message);
 	void handleImage(const Image<ColorRgb>& image);
-	linalg::vec<double, 3> hdr_to_srgb(linalg::vec<double, 3> yuv, const linalg::vec<uint8_t, 2>& UV, const linalg::vec<double, 3>& aspect, const linalg::mat<double, 4, 4>& coefMatrix, ColorSpaceMath::HDR_GAMMA gamma, double gammaHLG, double nits, int altConvert, const linalg::mat<double, 3, 3>& bt2020_to_sRgb, int tryBt2020Range);
 	void scoreBoard(bool testOnly, const linalg::mat<double, 4, 4>& coefMatrix, ColorSpaceMath::HDR_GAMMA gamma, double gammaHLG, double nits, linalg::vec<double, 3> aspect, int tryBt2020Range, int altConvert, const linalg::mat<double, 3, 3>& bt2020_to_sRgb, const long long int& minError, long long int& currentError);
 	void tryHDR10();
 	void setupWhitePointCorrection();
@@ -100,6 +99,8 @@ public slots:
 	void capturedPrimariesCorrection(ColorSpaceMath::HDR_GAMMA gamma, double gammaHLG, double nits, int coef, linalg::mat<double, 3, 3>& convert_bt2020_to_XYZ, linalg::mat<double, 3, 3>& convert_XYZ_to_corrected, bool printDebug = false);
 	bool parseTextLut2binary(const char* filename = "D:/interpolated_lut.txt", const char* outfile = "D:/lut_lin_tables.3d");
 
+	static QString writeLUT(Logger* _log, QString _rootPath, BestResult* bestResult);
+
 	Logger* _log;
 	std::shared_ptr<BoardUtils::CapturedColors> _capturedColors;
 	std::shared_ptr<YuvConverter> _yuvConverter;

diff --git a/include/utils/VideoBenchmark.h b/include/utils/VideoBenchmark.h
@@ -0,0 +1,57 @@
+#pragma once
+
+/* VideoBenchmark.h
+*
+*  MIT License
+*
+*  Copyright (c) 2020-2024 awawa-dev
+*
+*  Project homesite: https://github.com/awawa-dev/HyperHDR
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  The above copyright notice and this permission notice shall be included in all
+*  copies or substantial portions of the Software.
+
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+*  SOFTWARE.
+ */
+
+#ifndef PCH_ENABLED
+#include <QObject>
+#include <QString>
+#endif
+
+#include <image/Image.h>
+#include <utils/Components.h>
+
+class VideoBenchmark : public QObject
+{
+	Q_OBJECT
+
+	int			_benchmarkStatus;
+	QString		_benchmarkMessage;
+	bool		_connected;
+
+public:
+	VideoBenchmark(QObject* parent);
+
+public slots:
+	void signalSetGlobalImageHandler(int priority, const Image<ColorRgb>& image, int timeout_ms, hyperhdr::Components origin, QString clientDescription);
+	void signalNewVideoImageHandler(const QString& name, const Image<ColorRgb>& image);
+	void benchmarkCapture(int status, QString message);
+	void newFrame(const Image<ColorRgb>& image);
+
+signals:
+	void SignalBenchmarkUpdate(int status, QString message);
+};
diff --git a/sources/api/CallbackAPI.cpp b/sources/api/CallbackAPI.cpp
@@ -185,12 +185,12 @@ bool CallbackAPI::subscribeFor(const QString& type, bool unsubscribe)
 			connect(_accessManager.get(), &AccessManager::SignalTokenUpdated, this, &CallbackAPI::tokenChangeHandler, Qt::UniqueConnection);
 	}
 
-	if (type == "benchmark-update" && grabberWrapper != nullptr)
+	if (type == "benchmark-update")
 	{
 		if (unsubscribe)
-			disconnect(grabberWrapper, &GrabberWrapper::SignalBenchmarkUpdate, this, &CallbackAPI::signalBenchmarkUpdateHandler);
+			disconnect(_instanceManager.get(), &HyperHdrManager::SignalBenchmarkUpdate, this, &CallbackAPI::signalBenchmarkUpdateHandler);
 		else
-			connect(grabberWrapper, &GrabberWrapper::SignalBenchmarkUpdate, this, &CallbackAPI::signalBenchmarkUpdateHandler, Qt::UniqueConnection);
+			connect(_instanceManager.get(), &HyperHdrManager::SignalBenchmarkUpdate, this, &CallbackAPI::signalBenchmarkUpdateHandler, Qt::UniqueConnection);
 	}
 
 	return true;

diff --git a/sources/api/HyperAPI.cpp b/sources/api/HyperAPI.cpp
@@ -528,18 +528,8 @@ void HyperAPI::handleBenchmarkCommand(const QJsonObject& message, const QString&
 	GrabberWrapper* grabberWrapper = (_videoGrabber != nullptr) ? _videoGrabber->grabberWrapper() : nullptr;
 	const QString& subc = message["subcommand"].toString().trimmed();
 	int status = message["status"].toInt();
-
-	if (grabberWrapper != nullptr)
-	{
-		if (subc == "ping")
-		{
-			emit grabberWrapper->SignalBenchmarkUpdate(status, "pong");
-		}
-		else
-		{
-			BLOCK_CALL_2(grabberWrapper, benchmarkCapture, int, status, QString, subc);
-		}
-	}
+
+	emit _instanceManager->SignalBenchmarkCapture(status, subc);	
 
 	sendSuccessReply(command, tan);
 }

diff --git a/sources/base/Grabber.cpp b/sources/base/Grabber.cpp
@@ -74,8 +74,6 @@ Grabber::Grabber(const QString& configurationPath, const QString& grabberName)
 	, _signalDetectionEnabled(false)
 	, _signalAutoDetectionEnabled(false)
 	, _synchro(1)
-	, _benchmarkStatus(-1)
-	, _benchmarkMessage("")
 {
 	connect(GlobalSignals::getInstance(), &GlobalSignals::SignalSetLut, this, &Grabber::signalSetLutHandler, Qt::BlockingQueuedConnection);
 }
@@ -824,33 +822,12 @@ void Grabber::handleNewFrame(unsigned int workerIndex, Image<ColorRgb> image, qu
 		{
 			if (checkSignalDetectionManual(image))
 				emit GlobalSignals::getInstance()->SignalNewVideoImage(_deviceName, image);
-		}
-		if (_benchmarkStatus >= 0)
-		{
-			ColorRgb pixel = image(image.width() / 2, image.height() / 2);
-			if ((_benchmarkMessage == "white" && pixel.red > 120 && pixel.green > 120 && pixel.blue > 120) ||
-				(_benchmarkMessage == "red" && pixel.red > 120 && pixel.green < 30 && pixel.blue < 30) ||
-				(_benchmarkMessage == "green" && pixel.red < 30 && pixel.green > 120 && pixel.blue < 30) ||
-				(_benchmarkMessage == "blue" && pixel.red < 30 && pixel.green < 40 && pixel.blue > 120) ||
-				(_benchmarkMessage == "black" && pixel.red < 30 && pixel.green < 30 && pixel.blue < 30))
-
-			{
-				emit SignalBenchmarkUpdate(_benchmarkStatus, _benchmarkMessage);
-				_benchmarkStatus = -1;
-				_benchmarkMessage = "";
-			}
-		}
+		}		
 	}
 	else
 		frameStat.directAccess = true;
 }
 
-void Grabber::benchmarkCapture(int status, QString message)
-{
-	_benchmarkStatus = status;
-	_benchmarkMessage = message;
-}
-
 bool Grabber::isInitialized()
 {
 	return _initialized;

diff --git a/sources/base/GrabberWrapper.cpp b/sources/base/GrabberWrapper.cpp
@@ -412,14 +412,6 @@ void GrabberWrapper::revive()
 		QTimer::singleShot(3000, _grabber.get(), &Grabber::revive);
 }
 
-void GrabberWrapper::benchmarkCapture(int status, QString message)
-{
-	if (_grabber != nullptr)
-	{
-		_grabber->benchmarkCapture(status, message);
-	}
-}
-
 bool GrabberWrapper::getAutoResume()
 {
 	return _autoResume;

diff --git a/sources/base/HyperHdrManager.cpp b/sources/base/HyperHdrManager.cpp
@@ -49,9 +49,13 @@ HyperHdrManager::HyperHdrManager(const QString& rootPath)
 	, _instanceTable(new InstanceTable())
 	, _rootPath(rootPath)
 	, _fireStarter(0)
+	, _videoBenchmark(this)
 {
 	qRegisterMetaType<InstanceState>("InstanceState");
 	connect(this, &HyperHdrManager::SignalInstanceStateChanged, this, &HyperHdrManager::handleInstanceStateChange);
+
+	connect(&_videoBenchmark, &VideoBenchmark::SignalBenchmarkUpdate, this, &HyperHdrManager::SignalBenchmarkUpdate);
+	connect(this, &HyperHdrManager::SignalBenchmarkCapture, &_videoBenchmark, &VideoBenchmark::benchmarkCapture);
 }
 
 HyperHdrManager::~HyperHdrManager()

diff --git a/sources/grabber/linux/v4l2/V4L2Grabber.cpp b/sources/grabber/linux/v4l2/V4L2Grabber.cpp
@@ -1186,7 +1186,7 @@ bool V4L2Grabber::process_image(v4l2_buffer* buf, const void* frameImageBuffer,
 							loadLutFile();
 						}
 
-						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating() || (_benchmarkStatus >= 0));
+						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating() );
 						_workerThread->setup(
 							i,
 							buf,

diff --git a/sources/grabber/linux/v4l2/V4L2Wrapper.cpp b/sources/grabber/linux/v4l2/V4L2Wrapper.cpp
@@ -35,7 +35,6 @@ V4L2Wrapper::V4L2Wrapper(const QString& device,
 	: GrabberWrapper("V4L2:" + device.left(14))
 {
 	_grabber = std::unique_ptr<Grabber>(new V4L2Grabber(device, configurationPath));
-	connect(_grabber.get(), &Grabber::SignalBenchmarkUpdate, this, &GrabberWrapper::SignalBenchmarkUpdate);
     connect(_grabber.get(), &Grabber::SignalCapturingException, this, &GrabberWrapper::capturingExceptionHandler);
 	connect(_grabber.get(), &Grabber::SignalSetNewComponentStateToAllInstances, this, &GrabberWrapper::SignalSetNewComponentStateToAllInstances);
 	connect(_grabber.get(), &Grabber::SignalSaveCalibration, this, &GrabberWrapper::SignalSaveCalibration);

diff --git a/sources/grabber/osx/AVF/AVFGrabber.mm b/sources/grabber/osx/AVF/AVFGrabber.mm
@@ -810,7 +810,7 @@ - (void)captureOutput:(AVCaptureOutput *)output didOutputSampleBuffer:(CMSampleB
 							loadLutFile();
 						}
 
-						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating() || (_benchmarkStatus >= 0));
+						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating());
 						_workerThread->setup(
 							i,
 							_actualVideoFormat,

diff --git a/sources/grabber/osx/AVF/AVFWrapper.cpp b/sources/grabber/osx/AVF/AVFWrapper.cpp
@@ -36,7 +36,6 @@ AVFWrapper::AVFWrapper(const QString& device,
 	: GrabberWrapper("macOS AVF:" + device.left(14))
 {
 	_grabber = std::unique_ptr<Grabber>(new AVFGrabber(device, configurationPath));
-	connect(_grabber.get(), &Grabber::SignalBenchmarkUpdate, this, &GrabberWrapper::SignalBenchmarkUpdate);
     connect(_grabber.get(), &Grabber::SignalCapturingException, this, &GrabberWrapper::capturingExceptionHandler);
 	connect(_grabber.get(), &Grabber::SignalSetNewComponentStateToAllInstances, this, &GrabberWrapper::SignalSetNewComponentStateToAllInstances);
 	connect(_grabber.get(), &Grabber::SignalSaveCalibration, this, &GrabberWrapper::SignalSaveCalibration);

diff --git a/sources/grabber/windows/MF/MFGrabber.cpp b/sources/grabber/windows/MF/MFGrabber.cpp
@@ -1005,7 +1005,7 @@ bool MFGrabber::process_image(const void* frameImageBuffer, int size)
 							loadLutFile();
 						}
 
-						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating() || (_benchmarkStatus >= 0));
+						bool directAccess = !(_signalAutoDetectionEnabled || _signalDetectionEnabled || isCalibrating());
 						_workerThread->setup(
 							i,
 							_actualVideoFormat,

diff --git a/sources/grabber/windows/MF/MFWrapper.cpp b/sources/grabber/windows/MF/MFWrapper.cpp
@@ -36,7 +36,6 @@ MFWrapper::MFWrapper(const QString& device,
 	: GrabberWrapper("Media Foundation:" + device.left(14))
 {
 	_grabber = std::unique_ptr<Grabber>(new MFGrabber(device, configurationPath));
-	connect(_grabber.get(), &Grabber::SignalBenchmarkUpdate, this, &GrabberWrapper::SignalBenchmarkUpdate);
 	connect(_grabber.get(), &Grabber::SignalCapturingException, this, &GrabberWrapper::capturingExceptionHandler);
 	connect(_grabber.get(), &Grabber::SignalSetNewComponentStateToAllInstances, this, &GrabberWrapper::SignalSetNewComponentStateToAllInstances);
 	connect(_grabber.get(), &Grabber::SignalSaveCalibration, this, &GrabberWrapper::SignalSaveCalibration);

diff --git a/sources/lut-calibrator/BoardUtils.cpp b/sources/lut-calibrator/BoardUtils.cpp
@@ -419,9 +419,17 @@ namespace BoardUtils
 		_upYLimit = all[SCREEN_COLOR_DIMENSION - 1][SCREEN_COLOR_DIMENSION - 1][SCREEN_COLOR_DIMENSION - 1].y();
 	}
 
-	void CapturedColors::correctYRange(double3& yuv)
+	void CapturedColors::correctYRange(double3& yuv, double yRange, double upYLimit, double downYLimit, double yShift)
 	{
-		yuv.x = ((yuv.x - _downYLimit) / (_upYLimit - _downYLimit)) * _yRange + _yShift;
+		yuv.x = ((yuv.x - downYLimit) / (upYLimit - downYLimit)) * yRange + yShift;
+	}
+
+	void CapturedColors::getSignalParams(double& yRange, double& upYLimit, double& downYLimit, double& yShift)
+	{
+		yRange = _yRange;
+		upYLimit = _upYLimit;
+		downYLimit = _downYLimit;
+		yShift = _yShift;
 	}
 
 	void CapturedColors::setCaptured(int index)
@@ -439,7 +447,7 @@ namespace BoardUtils
 		return _range;
 	}
 
-	bool CapturedColors::saveResult(const char* filename)
+	bool CapturedColors::saveResult(const char* filename, const std::string& result)
 	{
 		std::ofstream myfile;
 		myfile.open(filename, std::ios::trunc | std::ios::out);
@@ -451,7 +459,7 @@ namespace BoardUtils
 
 		myfile << "// Values of the table represent YUV in range [0 - 1] * " << std::to_string(IMPORT_SCALE) << ", limited of full" << std::endl;
 		myfile << "// Each row of the " << std::to_string(SCREEN_COLOR_DIMENSION) <<"^3 table consist of the following RGB coordinates:" << std::endl << "// [ ";
-		
+
 		for (int i = 0, j = 0; i < SCREEN_COLOR_DIMENSION; i++, j += SCREEN_COLOR_STEP)
 		{
 			if (i)
@@ -461,6 +469,8 @@ namespace BoardUtils
 
 		myfile << " ]" << std::endl << "// First table is in Python format, second in C++ format" << std::endl << std::endl;
 
+		myfile << result;
+
 		for(const auto& currentArray : arrayMark)
 		{
 			myfile << currentArray.first << std::endl;