From 8843577c41c66afe281873949af0863d1636f9f3 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Wed, 12 Jan 2022 23:14:36 -0700 Subject: [PATCH 1/2] fix transcoding url --- .../BaseItemDto+VideoPlayerViewModel.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift index 77a27e13..0dad2320 100644 --- a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift +++ b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift @@ -45,23 +45,23 @@ extension BaseItemDto { // MARK: Stream - var streamURL = URLComponents(string: SessionManager.main.currentLogin.server.currentURI)! + var streamURL: URLComponents let streamType: ServerStreamType if let transcodeURL = mediaSource.transcodingUrl { streamType = .transcode - streamURL.path = transcodeURL + streamURL = URLComponents(string: SessionManager.main.currentLogin.server.currentURI.appending(transcodeURL))! } else { streamType = .direct + streamURL = URLComponents(string: SessionManager.main.currentLogin.server.currentURI)! streamURL.path = "/Videos/\(self.id!)/stream" + streamURL.addQueryItem(name: "Static", value: "true") + streamURL.addQueryItem(name: "MediaSourceId", value: self.id!) + streamURL.addQueryItem(name: "Tag", value: self.etag) + streamURL.addQueryItem(name: "MinSegments", value: "6") } - streamURL.addQueryItem(name: "Static", value: "true") - streamURL.addQueryItem(name: "MediaSourceId", value: self.id!) - streamURL.addQueryItem(name: "Tag", value: self.etag) - streamURL.addQueryItem(name: "MinSegments", value: "6") - // MARK: VidoPlayerViewModel Creation var subtitle: String? From 841632f897b42098dfab080979e702a891a8ee80 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Thu, 13 Jan 2022 09:08:11 -0700 Subject: [PATCH 2/2] some logging --- Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift index cf03075b..ca36f1df 100644 --- a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift @@ -343,6 +343,13 @@ extension VLCPlayerViewController { } viewModel = newViewModel + + switch viewModel.streamType { + case .transcode: + LogManager.shared.log.debug("Player set up with transcoded stream for item: \(viewModel.item.id ?? "--")") + case .direct: + LogManager.shared.log.debug("Player set up with direct play stream for item: \(viewModel.item.id ?? "--")") + } } // MARK: startPlayback