HDR tone mapping for flatbuffers (awawa-dev#215)

* intermediate state

* loading lut table works

* introduced flatbuffers tone mapping setting

* set tone mapping with global switch

* cleanup

* account for OS dependent LUT file paths

* cleanup

* rebased

* fixes

* fix flatbuffer server activation

Co-authored-by: Awawa <mail4awawa@gmail.com>

assets/webconfig/i18n/en.json

@@ -1144,5 +1144,7 @@
   "perf_no" : "No",
   "perf_decoding_time": "time",
   "perf_frames" : "frames",
-  "perf_invalid_frames" : "invalid frames"
+  "perf_invalid_frames" : "invalid frames",
+  "edt_conf_fbs_tonemapping_expl": "If enabled, HyperHDR will try to correct colors of the HDR10 content that was received by flatbuffers as SDR format. Default 3D LUT file <span class='fw-bold'>'lut_lin_tables.3d'</span> is already included.<span class='fw-bold'> You can generate one and preview the effect using link in the 'Advanced menu'.</span><br/>Your typical hidden configuration folder to upload that file in is (check 'Logs' page to confirm):<br/> Rpi→&#47;home&#47;pi&#47;.hyperhdr<br/>Windows→c:&#47;Users&#47;NAME&#47;.hyperhdr",
+  "edt_conf_fbs_tonemapping_title": "HDR to SDR tone mapping"
 } 

include/flatbufserver/FlatBufferConnection.h

@@ -75,6 +75,8 @@ class FlatBufferConnection : public QObject
 	///
 	void sendMessage(const uint8_t* buffer, uint32_t size);
 
+	bool isFree();
+
 public slots:
 	///
 	/// @brief Set the leds according to the given image
@@ -100,6 +102,8 @@ private slots:
 	///
 	///void setVideoModeHdr(int hdr);
 
+	void onImage(const Image<ColorRgb>& image);
+
 private:
 
 	///
@@ -132,4 +136,5 @@ private slots:
 	flatbuffers::FlatBufferBuilder _builder;
 
 	bool _registered;
+	bool _free;
 };

include/flatbufserver/FlatBufferServer.h

@@ -21,9 +21,15 @@ class FlatBufferServer : public QObject
 {
 	Q_OBJECT
 public:
-	FlatBufferServer(const QJsonDocument& config, QObject* parent = nullptr);
+	FlatBufferServer(const QJsonDocument& config, const QString& configurationPath, QObject* parent = nullptr);
 	~FlatBufferServer() override;
 
+	static FlatBufferServer* instance;
+	static FlatBufferServer* getInstance() { return instance; }
+
+signals:
+	void hdrToneMappingChanged(bool enabled, uint8_t* lutBuffer);
+
 public slots:
 	///
 	/// @brief Handle settings update
@@ -34,6 +40,8 @@ public slots:
 
 	void initServer();
 
+	void setHdrToneMappingEnabled(bool enabled);
+
 private slots:
 	///
 	/// @brief Is called whenever a new socket wants to connect
@@ -57,6 +65,17 @@ private slots:
 	void stopServer();
 
 
+	///
+	/// @brief Get shared LUT file folder
+	///
+	QString GetSharedLut();
+
+	///
+	/// @brief Load LUT file
+	///
+	void loadLutFile();
+
+
 private:
 	QTcpServer* _server;
 	NetOrigin* _netOrigin;
@@ -67,4 +86,10 @@ private slots:
 	BonjourServiceRegister* _serviceRegister = nullptr;
 
 	QVector<FlatBufferClient*> _openConnections;
+
+	// tone mapping
+	bool _hdrToneMappingEnabled;
+	uint8_t* _lutBuffer;
+	bool _lutBufferInit;
+	QString	_configurationPath;
 };

sources/api/API.cpp

@@ -25,6 +25,7 @@
 #include <HyperhdrConfig.h>
 #include <utils/SysInfo.h>
 #include <utils/ColorSys.h>
+#include <flatbufserver/FlatBufferServer.h>
 
 // bonjour wrapper
 #include <bonjour/bonjourbrowserwrapper.h>
@@ -211,7 +212,7 @@ bool API::setComponentState(const QString& comp, bool& compState, QString& reply
 		input = "VIDEOGRABBER";
 	Components component = stringToComponent(input);
 	if (component == COMP_ALL)
-	{		
+	{
 		QMetaObject::invokeMethod(HyperHdrIManager::getInstance(), "toggleStateAllInstances", Qt::QueuedConnection, Q_ARG(bool, compState));
 
 		return true;
@@ -237,7 +238,11 @@ void API::setLedMappingType(int type, hyperhdr::Components callerComp)
 
 void API::setVideoModeHdr(int hdr, hyperhdr::Components callerComp)
 {
-	QMetaObject::invokeMethod(GrabberWrapper::getInstance(), "setHdrToneMappingEnabled", Qt::QueuedConnection, Q_ARG(int, hdr));
+	if (GrabberWrapper::getInstance() != nullptr)
+		QMetaObject::invokeMethod(GrabberWrapper::getInstance(), "setHdrToneMappingEnabled", Qt::QueuedConnection, Q_ARG(int, hdr));
+
+	if (FlatBufferServer::getInstance() != nullptr)
+		QMetaObject::invokeMethod(FlatBufferServer::getInstance(), "setHdrToneMappingEnabled", Qt::QueuedConnection, Q_ARG(bool, hdr));
 }
 
 bool API::setEffect(const EffectCmdData& dat, hyperhdr::Components callerComp)

sources/flatbufserver/FlatBufferClient.cpp

@@ -6,14 +6,19 @@
 #include <QTimer>
 #include <QRgb>
 
-FlatBufferClient::FlatBufferClient(QTcpSocket* socket, int timeout, QObject* parent)
+// util includes
+#include <utils/FrameDecoder.h>
+
+FlatBufferClient::FlatBufferClient(QTcpSocket* socket, int timeout, bool hdrToneMappingEnabled, uint8_t* lutBuffer, QObject* parent)
 	: QObject(parent)
 	, _log(Logger::getInstance("FLATBUFSERVER"))
 	, _socket(socket)
 	, _clientAddress("@" + socket->peerAddress().toString())
 	, _timeoutTimer(new QTimer(this))
 	, _timeout(timeout * 1000)
 	, _priority()
+	, _hdrToneMappingEnabled(hdrToneMappingEnabled)
+	, _lutBuffer(lutBuffer)
 {
 	// timer setup
 	_timeoutTimer->setSingleShot(true);
@@ -65,6 +70,12 @@ void FlatBufferClient::forceClose()
 	_socket->close();
 }
 
+void FlatBufferClient::setHdrToneMappingEnabled(bool enabled, uint8_t* lutBuffer)
+{
+	_hdrToneMappingEnabled = enabled;
+	_lutBuffer = lutBuffer;
+}
+
 void FlatBufferClient::disconnected()
 {
 	Debug(_log, "Socket Closed");
@@ -164,6 +175,10 @@ void FlatBufferClient::handleImageCommand(const hyperhdrnet::Image* image)
 
 		Image<ColorRgb> imageDest(width, height);
 		memmove(imageDest.memptr(), imageData->data(), imageData->size());
+
+		// tone mapping
+		FrameDecoder::applyLUT((uint8_t*)imageDest.memptr(), imageDest.width(), imageDest.height(), _lutBuffer, _hdrToneMappingEnabled);
+
 		emit setGlobalInputImage(_priority, imageDest, duration);
 	}
 

sources/flatbufserver/FlatBufferClient.h

@@ -26,7 +26,7 @@ class FlatBufferClient : public QObject
 	/// @param timeout  The timeout when a client is automatically disconnected and the priority unregistered
 	/// @param parent   The parent
 	///
-	explicit FlatBufferClient(QTcpSocket* socket, int timeout, QObject* parent = nullptr);
+	explicit FlatBufferClient(QTcpSocket* socket, int timeout, bool hdrToneMappingEnabled, uint8_t* lutBuffer, QObject* parent = nullptr);
 
 signals:
 	///
@@ -65,6 +65,11 @@ public slots:
 	///
 	void forceClose();
 
+	///
+	/// @brief Change HDR tone mapping
+	///
+	void setHdrToneMappingEnabled(bool enabled, uint8_t* lutBuffer);
+
 private slots:
 	///
 	/// @brief Is called whenever the socket got new data to read
@@ -140,4 +145,8 @@ private slots:
 
 	// Flatbuffers builder
 	flatbuffers::FlatBufferBuilder _builder;
+
+	// tone mapping
+	bool _hdrToneMappingEnabled;
+	uint8_t* _lutBuffer;
 };

sources/flatbufserver/FlatBufferConnection.cpp

@@ -18,6 +18,7 @@ FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString&
 	, _prevSocketState(QAbstractSocket::UnconnectedState)
 	, _log(Logger::getInstance("FLATBUFCONN"))
 	, _registered(false)
+	, _free(true)
 {
 	QStringList parts = address.split(":");
 	if (parts.size() != 2)
@@ -45,6 +46,8 @@ FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString&
 
 	connect(&_timer, &QTimer::timeout, this, &FlatBufferConnection::connectToHost);
 	_timer.start();
+
+	connect(this, &FlatBufferConnection::onImage, this, &FlatBufferConnection::setImage);
 }
 
 FlatBufferConnection::~FlatBufferConnection()
@@ -126,6 +129,8 @@ void FlatBufferConnection::setColor(const ColorRgb& color, int priority, int dur
 
 void FlatBufferConnection::setImage(const Image<ColorRgb>& image)
 {
+	_free = false;
+
 	auto imgData = _builder.CreateVector(reinterpret_cast<const uint8_t*>(image.memptr()), image.size());
 	auto rawImg = hyperhdrnet::CreateRawImage(_builder, imgData, image.width(), image.height());
 	auto imageReq = hyperhdrnet::CreateImage(_builder, hyperhdrnet::ImageType_RawImage, rawImg.Union(), -1);
@@ -134,6 +139,14 @@ void FlatBufferConnection::setImage(const Image<ColorRgb>& image)
 	_builder.Finish(req);
 	sendMessage(_builder.GetBufferPointer(), _builder.GetSize());
 	_builder.Clear();
+
+	_free = true;
+}
+
+
+bool FlatBufferConnection::isFree()
+{
+	return _free;
 }
 
 void FlatBufferConnection::clear(int priority)