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

Add opus remux for jellyfin 10.10 and customizable bluetooth device icons #86

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add opus remux for jellyfin 10.10 and customizable bluetooth device icons #86

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
cc19d9e
Use Remux to support opus codec
gnattu Dec 10, 2024
8ae4caf
Add customizable Bluetooth device icons
gnattu Dec 10, 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
8 changes: 8 additions & 0 deletions AmpFinKit/Sources/AFNetwork/HTTP/JellyfinClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ public extension JellyfinClient {
_userId ?? ""
}
}

var supportsAudioRemuxing: Bool {
get {
let (major, minor, _) = serverVersion ?? (0,0,0);

return major >= 10 && minor >= 10;
}
}
}

public extension JellyfinClient {
Expand Down
6 changes: 5 additions & 1 deletion AmpFinKit/Sources/AFOffline/Filesystem/DownloadManager+Track.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ import AFNetwork

extension DownloadManager {
func download(trackId: String) -> URLSessionDownloadTask {
var supportedAudioCodecs = "mp3,aac,m4a|aac,m4b|aac,flac,alac,m4a|alac,m4b|alac,webma,webm|webma,wav,aiff,aif";
if JellyfinClient.shared.supportsAudioRemuxing {
supportedAudioCodecs.append(",mp4|opus")
}
var url = JellyfinClient.shared.serverUrl.appending(path: "Audio").appending(path: trackId).appending(path: "universal").appending(queryItems: [
URLQueryItem(name: "apiKey", value: JellyfinClient.shared.token),
URLQueryItem(name: "deviceId", value: JellyfinClient.shared.clientId),
URLQueryItem(name: "userId", value: JellyfinClient.shared.userId),
URLQueryItem(name: "container", value: "mp3,aac,m4a|aac,m4b|aac,flac,alac,m4a|alac,m4b|alac,webma,webm|webma,wav,aiff,aif"),
URLQueryItem(name: "container", value: supportedAudioCodecs),
URLQueryItem(name: "startTimeTicks", value: "0"),
URLQueryItem(name: "audioCodec", value: "aac"),
URLQueryItem(name: "transcodingContainer", value: "m4a"),
Expand Down
2 changes: 1 addition & 1 deletion AmpFinKit/Sources/AFPlayback/AudioPlayer/AudioPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public extension AudioPlayer {
case .HDMI, .displayPort:
return "tv"
case .bluetoothLE, .bluetoothHFP, .bluetoothA2DP:
return "hifispeaker"
return UserDefaults.standard.string(forKey: "defaultBTDeviceIcon") ?? "hifispeaker"
case .headphones:
return "headphones"
default:
Expand Down
1 change: 1 addition & 0 deletions AmpFinKit/Sources/AFPlayback/Extensions/Default+Keys.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ extension Defaults.Keys {
static let maxDownloadBitrate = Key("bitrate_downloads", default: -1)
static let maxStreamingBitrate = Key("bitrate_streaming", default: -1)
static let maxConstrainedBitrate = Key("bitrate_constrained", default: -1)
static let defaultBTDeviceIcon = Key<String>("defaultBTDeviceIcon", default: "hifispeaker")
}
7 changes: 5 additions & 2 deletions AmpFinKit/Sources/AFPlayback/LocalAudioEndpoint/LocalAudioEndpoint+Helper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ internal extension LocalAudioEndpoint {
return AVPlayerItem(url: DownloadManager.shared.url(trackId: track.id))
}
#endif

var supportedAudioCodecs = "mp3,aac,m4a|aac,m4b|aac,flac,alac,m4a|alac,m4b|alac,webma,webm|webma,wav,aiff,aiff|aif";
if JellyfinClient.shared.supportsAudioRemuxing {
supportedAudioCodecs.append(",mp4|opus")
}
var url = JellyfinClient.shared.serverUrl.appending(path: "Audio").appending(path: track.id).appending(path: "universal").appending(queryItems: [
URLQueryItem(name: "apiKey", value: JellyfinClient.shared.token),
URLQueryItem(name: "deviceId", value: JellyfinClient.shared.clientId),
URLQueryItem(name: "userId", value: JellyfinClient.shared.userId),
URLQueryItem(name: "container", value: "mp3,aac,m4a|aac,m4b|aac,flac,alac,m4a|alac,m4b|alac,webma,webm|webma,wav,aiff,aiff|aif"),
URLQueryItem(name: "container", value: supportedAudioCodecs),
URLQueryItem(name: "playSessionId", value: JellyfinClient.sessionID(itemId: track.id, bitrate: maxBitrate)),
URLQueryItem(name: "startTimeTicks", value: "0"),
URLQueryItem(name: "audioCodec", value: "aac"),
Expand Down
26 changes: 26 additions & 0 deletions Multiplatform/Settings.bundle/Root.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,32 @@
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Title</key>
<string>Default Bluetooth device icon</string>
<key>Key</key>
<string>defaultBTDeviceIcon</string>
<key>DefaultValue</key>
<string>hifispeaker</string>
<key>Values</key>
<array>
<string>hifispeaker</string>
<string>headphones</string>
<string>airpods.gen3</string>
<string>airpods.pro</string>
<string>airpods.max</string>
</array>
<key>Titles</key>
<array>
<string>Speaker</string>
<string>Headphones</string>
<string>AirPods</string>
<string>AirPods Pro</string>
<string>AirPods Max</string>
</array>
</dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
Expand Down