Amlogic DRM support

CMakeLists.txt

@@ -103,8 +103,9 @@ message(STATUS " - Build: ${HYPERION_BUILD_ID}")
 # Grabber
 set(DEFAULT_AMLOGIC                     OFF)
 set(DEFAULT_DISPMANX                    OFF)
-set(DEFAULT_DX                          OFF)
 set(DEFAULT_DDA                         OFF)
+set(DEFAULT_DRM                         OFF)
+set(DEFAULT_DX                          OFF)
 set(DEFAULT_MF                          OFF)
 set(DEFAULT_OSX                         OFF)
 set(DEFAULT_QT                          ON)
@@ -164,6 +165,7 @@ set(DEFAULT_HYPERION_LIGHT              OFF)
 set(DEFAULT_PRE_BUILD_DEPS              OFF)
 
 if(${CMAKE_SYSTEM} MATCHES "Linux")
+	set(DEFAULT_DRM             ON)
 	set(DEFAULT_FB              ON)
 	set(DEFAULT_V4L2            ON)
 	set(DEFAULT_DEV_SPI         ON)
@@ -288,9 +290,10 @@ if(HYPERION_LIGHT)
 
 	# Disable Screen/Video Grabbers
 	set(DEFAULT_AMLOGIC                     OFF)
+	set(DEFAULT_DDA                         OFF)
 	set(DEFAULT_DISPMANX                    OFF)
+	set(DEFAULT_DRM                         OFF)
 	set(DEFAULT_DX                          OFF)
-	set(DEFAULT_DDA                         OFF)
 	set(DEFAULT_FB                          OFF)
 	set(DEFAULT_MF                          OFF)
 	set(DEFAULT_OSX                         OFF)
@@ -331,12 +334,15 @@ message(STATUS "ENABLE_AMLOGIC = ${ENABLE_AMLOGIC}")
 option(ENABLE_DISPMANX "Enable the RPi dispmanx grabber" ${DEFAULT_DISPMANX})
 message(STATUS "ENABLE_DISPMANX = ${ENABLE_DISPMANX}")
 
-option(ENABLE_DX "Enable the DirectX grabber" ${DEFAULT_DX})
-message(STATUS "ENABLE_DX = ${ENABLE_DX}")
-
 option(ENABLE_DDA "Enable the DXGI DDA grabber" ${DEFAULT_DDA})
 message(STATUS "ENABLE_DDA = ${ENABLE_DDA}")
 
+option(ENABLE_DRM "Enable the DRM grabber" ${DEFAULT_DRM})
+message(STATUS "ENABLE_DRM = ${ENABLE_DRM}")
+
+option(ENABLE_DX "Enable the DirectX grabber" ${DEFAULT_DX})
+message(STATUS "ENABLE_DX = ${ENABLE_DX}")
+
 if(ENABLE_AMLOGIC)
 	set(ENABLE_FB ON)
 else()

CMakePresets.json

@@ -54,6 +54,7 @@
         "ENABLE_AMLOGIC": "OFF",
         "ENABLE_DDA": "OFF",
         "ENABLE_DISPMANX": "OFF",
+        "ENABLE_DRM": "OFF",
         "ENABLE_DX": "OFF",
         "ENABLE_FB": "OFF",
         "ENABLE_MF": "OFF",

HyperionConfig.h.in

@@ -43,6 +43,9 @@
 // Define to enable CEC
 #cmakedefine ENABLE_CEC
 
+// Define to enable the DRM grabber
+#cmakedefine ENABLE_DRM
+
 // Define to enable flatbuffer server
 #cmakedefine ENABLE_FLATBUF_SERVER
 

assets/webconfig/content/update.html

@@ -54,7 +54,7 @@ <h4 id="update_currver"></h4>
           }
 
           matches++;
-          $('#versionlist').append('<div class="col-lg-6"><div class="panel panel-' + danger + '"><div class="panel-heading"><i class="fa fa-television fa-fw"></i>Hyperion V' + window.gitHubVersionList[key].tag_name + '</div><div class="panel-body"><p><span style="font-weight:bold;">' + $.i18n('update_label_type') + '</span> ' + type + '</p><p><span id="desc" style="font-weight:bold;">' + $.i18n('update_label_description') + '</span> ' + DOMPurify.sanitize(marked.parse(window.gitHubVersionList[key].body)) + '</p><hr><a class="btn btn-primary" href="' + window.gitHubVersionList[key].html_url + '" target="_blank"><i class="fa fa-list fa-fw"></i><span style="font-weight:bold;">' + $.i18n('update_button_changelog') + '</span></a><button type="button" class="btn btn-warning pull-right" ' + (window.gitHubVersionList[key].tag_name == window.currentVersion ? "disabled" : "disabled") + '><i class="fa fa-download fa-fw"></i>' + $.i18n('update_button_install') + '</button></div></div></div>');
+          $('#versionlist').append('<div class="col-lg-6"><div class="panel panel-' + danger + '"><div class="panel-heading"><i class="fa fa-television fa-fw"></i>Hyperion - ' + window.gitHubVersionList[key].tag_name + '</div><div class="panel-body"><p><span style="font-weight:bold;">' + $.i18n('update_label_type') + '</span> ' + type + '</p><p><span id="desc" style="font-weight:bold;">' + $.i18n('update_label_description') + '</span> ' + DOMPurify.sanitize(marked.parse(window.gitHubVersionList[key].body)) + '</p><hr><a class="btn btn-primary" href="' + window.gitHubVersionList[key].html_url + '" target="_blank"><i class="fa fa-list fa-fw"></i><span style="font-weight:bold;">' + $.i18n('update_button_changelog') + '</span></a><button type="button" class="btn btn-warning pull-right" ' + (window.gitHubVersionList[key].tag_name == window.currentVersion ? "disabled" : "disabled") + '><i class="fa fa-download fa-fw"></i>' + $.i18n('update_button_install') + '</button></div></div></div>');
         }
         $('#update_currver').append($.i18n('update_versreminder', currentVersion));
 

assets/webconfig/js/content_grabber.js

@@ -207,7 +207,7 @@ $(document).ready(function () {
       var deviceSelected = conf_editor_screen.getEditor("root.framegrabber.available_devices").getValue();
       var videoInputSelected = conf_editor_screen.getEditor("root.framegrabber.device_inputs").getValue();
 
-      //Update hidden input element
+     //Update hidden input element
       conf_editor_screen.getEditor("root.framegrabber.input").setValue(parseInt(videoInputSelected));
 
       var addSchemaElements = {};
@@ -216,8 +216,9 @@ $(document).ready(function () {
       var enumDefaultVal = "";
 
       var deviceProperties = getPropertiesOfDevice("screen", deviceSelected);
-
-      var formats = deviceProperties.video_inputs[videoInputSelected].formats;
+
+      const videoInput = deviceProperties.video_inputs.find(input => input.inputIdx === parseInt(videoInputSelected));
+      const formats = videoInput.formats;
       var formatIdx = 0;
 
       var resolutions = formats[formatIdx].resolutions;
@@ -262,7 +263,8 @@ $(document).ready(function () {
 
       var deviceProperties = getPropertiesOfDevice("screen", deviceSelected);
 
-      var formats = deviceProperties.video_inputs[videoInputSelected].formats;
+      const videoInput = deviceProperties.video_inputs.find(input => input.inputIdx == videoInputSelected);
+      const formats = videoInput.formats;
       var formatIdx = 0;
 
       //Update hidden resolution related elements

assets/webconfig/js/ui_utils.js

@@ -1343,6 +1343,8 @@ function getReleases(callback) {
 
       // Iterate through releases
       releases.forEach((release) => {
+
+        if (release.tag_name === "nightly") return;
         if (release.draft) return;
 
         if (release.tag_name.includes('alpha') && semverLite.gt(release.tag_name, highestAlphaRelease.tag_name)) {