From 4cc89010d79002a7f0e0f3978a9a6f87574bd215 Mon Sep 17 00:00:00 2001 From: jellyfin-bot Date: Tue, 8 Oct 2024 14:03:59 +0000 Subject: [PATCH 1/3] Bump build version --- Makefile | 2 +- manifest | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f91b82442..bcc572a3c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # If you want to get_images, you'll also need convert from ImageMagick ########################################################################## -VERSION := 2.1.7 +VERSION := 2.1.8 ## usage diff --git a/manifest b/manifest index 532b80faf..0486a6822 100644 --- a/manifest +++ b/manifest @@ -3,7 +3,7 @@ title=Jellyfin major_version=2 minor_version=1 -build_version=7 +build_version=8 ### Main Menu Icons / Channel Poster Artwork diff --git a/package-lock.json b/package-lock.json index 8cf4e823c..8e69fd219 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "jellyfin-roku", - "version": "2.1.7", + "version": "2.1.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "jellyfin-roku", - "version": "2.1.7", + "version": "2.1.8", "hasInstallScript": true, "license": "GPL-2.0", "dependencies": { diff --git a/package.json b/package.json index ff420268c..da1252fdd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jellyfin-roku", "type": "module", - "version": "2.1.7", + "version": "2.1.8", "description": "Roku app for Jellyfin media server", "dependencies": { "@rokucommunity/bslib": "0.1.1", From 8dba7f1a8a9ea094c5662a4098368d685d394d05 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 8 Oct 2024 17:20:11 -0400 Subject: [PATCH 2/3] improve HDR support and add VideoBitDepth to device profile --- source/utils/deviceCapabilities.bs | 100 +++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 21 deletions(-) diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs index 746880cb6..866f04881 100644 --- a/source/utils/deviceCapabilities.bs +++ b/source/utils/deviceCapabilities.bs @@ -414,7 +414,14 @@ function getContainerProfiles() as object end function function getCodecProfiles() as object - globalUserSettings = m.global.session.user.settings + myGlobal = m.global + globalUserSettings = myGlobal.session.user.settings + displayMaxBitDepth = myGlobal.device.videoBitDepth + if displayMaxBitDepth = invalid + displayMaxBitDepth = "8" + else + displayMaxBitDepth = displayMaxBitDepth.toStr() + end if codecProfiles = [] profileSupport = { "h264": {}, @@ -556,25 +563,27 @@ function getCodecProfiles() as object vp9VideoRangeTypes = "SDR" av1VideoRangeTypes = "SDR" - dp = di.GetDisplayProperties() - if dp.Hdr10 - hevcVideoRangeTypes = hevcVideoRangeTypes + "|HDR10" - vp9VideoRangeTypes = vp9VideoRangeTypes + "|HDR10" - av1VideoRangeTypes = av1VideoRangeTypes + "|HDR10" - end if - if dp.Hdr10Plus - av1VideoRangeTypes = av1VideoRangeTypes + "|HDR10+" - end if - if dp.HLG - hevcVideoRangeTypes = hevcVideoRangeTypes + "|HLG" - vp9VideoRangeTypes = vp9VideoRangeTypes + "|HLG" - av1VideoRangeTypes = av1VideoRangeTypes + "|HLG" - end if - if dp.DolbyVision - h264VideoRangeTypes = h264VideoRangeTypes + "|DOVI" - hevcVideoRangeTypes = hevcVideoRangeTypes + "|DOVI" - 'vp9VideoRangeTypes = vp9VideoRangeTypes + ",DOVI" no evidence that vp9 can hold DOVI - av1VideoRangeTypes = av1VideoRangeTypes + "|DOVI" + if canPlay4k() + dp = di.GetDisplayProperties() + if dp.Hdr10 + hevcVideoRangeTypes = hevcVideoRangeTypes + "|HDR10" + vp9VideoRangeTypes = vp9VideoRangeTypes + "|HDR10" + av1VideoRangeTypes = av1VideoRangeTypes + "|HDR10" + end if + if dp.Hdr10Plus + av1VideoRangeTypes = av1VideoRangeTypes + "|HDR10+" + end if + if dp.HLG + hevcVideoRangeTypes = hevcVideoRangeTypes + "|HLG" + vp9VideoRangeTypes = vp9VideoRangeTypes + "|HLG" + av1VideoRangeTypes = av1VideoRangeTypes + "|HLG" + end if + if dp.DolbyVision + h264VideoRangeTypes = h264VideoRangeTypes + "|DOVI" + hevcVideoRangeTypes = hevcVideoRangeTypes + "|DOVI" + 'vp9VideoRangeTypes = vp9VideoRangeTypes + ",DOVI" no evidence that vp9 can hold DOVI + av1VideoRangeTypes = av1VideoRangeTypes + "|DOVI" + end if end if ' H264 @@ -670,7 +679,13 @@ function getCodecProfiles() as object "Property": "VideoLevel", "Value": mpeg2Levels.join("|"), "IsRequired": false - } + }, + { + "Condition": "LessThanEqual", + "Property": "VideoBitDepth", + "Value": displayMaxBitDepth, + "IsRequired": false + }, ] } @@ -706,6 +721,12 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "av1", "Conditions": [ + { + "Condition": "LessThanEqual", + "Property": "VideoBitDepth", + "Value": displayMaxBitDepth, + "IsRequired": false + }, { "Condition": "EqualsAny", "Property": "VideoProfile", @@ -765,6 +786,12 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "hevc", "Conditions": [ + { + "Condition": "LessThanEqual", + "Property": "VideoBitDepth", + "Value": displayMaxBitDepth, + "IsRequired": false + }, { "Condition": "NotEquals", "Property": "IsAnamorphic", @@ -834,6 +861,12 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "vp9", "Conditions": [ + { + "Condition": "LessThanEqual", + "Property": "VideoBitDepth", + "Value": displayMaxBitDepth, + "IsRequired": false + }, { "Condition": "EqualsAny", "Property": "VideoProfile", @@ -1094,3 +1127,28 @@ function setPreferredCodec(codecString as string, preferredCodec as string) as s return newCodecString end if end function + +' does the connected display support playing 4k video? +function canPlay4k() as boolean + deviceInfo = CreateObject("roDeviceInfo") + hdmiStatus = CreateObject("roHdmiStatus") + + ' Check if the output mode is 2160p or higher + maxVideoHeight = m.global.device.videoHeight + if maxVideoHeight = invalid then return false + if maxVideoHeight.ToInt() < 2160 + return false + end if + + ' Check if HDCP 2.2 is enabled, skip check for TVs + if deviceInfo.GetModelType = "STB" and hdmiStatus.IsHdcpActive("2.2") <> true + return false + end if + + ' Check if the Roku player can decode 4K 60fps HEVC streams + if deviceInfo.CanDecodeVideo({ Codec: "hevc", Profile: "main", Level: "5.1" }).result <> true + return false + end if + + return true +end function From 5f62f2e2e3853715291e2a1722f9e79440b83aab Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Wed, 9 Oct 2024 08:51:18 -0400 Subject: [PATCH 3/3] fix syntax Co-authored-by: Jimi --- source/utils/deviceCapabilities.bs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs index 866f04881..aa580e53a 100644 --- a/source/utils/deviceCapabilities.bs +++ b/source/utils/deviceCapabilities.bs @@ -1141,7 +1141,7 @@ function canPlay4k() as boolean end if ' Check if HDCP 2.2 is enabled, skip check for TVs - if deviceInfo.GetModelType = "STB" and hdmiStatus.IsHdcpActive("2.2") <> true + if deviceInfo.GetModelType() = "STB" and hdmiStatus.IsHdcpActive("2.2") <> true return false end if