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

Video playback progress and restoring time for previously played

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-10-22 22:49:31 +02:00
parent bc065e282a
commit 4307da57c5
13 changed files with 219 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Model/Player/PlayerModel.swift
View File

@@ -28,7 +28,6 @@ final class PlayerModel: ObservableObject {
@Published var queue = [PlayerQueueItem]()
@Published var currentItem: PlayerQueueItem!
@Published var live = false
@Published var time: CMTime?
@Published var history = [PlayerQueueItem]()
@@ -58,6 +57,18 @@ final class PlayerModel: ObservableObject {
player.timeControlStatus == .playing
}
var time: CMTime? {
currentItem?.playbackTime
}
var playerItemDuration: CMTime? {
player.currentItem?.asset.duration
}
var videoDuration: TimeInterval? {
currentItem?.duration ?? currentVideo?.length
}
func togglePlay() {
isPlaying ? pause() : play()
}
@@ -78,8 +89,8 @@ final class PlayerModel: ObservableObject {
player.pause()
}
func playVideo(_ video: Video) {
savedTime = nil
func playVideo(_ video: Video, time: CMTime? = nil) {
savedTime = time
shouldResumePlaying = true
loadAvailableStreams(video) { streams in
@@ -88,33 +99,32 @@ final class PlayerModel: ObservableObject {
}
self.streamSelection = stream
self.playStream(stream, of: video, forcePlay: true)
self.playStream(stream, of: video, preservingTime: !time.isNil)
}
}
func upgradeToStream(_ stream: Stream) {
if !self.stream.isNil, self.stream != stream {
playStream(stream, of: currentItem.video, preservingTime: true)
playStream(stream, of: currentVideo!, preservingTime: true)
}
}
private func playStream(
_ stream: Stream,
of video: Video,
forcePlay: Bool = false,
preservingTime: Bool = false
) {
if let url = stream.singleAssetURL {
logger.info("playing stream with one asset\(stream.kind == .hls ? " (HLS)" : ""): \(url)")
insertPlayerItem(stream, for: video, forcePlay: forcePlay, preservingTime: preservingTime)
insertPlayerItem(stream, for: video, preservingTime: preservingTime)
} else {
logger.info("playing stream with many assets:")
logger.info("composition audio asset: \(stream.audioAsset.url)")
logger.info("composition video asset: \(stream.videoAsset.url)")
Task {
await self.loadComposition(stream, of: video, forcePlay: forcePlay, preservingTime: preservingTime)
await self.loadComposition(stream, of: video, preservingTime: preservingTime)
}
}
}
@@ -122,51 +132,58 @@ final class PlayerModel: ObservableObject {
private func insertPlayerItem(
_ stream: Stream,
for video: Video,
forcePlay: Bool = false,
preservingTime: Bool = false
) {
let playerItem = playerItem(stream)
guard playerItem != nil else {
return
}
attachMetadata(to: playerItem!, video: video, for: stream)
DispatchQueue.main.async {
self.stream = stream
self.composition = AVMutableComposition()
}
shouldResumePlaying = forcePlay || isPlaying
let replaceItemAndSeek = {
self.player.replaceCurrentItem(with: playerItem)
self.seekToSavedTime { finished in
guard finished else {
return
}
self.savedTime = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
self.play()
}
}
}
let startPlaying = {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
self.play()
}
}
if preservingTime {
saveTime {
self.player.replaceCurrentItem(with: playerItem)
self.seekToSavedTime { finished in
guard finished else {
return
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
forcePlay || self.shouldResumePlaying ? self.play() : self.pause()
self.shouldResumePlaying = false
}
if savedTime.isNil {
saveTime {
replaceItemAndSeek()
startPlaying()
}
} else {
replaceItemAndSeek()
startPlaying()
}
} else {
player.replaceCurrentItem(with: playerItem)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
forcePlay || self.shouldResumePlaying ? self.play() : self.pause()
self.shouldResumePlaying = false
}
startPlaying()
}
}
private func loadComposition(
_ stream: Stream,
of video: Video,
forcePlay: Bool = false,
preservingTime: Bool = false
) async {
await loadCompositionAsset(stream.audioAsset, type: .audio, of: video)
@@ -177,7 +194,7 @@ final class PlayerModel: ObservableObject {
return
}
insertPlayerItem(stream, for: video, forcePlay: forcePlay, preservingTime: preservingTime)
insertPlayerItem(stream, for: video, preservingTime: preservingTime)
}
private func loadCompositionAsset(_ asset: AVURLAsset, type: AVMediaType, of video: Video) async {
@@ -274,6 +291,7 @@ final class PlayerModel: ObservableObject {
@objc func itemDidPlayToEndTime() {
if queue.isEmpty {
addCurrentItemToHistory()
resetQueue()
#if os(tvOS)
avPlayerViewController!.dismiss(animated: true) {
@@ -318,7 +336,8 @@ final class PlayerModel: ObservableObject {
timeObserver = player.addPeriodicTimeObserver(forInterval: interval, queue: .main) { _ in
self.currentRate = self.player.rate
self.live = self.currentVideo?.live ?? false
self.time = self.player.currentTime()
self.currentItem?.playbackTime = self.player.currentTime()
self.currentItem?.videoDuration = self.player.currentItem?.asset.duration.seconds
}
}
}

24
Model/Player/PlayerQueue.swift
View File

@@ -37,12 +37,15 @@ extension PlayerModel {
func playItem(_ item: PlayerQueueItem, video: Video? = nil) {
currentItem = item
if currentItem.playbackTime.isNil {
currentItem.playbackTime = .zero
}
if video != nil {
currentItem.video = video!
}
playVideo(currentItem.video)
playVideo(currentVideo!, time: item.playbackTime)
}
func advanceToNextItem() {
@@ -54,6 +57,8 @@ extension PlayerModel {
}
func advanceToItem(_ newItem: PlayerQueueItem) {
addCurrentItemToHistory()
let item = remove(newItem)!
loadDetails(newItem.video) { video in
self.playItem(item, video: video)
@@ -86,10 +91,11 @@ extension PlayerModel {
@discardableResult func enqueueVideo(
_ video: Video,
play: Bool = false,
atTime: CMTime? = nil,
prepending: Bool = false,
videoDetailsLoadHandler: @escaping (Video, PlayerQueueItem) -> Void = { _, _ in }
) -> PlayerQueueItem? {
let item = PlayerQueueItem(video)
let item = PlayerQueueItem(video, playbackTime: atTime)
queue.insert(item, at: prepending ? 0 : queue.endIndex)
@@ -117,13 +123,23 @@ extension PlayerModel {
}
func addCurrentItemToHistory() {
if let item = currentItem, !history.contains(where: { $0.video.videoID == item.video.videoID }) {
if let item = currentItem {
if let index = history.firstIndex(where: { $0.video.videoID == item.video.videoID }) {
history.remove(at: index)
}
history.insert(item, at: 0)
}
}
func playHistory(_ item: PlayerQueueItem) {
let newItem = enqueueVideo(item.video, prepending: true)
var time = item.playbackTime
if item.shouldRestartPlaying {
time = .zero
}
let newItem = enqueueVideo(item.video, atTime: time, prepending: true)
advanceToItem(newItem!)

22
Model/Player/PlayerQueueItem.swift
View File

@@ -4,10 +4,28 @@ import Foundation
struct PlayerQueueItem: Hashable, Identifiable {
var id = UUID()
var video: Video
var playbackTime: CMTime?
var videoDuration: TimeInterval?
init(_ video: Video) {
init(_ video: Video, playbackTime: CMTime? = nil, videoDuration: TimeInterval? = nil) {
self.video = video
self.playbackTime = playbackTime
self.videoDuration = videoDuration
}
var playerItems = [AVPlayerItem]()
var duration: TimeInterval {
videoDuration ?? video.length
}
var shouldRestartPlaying: Bool {
guard let seconds = playbackTime?.seconds else {
return false
}
return duration - seconds <= 10
}
func hash(into hasher: inout Hasher) {
hasher.combine(id)
}
}

6
Model/Player/PlayerStreams.swift
View File

@@ -112,6 +112,10 @@ extension PlayerModel {
}
func streamsSorter(_ lhs: Stream, _ rhs: Stream) -> Bool {
lhs.kind == rhs.kind ? (lhs.resolution.height > rhs.resolution.height) : (lhs.kind < rhs.kind)
if lhs.resolution.isNil || rhs.resolution.isNil {
return lhs.kind < rhs.kind
}
return lhs.kind == rhs.kind ? (lhs.resolution.height > rhs.resolution.height) : (lhs.kind < rhs.kind)
}
}

14
Model/Video.swift
View File

@@ -72,20 +72,6 @@ struct Video: Identifiable, Equatable, Hashable {
self.streams = streams
}
var playTime: String? {
guard !length.isZero else {
return nil
}
let formatter = DateComponentsFormatter()
formatter.unitsStyle = .positional
formatter.allowedUnits = length >= (60 * 60) ? [.hour, .minute, .second] : [.minute, .second]
formatter.zeroFormattingBehavior = [.pad]
return formatter.string(from: length)
}
var publishedDate: String? {
(published.isEmpty || published == "0 seconds ago") ? nil : published
}