Revamp Device Profile Builder (#519)

jellyfin · Jan 13, 2024 · e2d6237 · e2d6237
1 parent b038f05
commit e2d6237
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 261 deletions.
diff --git a/Shared/Extensions/JellyfinAPI/BaseItemDto+VideoPlayerViewModel.swift b/Shared/Extensions/JellyfinAPI/BaseItemDto+VideoPlayerViewModel.swift
@@ -17,11 +17,10 @@ extension BaseItemDto {
 
     func videoPlayerViewModel(with mediaSource: MediaSourceInfo) async throws -> VideoPlayerViewModel {
 
-        let builder = DeviceProfileBuilder()
+        let currentVideoPlayerType = Defaults[.VideoPlayer.videoPlayerType]
         // TODO: fix bitrate settings
         let tempOverkillBitrate = 360_000_000
-        builder.setMaxBitrate(bitrate: tempOverkillBitrate)
-        let profile = builder.buildProfile()
+        let profile = DeviceProfileBuilder.buildProfile(for: currentVideoPlayerType, maxBitrate: tempOverkillBitrate)
 
         let userSession = Container.userSession.callAsFunction()
 

diff --git a/Shared/Objects/DeviceProfileBuilder.swift b/Shared/Objects/DeviceProfileBuilder.swift
diff --git a/Shared/Services/SwiftfinDefaults.swift b/Shared/Services/SwiftfinDefaults.swift
@@ -150,11 +150,6 @@ extension Defaults.Keys {
             )
         }
 
-        enum Native {
-
-            static let fMP4Container: Key<Bool> = .init("fmp4Container", default: false, suite: .generalSuite)
-        }
-
         enum Overlay {
 
             static let chapterSlider: Key<Bool> = .init("chapterSlider", default: true, suite: .generalSuite)

diff --git a/Shared/ViewModels/VideoPlayerViewModel.swift b/Shared/ViewModels/VideoPlayerViewModel.swift
@@ -30,14 +30,13 @@ class VideoPlayerViewModel: ViewModel {
 
     var hlsPlaybackURL: URL {
 
-        let segmentContainer = Defaults[.VideoPlayer.Native.fMP4Container] ? "mp4" : "ts"
         let userSession = Container.userSession.callAsFunction()
 
         let parameters = Paths.GetMasterHlsVideoPlaylistParameters(
             isStatic: true,
             tag: mediaSource.eTag,
             playSessionID: playSessionID,
-            segmentContainer: segmentContainer,
+            segmentContainer: "mp4",
             minSegments: 2,
             mediaSourceID: mediaSource.id!,
             deviceID: UIDevice.vendorUUIDString,
@@ -46,7 +45,7 @@ class VideoPlayerViewModel: ViewModel {
                 .joined(separator: ","),
             isBreakOnNonKeyFrames: true,
             requireAvc: false,
-            transcodingMaxAudioChannels: 6,
+            transcodingMaxAudioChannels: 8,
             videoCodec: videoStreams
                 .compactMap(\.codec)
                 .joined(separator: ","),

diff --git a/Swiftfin tvOS/Views/VideoPlayer/NativeVideoPlayer.swift b/Swiftfin tvOS/Views/VideoPlayer/NativeVideoPlayer.swift
@@ -70,7 +70,7 @@ class UINativeVideoPlayerViewController: AVPlayerViewController {
 
         super.init(nibName: nil, bundle: nil)
 
-        let newPlayer: AVPlayer = .init(url: manager.currentViewModel.hlsPlaybackURL)
+        let newPlayer: AVPlayer = .init(url: manager.currentViewModel.playbackURL)
 
         newPlayer.allowsExternalPlayback = true
         newPlayer.appliesMediaSelectionCriteriaAutomatically = false

diff --git a/Swiftfin/Views/SettingsView/NativeVideoPlayerSettingsView.swift b/Swiftfin/Views/SettingsView/NativeVideoPlayerSettingsView.swift
@@ -11,8 +11,6 @@ import SwiftUI
 
 struct NativeVideoPlayerSettingsView: View {
 
-    @Default(.VideoPlayer.Native.fMP4Container)
-    private var fMP4Container
     @Default(.VideoPlayer.resumeOffset)
     private var resumeOffset
 
@@ -33,13 +31,6 @@ struct NativeVideoPlayerSettingsView: View {
             } footer: {
                 Text("Resume content seconds before the recorded resume time")
             }
-
-            Section {
-
-                Toggle("fMP4 Container", isOn: $fMP4Container)
-            } footer: {
-                Text("Use fMP4 container to allow hevc content on supported devices")
-            }
         }
         .navigationTitle("Native Player")
     }

diff --git a/Swiftfin/Views/VideoPlayer/NativeVideoPlayer.swift b/Swiftfin/Views/VideoPlayer/NativeVideoPlayer.swift
@@ -70,7 +70,7 @@ class UINativeVideoPlayerViewController: AVPlayerViewController {
 
         super.init(nibName: nil, bundle: nil)
 
-        let newPlayer: AVPlayer = .init(url: manager.currentViewModel.hlsPlaybackURL)
+        let newPlayer: AVPlayer = .init(url: manager.currentViewModel.playbackURL)
 
         newPlayer.allowsExternalPlayback = true
         newPlayer.appliesMediaSelectionCriteriaAutomatically = false