Fix black video, freezes, autoplay and clock on Apple TV HD (A8)

Fixes four bugs behind yattee#956 on Apple TV HD (AppleTV5,3, A8,
tvOS 26.5), where video played audio only with a permanently black
picture, never autoplayed, the clock stayed at 0:00, and navigating
during/after playback could freeze the whole app.

1. A8 GL driver deadlock (device-specific). glTexImage2D uploading
   float32 data into a float16 texture hangs in libGLImage's
   glgProcessPixelsWithProcessor (a dispatch_group_wait that never
   returns), permanently wedging mpv_render_context_render. mpv 0.37
   (commit 703f1588) turned on dithering (dither-depth=auto) and
   LUT-based scalers by default; on the A8 (no GL_EXT_texture_norm16)
   both upload float weights via that fatal conversion, and per-frame
   CPU plane uploads (videotoolbox-copy / software decode) hit the same
   path. Yattee 1.x shipped mpv 0.36 with these off, which is why the
   device worked there. Worked around on AppleTV5,3 only: dither-depth=no,
   hwdec=videotoolbox (zero-copy via IOSurface), and bilinear scalers.
   Confirmed by two on-device lldb backtraces.

2. Swift cooperative-pool starvation (all platforms). MPVClient's event
   loop ran as Task.detached and blocked a cooperative-pool thread for
   the client's entire lifetime. With two clients alive (active +
   pre-warmed) on a 2-core A8, both pool threads were held and every
   await in the app starved: the load pipeline froze at its first
   Task.sleep, killing autoplay, Now Playing and progress saving. Moved
   the event loop to a dedicated Thread; EAGLContext creation now bridges
   through GCD instead of Task.detached.

3. Leaked time-update gate (all platforms). PlayerService dropped all
   time updates while loadingVideoID was set; when a load task died
   mid-flight the flag leaked and the clock stayed at 0:00 during
   playback. Heal the gate on the ready/playing transition and leak-proof
   play() with a defer; log the previously silent load cancellation.

4. Orphaned player view (all platforms). Detach the shared render view in
   MPVContainerView.deinit when no successor container exists, and skip
   framebuffer recreation while the view is windowless, to stop a 100% CPU
   SwiftUI trait-update loop when opening a settings detail during playback.
This commit is contained in:
Ramon
2026-07-22 14:13:34 +02:00
parent afc03188a0
commit 0db7b73d25
5 changed files with 106 additions and 28 deletions

View File

@@ -161,8 +161,9 @@ final class MPVClient: @unchecked Sendable {
weak var delegate: MPVClientDelegate?
/// Event loop task
private var eventLoopTask: Task<Void, Never>?
/// Whether the dedicated event-loop thread has been started (mpvQueue-guarded).
/// The loop itself exits via `isDestroyed` + `mpv_wakeup` + `eventLoopExitSemaphore`.
private var eventLoopRunning = false
/// Semaphore signaled when event loop exits
private let eventLoopExitSemaphore = DispatchSemaphore(value: 0)
@@ -187,6 +188,22 @@ final class MPVClient: @unchecked Sendable {
destroy()
}
// MARK: - Device Detection
#if os(tvOS)
/// Apple TV HD (AppleTV5,3, A8): its GL driver deadlocks on the float
/// texture uploads mpv's renderer defaults to (issue #956).
static let hasFragileGLDriver: Bool = {
var systemInfo = utsname()
uname(&systemInfo)
let machine = withUnsafeBytes(of: systemInfo.machine) { rawPtr -> String in
guard let base = rawPtr.baseAddress else { return "" }
return String(cString: base.assumingMemoryBound(to: CChar.self))
}
return machine == "AppleTV5,3"
}()
#endif
// MARK: - Logging Helpers
/// Log to LoggingService from any thread (async dispatch to MainActor).
@@ -244,9 +261,16 @@ final class MPVClient: @unchecked Sendable {
case "warn":
Task { @MainActor in LoggingService.shared.logMPVWarning(formatted) }
default:
// Surface info always; verbose only for renderer/decoder subsystems
// so the persisted log stays readable when verbose capture is on.
let p = prefix.lowercased()
let rendererRelevant = p.hasPrefix("vo") || p.contains("gpu")
|| p.contains("placebo") || p.hasPrefix("vd") || p.hasPrefix("ffmpeg")
if level == "info" || rendererRelevant {
Task { @MainActor in LoggingService.shared.logMPV(formatted) }
}
}
}
/// Snapshot the recent log buffer (most-recent-last). Thread-safe.
func recentLogLines(minimumSeverity: Int = 0) -> [MPVLogLine] {
@@ -303,10 +327,10 @@ final class MPVClient: @unchecked Sendable {
log("Initialized, setting up property observers...")
// Subscribe to mpv log messages so we can capture HTTP/demuxer/decoder errors
// and surface them when load fails. "warn" covers HTTP errors, demuxer/codec
// failures, and network issues without flooding on the happy path.
let logLevelResult = mpv_request_log_messages(mpv, "warn")
// Capture HTTP/demuxer/decoder errors to surface on load failure.
// Verbose logging (when enabled) also captures renderer init details.
let mpvLogLevel = MPVLogging.verboseEnabled ? "v" : "warn"
let logLevelResult = mpv_request_log_messages(mpv, mpvLogLevel)
if logLevelResult < 0 {
logWarning("Failed to subscribe to mpv log messages: \(String(cString: mpv_error_string(logLevelResult)))")
}
@@ -394,9 +418,8 @@ final class MPVClient: @unchecked Sendable {
mpv_wakeup(mpv)
}
let hasTask = eventLoopTask != nil
eventLoopTask?.cancel()
eventLoopTask = nil
let hasTask = eventLoopRunning
eventLoopRunning = false
return hasTask
}
@@ -449,6 +472,19 @@ final class MPVClient: @unchecked Sendable {
setOptionSync("target-prim", "bt.709")
setOptionSync("target-trc", "srgb")
#if os(tvOS)
// Avoid the float texture uploads that hang the A8 GL driver (issue #956):
// dithering and LUT scalers (mpv 0.37+ defaults) and CPU frame uploads all
// deadlock. Zero-copy VideoToolbox uploads via IOSurface instead.
if Self.hasFragileGLDriver {
setOptionSync("dither-depth", "no")
setOptionSync("hwdec", "videotoolbox")
setOptionSync("scale", "bilinear")
setOptionSync("dscale", "bilinear")
setOptionSync("cscale", "bilinear")
}
#endif
// Use display-vdrop: drops/repeats frames to match display timing
// This is lighter weight than display-resample (no interpolation overhead)
// and handles both hardware and software decode gracefully.
@@ -1523,9 +1559,18 @@ final class MPVClient: @unchecked Sendable {
// MARK: - Event Loop
private func startEventLoop() {
eventLoopTask = Task.detached(priority: .high) { [weak self] in
// Dedicated OS thread, not the Swift cooperative pool: runEventLoop blocks
// in mpv_wait_event for the client's whole lifetime, and as a Task it would
// permanently occupy a pool thread. On a 2-core device the two live clients
// (active + pre-warmed) would hold both pool threads and starve every await
// in the app (issue #956).
eventLoopRunning = true
let thread = Thread { [weak self] in
self?.runEventLoop()
}
thread.name = "stream.yattee.mpv.events"
thread.qualityOfService = .userInitiated
thread.start()
}
private func runEventLoop() {
@@ -1534,7 +1579,7 @@ final class MPVClient: @unchecked Sendable {
eventLoopExitSemaphore.signal()
}
while !Task.isCancelled && !isDestroyed {
while !isDestroyed {
guard let mpv else { break }
// Wait for events with a short timeout

View File

@@ -448,6 +448,14 @@ final class MPVRenderView: UIView {
// Skip if framebuffer already matches
guard framebufferMismatch else { return }
// Don't recreate the framebuffer for an orphaned (windowless) view: binding
// the CAEAGLLayer off-main would collide with the main-thread CoreAnimation
// commit and pin a CPU (issue #956).
guard window != nil else {
MPVLogging.warn("layoutSubviews: skipped framebuffer recreation (no window)")
return
}
MPVLogging.logTransition("layoutSubviews - size mismatch",
fromSize: CGSize(width: CGFloat(renderWidth), height: CGFloat(renderHeight)),
toSize: CGSize(width: CGFloat(expectedFBWidth), height: CGFloat(expectedFBHeight)))
@@ -487,19 +495,23 @@ final class MPVRenderView: UIView {
MPVLogging.log("setupAsync: creating EAGLContext on background thread")
let glStartTime = Date()
let context = try await Task.detached(priority: .userInitiated) {
// This runs on background thread - doesn't block main thread!
// Bridge through GCD, not Task.detached: EAGLContext creation can block for
// seconds in the GL driver, and a detached task would tie up a Swift
// cooperative-pool thread the app needs elsewhere (issue #956).
let context: EAGLContext = try await withCheckedThrowingContinuation { continuation in
DispatchQueue.global(qos: .userInitiated).async {
if let ctx = EAGLContext(api: .openGLES3) {
MPVLogging.log("setupAsync: created OpenGL ES 3.0 context")
return ctx
continuation.resume(returning: ctx)
} else if let ctx = EAGLContext(api: .openGLES2) {
MPVLogging.log("setupAsync: created OpenGL ES 2.0 context (ES3 unavailable)")
return ctx
continuation.resume(returning: ctx)
} else {
MPVLogging.warn("setupAsync: failed to create EAGLContext")
throw MPVRenderError.openGLSetupFailed
continuation.resume(throwing: MPVRenderError.openGLSetupFailed)
}
}
}
}.value
let glCreateTime = Date().timeIntervalSince(glStartTime)
MPVLogging.log("setupAsync: EAGLContext created",

View File

@@ -538,9 +538,9 @@ final class MPVBackend: PlayerBackend {
LoggingService.shared.logMPV("MPV stream loaded successfully")
} catch is CancellationError {
// Re-throw cancellation errors without retry
// Only reset isInitialLoading if we're still the active load operation
// A newer load may have already set isInitialLoading=true
// Re-throw cancellation errors without retry.
// Only reset isInitialLoading if we're still the active load operation.
LoggingService.shared.debug("MPV: loadWithRetry cancelled", category: .mpv)
if currentLoadingID == loadingID {
isInitialLoading = false
}

View File

@@ -250,6 +250,13 @@ final class PlayerService {
// Mark that we're loading this video - time updates will be ignored until loading completes
loadingVideoID = video.id
// Release the gate on any exit path (a newer play() claims it with its own
// id, so only clear our own). Prevents the time-update gate from leaking if
// the load flow exits early (issue #956).
defer {
if loadingVideoID == video.id { loadingVideoID = nil }
}
state.setPlaybackState(.loading)
state.isFirstFrameReady = false // Reset until first frame of new video is rendered
state.isBufferReady = false // Reset until buffer is ready for smooth playback
@@ -2844,6 +2851,14 @@ extension PlayerService: PlayerBackendDelegate {
func backend(_ backend: any PlayerBackend, didChangeState playbackState: PlaybackState) {
LoggingService.shared.debug("Backend state changed to: \(playbackState)", category: .player)
// Clear the time-update gate once playback is ready/playing, in case the
// load flow exited before doing so (issue #956). Safe: stale updates from a
// previous video can only arrive before the new video's ready transition.
if playbackState == .ready || playbackState == .playing, loadingVideoID != nil {
loadingVideoID = nil
}
state.setPlaybackState(playbackState)
delegate?.playerService(self, didChangeState: playbackState)
}

View File

@@ -86,6 +86,12 @@ private class MPVContainerView: UIView {
}
}
MPVLogging.warn("MPVContainerView deinit: no surviving container to transfer player view to!")
// Detach the shared view now instead of leaving it bound to this
// deallocating container: otherwise SwiftUI keeps reconciling a
// half-alive view and spins the main-thread trait update loop (100%
// CPU hang when opening a settings detail during playback, issue #956).
playerView.removeFromSuperview()
}
}