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

Fix Transcoding #294

Merged
merged 3 commits into from
Jan 13, 2022
Merged

Fix Transcoding #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8843577
fix transcoding url
LePips Jan 13, 2022
bdae39c
Merge branch 'main' into fix-transcoding
LePips Jan 13, 2022
841632f
some logging
LePips Jan 13, 2022
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
23 changes: 10 additions & 13 deletions Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down