From fa3259a21b77bb07aab148510b9fa964c8fee149 Mon Sep 17 00:00:00 2001
From: levs42 <lsokolov@logitech.com>
Date: Tue, 6 Aug 2024 11:48:23 -0700
Subject: [PATCH] Handle mediaServicesWereReset notification with lock queue

---
 Sources/IO/IOCaptureSession.swift |  8 --------
 Sources/IO/IOMixer.swift          | 12 ++++++++++++
 Sources/IO/IOStream.swift         | 10 ++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Sources/IO/IOCaptureSession.swift b/Sources/IO/IOCaptureSession.swift
index bd2f8aab5..93664a9c1 100644
--- a/Sources/IO/IOCaptureSession.swift
+++ b/Sources/IO/IOCaptureSession.swift
@@ -236,14 +236,6 @@ final class IOCaptureSession {
             return
         }
         let error = AVError(_nsError: errorValue)
-        switch error.code {
-        #if os(iOS) || os(tvOS)
-        case .mediaServicesWereReset:
-            startRunningIfNeeded()
-        #endif
-        default:
-            break
-        }
         delegate?.captureSession(self, sessionRuntimeError: session, error: error)
     }
 
diff --git a/Sources/IO/IOMixer.swift b/Sources/IO/IOMixer.swift
index d9ed18f88..03cefa6f2 100644
--- a/Sources/IO/IOMixer.swift
+++ b/Sources/IO/IOMixer.swift
@@ -17,6 +17,10 @@ protocol IOMixerDelegate: AnyObject {
     @available(tvOS 17.0, *)
     func mixer(_ mixer: IOMixer, sessionInterruptionEnded session: AVCaptureSession)
     #endif
+    #if os(iOS) || os(tvOS)
+    @available(tvOS 17.0, *)
+    func mixer(_ mixer: IOMixer, mediaServicesWereReset error: AVError)
+    #endif
 }
 
 /// An object that mixies audio and video for streaming.
@@ -164,6 +168,14 @@ extension IOMixer: IOCaptureSessionDelegate {
             break
         }
         #endif
+        switch error.code {
+        #if os(iOS) || os(tvOS)
+        case .mediaServicesWereReset:
+            delegate?.mixer(self, mediaServicesWereReset: error)
+        #endif
+        default:
+            break
+        }
     }
 
     #if os(iOS) || os(tvOS) || os(visionOS)
diff --git a/Sources/IO/IOStream.swift b/Sources/IO/IOStream.swift
index b42eb43b8..ed7073838 100644
--- a/Sources/IO/IOStream.swift
+++ b/Sources/IO/IOStream.swift
@@ -519,6 +519,16 @@ extension IOStream: IOMixerDelegate {
         delegate?.stream(self, sessionInterruptionEnded: session)
     }
     #endif
+
+    #if os(iOS) || os(tvOS)
+    @available(tvOS 17.0, *)
+    func mixer(_ mixer: IOMixer, mediaServicesWereReset error: AVError) {
+        lockQueue.async {
+            self.mixer.session.startRunningIfNeeded()
+        }
+    }
+    #endif
+
 }
 
 extension IOStream: IOTellyUnitDelegate {