improvements to MPVGLView

- add Pixel Buffer Object to (PBO)
- add some debug logging
- add scissor testing
- add dirty region checking

Signed-off-by: Toni Förster <toni.foerster@gmail.com>

Model/Player/Backends/AVPlayerBackend.swift

@@ -181,9 +181,7 @@ final class AVPlayerBackend: PlayerBackend {
         {
             seek(to: 0, seekType: .loopRestart)
         }
-        #if !os(macOS)
+
-            model.setAudioSessionActive(true)
-        #endif
         avPlayer.play()
 
         // Setting hasStarted to true the first time player started
@@ -198,9 +196,7 @@ final class AVPlayerBackend: PlayerBackend {
         guard avPlayer.timeControlStatus != .paused else {
             return
         }
-        #if !os(macOS)
+
-            model.setAudioSessionActive(false)
-        #endif
         avPlayer.pause()
         model.objectWillChange.send()
     }
@@ -214,9 +210,6 @@ final class AVPlayerBackend: PlayerBackend {
     }
 
     func stop() {
-        #if !os(macOS)
-            model.setAudioSessionActive(false)
-        #endif
         avPlayer.replaceCurrentItem(with: nil)
         hasStarted = false
     }
@@ -371,7 +364,11 @@ final class AVPlayerBackend: PlayerBackend {
 
         let startPlaying = {
             #if !os(macOS)
-                self.model.setAudioSessionActive(true)
+                do {
+                    try AVAudioSession.sharedInstance().setActive(true)
+                } catch {
+                    self.logger.error("Error setting up audio session: \(error)")
+                }
             #endif
 
             self.setRate(self.model.currentRate)

Model/Player/Backends/MPVBackend.swift

@@ -253,7 +253,11 @@ final class MPVBackend: PlayerBackend {
 
         let startPlaying = {
             #if !os(macOS)
-                self.model.setAudioSessionActive(true)
+                do {
+                    try AVAudioSession.sharedInstance().setActive(true)
+                } catch {
+                    self.logger.error("Error setting up audio session: \(error)")
+                }
             #endif
 
             DispatchQueue.main.async { [weak self] in
@@ -355,9 +359,6 @@ final class MPVBackend: PlayerBackend {
     }
 
     func play() {
-        #if !os(macOS)
-            model.setAudioSessionActive(true)
-        #endif
         startClientUpdates()
         startRefreshRateUpdates()
 
@@ -386,9 +387,6 @@ final class MPVBackend: PlayerBackend {
     }
 
     func pause() {
-        #if !os(macOS)
-            model.setAudioSessionActive(false)
-        #endif
         stopClientUpdates()
         stopRefreshRateUpdates()
 
@@ -410,9 +408,6 @@ final class MPVBackend: PlayerBackend {
     }
 
     func stop() {
-        #if !os(macOS)
-            model.setAudioSessionActive(false)
-        #endif
         stopClientUpdates()
         stopRefreshRateUpdates()
         client?.stop()

Model/Player/PlayerModel.swift

@@ -232,14 +232,6 @@ final class PlayerModel: ObservableObject {
                 name: AVAudioSession.interruptionNotification,
                 object: nil
             )
-
-            // Register for audio session route change notifications
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(handleRouteChange(_:)),
-                name: AVAudioSession.routeChangeNotification,
-                object: AVAudioSession.sharedInstance()
-            )
         #endif
 
         playbackMode = Defaults[.playbackMode]
@@ -258,15 +250,7 @@ final class PlayerModel: ObservableObject {
 
     #if !os(macOS)
         deinit {
-            NotificationCenter.default.removeObserver(
+            NotificationCenter.default.removeObserver(self, name: AVAudioSession.interruptionNotification, object: nil)
-                self, name: AVAudioSession.interruptionNotification, object: nil
-            )
-
-            NotificationCenter.default.removeObserver(
-                self,
-                name: AVAudioSession.routeChangeNotification,
-                object: AVAudioSession.sharedInstance()
-            )
         }
     #endif
 
@@ -1292,27 +1276,12 @@ final class PlayerModel: ObservableObject {
     }
 
     #if !os(macOS)
-        func setAudioSessionActive(_ setActive: Bool) {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
-                do {
-                    try AVAudioSession.sharedInstance().setActive(setActive)
-                } catch {
-                    self.logger.error("Error setting up audio session: \(error)")
-                }
-            }
-        }
-
         @objc func handleAudioSessionInterruption(_ notification: Notification) {
             logger.info("Audio session interruption received.")
-            logger.info("Notification object: \(String(describing: notification.object))")
+            logger.info("Notification received: \(notification)")
 
-            guard let info = notification.userInfo else {
+            guard let info = notification.userInfo,
-                logger.info("userInfo is missing in the notification.")
+                  let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
-                return
-            }
-
-            // Extract the interruption type
-            guard let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
                   let type = AVAudioSession.InterruptionType(rawValue: typeValue)
             else {
                 logger.info("AVAudioSessionInterruptionTypeKey is missing or not a UInt in userInfo.")
@@ -1321,103 +1290,23 @@ final class PlayerModel: ObservableObject {
 
             logger.info("Interruption type received: \(type)")
 
-            // Check availability for iOS 14.5 or newer to handle interruption reason
-            // Currently only for debugging purpose
-            #if os(iOS)
-                if #available(iOS 14.5, *) {
-                    // Extract the interruption reason, if available
-                    if let reasonValue = info[AVAudioSessionInterruptionReasonKey] as? UInt,
-                       let reason = AVAudioSession.InterruptionReason(rawValue: reasonValue)
-                    {
-                        logger.info("Interruption reason received: \(reason)")
-                        switch reason {
-                        case .default:
-                            logger.info("Interruption reason: Default or unspecified interruption occurred.")
-                        case .appWasSuspended:
-                            logger.info("Interruption reason: The app was suspended during the interruption.")
-                        @unknown default:
-                            logger.info("Unknown interruption reason received.")
-                        }
-                    } else {
-                        logger.info("AVAudioSessionInterruptionReasonKey is missing or not a UInt in userInfo.")
-                    }
-                } else {
-                    logger.info("Interruption reason handling is not available on this iOS version.")
-                }
-            #endif
-
-            // Handle the specific interruption type
             switch type {
             case .began:
+                logger.info("Audio session interrupted.")
+                // We need to call pause() to set all variables correctly, and play()
+                // directly afterwards, because the .began interrupt is sent after audio
+                // ducking ended and playback would pause. Audio ducking usually happens
+                // when using headphones.
                 pause()
-                logger.info("Audio session interrupted (began).")
+                play()
             case .ended:
-                // Extract any interruption options, if available
-                if let optionsValue = info[AVAudioSessionInterruptionOptionKey] as? UInt {
-                    logger.info("Interruption options received: \(optionsValue)")
-                    if optionsValue & AVAudioSession.InterruptionOptions.shouldResume.rawValue != 0 {
-                        play()
-                        logger.info("Interruption option indicates playback should resume automatically.")
-                    } else {
-                        logger.info("Interruption option indicates playback should not resume automatically.")
-                    }
-                } else {
-                    logger.info("AVAudioSessionInterruptionOptionKey is missing or not a UInt in userInfo.")
-                }
                 logger.info("Audio session interruption ended.")
-                // Check if audio was resumed or if there's any indication of ducking
+                // We need to call pause() to set all variables correctly.
-                let currentVolume = AVAudioSession.sharedInstance().outputVolume
+                // Otherwise, playback does not resume when the interruption ends.
-                logger.info("Current output volume: \(currentVolume)")
+                pause()
+                play()
             default:
-                logger.info("Unknown interruption type received.")
+                break
-            }
-        }
-
-        @objc func handleRouteChange(_ notification: Notification) {
-            logger.info("Audio route change received.")
-
-            guard let info = notification.userInfo else {
-                logger.info("userInfo is missing in the notification.")
-                return
-            }
-
-            guard let reasonValue = info[AVAudioSessionRouteChangeReasonKey] as? UInt,
-                  let reason = AVAudioSession.RouteChangeReason(rawValue: reasonValue)
-            else {
-                logger.info("AVAudioSessionRouteChangeReasonKey is missing or not a UInt in userInfo.")
-                return
-            }
-
-            logger.info("Route change reason received: \(reason)")
-
-            let currentCategory = AVAudioSession.sharedInstance().category
-            logger.info("Current audio session category before change: \(currentCategory)")
-
-            switch reason {
-            case .categoryChange:
-                logger.info("Audio session category changed.")
-                let newCategory = AVAudioSession.sharedInstance().category
-                logger.info("New audio session category: \(newCategory)")
-            case .oldDeviceUnavailable, .newDeviceAvailable:
-                logger.info("Audio route change may indicate ducking or device change.")
-                let currentRoute = AVAudioSession.sharedInstance().currentRoute
-                logger.info("Current audio route: \(currentRoute)")
-
-                for output in currentRoute.outputs {
-                    logger.info("Output port type: \(output.portType), UID: \(output.uid)")
-                    switch output.portType {
-                    case .headphones, .bluetoothA2DP:
-                        logger.info("Detected port type \(output.portType). Executing play().")
-                        play()
-                    default:
-                        logger.info("Detected port type \(output.portType). Executing pause().")
-                        pause()
-                    }
-                }
-            case .noSuitableRouteForCategory:
-                logger.info("No suitable route for the current category.")
-            default:
-                logger.info("Unhandled route change reason: \(reason)")
             }
         }
     #endif

Open in Yattee/Open in Yattee.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.78Z5H3M6RJ.stream.yattee.app.urlbookmarks</string>
+		<string>group.ZYMM2HKXY2.yattee.app.url</string>
 	</array>
 </dict>
 </plist>

Shared/Player/MPV/MPVOGLView.swift

@@ -11,6 +11,7 @@ final class MPVOGLView: GLKView {
     var mpvGL: UnsafeMutableRawPointer?
     var queue = DispatchQueue(label: "stream.yattee.opengl", qos: .userInteractive)
     var needsDrawing = true
+    private var dirtyRegion: CGRect?
 
     override init(frame: CGRect) {
         guard let context = EAGLContext(api: .openGLES2) else {
@@ -85,6 +86,7 @@ final class MPVOGLView: GLKView {
     @objc private func updateFrame() {
         // Trigger the drawing process if needed
         if needsDrawing {
+            markRegionAsDirty(bounds)
             setNeedsDisplay()
         }
     }
@@ -100,16 +102,60 @@ final class MPVOGLView: GLKView {
         glClear(UInt32(GL_COLOR_BUFFER_BIT))
     }
 
+    // Function to set a dirty region when a part of the screen changes
+    func markRegionAsDirty(_ region: CGRect) {
+        if dirtyRegion == nil {
+            dirtyRegion = region
+        } else {
+            // Expand the dirty region to include the new region
+            dirtyRegion = dirtyRegion!.union(region)
+        }
+    }
+
+    // Logic to decide if only part of the screen needs updating
+    private func needsPartialUpdate() -> Bool {
+        // Check if there is a defined dirty region that needs updating
+        if let dirtyRegion, !dirtyRegion.isEmpty {
+            // Set up glScissor based on dirtyRegion coordinates
+            glScissor(GLint(dirtyRegion.origin.x), GLint(dirtyRegion.origin.y), GLsizei(dirtyRegion.width), GLsizei(dirtyRegion.height))
+            return true
+        }
+        return false
+    }
+
+    // Call this function when you know the entire screen needs updating
+    private func clearDirtyRegion() {
+        dirtyRegion = nil
+    }
+
     override func draw(_: CGRect) {
         guard needsDrawing, let mpvGL else { return }
 
+        // Ensure the correct context is set
+        guard EAGLContext.setCurrent(context) else {
+            logger.error("Failed to set current OpenGL context.")
+            return
+        }
+
         // Bind the default framebuffer
         glGetIntegerv(UInt32(GL_FRAMEBUFFER_BINDING), &defaultFBO!)
 
+        // Ensure the framebuffer is valid
+        guard defaultFBO != nil && defaultFBO! != 0 else {
+            logger.error("Invalid framebuffer ID.")
+            return
+        }
+
         // Get the current viewport dimensions
         var dims: [GLint] = [0, 0, 0, 0]
         glGetIntegerv(GLenum(GL_VIEWPORT), &dims)
 
+        // Check if we need partial updates
+        if needsPartialUpdate() {
+            logger.info("Performing partial update with scissor test.")
+            glEnable(GLenum(GL_SCISSOR_TEST))
+        }
+
         // Set up the OpenGL FBO data
         var data = mpv_opengl_fbo(
             fbo: Int32(defaultFBO!),
@@ -129,9 +175,23 @@ final class MPVOGLView: GLKView {
                     mpv_render_param(type: MPV_RENDER_PARAM_FLIP_Y, data: flipPtr),
                     mpv_render_param()
                 ]
-                mpv_render_context_render(OpaquePointer(mpvGL), &params)
+                // Call the render function and check for errors
+                let result = mpv_render_context_render(OpaquePointer(mpvGL), &params)
+                if result < 0 {
+                    logger.error("mpv_render_context_render() failed with error code: \(result)")
+                } else {
+                    logger.info("mpv_render_context_render() called successfully.")
+                }
             }
         }
+
+        // Disable the scissor test after rendering if it was enabled
+        if needsPartialUpdate() {
+            glDisable(GLenum(GL_SCISSOR_TEST))
+        }
+
+        // Clear dirty region after drawing
+        clearDirtyRegion()
     }
 }