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

Fix killing player on Apple TV

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-06-16 21:12:41 +02:00
parent 4dd6f13df9
commit c4a3dab5fb
7 changed files with 230 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Apple TV/PlayerView.swift
View File

@@ -10,11 +10,9 @@ struct PlayerView: View {
}
var body: some View {
ZStack {
if let video = provider.video {
PlayerViewController(video: video)
.edgesIgnoringSafeArea(.all)
}
VStack {
pvc?
.edgesIgnoringSafeArea(.all)
}
.task {
async {
@@ -22,4 +20,12 @@ struct PlayerView: View {
}
}
}
var pvc: PlayerViewController? {
guard provider.video != nil else {
return nil
}
return PlayerViewController(video: provider.video!)
}
}

52
Apple TV/PlayerViewController.swift
View File

@@ -14,25 +14,17 @@ struct PlayerViewController: UIViewControllerRepresentable {
self.video = video
state = PlayerState(video)
loadStream(video.defaultStream, loadBest: false)
loadStream(video.defaultStream, loadBest: true)
}
func loadStream(_ stream: Stream?, loadBest: Bool = false) {
fileprivate func loadStream(_ stream: Stream?, loadBest: Bool = false) {
if stream != state.streamToLoad {
state.loadStream(stream)
addTracksAndLoadAssets(stream!, loadBest: loadBest)
}
}
func loadBestStream() {
guard state.currentStream != video.bestStream else {
return
}
loadStream(video.bestStream)
}
func addTracksAndLoadAssets(_ stream: Stream, loadBest: Bool = false) {
fileprivate func addTracksAndLoadAssets(_ stream: Stream, loadBest: Bool = false) {
logger.info("adding tracks and loading assets for: \(stream.type), \(stream.description)")
stream.assets.forEach { asset in
@@ -42,7 +34,7 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
func addTrack(_ asset: AVURLAsset, stream: Stream, type: AVMediaType? = nil) {
fileprivate func addTrack(_ asset: AVURLAsset, stream: Stream, type: AVMediaType? = nil) {
let types: [AVMediaType] = stream.type == .adaptive ? [type!] : [.video, .audio]
types.forEach { type in
@@ -67,7 +59,7 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
func handleAssetLoad(_ stream: Stream, type: AVMediaType, loadBest: Bool = false) {
fileprivate func handleAssetLoad(_ stream: Stream, type: AVMediaType, loadBest: Bool = false) {
logger.info("handling asset load: \(stream.type), \(stream.description)")
guard stream != state.currentStream else {
@@ -82,7 +74,7 @@ struct PlayerViewController: UIViewControllerRepresentable {
DispatchQueue.main.async {
logger.info("ALL assets loaded: \(stream.type), \(stream.description)")
state.loadStreamIntoPlayer(stream)
state.playStream(stream)
}
if loadBest {
@@ -92,18 +84,28 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
func makeUIViewController(context _: Context) -> AVPlayerViewController {
let controller = AVPlayerViewController()
fileprivate func loadBestStream() {
guard state.currentStream != video.bestStream else {
return
}
controller.transportBarCustomMenuItems = [streamingQualityMenu]
loadStream(video.bestStream)
}
func makeUIViewController(context _: Context) -> StreamAVPlayerViewController {
let controller = StreamAVPlayerViewController()
controller.state = state
#if os(tvOS)
controller.transportBarCustomMenuItems = [streamingQualityMenu]
#endif
controller.modalPresentationStyle = .fullScreen
controller.player = state.player
controller.player?.automaticallyWaitsToMinimizeStalling = true
return controller
}
func updateUIViewController(_ controller: AVPlayerViewController, context _: Context) {
func updateUIViewController(_ controller: StreamAVPlayerViewController, context _: Context) {
var items: [UIMenuElement] = []
if state.streamToLoad != nil {
@@ -112,14 +114,16 @@ struct PlayerViewController: UIViewControllerRepresentable {
items.append(streamingQualityMenu)
controller.transportBarCustomMenuItems = items
#if os(tvOS)
controller.transportBarCustomMenuItems = items
#endif
}
var streamingQualityMenu: UIMenu {
fileprivate var streamingQualityMenu: UIMenu {
UIMenu(title: "Streaming quality", image: UIImage(systemName: "waveform"), children: streamingQualityMenuActions)
}
var streamingQualityMenuActions: [UIAction] {
fileprivate var streamingQualityMenuActions: [UIAction] {
video.selectableStreams.map { stream in
let image = self.state.currentStream == stream ? UIImage(systemName: "checkmark") : nil
@@ -133,11 +137,11 @@ struct PlayerViewController: UIViewControllerRepresentable {
}
}
var actionsMenu: UIMenu {
fileprivate var actionsMenu: UIMenu {
UIMenu(title: "Actions", image: UIImage(systemName: "bolt.horizontal.fill"), children: [cancelLoadingAction])
}
var cancelLoadingAction: UIAction {
fileprivate var cancelLoadingAction: UIAction {
UIAction(title: "Cancel loading \(state.streamToLoad.description) stream") { _ in
DispatchQueue.main.async {
state.streamToLoad.cancelLoadingAssets()

11
Apple TV/StreamAVPlayerViewController.swift Normal file
View File

@@ -0,0 +1,11 @@
import AVKit
class StreamAVPlayerViewController: AVPlayerViewController {
var state: PlayerState?
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
state?.destroyPlayer()
}
}

1
Apple TV/VideoThumbnailView.swift
View File

@@ -20,7 +20,6 @@ struct VideoThumbnailView: View {
.frame(width: 320, height: 180)
}
.mask(RoundedRectangle(cornerRadius: 12))
.frame(width: 320, height: 180)
} else {
Image(systemName: "exclamationmark.square")
}