chore: update demo

Author: cxfksword

.gitignore

@@ -118,4 +118,6 @@ temp/
 dist/
 *.log
 *.xcframework
-Package.resolved
+Package.resolved
+buildServer.json
+.vscode

Demo/Demo-iOS/Demo-iOS/Player/OpenGL/MPVViewController.swift

@@ -2,14 +2,24 @@ import Foundation
 import GLKit
 import Libmpv
 
+/**
+ Warning: OpenGL rendering can not play 10bit videos correctly on iOS/tvOS.
+ https://github.com/mpv-player/mpv/issues/7846
+ */
 class MPVViewController: GLKViewController {
     var mpv: OpaquePointer!
     var mpvGL: OpaquePointer!
     var playDelegate: MPVPlayerDelegate?
     var queue: DispatchQueue = DispatchQueue(label: "mpv", qos: .userInteractive)
     private var defaultFBO: GLint = -1
     var playUrl: URL?
-    
+    var isSimulator: Bool {
+#if targetEnvironment(simulator)
+        return true
+#else
+        return false
+#endif
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -55,7 +65,7 @@ class MPVViewController: GLKViewController {
 #endif
         checkError(mpv_set_option_string(mpv, "subs-match-os-language", "yes"))
         checkError(mpv_set_option_string(mpv, "subs-fallback", "yes"))
-        checkError(mpv_set_option_string(mpv, "hwdec", machine == "x86_64" ? "no" : "auto-safe"))
+        checkError(mpv_set_option_string(mpv, "hwdec", isSimulator ? "no" : "videotoolbox"))
         checkError(mpv_set_option_string(mpv, "vo", "libmpv"))
 
         checkError(mpv_initialize(mpv))
@@ -176,7 +186,9 @@ class MPVViewController: GLKViewController {
 
 
     func readEvents() {
-        queue.async { [self] in
+        queue.async { [weak self] in
+            guard let self else { return }
+
             while self.mpv != nil {
                 let event = mpv_wait_event(self.mpv, 0)
                 if event!.pointee.event_id == MPV_EVENT_NONE {

Demo/Demo-macOS/Demo-macOS/Player/Metal/MPVMetalViewController.swift

@@ -114,12 +114,12 @@ final class MPVMetalViewController: NSViewController {
         mpv_observe_property(mpv, 0, MPVProperty.videoParamsColormatrix, MPV_FORMAT_STRING)
         mpv_observe_property(mpv, 0, MPVProperty.pausedForCache, MPV_FORMAT_FLAG)
         mpv_set_wakeup_callback(self.mpv, { (ctx) in
-            let client = unsafeBitCast(ctx, to: MPVMetalViewController.self)
-            client.readEvents()
-        }, UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque()))
+            guard let client = ctx else { return }
+            let viewController = Unmanaged<MPVMetalViewController>.fromOpaque(client).takeUnretainedValue()
+            viewController.readEvents()
+        }, Unmanaged.passRetained(self).toOpaque())
     }
 
-    
     func loadFile(
         _ url: URL,
         time: Double? = nil
@@ -214,7 +214,9 @@ final class MPVMetalViewController: NSViewController {
     }
 
     func readEvents() {
-        queue.async { [self] in
+        queue.async { [weak self] in
+            guard let self else { return }
+
             while self.mpv != nil {
                 let event = mpv_wait_event(self.mpv, 0)
                 if event?.pointee.event_id == MPV_EVENT_NONE {
@@ -261,6 +263,24 @@ final class MPVMetalViewController: NSViewController {
         }
     }
 
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+        
+        if mpv != nil {
+            mpv_set_wakeup_callback(mpv, nil, nil)
+            
+            // Wait for any pending queue operations to complete
+            queue.sync {
+                if self.mpv != nil {
+                    mpv_terminate_destroy(self.mpv)
+                    self.mpv = nil
+                }
+            }
+            
+            // Release the retained self from wakeup callback
+            Unmanaged.passUnretained(self).release()
+        }
+    }
 
     private func checkError(_ status: CInt) {
         if status < 0 {

Demo/Demo-macOS/Demo-macOS/Player/OpenGL/MPVOGLView.swift

@@ -172,7 +172,9 @@ final class MPVOGLView: NSOpenGLView {
 
 
     func readEvents() {
-        queue.async { [self] in
+        queue.async { [weak self] in
+            guard let self else { return }
+
             while self.mpv != nil {
                 let event = mpv_wait_event(self.mpv, 0)
                 if event!.pointee.event_id == MPV_EVENT_NONE {

Demo/Demo-tvOS/Demo-tvOS/Player/OpenGL/MPVViewController.swift

@@ -2,6 +2,10 @@ import Foundation
 import GLKit
 import Libmpv
 
+/**
+ Warning: OpenGL rendering can not play 10bit videos correctly on iOS/tvOS.
+ https://github.com/mpv-player/mpv/issues/7846
+ */
 class MPVViewController: GLKViewController {
     var mpv: OpaquePointer!
     var mpvGL: OpaquePointer!
@@ -10,6 +14,14 @@ class MPVViewController: GLKViewController {
     private var defaultFBO: GLint = -1
     var playUrl: URL?
 
+    var isSimulator: Bool {
+#if targetEnvironment(simulator)
+        return true
+#else
+        return false
+#endif
+    }
+    
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -55,7 +67,7 @@ class MPVViewController: GLKViewController {
 #endif
         checkError(mpv_set_option_string(mpv, "subs-match-os-language", "yes"))
         checkError(mpv_set_option_string(mpv, "subs-fallback", "yes"))
-        checkError(mpv_set_option_string(mpv, "hwdec", machine == "x86_64" ? "no" : "auto-safe"))
+        checkError(mpv_set_option_string(mpv, "hwdec", isSimulator ? "no" : "videotoolbox"))
         checkError(mpv_set_option_string(mpv, "vo", "libmpv"))
 
         checkError(mpv_initialize(mpv))
@@ -176,7 +188,9 @@ class MPVViewController: GLKViewController {
 
 
     func readEvents() {
-        queue.async { [self] in
+        queue.async { [weak self] in
+            guard let self else { return }
+
             while self.mpv != nil {
                 let event = mpv_wait_event(self.mpv, 0)
                 if event!.pointee.event_id == MPV_EVENT_NONE {