diff --git a/.github/workflows/push-master.bak b/.github/workflows/push-master.bak deleted file mode 100644 index b125e05ba..000000000 --- a/.github/workflows/push-master.bak +++ /dev/null @@ -1,252 +0,0 @@ -name: HyperHDR CI Build - -on: [push] - -env: - USE_CACHE: "1" - RESET_CACHE: "0" - -jobs: - -###################### -###### Linux ######### -###################### - - Linux: - name: ${{ matrix.dockerName }} - runs-on: ubuntu-20.04 - - strategy: - matrix: - debian: [ bullseye ] - dockerImage: [ x86_64, rpi012-armv6l, rpi34-armv7l, arm-aarch64 ] - include: - - dockerImage: x86_64 - debian: bullseye - dockerName: Debian Bullseye (x86_64) - platform: linux - - dockerImage: rpi012-armv6l - debian: bullseye - dockerName: Debian Bullseye (Raspberry Pi ZERO, 1 & 2) - platform: rpi - - dockerImage: rpi34-armv7l - debian: bullseye - dockerName: Debian Bullseye (Raspberry Pi 3 & 4) - platform: rpi - - dockerImage: arm-aarch64 - debian: bullseye - dockerName: Debian Bullseye (ARM aarch64) - platform: rpi - - steps: - # checkout - - uses: actions/checkout@v1 - with: - submodules: true - - # generate cache id - - name: Prepare ccache timestamp - if: env.USE_CACHE == '1' - id: ccache_cache_timestamp - shell: cmake -P {0} - run: | - string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC) - message("::set-output name=timestamp::${current_date}") - - # download cache - - name: ccache cache files - if: ( env.USE_CACHE == '1' ) - uses: actions/cache@v1.1.0 - with: - path: .ccache - key: ${{ matrix.debian }}-${{ matrix.dockerImage }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: ${{ matrix.debian }}-${{ matrix.dockerImage }}-ccache- - - - name: Build packages - env: - DOCKER_IMAGE: ${{ matrix.dockerImage }} - DOCKER_TAG: ${{ matrix.debian }} - DOCKER_NAME: ${{ matrix.dockerName }} - PLATFORM: ${{ matrix.platform }} - USE_CCACHE: ${{ env.USE_CACHE }} - RESET_CACHE: ${{ env.RESET_CACHE }} - shell: bash - run: ./.ci/ci_build.sh - - # upload artifacts (only on tagged commit) - - name: Upload artifacts - if: startsWith(github.event.ref, 'refs/tags') - uses: actions/upload-artifact@v2 - with: - path: deploy/Hyper* - - # Upload artifacts from commit - - name: Upload artifacts from commit - if: (startsWith(github.event.ref, 'refs/tags') != true) - uses: actions/upload-artifact@v2 - with: - name: Linux-${{ matrix.debian }}-${{ matrix.dockerImage }}-DEB-installer - path: deploy/Hyper*.deb - -###################### -####### macOS ######## -###################### - - macOS: - name: macOS - runs-on: macOS-10.15 - steps: - # Checkout - - uses: actions/checkout@v1 - with: - submodules: true - - # Generate cache id - - name: Prepare ccache timestamp - if: env.USE_CACHE == '1' - id: ccache_cache_timestamp - shell: cmake -P {0} - run: | - string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC) - message("::set-output name=timestamp::${current_date}") - - # Download cache - - name: ccache cache files - if: ( env.USE_CACHE == '1' ) - uses: actions/cache@v1.1.0 - with: - path: .ccache - key: macOS-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: macOS-ccache- - - # Install deps - - name: Install deps - shell: bash - run: brew update && brew install qt@6 xz ccache protobuf - - # Build process - - name: Build packages - env: - PLATFORM: osx - USE_CCACHE: ${{ env.USE_CACHE }} - RESET_CACHE: ${{ env.RESET_CACHE }} - shell: bash - run: ./.ci/ci_build.sh - - # Upload artifacts (only on tagged commit) - - name: Upload artifacts - if: startsWith(github.event.ref, 'refs/tags') - uses: actions/upload-artifact@v2 - with: - path: build/Hyper*.dmg - - # Upload artifacts from commit - - name: Upload artifacts from commit - if: (startsWith(github.event.ref, 'refs/tags') != true) - uses: actions/upload-artifact@v2 - with: - name: Apple_macOS_x64_DMG_installer - path: build/Hyper*.dmg - -###################### -###### Windows ####### -###################### - - windows: - name: Windows - runs-on: windows-2022 - env: - VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' - QT_VERSION: 6.2.2 - steps: - - name: Checkout - uses: actions/checkout@v1 - with: - submodules: true - - - name: Cache Qt - uses: actions/cache@v2 - id: cache-qt-windows - with: - path: ${{ runner.workspace }}/Qt - key: ${{ runner.os }}-Qt.${{ env.QT_VERSION }} - - - name: Install QT - if: steps.cache-qt-windows.outputs.cache-hit != 'true' - run: | - pip install aqtinstall - aqt install-qt -O ${{ runner.workspace }}/Qt windows desktop ${{ env.QT_VERSION }} win64_msvc2019_64 -m qtserialport - - - name: Set up x64 build architecture environment - shell: cmd - run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat" - - - name: Set up nasm - uses: ilammy/setup-nasm@v1 - - # Build packages - - name: Build packages - env: - PLATFORM: windows - CMAKE_PREFIX_PATH: "${{ runner.workspace }}/Qt/${{ env.QT_VERSION }}/msvc2019_64/lib/cmake/" - shell: bash - run: | - ./.ci/ci_build.sh - - # upload artifacts (only on tagged commit) - - name: Upload artifacts - if: startsWith(github.event.ref, 'refs/tags') - uses: actions/upload-artifact@v2 - with: - path: build/Hyper* - - # Upload artifacts from commit - - name: Upload artifacts from commit - if: (startsWith(github.event.ref, 'refs/tags') != true) - uses: actions/upload-artifact@v2 - with: - name: Windows_x64_setup - path: build/Hyper*.exe - -################################ -###### Publish Releases ######## -################################ - - publish: - name: Publish Releases - if: startsWith(github.event.ref, 'refs/tags') - needs: [Linux, windows, macOS] - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - # generate environment variables - - name: Generate environment variables from version and tag - run: | - echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - echo "VERSION=$(tr -d '\n' < version)" >> $GITHUB_ENV - echo "preRelease=false" >> $GITHUB_ENV - - # If version contains alpha or beta, mark draft release as pre-release - - name: Mark release as pre-release - if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta') - run: echo "preRelease=true" >> $GITHUB_ENV - - # Download artifacts from previous build process - - name: Download artifacts - uses: actions/download-artifact@v2 - with: - path: artifacts - - # create draft release and upload artifacts - - name: Create draft release - uses: softprops/action-gh-release@v1 - with: - name: HyperHDR ${{ env.VERSION }} - tag_name: ${{ env.TAG }} - files: "artifacts/**" - draft: true - prerelease: ${{ env.preRelease }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index f95370a79..05c4064bf 100644 --- 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 index 021f24ea5..d49d5c3f9 100644 --- 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 index f68479c32..247df1638 100644 --- a/assets/webconfig/content/overview.html +++ b/assets/webconfig/content/overview.html @@ -101,21 +101,21 @@

+
-
+
-
+
-
+
Instance
-
+
⇒ Smoothing ⇒
@@ -126,7 +126,7 @@

-
+
diff --git a/assets/webconfig/js/overview.js b/assets/webconfig/js/overview.js index 99210a5cc..0075eb650 100644 --- a/assets/webconfig/js/overview.js +++ b/assets/webconfig/js/overview.js @@ -130,7 +130,7 @@ $(document).ready(function () function renderReport() { - const waitingSpinner = ' ' + $.i18n("perf_please_wait"); + const waitingSpinner = ' ' + $.i18n("perf_please_wait"); const fpsTag = 'fps'; 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 : - `${curElem.param1.toFixed(2)} fps` + + `${curElem.param1.toFixed(2)} fps` + `  ${curElem.param2}ms  ${curElem.param3} `+ ((curElem.param4 != 0)?`, ${$.i18n("perf_invalid_frames")}: ${curElem.param4}`:``); render += ` (${curElem.refresh})`; @@ -184,9 +184,9 @@ $(document).ready(function () if (placer != null) { - let render = (curElem.token <= 0) ? ((curElem.type == 2) ? `${curElem.name} ` : "") + waitingSpinner : (curElem.type == 2) ? - `${curElem.name} ${curElem.param1.toFixed(2)} fps ${curElem.param2} ` : - `${curElem.name} ${curElem.param1.toFixed(2)} fps ${curElem.param3}   ${curElem.param2} `; + let render = (curElem.token <= 0) ? ((curElem.type == 2) ? `${curElem.name} ` : "") + waitingSpinner : (curElem.type == 2) ? + `${curElem.name} ${curElem.param1.toFixed(2)} fps ${curElem.param2} ` : + `${curElem.name} ${curElem.param1.toFixed(2)} fps ${curElem.param3}   ${curElem.param2} `; render += ` (${curElem.refresh})`; placer.innerHTML = render; } diff --git a/sources/api/JsonAPI.cpp b/sources/api/JsonAPI.cpp index 01b069ff9..4df87fb2d 100644 --- 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 index 0da2ff61c..448818e16 100644 --- 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 index a670bb4f7..46af3dcc0 100644 --- 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 index e75c34400..072e8f10e 100644 --- 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: diff --git a/sources/hyperhdr/systray.cpp b/sources/hyperhdr/systray.cpp index ca4d49880..df523c4fd 100644 --- a/sources/hyperhdr/systray.cpp +++ b/sources/hyperhdr/systray.cpp @@ -28,11 +28,7 @@ SysTray::SysTray(HyperHdrDaemon* hyperhdrd) , _instanceManager(HyperHdrIManager::getInstance()) , _webPort(8090) { - Q_INIT_RESOURCE(resources); - - // webserver port - WebServer* webserver = hyperhdrd->getWebServerInstance(); - connect(webserver, &WebServer::portChanged, this, &SysTray::webserverPortChanged); + Q_INIT_RESOURCE(resources); // instance changes connect(_instanceManager, &HyperHdrIManager::instanceStateChanged, this, &SysTray::handleInstanceStateChange); @@ -213,6 +209,11 @@ void SysTray::settings() } #endif + if (_hyperhdrd) + { + _webPort = _hyperhdrd->getWebPort(); + } + QDesktopServices::openUrl(QUrl("http://localhost:" + QString::number(_webPort) + "/", QUrl::TolerantMode)); #ifndef _WIN32 diff --git a/sources/hyperhdr/systray.h b/sources/hyperhdr/systray.h index 35421d56e..ceddddae9 100644 --- a/sources/hyperhdr/systray.h +++ b/sources/hyperhdr/systray.h @@ -35,11 +35,6 @@ public slots: private slots: void iconActivated(QSystemTrayIcon::ActivationReason reason); - /// - /// @brief is called whenever the webserver changes the port - /// - void webserverPortChanged(quint16 port) { _webPort = port; }; - /// /// @brief is called whenever a hyperhdr instance state changes /// @@ -80,8 +75,8 @@ private slots: QColorDialog* _colorDlg; - HyperHdrDaemon* _hyperhdrd; - HyperHdrInstance* _hyperhdr; - HyperHdrIManager* _instanceManager; - quint16 _webPort; + HyperHdrDaemon* _hyperhdrd; + HyperHdrInstance* _hyperhdr; + HyperHdrIManager* _instanceManager; + quint16 _webPort; }; diff --git a/version b/version index b9f498d85..d3b65ecea 100644 --- a/version +++ b/version @@ -1 +1 @@ -18.0.0.0beta2 +18.0.0.0beta3