18.0.0.0beta3 release

awawa-dev · Jun 4, 2022 · 8d314bc · 8d314bc
1 parent 22ba66c
commit 8d314bc
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 282 deletions.
diff --git a/.github/workflows/push-master.bak b/.github/workflows/push-master.bak
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -3,7 +3,7 @@ name: HyperHDR CI Build
 on: [push]
 
 env:
-    USE_CACHE: "1"
+    USE_CACHE: "0"
     RESET_CACHE: "0"
 
 jobs:
@@ -122,7 +122,7 @@ jobs:
       # Install deps
       - name: Install deps
         shell: bash
-        run: brew update && brew install qt@6 xz ccache protobuf
+        run: brew update && brew install qt@6 xz ccache
 
         # Build process
       - name: Build packages

diff --git a/README.md b/README.md
@@ -62,6 +62,15 @@ SSH and SPI are enabled on default.
 - Direct support for USB grabbers under Windows 10, Linux and macOS (really fast & of course multi-threaded)
 - Support for software screen grabbers: DirectX11, CoreGraphics, X11
 - New software grabber for Linux: Wayland (pipewire/portal) which also means support for **Ubuntu 22.04 LTS** :new:
+- Registering HyperHDR services with the MQTT broker :new:
+- Frame Buffer software screen grabber (Linux) :new:
+- Reworked network discovery service and added Windows support :new:
+- Improved Philips Hue wizard :new:
+- WLED Configuration Wizard can discover WLED devices on the network :new:
+- Protocol buffers HDR tone mapping :new:
+- Replaced protobuf with a lightweight nanopb library :new:
+- System event support: hibernation/sleep/wake up/resume :new:
+- Added WLED auto-resume initialization and improved existing Philips Hue auto-resume feature :new:
 - Wayland grabber: support for pipewire/portal version 4 protocol persistent authentication :new:
 - [New fully automatic LUT calibration for HDR/SDR/YUV](https://www.hyperhdr.eu/2022/04/usb-grabbers-hdr-to-sdr-quality-test.html) :new:
 - 30% improved performance for MJPEG HDR mode :new:

diff --git a/assets/webconfig/content/overview.html b/assets/webconfig/content/overview.html
@@ -101,21 +101,21 @@ <h3 class="page-header"><i class="fa fa-heartbeat fa-fw"></i><span data-i18n="ma
 													</div>
 												</div>
 											</div>
-											<div class="d-none" id="perf_grabber_data">
+											<div class="d-none mt-2" id="perf_grabber_data">
 												<div class="row border-bottom fw-bold text-primary col-12">
 													<span data-i18n="perf_usb_grabber"></span>
 												</div>
-												<div class="col-12 pt-1 pb-1">
+												<div class="col-12 pt-2 pb-1">
 													<span id="perf_usb_data_holder"></span>
 												</div>
 											</div>
-											<div class="row border-bottom fw-bold">
+											<div class="row border-bottom fw-bold mt-2">
 												<div id="perf_instance_header" class="col-12 col-md-6 text-primary">
 													<div class="row">
-														<div class="col-6">
+														<div class="col-md-6 col-xs-12">
 															<span data-i18n="perf_usb_instance">Instance</span>
 														</div>
-														<div class="col-6">
+														<div class="col-md-6 col-xs-12">
 															⇒&nbsp;<i><span data-i18n="general_comp_SMOOTHING">Smoothing</span></i>&nbsp;⇒
 														</div>
 													</div>
@@ -126,7 +126,7 @@ <h3 class="page-header"><i class="fa fa-heartbeat fa-fw"></i><span data-i18n="ma
 											</div>
 											<div id="perf_per_instance_data_holder" class="w-100">
 											</div>
-											<div id="perf_per_instance_data_row" class="row">
+											<div id="perf_per_instance_data_row" class="row mt-1 pb-1">
 												<div class="col-12 col-sm-6 pt-1 pb-1"></div>
 												<div class="col-12 col-sm-6 pt-1 pb-1"></div>
 											</div>

diff --git a/assets/webconfig/js/overview.js b/assets/webconfig/js/overview.js
@@ -130,7 +130,7 @@ $(document).ready(function ()
 
 	function renderReport()
 	{
-		const waitingSpinner = '<i class="fa fa-spinner fa-spin"></i> ' + $.i18n("perf_please_wait");
+		const waitingSpinner = '<i class="fa fa-spinner fa-spin ms-1"></i> ' + $.i18n("perf_please_wait");
 		const fpsTag = '<span class="card-tools"><span class="badge bg-secondary" style="font-weight: normal;">fps</span></span>';
 
 		for (var i = 0; i < performance.length; i++)
@@ -145,7 +145,7 @@ $(document).ready(function ()
 			if (curElem.type == 1)
 			{
 				let render = (curElem.token <= 0) ? waitingSpinner :
-					`<span class="card-tools"><span class="badge bg-secondary" style="font-size: .9em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span>` +
+					`<span class="card-tools"><span class="badge bg-secondary" style="font-size: 1em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span>` +
 					` <small>&nbsp;${curElem.param2}ms</small> <i class="fa fa-clock-o" aria-hidden="true"></i> <small>${curElem.param3}</small> <i class="fa fa-long-arrow-down" aria-hidden="true"></i><i class="fa fa-long-arrow-up" aria-hidden="true"></i>`+
 					((curElem.param4 != 0)?`, ${$.i18n("perf_invalid_frames")}: <small>${curElem.param4}</small>`:``);
 				render += ` <span class='perf_counter small text-muted'>(${curElem.refresh})</span>`;
@@ -184,9 +184,9 @@ $(document).ready(function ()
 
 					if (placer != null)
 					{
-						let render = (curElem.token <= 0) ? ((curElem.type == 2) ? `<span class="card-tools"><span class="badge bg-danger" style="font-size: .9em;font-weight: normal;">${curElem.name}</span></span>&nbsp;` : "") + waitingSpinner : (curElem.type == 2) ?
-							`<span class="card-tools"><span class="badge bg-danger" style="font-size: .9em;font-weight: normal;">${curElem.name}</span></span> <span class="card-tools"><span class="badge bg-secondary" style="font-size: .9em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span> <small>${curElem.param2}</small> <i class="fa fa-long-arrow-down" aria-hidden="true"></i><i class="fa fa-long-arrow-up" aria-hidden="true"></i>` :
-							`<span class="card-tools"><span class="badge bg-success" style="font-size: .9em;font-weight: normal;">${curElem.name}</span></span> <span class="card-tools"><span class="badge bg-secondary" style="font-size: .9em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span> <small>${curElem.param3} </small><i class="fa fa-long-arrow-down" aria-hidden="true"></i>  <small>${curElem.param2}</small> <i class="fa fa-long-arrow-up" aria-hidden="true"></i>`;
+						let render = (curElem.token <= 0) ? ((curElem.type == 2) ? `<span class="card-tools"><span class="badge bg-danger" style="font-size: 1em;font-weight: normal;">${curElem.name}</span></span>&nbsp;` : "") + waitingSpinner : (curElem.type == 2) ?
+							`<span class="card-tools"><span class="badge bg-danger" style="font-size: 1em;font-weight: normal;">${curElem.name}</span></span> <span class="card-tools me-1"><span class="badge bg-secondary" style="font-size: 1em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span> <small>${curElem.param2}</small> <i class="fa fa-long-arrow-down" aria-hidden="true"></i><i class="fa fa-long-arrow-up" aria-hidden="true"></i>` :
+							`<span class="card-tools"><span class="badge bg-success" style="font-size: 1em;font-weight: normal;">${curElem.name}</span></span> <span class="card-tools me-1"><span class="badge bg-secondary" style="font-size: 1em;font-weight: normal;">${curElem.param1.toFixed(2)} fps</span></span> <small>${curElem.param3} </small><i class="fa fa-long-arrow-down" aria-hidden="true"></i>  <small>${curElem.param2}</small> <i class="fa fa-long-arrow-up" aria-hidden="true"></i>`;
 						render += ` <span class='perf_counter small text-muted'>(${curElem.refresh})</span>`;
 						placer.innerHTML = render;
 					}

diff --git a/sources/api/JsonAPI.cpp b/sources/api/JsonAPI.cpp
@@ -1888,7 +1888,7 @@ void JsonAPI::handleTunnel(const QJsonObject& message, const QString& command, i
 
 		if (service == "hue")
 		{
-			if (path.indexOf("/api") != 0)
+			if (path.indexOf("/api") != 0 || ip.indexOf("/") >= 0)
 			{
 				sendErrorReply("Invalid path", full_command, tan);
 				return;

diff --git a/sources/base/HyperHdrIManager.cpp b/sources/base/HyperHdrIManager.cpp
@@ -273,7 +273,7 @@ void HyperHdrIManager::handleStarted()
 
 	_startQueue.removeAll(instance);
 	_runningInstances.insert(instance, hyperhdr);
-	emit instanceStateChanged(InstanceState::H_STARTED, instance);
+	emit instanceStateChanged(InstanceState::H_STARTED, instance, _instanceTable->getNamebyIndex(instance));
 	emit change();
 
 	if (_pendingRequests.contains(instance))

diff --git a/sources/hyperhdr/hyperhdr.cpp b/sources/hyperhdr/hyperhdr.cpp
@@ -366,6 +366,11 @@ void HyperHdrDaemon::startNetworkServices()
 #endif
 }
 
+quint16 HyperHdrDaemon::getWebPort()
+{
+	return (quint16)getSetting(settings::type::WEBSERVER).object()["port"].toInt(8090);
+}
+
 void HyperHdrDaemon::handleSettingsUpdateGlobal(settings::type settingsType, const QJsonDocument& config)
 {
 	if (settingsType == settings::type::SYSTEMCONTROL || settingsType == settings::type::VIDEOCONTROL || settingsType == settings::type::VIDEOGRABBER)

diff --git a/sources/hyperhdr/hyperhdr.h b/sources/hyperhdr/hyperhdr.h
@@ -139,6 +139,7 @@ public slots:
 	void freeObjects();
 	void enableCEC(bool enabled, QString info);
 	void keyPressedCEC(int keyCode);
+	quint16 getWebPort();
 
 signals: