ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #294 from LePips/fix-transcoding 

Fix Transcoding
This commit is contained in:
aiden 3 2022-01-13 12:19:42 -05:00 committed by GitHub
parent 8b696fcb08 841632f897
commit be7be050d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
View File

@ -47,27 +47,24 @@ extension BaseItemDto {
let defaultSubtitleStream = subtitleStreams
.first(where: { $0.index! == currentMediaSource.defaultSubtitleStreamIndex ?? -1 })
// MARK: Stream
var streamURL = URLComponents(string: SessionManager.main.currentLogin.server.currentURI)!
var streamURL: URLComponents
let streamType: ServerStreamType
if let transcodeURL = currentMediaSource.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")
if mediaSources.count > 1 {
streamURL.addQueryItem(name: "MediaSourceId", value: currentMediaSource.id)
if mediaSources.count > 1 {
streamURL.addQueryItem(name: "MediaSourceId", value: currentMediaSource.id)
}
}
// MARK: VidoPlayerViewModel Creation

7
Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift
View File

@ -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