Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-10-28 11:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve building AVPlayer composition

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-06-18 12:17:01 +02:00
parent d551dee426
commit c40fc3e042
5 changed files with 114 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Apple TV/PlayerViewController.swift
View File

@@ -18,7 +18,7 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
fileprivate func loadStream(_ stream: Stream?, loadBest: Bool = false) {
if stream != state.streamToLoad {
if stream != state.nextStream {
state.loadStream(stream)
addTracksAndLoadAssets(stream!, loadBest: loadBest)
}
@@ -34,31 +34,6 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
fileprivate func addTrack(_ asset: AVURLAsset, stream: Stream, type: AVMediaType? = nil) {
let types: [AVMediaType] = stream.type == .adaptive ? [type!] : [.video, .audio]
types.forEach { type in
guard let assetTrack = asset.tracks(withMediaType: type).first else {
return
}
if let track = state.composition.tracks(withMediaType: type).first {
logger.info("removing \(type) track")
state.composition.removeTrack(track)
}
let track = state.composition.addMutableTrack(withMediaType: type, preferredTrackID: kCMPersistentTrackID_Invalid)!
try! track.insertTimeRange(
CMTimeRange(start: .zero, duration: CMTime(seconds: video.length, preferredTimescale: 1)),
of: assetTrack,
at: .zero
)
logger.info("inserted \(type) track")
}
}
fileprivate func handleAssetLoad(_ stream: Stream, type: AVMediaType, loadBest: Bool = false) {
logger.info("handling asset load: \(stream.type), \(stream.description)")
@@ -84,6 +59,12 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
fileprivate func addTrack(_ asset: AVURLAsset, stream: Stream, type: AVMediaType? = nil) {
let types: [AVMediaType] = stream.type == .adaptive ? [type!] : [.video, .audio]
types.forEach { state.addTrackToNextComposition(asset, type: $0) }
}
fileprivate func loadBestStream() {
guard state.currentStream != video.bestStream else {
return
@@ -108,7 +89,7 @@ struct PlayerViewController: UIViewControllerRepresentable {
func updateUIViewController(_ controller: StreamAVPlayerViewController, context _: Context) {
var items: [UIMenuElement] = []
if state.streamToLoad != nil {
if state.nextStream != nil {
items.append(actionsMenu)
}
@@ -116,15 +97,15 @@ struct PlayerViewController: UIViewControllerRepresentable {
#if os(tvOS)
controller.transportBarCustomMenuItems = items
#endif
if let skip = skipSegmentAction {
if controller.contextualActions.isEmpty {
controller.contextualActions = [skip]
if let skip = skipSegmentAction {
if controller.contextualActions.isEmpty {
controller.contextualActions = [skip]
}
} else {
controller.contextualActions = []
}
} else {
controller.contextualActions = []
}
#endif
}
fileprivate var streamingQualityMenu: UIMenu {
@@ -150,10 +131,10 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
fileprivate var cancelLoadingAction: UIAction {
UIAction(title: "Cancel loading \(state.streamToLoad.description) stream") { _ in
UIAction(title: "Cancel loading \(state.nextStream.description) stream") { _ in
DispatchQueue.main.async {
state.streamToLoad.cancelLoadingAssets()
state.cancelLoadingStream(state.streamToLoad)
state.nextStream.cancelLoadingAssets()
state.cancelLoadingStream(state.nextStream)
}
}
}