Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transcode multichannel audio to keep multichannel support #2003

Draft
wants to merge 2 commits into
base: 2.2.z
Choose a base branch
from
Draft

Transcode multichannel audio to keep multichannel support #2003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f748770
transcode audio to keep multichannel support
cewert Oct 20, 2024
c0f0a18
always transcode multichannel aac if surround sound is detected
cewert Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 49 additions & 1 deletion source/api/Items.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function ItemPostPlaybackInfo(id as string, mediaSourceId = "" as string, audioT
if selectedAudioStream <> invalid
params.AudioStreamIndex = audioTrackIndex

' force the server to transcode AAC profiles we don't support to MP3 instead of the usual AAC
' force the server to transcode AAC profiles we don't support to MP3 instead of the usual AAC.
' TODO: Remove this after server adds support for transcoding AAC from one profile to another
if selectedAudioStream.Codec <> invalid and LCase(selectedAudioStream.Codec) = "aac"
if selectedAudioStream.Profile <> invalid and LCase(selectedAudioStream.Profile) = "main" or LCase(selectedAudioStream.Profile) = "he-aac"
Expand All @@ -64,6 +64,39 @@ function ItemPostPlaybackInfo(id as string, mediaSourceId = "" as string, audioT
end for
end if
end if

preferredAudioCodec = GetPreferredAudioCodec()
if preferredAudioCodec <> "aac"
' device supports multi-channel audio output

' is this a multi-channel audio stream?
if selectedAudioStream.Channels <> invalid and selectedAudioStream.Channels > 2
' tell the server to transcode this file to the preferred multi channel audio codec instead of the default AAC for stereo
for each rule in deviceProfile.TranscodingProfiles
if rule.Container = "ts" or rule.Container = "mp4"
if rule.AudioCodec = "aac"
rule.AudioCodec = preferredAudioCodec
else
rule.AudioCodec = preferredAudioCodec + "," + rule.AudioCodec
end if
end if
end for

' don't direct play multi-channel AAC
if selectedAudioStream.Codec <> invalid and LCase(selectedAudioStream.Codec) = "aac"
for each rule in deviceProfile.DirectPlayProfiles
if rule.audioCodec <> invalid
if rule.AudioCodec = "aac"
rule.AudioCodec = ""
else if rule.AudioCodec.Left(4) = "aac,"
rule.AudioCodec = mid(rule.AudioCodec, 5)
end if
end if
end for
end if
end if

end if
end if
end if

Expand Down Expand Up @@ -538,3 +571,18 @@ function TVEpisodeShuffleList(show_id as string)

return data
end function

' Returns the users preferred audio codec in string format
' Defaults to AAC for stereo and AC3 for surround sound
' with a user setting to use DTS for surround sound
function GetPreferredAudioCodec() as string
deviceInfo = CreateObject("roDeviceInfo")
preferredAudioCodec = "aac" ' AAC for stereo
if deviceInfo.GetAudioOutputChannel() <> "Stereo"
preferredAudioCodec = "ac3" ' Dolby Digital for surround sound
if m.global.session.user.settings["playback.forceDTS"]
preferredAudioCodec = "dts" ' DTS for surround sound when asked
end if
end if
return preferredAudioCodec
end function
2 changes: 1 addition & 1 deletion source/utils/deviceCapabilities.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function GetDirectPlayProfiles() as object
}
' all possible codecs (besides those restricted by user settings)
videoCodecs = ["h264", "mpeg4 avc", "vp8", "vp9", "h263", "mpeg1"]
audioCodecs = ["mp3", "mp2", "pcm", "lpcm", "wav", "ac3", "ac4", "aiff", "wma", "flac", "alac", "aac", "opus", "dts", "wmapro", "vorbis", "eac3", "mpg123"]
audioCodecs = ["aac", "mp3", "mp2", "pcm", "lpcm", "wav", "ac3", "ac4", "aiff", "wma", "flac", "alac", "opus", "dts", "wmapro", "vorbis", "eac3", "mpg123"]

' check if hevc is disabled
if globalUserSettings["playback.compatibility.disablehevc"] = false
Expand Down
Loading