lgladsden/jf-roku
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Add max res mode setting - allow user to set max res on all files or just transcoded files

Browse Source
This commit is contained in:
Charles Ewert 2023-09-03 12:16:26 -04:00
parent 7e69fab436
commit f8fc95418a
2 changed files with 111 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
settings/settings.json
View File

@ -37,45 +37,69 @@
]
},
{
"title": "Maximum Resolution",
"description": "Set the maximum resolution when playing video files on this device.",
"settingName": "playback.resolution",
"type": "radio",
"default": "auto",
"options": [
"title": "Resolution",
"description": "Modify the mode and maximum resolution when playing video files on this device.",
"children": [
{
"title": "Off - Attempt to play all resolutions",
"id": "off"
"title": "Set Mode",
"description": "Restrict resolution on just transcoded files or all files.",
"settingName": "playback.resolution.mode",
"type": "radio",
"default": "transcoding",
"options": [
{
"title": "All files",
"id": "everything"
},
{
"title": "Transcoded files only",
"id": "transcoding"
}
]
},
{
"title": "Auto - Use TV resolution",
"id": "auto"
},
{
"title": "360p",
"id": "360"
},
{
"title": "480p",
"id": "480"
},
{
"title": "720p",
"id": "720"
},
{
"title": "1080p",
"id": "1080"
},
{
"title": "4k",
"id": "2160"
},
{
"title": "8k",
"id": "4320"
"title": "Maximum Resolution",
"description": "Set the maximum resolution when playing video files on this device.",
"settingName": "playback.resolution.max",
"type": "radio",
"default": "auto",
"options": [
{
"title": "Off - Attempt to play all resolutions",
"id": "off"
},
{
"title": "Auto - Use TV resolution",
"id": "auto"
},
{
"title": "360p",
"id": "360"
},
{
"title": "480p",
"id": "480"
},
{
"title": "720p",
"id": "720"
},
{
"title": "1080p",
"id": "1080"
},
{
"title": "4k",
"id": "2160"
},
{
"title": "8k",
"id": "4320"
}
]
}
]
},
{
"title": "Video Codec Support",

95
source/utils/deviceCapabilities.brs
View File

@ -43,6 +43,11 @@ sub PostDeviceProfile()
print "profile.DeviceProfile.TranscodingProfiles ="
for each prof in profile.DeviceProfile.TranscodingProfiles
print prof
if isValid(prof.Conditions)
for each condition in prof.Conditions
print condition
end for
end if
end for
print "profile.PlayableMediaTypes =", profile.PlayableMediaTypes
print "profile.SupportedCommands =", profile.SupportedCommands
@ -314,6 +319,43 @@ function getDeviceProfile() as object
}
' build TranscodingProfiles
' max resolution
maxResSetting = m.global.session.user.settings["playback.resolution.max"]
maxResMode = m.global.session.user.settings["playback.resolution.mode"]
maxVideoHeight = maxResSetting
maxVideoWidth = invalid
if maxResSetting = "auto"
maxVideoHeight = m.global.device.videoHeight
maxVideoWidth = m.global.device.videoWidth
else if maxResSetting <> "off"
if maxResSetting = "360"
maxVideoWidth = "480"
else if maxResSetting = "480"
maxVideoWidth = "640"
else if maxResSetting = "720"
maxVideoWidth = "1280"
else if maxResSetting = "1080"
maxVideoWidth = "1920"
else if maxResSetting = "2160"
maxVideoWidth = "3840"
else if maxResSetting = "4320"
maxVideoWidth = "7680"
end if
end if
maxVideoHeightArray = {
"Condition": "LessThanEqual",
"Property": "Width",
"Value": maxVideoWidth,
"IsRequired": true
}
maxVideoWidthArray = {
"Condition": "LessThanEqual",
"Property": "Height",
"Value": maxVideoHeight,
"IsRequired": true
}
'
' add mp3 to TranscodingProfile for music
deviceProfile.TranscodingProfiles.push({
@ -373,6 +415,12 @@ function getDeviceProfile() as object
"BreakOnNonKeyFrames": false
}
' always apply max res to transcoding profile
if maxResSetting <> "off"
tsArray.Conditions = [maxVideoHeightArray, maxVideoWidthArray]
mp4Array.Conditions = [maxVideoHeightArray, maxVideoWidthArray]
end if
' surround sound
if surroundSoundCodec <> invalid
' add preferred surround sound codec to TranscodingProfile
@ -411,44 +459,7 @@ function getDeviceProfile() as object
deviceProfile.TranscodingProfiles.push(mp4Array)
' Build CodecProfiles
' max resolution
maxResSetting = m.global.session.user.settings["playback.resolution"]
maxVideoHeight = invalid
maxVideoWidth = invalid
maxVideoHeight = maxResSetting
if maxResSetting = "auto"
maxVideoHeight = m.global.device.videoHeight
maxVideoWidth = m.global.device.videoWidth
else if maxResSetting <> "off"
if maxResSetting = "360"
maxVideoWidth = "480"
else if maxResSetting = "480"
maxVideoWidth = "640"
else if maxResSetting = "720"
maxVideoWidth = "1280"
else if maxResSetting = "1080"
maxVideoWidth = "1920"
else if maxResSetting = "2160"
maxVideoWidth = "3840"
else if maxResSetting = "4320"
maxVideoWidth = "7680"
end if
end if
maxVideoHeightArray = {
"Condition": "LessThanEqual",
"Property": "Width",
"Value": maxVideoWidth,
"IsRequired": true
}
maxVideoWidthArray = {
"Condition": "LessThanEqual",
"Property": "Height",
"Value": maxVideoHeight,
"IsRequired": true
}
' H264
h264Mp4LevelSupported = 0.0
h264TsLevelSupported = 0.0
@ -507,7 +518,7 @@ function getDeviceProfile() as object
]
}
' set max resolution
if maxResSetting <> "off"
if maxResMode = "everything" and maxResSetting <> "off"
codecProfileArray.Conditions.push(maxVideoHeightArray)
codecProfileArray.Conditions.push(maxVideoWidthArray)
end if
@ -555,7 +566,7 @@ function getDeviceProfile() as object
}
' set max resolution
if maxResSetting <> "off"
if maxResMode = "everything" and maxResSetting <> "off"
codecProfileArray.Conditions.push(maxVideoHeightArray)
codecProfileArray.Conditions.push(maxVideoWidthArray)
end if
@ -623,7 +634,7 @@ function getDeviceProfile() as object
}
' set max resolution
if maxResSetting <> "off"
if maxResMode = "everything" and maxResSetting <> "off"
codecProfileArray.Conditions.push(maxVideoHeightArray)
codecProfileArray.Conditions.push(maxVideoWidthArray)
end if
@ -696,7 +707,7 @@ function getDeviceProfile() as object
}
' set max resolution
if maxResSetting <> "off"
if maxResMode = "everything" and maxResSetting <> "off"
codecProfileArray.Conditions.push(maxVideoHeightArray)
codecProfileArray.Conditions.push(maxVideoWidthArray)
end if
@ -750,7 +761,7 @@ function getDeviceProfile() as object
}
' set max resolution
if maxResSetting <> "off"
if maxResMode = "everything" and maxResSetting <> "off"
codecProfileArray.Conditions.push(maxVideoHeightArray)
codecProfileArray.Conditions.push(maxVideoWidthArray)
end if