fix: rework previous fix to fix linter and be more aligned with archi…

…tecture
TheWidlarzGroup · Jan 30, 2024 · 1e1ca65 · 1e1ca65
1 parent b9c18d7
commit 1e1ca65
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/ios/Video/Features/RCTPlayerObserver.swift b/ios/Video/Features/RCTPlayerObserver.swift
@@ -25,6 +25,7 @@ protocol RCTPlayerObserverHandler: RCTPlayerObserverHandlerObjc {
     func handleVolumeChange(player: AVPlayer, change: NSKeyValueObservedChange<Float>)
     func handleExternalPlaybackActiveChange(player: AVPlayer, change: NSKeyValueObservedChange<Bool>)
     func handleViewControllerOverlayViewFrameChange(overlayView: UIView, change: NSKeyValueObservedChange<CGRect>)
+    func handleTracksChange(playerItem: AVPlayerItem, change: NSKeyValueObservedChange<[AVPlayerItemTrack]>)
 }
 
 // MARK: - RCTPlayerObserver
@@ -96,6 +97,7 @@ class RCTPlayerObserver: NSObject, AVPlayerItemMetadataOutputPushDelegate {
     private var _playerViewControllerReadyForDisplayObserver: NSKeyValueObservation?
     private var _playerLayerReadyForDisplayObserver: NSKeyValueObservation?
     private var _playerViewControllerOverlayFrameObserver: NSKeyValueObservation?
+    private var _playerTracksObserver: NSKeyValueObservation?
 
     deinit {
         if let _handlers {
@@ -141,13 +143,21 @@ class RCTPlayerObserver: NSObject, AVPlayerItemMetadataOutputPushDelegate {
             options: [.new, .old],
             changeHandler: _handlers.handlePlaybackLikelyToKeepUp
         )
+
+        // observe tracks update
+        _playerTracksObserver = playerItem.observe(
+            \.tracks,
+            options: [.new, .old],
+            changeHandler: _handlers.handleTracksChange
+        )
     }
 
     func removePlayerItemObservers() {
         _playerItemStatusObserver?.invalidate()
         _playerPlaybackBufferEmptyObserver?.invalidate()
         _playerPlaybackLikelyToKeepUpObserver?.invalidate()
         _playerTimedMetadataObserver?.invalidate()
+        _playerTracksObserver?.invalidate()
     }
 
     func addPlayerViewControllerObservers() {

diff --git a/ios/Video/RCTVideo.swift b/ios/Video/RCTVideo.swift
@@ -248,19 +248,6 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
         }
     }
 
-    /// Tracks notifications is handled here.
-    override func observeValue(forKeyPath keyPath: String?,
-                               of _: Any?,
-                               change _: [NSKeyValueChangeKey: Any]?,
-                               context _: UnsafeMutableRawPointer?) {
-        if keyPath == #keyPath(AVPlayerItem.tracks) {
-            all(RCTVideoUtils.getAudioTrackInfo(self._player), RCTVideoUtils.getTextTrackInfo(self._player)).then { audioTracks, textTracks in
-                self.onTextTracks?(["textTracks": textTracks])
-                self.onAudioTracks?(["audioTracks": audioTracks])
-            }
-        }
-    }
-
     // MARK: - Progress
 
     func sendProgressUpdate() {
@@ -377,13 +364,9 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
                     }
 
                     self._player = self._player ?? AVPlayer()
+
                     self._player?.replaceCurrentItem(with: playerItem)
 
-                    // observe tracks update
-                    self._player?.currentItem?.addObserver(self,
-                                                           forKeyPath: #keyPath(AVPlayerItem.tracks),
-                                                           options: [.old, .new],
-                                                           context: nil)
                     self._playerObserver.player = self._player
                     self.applyModifiers()
                     self._player?.actionAtItemEnd = .none
@@ -1387,4 +1370,11 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
 
         onVideoBandwidthUpdate?(["bitrate": lastEvent.observedBitrate, "target": reactTag])
     }
+
+    func handleTracksChange(playerItem _: AVPlayerItem, change _: NSKeyValueObservedChange<[AVPlayerItemTrack]>) {
+        all(RCTVideoUtils.getAudioTrackInfo(self._player), RCTVideoUtils.getTextTrackInfo(self._player)).then { audioTracks, textTracks in
+            self.onTextTracks?(["textTracks": textTracks])
+            self.onAudioTracks?(["audioTracks": audioTracks])
+        }
+    }
 }