From ee4d7a14650a4d9f50764bedf0a7c24bf1616145 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 15 Oct 2024 09:21:24 -0400 Subject: [PATCH 1/4] Improve direct play support for Dolby Vision --- source/utils/deviceCapabilities.bs | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs index aa580e53a..8960b504b 100644 --- a/source/utils/deviceCapabilities.bs +++ b/source/utils/deviceCapabilities.bs @@ -562,27 +562,44 @@ function getCodecProfiles() as object hevcVideoRangeTypes = "SDR" vp9VideoRangeTypes = "SDR" av1VideoRangeTypes = "SDR" + canPlayDovi = false if canPlay4k() dp = di.GetDisplayProperties() + + if dp.DolbyVision + canPlayDovi = true + + h264VideoRangeTypes = h264VideoRangeTypes + "|DOVI|DOVIWithSDR" + hevcVideoRangeTypes = hevcVideoRangeTypes + "|DOVI|DOVIWithSDR" + av1VideoRangeTypes = av1VideoRangeTypes + "|DOVI|DOVIWithSDR" + end if + if dp.Hdr10 hevcVideoRangeTypes = hevcVideoRangeTypes + "|HDR10" vp9VideoRangeTypes = vp9VideoRangeTypes + "|HDR10" av1VideoRangeTypes = av1VideoRangeTypes + "|HDR10" + + if canPlayDovi + hevcVideoRangeTypes = hevcVideoRangeTypes + "|DOVIWithHDR10" + av1VideoRangeTypes = av1VideoRangeTypes + "|DOVIWithHDR10" + end if 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 canPlayDovi + hevcVideoRangeTypes = hevcVideoRangeTypes + "|DOVIWithHLG" + vp9VideoRangeTypes = vp9VideoRangeTypes + "|DOVIWithHLG" + av1VideoRangeTypes = av1VideoRangeTypes + "|DOVIWithHLG" + end if end if end if From ee2a7b94c40da14eadf02705e09269e12414e5d2 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 15 Oct 2024 11:07:01 -0400 Subject: [PATCH 2/4] correctly detect the displays video bit depth --- source/utils/globals.bs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/source/utils/globals.bs b/source/utils/globals.bs index dc13af952..b9f924f18 100644 --- a/source/utils/globals.bs +++ b/source/utils/globals.bs @@ -97,11 +97,8 @@ sub SaveDeviceToGlobal() print "ERROR parsing deviceInfo.GetVideoMode()" end if videoWidth = heightToWidth[videoHeight] - if videoHeight = "2160" and extraData = "b10" - bitDepth = 10 - else if videoHeight = "4320" - bitDepth = 12 - end if + if extraData <> invalid and extraData = "b10" then bitDepth = 10 + if videoHeight = "4320" then bitDepth = 12 m.global.addFields({ device: { From 3fbe253d0dd7e8135dae0622bb790399c5d713e8 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 15 Oct 2024 11:16:31 -0400 Subject: [PATCH 3/4] if display reports as 8bit but can play HDR, then tell the server we can play 10bit videos --- source/utils/globals.bs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/utils/globals.bs b/source/utils/globals.bs index b9f924f18..cea2664b8 100644 --- a/source/utils/globals.bs +++ b/source/utils/globals.bs @@ -44,6 +44,7 @@ end sub ' Save information from roDeviceInfo to m.global.device sub SaveDeviceToGlobal() deviceInfo = CreateObject("roDeviceInfo") + displayProperties = deviceInfo.GetDisplayProperties() ' remove special characters regex = CreateObject("roRegex", "[^a-zA-Z0-9\ \-\_]", "") @@ -98,6 +99,7 @@ sub SaveDeviceToGlobal() end if videoWidth = heightToWidth[videoHeight] if extraData <> invalid and extraData = "b10" then bitDepth = 10 + if bitDepth = 8 and displayProperties.HdrSeamless then bitDepth = 10 if videoHeight = "4320" then bitDepth = 12 m.global.addFields({ From 21667359b13e345b8b70d8c3764dfd3a5a0498b7 Mon Sep 17 00:00:00 2001 From: Charles Ewert Date: Tue, 15 Oct 2024 11:36:18 -0400 Subject: [PATCH 4/4] stop restricting videos based on bitdepth --- source/utils/deviceCapabilities.bs | 39 ++---------------------------- source/utils/globals.bs | 2 -- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs index 8960b504b..384838972 100644 --- a/source/utils/deviceCapabilities.bs +++ b/source/utils/deviceCapabilities.bs @@ -416,12 +416,7 @@ end function function getCodecProfiles() as object 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": {}, @@ -631,12 +626,6 @@ function getCodecProfiles() as object "Value": "true", "IsRequired": false }, - { - "Condition": "LessThanEqual", - "Property": "VideoBitDepth", - "Value": "8", - "IsRequired": false - }, { "Condition": "EqualsAny", "Property": "VideoProfile", @@ -696,13 +685,7 @@ function getCodecProfiles() as object "Property": "VideoLevel", "Value": mpeg2Levels.join("|"), "IsRequired": false - }, - { - "Condition": "LessThanEqual", - "Property": "VideoBitDepth", - "Value": displayMaxBitDepth, - "IsRequired": false - }, + } ] } @@ -738,12 +721,6 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "av1", "Conditions": [ - { - "Condition": "LessThanEqual", - "Property": "VideoBitDepth", - "Value": displayMaxBitDepth, - "IsRequired": false - }, { "Condition": "EqualsAny", "Property": "VideoProfile", @@ -803,12 +780,6 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "hevc", "Conditions": [ - { - "Condition": "LessThanEqual", - "Property": "VideoBitDepth", - "Value": displayMaxBitDepth, - "IsRequired": false - }, { "Condition": "NotEquals", "Property": "IsAnamorphic", @@ -878,12 +849,6 @@ function getCodecProfiles() as object "Type": "Video", "Codec": "vp9", "Conditions": [ - { - "Condition": "LessThanEqual", - "Property": "VideoBitDepth", - "Value": displayMaxBitDepth, - "IsRequired": false - }, { "Condition": "EqualsAny", "Property": "VideoProfile", diff --git a/source/utils/globals.bs b/source/utils/globals.bs index cea2664b8..b9f924f18 100644 --- a/source/utils/globals.bs +++ b/source/utils/globals.bs @@ -44,7 +44,6 @@ end sub ' Save information from roDeviceInfo to m.global.device sub SaveDeviceToGlobal() deviceInfo = CreateObject("roDeviceInfo") - displayProperties = deviceInfo.GetDisplayProperties() ' remove special characters regex = CreateObject("roRegex", "[^a-zA-Z0-9\ \-\_]", "") @@ -99,7 +98,6 @@ sub SaveDeviceToGlobal() end if videoWidth = heightToWidth[videoHeight] if extraData <> invalid and extraData = "b10" then bitDepth = 10 - if bitDepth = 8 and displayProperties.HdrSeamless then bitDepth = 10 if videoHeight = "4320" then bitDepth = 12 m.global.addFields({