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

remove uneeded code + update surround sound codec logic

Browse Source
This commit is contained in:
Charles Ewert 2023-06-06 00:42:33 -04:00
parent 9c6201b25e
commit 3e26aabe01
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/utils/deviceCapabilities.brs
View File

@ -64,7 +64,6 @@ function getDeviceProfile() as object
ts: {} ts: {}
} }
' does the users setup support surround sound? ' does the users setup support surround sound?
maxAudioChannels = "2" ' jellyfin expects this as a string maxAudioChannels = "2" ' jellyfin expects this as a string
' in order of preference from left to right ' in order of preference from left to right
@ -229,15 +228,9 @@ function getDeviceProfile() as object
for each codec in audioCodecs for each codec in audioCodecs
if di.CanDecodeAudio({ Codec: codec, Container: container }).result if di.CanDecodeAudio({ Codec: codec, Container: container }).result
if container = "mp4" if container = "mp4"
' check for codec string before adding it mp4AudioCodecs = mp4AudioCodecs + "," + codec
if mp4VideoCodecs.Instr(0, "," + codec) = -1
mp4AudioCodecs = mp4AudioCodecs + "," + codec
end if
else if container = "ts" else if container = "ts"
' check for codec string before adding it tsAudioCodecs = tsAudioCodecs + "," + codec
if tsAudioCodecs.Instr(0, "," + codec) = -1
tsAudioCodecs = tsAudioCodecs + "," + codec
end if
end if end if
end if end if
end for end for
@ -381,21 +374,35 @@ function getDeviceProfile() as object
' search codec strings for our preferred codec ' search codec strings for our preferred codec
tsCodecStringPosition = tsArray.AudioCodec.Instr(0, "," + surroundSoundCodec) tsCodecStringPosition = tsArray.AudioCodec.Instr(0, "," + surroundSoundCodec)
mp4CodecStringPosition = mp4Array.AudioCodec.Instr(0, "," + surroundSoundCodec) mp4CodecStringPosition = mp4Array.AudioCodec.Instr(0, "," + surroundSoundCodec)
' ts
if tsCodecStringPosition <> -1 if tsCodecStringPosition <> -1
' ts supports our prefered codec
' remove codec from string ' remove codec from string
tsArray.AudioCodec.Replace("," + surroundSoundCodec, "") tsArray.AudioCodec.Replace("," + surroundSoundCodec, "")
' put codec in front of string
tsArray.AudioCodec = surroundSoundCodec + "," + tsArray.AudioCodec
end if end if
' check beginning of array before adding to it
if tsArray.AudioCodec.Instr(0, surroundSoundCodec) = -1
' put codec in front of string
if tsArray.AudioCodec <> ""
tsArray.AudioCodec = surroundSoundCodec + "," + tsArray.AudioCodec
else
tsArray.AudioCodec = surroundSoundCodec
end if
end if
' mp4
if mp4CodecStringPosition <> -1 if mp4CodecStringPosition <> -1
' mp4 supports our prefered codec
' remove codec from string ' remove codec from string
mp4Array.AudioCodec.Replace("," + surroundSoundCodec, "") mp4Array.AudioCodec.Replace("," + surroundSoundCodec, "")
' put codec in front of string
mp4Array.AudioCodec = surroundSoundCodec + "," + mp4Array.AudioCodec
end if end if
' check beginning of array before adding to it
if mp4Array.AudioCodec.Instr(0, surroundSoundCodec) = -1
' put codec in front of string
if mp4Array.AudioCodec <> ""
mp4Array.AudioCodec = surroundSoundCodec + "," + mp4Array.AudioCodec
else
mp4Array.AudioCodec = surroundSoundCodec
end if
end if
end if end if
deviceProfile.TranscodingProfiles.push(tsArray) deviceProfile.TranscodingProfiles.push(tsArray)