Media Foundation/V4L2 grabber ... (#1119)

* - New Media Foundation grabber
- JsonAPI available grabber fix
- commented json config removed

* Added libjpeg-turbo to dependencies

* Fix OSX build
Removed Azure Pipelines from build scripts

* Remove Platform from Dashboard

* Correct Grabber Namings

* Grabber UI improvements, generic JSONEditor Selection Update

* Active grabber fix

* Stop Framebuffer grabber on failure

* - Image format NV12 and I420 added
- Flip mode
- Scaling factor for MJPEG
- VSCode (compile before run)
- CI (push) dependency libjpeg-turbo added

* Refactor MediaFoundation (Part 1)

* Remove QDebug output

* Added image flipping ability to MF Grabber

* fix issue 1160

* -Reload MF Grabber only once per WebUI update
- Cleanup

* Improvements

* - Set 'Software Frame Decimation' begin to 0
- Removed grabber specific device name from Log
- Keep pixel format when switching resolution
- Display 'Flip mode' correct in Log
- BGR24 images always flipped

* Refactor MediaFoundation (Part 2)

* Refactor V4L2 grabber (part 1) (#62)

* Media Foundation grabber adapted to V4L2 change

* Enable Media Foundation grabber on windows

* Have fps as int, fix height typo

* Added video standards to JsonAPI output

* Error handling in source reader improved

* Fix "Frame to small" error

* Discovery VideoSources and Dynamically Update Editor

* Hide all element when no video grabber discovered, upate naming

* Do not show unsupported grabbers

* Copy Log to Clipboard

* Update Grabber schema and Defaults

* Update access levels and validate crop ranges

* Height and width in Qt grabber corrected

* Correct formatting

* Untabify

* Global component states across instances

* Components divided on the dashboard

* refactor

* Fix Merge-issues

* Database migration aligning with updated grabber model

* Align Grabber.js with new utility functions

* Allow editor-validation for enum-lists

* Handle "Show Explainations scenario" correctly

* Grabber - Ensure save is only possible on valid content

* Dashboard update + fix GlobalSignal connection

* Ensure default database is populated with current release

* Correct grabber4L2 access level

* Display Signal detection area in preview

* Write Hyperion version into default config on compiling.

* Create defaultconfig.json dynamically

* WebUI changes

* Correct grabber config look-ups

* Refactor i18n language loading

* Fix en.json

* Split global capture from instance capture config

* Update grabber default values

* Standalone grabber: Add --debug switch

* Enhance showInputOptionsForKey for multiple keys

* Add grabber instance link to system grabber config

* Only show signal detection area, if grabber is enabled

* Always show Active element on grabber page

* Remote control - Only display gabber status, if global grabber is enabled

* WebUI optimization (thx to @mkcologne)
Start Grabber only when global settings are enabled
Fixed an issue in the WebUI preview

* V4L2/MF changes

* Jsoneditor, Correct translation for default values

* Refactor LED-Device handling in UI and make element naming consistent

* MF Discovery extended

* Fix LGTM finding

* Support Grabber Bri, Hue, Sat and Con in UI, plus their defaults

* Concider Access level for item filtering

* Concider Access level for item filtering

* Revert "Concider Access level for item filtering"

This reverts commit 5b0ce3c.

* Disable fpsSoftwareDecimation for framegrabber, as not supported yet

* JSON-Editor- Add updated schema for validation on dynamic elements

* added V4L2 color IDs

* LGTM findings fix

* destroy SR callback only on exit

* Grabber.js - Hide elements not supported by platform

* Fixed freezing start effect

* Grabber UI - Hardware controls - Show current values and allow to reset to defaults

* Grabber - Discovery - Add current values to properties

* Small things

* Clean-up Effects and have ENDLESS consistently defined

* Fix on/off/on priority during startup, by initializing _prevVisComp in line with background priority

* Add missing translation mappings

* DirectX Grabber reactivated/ QT Grabber size decimation fixed

* typo in push-master workflow

* Use PreciseTimer for Grabber to ensure stable FPS timing

* Set default Screencapture rate consistently

* Fix libjpeg-turbo download

* Remove Zero character from file

* docker-compile Add PLATFORM parameter, only copy output file after successful compile

* Framebuffer, Dispmanx, OSX, AML Grabber discovery, various clean-up and consistencies across grabbers

* Fix merge problem - on docker-compile Add PLATFORM parameter, only copy output file after successful compile

* Fix definition

* OSXFRameGrabber - Revert cast

* Clean-ups nach Feedback

* Disable certain libraries when building armlogic via standard stretch image as developer

* Add CEC availability to ServerInfo to have it platform independent

* Grabber UI - Fix problem that crop values are not populated when refining editor rage

* Preserve value when updating json-editor range

* LEDVisualisation - Clear image when source changes

* Fix - Preserve value when updating json-editor range

* LEDVisualisation - Clear image when no component is active

* Allow to have password handled by Password-Manager (#1263)

* Update default signal detection area to green assuming rainbow grabber

* LED Visualisation - Handle empty priority update

* Fix yuv420 in v4l2 grabber

* V4L2-Grabber discovery - Only report grabbers with valid video input information

* Grabber - Update static variables to have them working in release build

* LED Visualisation - ClearImage when no priorities

* LED Visualisation - Fix Logo resizing issue

* LED Visualisation - Have nearly black background and negative logo

Co-authored-by: LordGrey <lordgrey.emmel@gmail.com>
Co-authored-by: LordGrey <48840279+Lord-Grey@users.noreply.github.com>

Author: Paulchen-Panther

.ci/ci_build.sh

@@ -1,14 +1,8 @@
 #!/bin/bash
 
 # detect CI
-if [ "$SYSTEM_COLLECTIONID" != "" ]; then
-	# Azure Pipelines
-	echo "Azure detected"
-	CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')"
-	CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY"
-elif [ "$HOME" != "" ]; then
+if [ "$HOME" != "" ]; then
 	# GitHub Actions
-	echo "Github Actions detected"
 	CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
 	CI_BUILD_DIR="$GITHUB_WORKSPACE"
 else

.ci/ci_install.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # detect CI
-if [ "$SYSTEM_COLLECTIONID" != "" ]; then
-	# Azure Pipelines
-	CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')"
-	CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY"
-elif [ "$HOME" != "" ]; then
+if [ "$HOME" != "" ]; then
 	# GitHub Actions
 	CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
 	CI_BUILD_DIR="$GITHUB_WORKSPACE"

.github/workflows/pull-request.yml

@@ -159,10 +159,21 @@ jobs:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
           key: ${{ runner.os }}-chocolatey
 
-      - name: Install Python, NSIS, OpenSSL
+      - name: "Remove Redistributable"
+        shell: cmd
+        run: |
+          MsiExec.exe /passive /X{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}
+          MsiExec.exe /passive /X{1D8E6291-B0D5-35EC-8441-6616F567A0F7}
+
+      - name: Install Python, NSIS, OpenSSL, DirectX SDK
         shell: powershell
         run: |
-          choco install --no-progress python nsis openssl -y
+          choco install --no-progress python nsis openssl directx-sdk -y
+
+      - name: Install libjpeg-turbo
+        run: |
+          Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/2.0.6/libjpeg-turbo-2.0.6-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
+          .\libjpeg-turbo /S
 
       - name: Set up x64 build architecture environment
         shell: cmd

.github/workflows/push-master.yml

@@ -122,10 +122,21 @@ jobs:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
           key: ${{ runner.os }}-chocolatey
 
-      - name: Install Python, NSIS, OpenSSL
+      - name: "Remove Redistributable"
+        shell: cmd
+        run: |
+          MsiExec.exe /passive /X{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}
+          MsiExec.exe /passive /X{1D8E6291-B0D5-35EC-8441-6616F567A0F7}
+
+      - name: Install Python, NSIS, OpenSSL, DirectX SDK
         shell: powershell
         run: |
-          choco install --no-progress python nsis openssl -y
+          choco install --no-progress python nsis openssl directx-sdk -y
+
+      - name: Install libjpeg-turbo
+        run: |
+          Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/2.0.6/libjpeg-turbo-2.0.6-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
+          .\libjpeg-turbo /S
 
       - name: Set up x64 build architecture environment
         shell: cmd

.gitignore

@@ -27,5 +27,11 @@ libsrc/flatbufserver/hyperion_request_generated.h
 *.kdev*
 
 # Visual Studio 2015/2017/2019 cache/options directory
-.vs/
+# Ignore
+.vs/*
 CMakeSettings.json
+# Allow
+!.vs/launch.vs.json
+
+# LedDevice 'File' output
+NULL

.vs/launch.vs.json

@@ -0,0 +1,17 @@
+{
+  "version": "0.2.1",
+  "defaults": {},
+  "configurations": [
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "hyperiond.exe (bin\\hyperiond.exe)",
+      "name": "Run hyperion with debug option and external console",
+      "args": [
+        "-d",
+        "-c"
+      ],
+      "externalConsole": true
+    }
+  ]
+}

.vscode/launch.json

@@ -27,12 +27,12 @@
       "name": "(Windows) hyperiond",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/Debug/hyperiond.exe",
+      "program": "${command:cmake.launchTargetDirectory}/hyperiond",
       "args": ["-d"],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}",
       "environment": [],
-      "externalConsole": false
+      "console": "internalConsole"
     }
   ]
 }

CMakeLists.txt

@@ -4,10 +4,15 @@ message( STATUS "CMake Version: ${CMAKE_VERSION}" )
 
 PROJECT(hyperion)
 
-# Parse semantic version of version file
+# Parse semantic version of version file and write version to config
 include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
 file (STRINGS "version" HYPERION_VERSION)
 SetVersionNumber(HYPERION ${HYPERION_VERSION})
+set(DEFAULT_JSON_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/config/hyperion.config.json.default)
+file(READ ${DEFAULT_JSON_CONFIG_FILE} DEFAULT_JSON_CONFIG_VAR)
+string(REPLACE "configVersionValue" ${HYPERION_VERSION} DEFAULT_JSON_CONFIG_VAR "${DEFAULT_JSON_CONFIG_VAR}")
+string(REPLACE "previousVersionValue" ${HYPERION_VERSION} DEFAULT_JSON_CONFIG_VAR "${DEFAULT_JSON_CONFIG_VAR}")
+file(WRITE ${CMAKE_BINARY_DIR}/config/hyperion.config.json.default "${DEFAULT_JSON_CONFIG_VAR}")
 
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
@@ -50,6 +55,7 @@ SET ( DEFAULT_USE_SYSTEM_PROTO_LIBS       OFF )
 SET ( DEFAULT_USE_SYSTEM_MBEDTLS_LIBS     OFF )
 SET ( DEFAULT_TESTS                       OFF )
 SET ( DEFAULT_EXPERIMENTAL                OFF )
+SET ( DEFAULT_MF                          OFF )
 SET ( DEFAULT_DEPLOY_DEPENDENCIES         ON  )
 
 IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )
@@ -60,7 +66,8 @@ IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )
 	SET ( DEFAULT_USB_HID     ON )
 	SET ( DEFAULT_CEC         ON )
 ELSEIF ( WIN32 )
-	SET ( DEFAULT_DX OFF )
+	SET ( DEFAULT_DX ON )
+	SET ( DEFAULT_MF ON )
 ELSE()
 	SET ( DEFAULT_V4L2        OFF )
 	SET ( DEFAULT_FB          OFF )
@@ -121,9 +128,14 @@ elseif ( "${PLATFORM}" MATCHES "rpi" )
 	SET ( DEFAULT_DISPMANX   ON )
 	SET ( DEFAULT_WS281XPWM  ON )
 elseif ( "${PLATFORM}" STREQUAL "amlogic" )
-	SET ( DEFAULT_AMLOGIC    ON )
+	SET ( DEFAULT_AMLOGIC     ON )
+elseif ( "${PLATFORM}" STREQUAL "amlogic-dev" )
+	SET ( DEFAULT_AMLOGIC     ON )
+	SET ( DEFAULT_DISPMANX    OFF )
+	SET ( DEFAULT_QT 		  OFF )
+	SET ( DEFAULT_CEC         OFF )
 elseif ( "${PLATFORM}" STREQUAL "amlogic64" )
-	SET ( DEFAULT_AMLOGIC    ON )
+	SET ( DEFAULT_AMLOGIC     ON )
 elseif ( "${PLATFORM}" MATCHES "x11" )
 	SET ( DEFAULT_X11        ON )
 	SET ( DEFAULT_XCB        ON )
@@ -150,17 +162,18 @@ ADD_DEFINITIONS( ${PLATFORM_DEFINE} )
 option(ENABLE_AMLOGIC "Enable the AMLOGIC video grabber" ${DEFAULT_AMLOGIC} )
 message(STATUS "ENABLE_AMLOGIC = ${ENABLE_AMLOGIC}")
 
-option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ${DEFAULT_DISPMANX} )
-message(STATUS "ENABLE_DISPMANX = ${ENABLE_DISPMANX}")
-
 if (ENABLE_AMLOGIC)
 	SET(ENABLE_FB ON)
 else()
 	option(ENABLE_FB "Enable the framebuffer grabber" ${DEFAULT_FB} )
 endif()
+
 message(STATUS "ENABLE_FB = ${ENABLE_FB}")
 
-option(ENABLE_OSX "Enable the osx grabber" ${DEFAULT_OSX} )
+option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ${DEFAULT_DISPMANX} )
+message(STATUS "ENABLE_DISPMANX = ${ENABLE_DISPMANX}")
+
+option(ENABLE_OSX "Enable the OSX grabber" ${DEFAULT_OSX} )
 message(STATUS "ENABLE_OSX = ${ENABLE_OSX}")
 
 option(ENABLE_SPIDEV   "Enable the SPIDEV device" ${DEFAULT_SPIDEV} )
@@ -172,6 +185,9 @@ message(STATUS "ENABLE_TINKERFORGE = ${ENABLE_TINKERFORGE}")
 option(ENABLE_V4L2 "Enable the V4L2 grabber" ${DEFAULT_V4L2})
 message(STATUS "ENABLE_V4L2 = ${ENABLE_V4L2}")
 
+option(ENABLE_MF "Enable the Media Foundation grabber" ${DEFAULT_MF})
+message(STATUS "ENABLE_MF = ${ENABLE_MF}")
+
 option(ENABLE_WS281XPWM "Enable the WS281x-PWM device" ${DEFAULT_WS281XPWM} )
 message(STATUS "ENABLE_WS281XPWM = ${ENABLE_WS281XPWM}")
 
@@ -190,7 +206,7 @@ message(STATUS "ENABLE_X11 = ${ENABLE_X11}")
 option(ENABLE_XCB "Enable the XCB grabber" ${DEFAULT_XCB})
 message(STATUS "ENABLE_XCB = ${ENABLE_XCB}")
 
-option(ENABLE_QT "Enable the qt grabber" ${DEFAULT_QT})
+option(ENABLE_QT "Enable the Qt grabber" ${DEFAULT_QT})
 message(STATUS "ENABLE_QT = ${ENABLE_QT}")
 
 option(ENABLE_DX "Enable the DirectX grabber" ${DEFAULT_DX})
@@ -216,10 +232,7 @@ SET ( PROTOBUF_INSTALL_LIB_DIR ${CMAKE_BINARY_DIR}/proto )
 
 # check all json files
 FILE ( GLOB_RECURSE HYPERION_SCHEMAS RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libsrc/*schema*.json )
-SET( JSON_FILES
-	config/hyperion.config.json.default
-	${HYPERION_SCHEMAS}
-)
+SET( JSON_FILES ${CMAKE_BINARY_DIR}/config/hyperion.config.json.default	${HYPERION_SCHEMAS})
 
 EXECUTE_PROCESS (
 	COMMAND ${PYTHON_EXECUTABLE} test/jsonchecks/checkjson.py ${JSON_FILES}
@@ -243,7 +256,7 @@ ENDIF ()
 # TODO on windows it can't resolve the path inside the file (Das System kann den angegebenen Pfad nicht finden: '\\schema\\schema-general.json')
 IF (NOT WIN32)
 	EXECUTE_PROCESS (
-		COMMAND python test/jsonchecks/checkschema.py config/hyperion.config.json.default libsrc/hyperion/hyperion.schema.json
+		COMMAND python test/jsonchecks/checkschema.py ${CMAKE_BINARY_DIR}/config/hyperion.config.json.default libsrc/hyperion/hyperion.schema.json
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		RESULT_VARIABLE CHECK_CONFIG_FAILED
 	)
@@ -399,31 +412,6 @@ find_package(libusb-1.0 REQUIRED)
 find_package(Threads REQUIRED)
 add_definitions(${QT_DEFINITIONS})
 
-# Add JPEG library
-if (ENABLE_V4L2)
-	# Turbo JPEG
-	find_package(TurboJPEG)
-	if (TURBOJPEG_FOUND)
-		add_definitions(-DHAVE_TURBO_JPEG)
-		message( STATUS "Using Turbo JPEG library: ${TurboJPEG_LIBRARY}")
-		include_directories(${TurboJPEG_INCLUDE_DIRS})
-	else()
-		# System JPEG
-		find_package(JPEG)
-		if (JPEG_FOUND)
-			add_definitions(-DHAVE_JPEG)
-			message( STATUS "Using system JPEG library: ${JPEG_LIBRARIES}")
-			include_directories(${JPEG_INCLUDE_DIR})
-		else()
-			message( STATUS "JPEG library not found, MJPEG camera format won't work in V4L2 grabber.")
-		endif()
-	endif (TURBOJPEG_FOUND)
-
-	if (TURBOJPEG_FOUND OR JPEG_FOUND)
-		add_definitions(-DHAVE_JPEG_DECODER)
-	endif()
-endif()
-
 if(APPLE)
 	set(CMAKE_EXE_LINKER_FLAGS "-framework CoreGraphics")
 endif()

HyperionConfig.h.in

@@ -1,48 +1,51 @@
 // Generated config file
 
-// Define to enable the dispmanx grabber
+// Define to enable the DispmanX grabber
 #cmakedefine ENABLE_DISPMANX
 
-// Define to enable the v4l2 grabber
+// Define to enable the V4L2 grabber
 #cmakedefine ENABLE_V4L2
 
-// Define to enable the framebuffer grabber
+// Define to enable the Media Foundation grabber
+#cmakedefine ENABLE_MF
+
+// Define to enable the Framebuffer grabber
 #cmakedefine ENABLE_FB
 
-// Define to enable the amlogic grabber
+// Define to enable the AMLogic grabber
 #cmakedefine ENABLE_AMLOGIC
 
-// Define to enable the osx grabber
+// Define to enable the OSX grabber
 #cmakedefine ENABLE_OSX
 
-// Define to enable the x11 grabber
+// Define to enable the X11 grabber
 #cmakedefine ENABLE_X11
 
-// Define to enable the xcb grabber
+// Define to enable the XCB grabber
 #cmakedefine ENABLE_XCB
 
-// Define to enable the qt grabber
+// Define to enable the Qt grabber
 #cmakedefine ENABLE_QT
 
 // Define to enable the DirectX grabber
 #cmakedefine ENABLE_DX
 
-// Define to enable the spi-device
+// Define to enable the SPI-Device
 #cmakedefine ENABLE_SPIDEV
 
-// Define to enable the ws281x-pwm-via-dma-device using jgarff's library
+// Define to enable the WS281x-PWM-via-DMA-device using jgarff's library
 #cmakedefine ENABLE_WS281XPWM
 
-// Define to enable the tinkerforge device
+// Define to enable the Tinkerforge device
 #cmakedefine ENABLE_TINKERFORGE
 
-// Define to enable avahi
+// Define to enable AVAHI
 #cmakedefine ENABLE_AVAHI
 
-// Define to enable cec
+// Define to enable CEC
 #cmakedefine ENABLE_CEC
 
-// Define to enable the usb / hid devices
+// Define to enable the USB / HID devices
 #cmakedefine ENABLE_USB_HID
 
 // Define to enable profiler for development purpose

assets/webconfig/content/conf_grabber.html

@@ -2,7 +2,7 @@
 <div class="container-fluid">
 	<div class="row">
 		<div class="col-lg-12">
-			<h3 class="page-header"><i class="fa fa-camera fa-fw"></i><span  data-i18n="main_menu_grabber_conf_token">Capturing Hardware</span></h3> 
+			<h3 class="page-header"><i class="fa fa-camera fa-fw"></i><span  data-i18n="main_menu_grabber_conf_token">Capturing Hardware</span></h3>
 			<div id="conf_cont"></div>
 		</div>
 	</div>