From f6032969c3ee3761a7469a114b9ebbb1254e6b03 Mon Sep 17 00:00:00 2001
From: Acaki <github-20201224@wdy.one>
Date: Sun, 13 Jul 2025 22:07:40 +0800
Subject: [PATCH] fix(AVSB): black screen when turning screen off and on

---
 VoidLink/Stream/VideoDecoderRenderer.m        | 29 ++++++++-----------
 .../StreamFrameViewController.m               |  5 +---
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/VoidLink/Stream/VideoDecoderRenderer.m b/VoidLink/Stream/VideoDecoderRenderer.m
index a97d0a77..9c6620f0 100644
--- a/VoidLink/Stream/VideoDecoderRenderer.m
+++ b/VoidLink/Stream/VideoDecoderRenderer.m
@@ -213,8 +213,9 @@ extern int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size,
 
         // Recreate the display layer. We are already on the main thread,
         // so this is safe to do right here.
+        [self->_displayLayer flushAndRemoveImage];
         [self reinitializeDisplayLayer];
-
+        
         // Request an IDR frame to initialize the new decoder
         LiRequestIdrFrame();
     }
@@ -729,21 +730,6 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit);
         return DR_NEED_IDR;
     }
     
-    // Check for previous decoder errors before doing anything
-    if (_displayLayer.status == AVQueuedSampleBufferRenderingStatusFailed) {
-        Log(LOG_E, @"Display layer rendering failed: %@", _displayLayer.error);
-
-        [self->_displayLayer flushAndRemoveImage];
-
-        // Recreate the display layer. We are already on the main thread,
-        // so this is safe to do right here.
-        [self reinitializeDisplayLayer];
-        
-        // Request an IDR frame to initialize the new decoder
-        free(data);
-        return DR_NEED_IDR;
-    }
-    
     // Now we're decoding actual frame data here
     CMBlockBufferRef frameBlockBuffer;
     CMBlockBufferRef dataBlockBuffer;
@@ -909,7 +895,16 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit);
           if (status != noErr || !imageBuffer) {
             NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil];
             Log(LOG_E, @"Decompression session error: %@", error);
-            LiRequestIdrFrame();
+            if (status == kVTInvalidSessionErr) {
+                // The session was invalidated by the OS. Destroy our reference
+                // so it gets recreated on the next IDR frame.
+                if (self->_decompressionSession) {
+                    VTDecompressionSessionInvalidate(self->_decompressionSession);
+                    CFRelease(self->_decompressionSession);
+                    self->_decompressionSession = nil;
+                }
+            }
+            LiRequestIdrFrame(); // Request an IDR to restart the stream
             return;
           }
 
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m
index 28b2b957..51367372 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.m
+++ b/VoidLink/ViewControllers/StreamFrameViewController.m
@@ -929,10 +929,7 @@
         [self.pipController stopPictureInPicture];
     }
     
-    if (_isRestoringFromPiP) {
-        [self->_streamMan.videoRenderer resetFramePacing];
-    }
-
+    [self->_streamMan.videoRenderer resetFramePacing];
     _isRestoringFromPiP = NO;
 }