Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions PiliPod/Services/PlaybackSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ struct AudioVideoSettings: Codable, Equatable {
static let supportedHistoryReportIntervals = [5, 10, 20, 30]

var playerCore: PlayerCore = .avPlayer
var directPlayOnVideoDetail = true
var historyReportInterval = 10
var hardwareDecodingEnabled = true
var allowsBackgroundPlayback = false
Expand Down Expand Up @@ -240,6 +241,7 @@ struct AudioVideoSettings: Codable, Equatable {
private enum CodingKeys: String, CodingKey {
case hardwareDecodingEnabled
case playerCore
case directPlayOnVideoDetail
case historyReportInterval
case allowsBackgroundPlayback
case allowsLiveBackgroundPlayback
Expand Down Expand Up @@ -288,6 +290,7 @@ struct AudioVideoSettings: Codable, Equatable {
let container = try decoder.container(keyedBy: CodingKeys.self)
hardwareDecodingEnabled = try container.decodeIfPresent(Bool.self, forKey: .hardwareDecodingEnabled) ?? true
playerCore = try container.decodeIfPresent(PlayerCore.self, forKey: .playerCore) ?? .avPlayer
directPlayOnVideoDetail = try container.decodeIfPresent(Bool.self, forKey: .directPlayOnVideoDetail) ?? true
historyReportInterval = try container.decodeIfPresent(Int.self, forKey: .historyReportInterval) ?? 10
allowsBackgroundPlayback = try container.decodeIfPresent(Bool.self, forKey: .allowsBackgroundPlayback) ?? false
allowsLiveBackgroundPlayback = try container.decodeIfPresent(Bool.self, forKey: .allowsLiveBackgroundPlayback) ?? false
Expand Down
70 changes: 60 additions & 10 deletions PiliPod/ViewModels/VideoDetailViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class VideoDetailViewModel {
var videoPages: [VideoPageListItem] = []
var videoPagesIsLoading = false
var isPlayingOfflineCache = false
private(set) var hasStartedPlayback = false
private(set) var isStartingPlayback = false

var relatedVideos: [VideoItem] = []
var relatedIsLoading = false
Expand Down Expand Up @@ -175,8 +177,11 @@ class VideoDetailViewModel {
videoShotMetadata = nil
videoShotIsLoading = false
isPlayingOfflineCache = false
hasStartedPlayback = false
isStartingPlayback = false
videoShotWarmTask?.cancel()
videoShotWarmTask = nil
let shouldAutoPlay = AudioVideoSettingsStore.load().directPlayOnVideoDetail

let preferredCachedAsset = OfflineCacheStorage.loadPlayableAsset(
bvid: bvid,
Expand Down Expand Up @@ -357,9 +362,10 @@ class VideoDetailViewModel {
self.isPlayingOfflineCache = true
self.isLoading = false

if let player = self.player {
if shouldAutoPlay, let player = self.player {
player.play(stream: cachedAsset.stream)
player.setPlaybackRate(self.selectedPlaybackRate)
self.hasStartedPlayback = true
}
}
} else {
Expand Down Expand Up @@ -398,9 +404,10 @@ class VideoDetailViewModel {
self.isPlayingOfflineCache = false
self.isLoading = false

if let player = self.player {
if shouldAutoPlay, let player = self.player {
player.play(stream: self.dashStream!)
player.setPlaybackRate(self.selectedPlaybackRate)
self.hasStartedPlayback = true
}
}
}
Expand All @@ -410,7 +417,7 @@ class VideoDetailViewModel {
}

// 历史记录跳转播放:等待播放器状态开始更新后再恢复,避免 load 后被底层 0 位置覆盖。
if let seekTo = seekTime, seekTo > 0, let activePlayer {
if shouldAutoPlay, let seekTo = seekTime, seekTo > 0, let activePlayer {
await restorePlaybackState(
on: activePlayer,
time: seekTo,
Expand All @@ -428,6 +435,36 @@ class VideoDetailViewModel {
}
}

@MainActor
func startPlaybackIfNeeded() async -> Bool {
guard !Task.isCancelled, !hasStartedPlayback, !isStartingPlayback,
let player, let dashStream else { return false }

isStartingPlayback = true
hasStartedPlayback = true
player.play(stream: dashStream)
player.setPlaybackRate(selectedPlaybackRate)

if let seekTo = initialSeekTime, seekTo > 0 {
if player.usesAVPlayer {
player.seek(to: seekTo)
}
await restorePlaybackState(
on: player,
time: seekTo,
rate: selectedPlaybackRate,
shouldResume: true
)
}
isStartingPlayback = false
if Task.isCancelled {
player.stop()
hasStartedPlayback = false
return false
}
return true
}

@MainActor
func switchQuality(to code: Int) async {
guard selectedQualityCode != code,
Expand All @@ -447,6 +484,7 @@ class VideoDetailViewModel {
selectedQualityCode = code
let resolvedStream = stream.applying(dolbyEnabled: isDolbyEnabled)
dashStream = resolvedStream
guard hasStartedPlayback else { return }
player.play(stream: resolvedStream)
player.setPlaybackRate(resumeRate)

Expand Down Expand Up @@ -481,6 +519,7 @@ class VideoDetailViewModel {

isDolbyEnabled = nextValue
dashStream = resolvedStream
guard hasStartedPlayback else { return }
player.play(stream: resolvedStream)
player.setPlaybackRate(resumeRate)
await restorePlaybackState(
Expand Down Expand Up @@ -550,7 +589,10 @@ class VideoDetailViewModel {
isPlayingOfflineCache = false
error = nil

guard let currentPlayer else { return }
guard hasStartedPlayback, let currentPlayer else {
pendingNavigationResumeTime = nil
return
}
currentPlayer.play(stream: resolvedStream)
currentPlayer.setPlaybackRate(resumeRate)

Expand All @@ -569,8 +611,10 @@ class VideoDetailViewModel {

pendingNavigationResumeTime = max(0, currentPlayer.currentTime)
pendingNavigationShouldResume = currentPlayer.isPlaying
stopHistoryReporting(with: currentPlayer)
currentPlayer.pause()
if hasStartedPlayback {
stopHistoryReporting(with: currentPlayer)
currentPlayer.pause()
}
}

@MainActor
Expand Down Expand Up @@ -625,7 +669,7 @@ class VideoDetailViewModel {
isPlayingOfflineCache = true
isDolbyEnabled = false

if let player {
if hasStartedPlayback, let player {
player.play(stream: cachedAsset.stream)
player.setPlaybackRate(selectedPlaybackRate)
if previousIsPlaying {
Expand Down Expand Up @@ -695,7 +739,7 @@ class VideoDetailViewModel {
error = nil
isPlayingOfflineCache = false

if let player {
if hasStartedPlayback, let player {
player.play(stream: dashStream!)
player.setPlaybackRate(selectedPlaybackRate)
if previousIsPlaying {
Expand Down Expand Up @@ -753,6 +797,8 @@ class VideoDetailViewModel {
player = newPlayer
playerRebuildToken = UUID()

guard hasStartedPlayback else { return }

newPlayer.play(stream: stream.applying(route: AudioVideoSettingsStore.load().playbackCDNRoute))
newPlayer.setPlaybackRate(resumeRate)

Expand All @@ -772,16 +818,19 @@ class VideoDetailViewModel {
rate: Double,
shouldResume: Bool
) async {
guard !Task.isCancelled else { return }
let targetTime = max(0, time)

// Wait for player state to start updating (controller attached / file loaded).
for _ in 0 ..< 20 {
guard !Task.isCancelled else { return }
if player.duration > 0 || player.currentTime > 0 {
break
}
try? await Task.sleep(nanoseconds: 100000000)
}

guard !Task.isCancelled else { return }
player.seek(to: targetTime)
player.setPlaybackRate(rate)

Expand All @@ -794,6 +843,7 @@ class VideoDetailViewModel {
// One more correction pass to reduce occasional drift after stream rebuild.
for _ in 0 ..< 6 {
try? await Task.sleep(nanoseconds: 120000000)
guard !Task.isCancelled else { return }
if abs(player.currentTime - targetTime) <= 1.0 {
break
}
Expand Down Expand Up @@ -1336,7 +1386,7 @@ class VideoDetailViewModel {
// MARK: - History Report

func startHistoryReporting() {
guard !isPlayingOfflineCache else { return }
guard hasStartedPlayback, !isPlayingOfflineCache else { return }
historyReportStartTask?.cancel()
historyReportTimer?.invalidate()
historyReportTimer = nil
Expand Down Expand Up @@ -1381,7 +1431,7 @@ class VideoDetailViewModel {
historyReportTimer?.invalidate()
historyReportTimer = nil

guard !isPlayingOfflineCache else { return }
guard hasStartedPlayback, !isPlayingOfflineCache else { return }

// 退出时最后上报一次
let finalProgress = Int(player.currentTime)
Expand Down
7 changes: 7 additions & 0 deletions PiliPod/Views/SettingsContext/AudioVideoSettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ private struct AudioVideoSettingsView: View {

var body: some View {
Form {
Section {
Toggle("详情页直接播放", isOn: $settings.directPlayOnVideoDetail)
.tint(Color("BiliPink"))
} footer: {
Text("关闭后,进入视频详情页需点击播放键才开始播放。")
}

Section {
Toggle("硬件解码", isOn: $settings.hardwareDecodingEnabled)
.tint(Color("BiliPink"))
Expand Down
34 changes: 29 additions & 5 deletions PiliPod/Views/VideoDetail/VideoDetailPage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ struct VideoDetailPage: View {
@State private var showsVideoPageDrawer = false
@State private var cachedIntroDescriptionText = AttributedString("")
@State private var shouldResumeAfterBackgroundPause = false
@State private var initialPlaybackTask: Task<Void, Never>?
@State private var backgroundPauseRestoreTime: TimeInterval?
@State private var offlineCachePrefill: OfflineCacheQueryPrefill?
@State private var onlineTotal: String?
Expand Down Expand Up @@ -350,6 +351,8 @@ struct VideoDetailPage: View {
VideoDetailPlayerSurfaceView(
stream: stream,
player: player,
coverURL: URL(string: bindableViewModel.cover),
isAwaitingPlayback: !bindableViewModel.hasStartedPlayback,
playerViewID: bindableViewModel.currentPlayerViewID,
containerSize: geo.size,
safeAreaInsets: geo.safeAreaInsets,
Expand Down Expand Up @@ -440,7 +443,9 @@ struct VideoDetailPage: View {
syncSystemMediaControl(reason: reason)
},
onPlaybackTick: { currentTime in
handleSponsorSegmentPlayback(currentTime: currentTime, player: player)
if bindableViewModel.hasStartedPlayback {
handleSponsorSegmentPlayback(currentTime: currentTime, player: player)
}
},
onPreloadDanmakuBoundary: { currentTime in
Task {
Expand All @@ -453,6 +458,9 @@ struct VideoDetailPage: View {
onPlaybackEnded: {
pausePlayback(player: player)
},
onTogglePlayPause: {
togglePlayback(player: player)
},
onToggleFullscreen: {
toggleFullscreenManually()
},
Expand Down Expand Up @@ -832,10 +840,12 @@ struct VideoDetailPage: View {
refreshCachedIntroDescription()
ensureSponsorSegmentsLoadedIfNeeded()
#if canImport(UIKit)
audioSessionManager.activate()
if let player = bindableViewModel.player {
Task { @MainActor in
await syncSystemMediaControlWhenPlaybackStarts(player: player)
if bindableViewModel.hasStartedPlayback {
audioSessionManager.activate()
if let player = bindableViewModel.player {
Task { @MainActor in
await syncSystemMediaControlWhenPlaybackStarts(player: player)
}
}
}
#endif
Expand Down Expand Up @@ -868,6 +878,8 @@ struct VideoDetailPage: View {
}
}
.onDisappear {
initialPlaybackTask?.cancel()
initialPlaybackTask = nil
if let player = bindableViewModel.player {
player.setListenVideoModeActive(false)
let isRetainedForPictureInPicture =
Expand Down Expand Up @@ -1693,6 +1705,18 @@ struct VideoDetailPage: View {

#if canImport(UIKit)
private func togglePlayback(player: MPVKitPlayer) {
if !viewModel.hasStartedPlayback {
initialPlaybackTask?.cancel()
initialPlaybackTask = Task { @MainActor in
guard !Task.isCancelled else { return }
audioSessionManager.activate()
guard await viewModel.startPlaybackIfNeeded(), !Task.isCancelled else { return }
viewModel.startHistoryReporting()
await syncSystemMediaControlWhenPlaybackStarts(player: player)
}
return
}
guard !viewModel.isStartingPlayback else { return }
if player.isPlaying {
pausePlayback(player: player)
} else {
Expand Down
33 changes: 28 additions & 5 deletions PiliPod/Views/VideoDetail/VideoDetailPlayerSurfaceView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ struct VideoDetailPlayerSurfaceView: View {

let stream: DashStream
let player: MPVKitPlayer
let coverURL: URL?
let isAwaitingPlayback: Bool
let playerViewID: String
let containerSize: CGSize
let safeAreaInsets: EdgeInsets
Expand Down Expand Up @@ -61,6 +63,7 @@ struct VideoDetailPlayerSurfaceView: View {
let onPreloadDanmakuBoundary: (TimeInterval) -> Void
let onPreviewDraftFinished: () -> Void
let onPlaybackEnded: () -> Void
let onTogglePlayPause: () -> Void
let onToggleFullscreen: () -> Void

@Binding var danmakuConfig: DanmakuEngineConfig
Expand Down Expand Up @@ -168,7 +171,31 @@ struct VideoDetailPlayerSurfaceView: View {
// canvas can expose the ambient background around it.
.frame(width: videoRenderSize.width, height: videoRenderSize.height, alignment: .center)

if isAwaitingPlayback {
CachedAsyncImage(url: coverURL) { phase in
if case .success(let image) = phase {
image.resizable().scaledToFill()
} else {
Color.black
}
}
.frame(width: videoRenderSize.width, height: videoRenderSize.height)
.clipped()
.allowsHitTesting(false)
}

gestureOverlay
if isAwaitingPlayback {
Button(action: togglePlayback) {
Image(systemName: "play.fill")
.font(.system(size: 28, weight: .semibold))
.foregroundStyle(.white)
.frame(width: 64, height: 64)
.background(.black.opacity(0.55), in: Circle())
}
.buttonStyle(.plain)
.accessibilityLabel("播放视频")
}
danmakuOverlay
subtitleOverlay
loadingOverlay
Expand Down Expand Up @@ -761,11 +788,7 @@ struct VideoDetailPlayerSurfaceView: View {
}

private func togglePlayback() {
if player.isPlaying {
player.pause()
} else {
player.resume()
}
onTogglePlayPause()
playerUISnapshot = player.uiSnapshot
}

Expand Down
Loading