feat: implement onAudioTracks and onTextTracks on ios (#3503)

* feat: implement onAudioTracks and onTextTracks on ios * chore: lint code * fix: rework previous fix to fix linter and be more aligned with architecture --------- Co-authored-by: olivier <[email protected]>
TheWidlarzGroup · Feb 1, 2024 · 6a49cba · 6a49cba
1 parent 41e9bcb
commit 6a49cba
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/docs/pages/component/events.md b/docs/pages/component/events.md
@@ -6,7 +6,7 @@ This page shows the list of available callbacks to handle player notifications
 |-------------------------------------------------------------------------------------------------|---------------------------|
 | [onAudioBecomingNoisy](#onaudiobecomingnoisy)                                                   | Android, iOS              |
 | [onAudioFocusChanged](#onaudiofocuschanged)                                                     | Android                   |
-| [onAudioTracks](#onaudiotracks)                                                                 | Android                   |
+| [onAudioTracks](#onaudiotracks)                                                                 | Android, iOS              |
 | [onBandwidthUpdate](#onbandwidthupdate)                                                         | Android                   |
 | [onBuffer](#onbuffer)                                                                           | Android, iOS              |
 | [onEnd](#onend)                                                                                 | All                       |
@@ -27,7 +27,7 @@ This page shows the list of available callbacks to handle player notifications
 | [onRestoreUserInterfaceForPictureInPictureStop](#onrestoreuserinterfaceforpictureinpicturestop) | iOS, visionOS             |
 | [onSeek](#onseek)                                                                               | All                       |
 | [onTimedMetadata](#ontimedmetadata)                                                             | Android, iOS, visionOS    |
-| [onTextTracks](#ontexttracks)                                                                   | Android                   |
+| [onTextTracks](#ontexttracks)                                                                   | Android, iOS              |
 | [onVideoTracks](#onvideotracks)                                                                 | Android                   |
 | [onVolumeChange](#onvolumechange)                                                               | Android, iOS, visionOS    |
 

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
@@ -116,6 +116,8 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
     @objc var onRestoreUserInterfaceForPictureInPictureStop: RCTDirectEventBlock?
     @objc var onGetLicense: RCTDirectEventBlock?
     @objc var onReceiveAdEvent: RCTDirectEventBlock?
+    @objc var onTextTracks: RCTDirectEventBlock?
+    @objc var onAudioTracks: RCTDirectEventBlock?
 
     @objc
     func _onPictureInPictureStatusChanged() {
@@ -367,7 +369,9 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
                     }
 
                     self._player = self._player ?? AVPlayer()
+
                     self._player?.replaceCurrentItem(with: playerItem)
+
                     self._playerObserver.player = self._player
                     self.applyModifiers()
                     self._player?.actionAtItemEnd = .none
@@ -1371,4 +1375,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])
+        }
+    }
 }
diff --git a/ios/Video/RCTVideoManager.m b/ios/Video/RCTVideoManager.m
@@ -64,6 +64,8 @@ @interface RCT_EXTERN_MODULE (RCTVideoManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(onPictureInPictureStatusChanged, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onRestoreUserInterfaceForPictureInPictureStop, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onReceiveAdEvent, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onTextTracks, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onAudioTracks, RCTDirectEventBlock);
 
 RCT_EXTERN_METHOD(save
                   : (NSDictionary*)options reactTag