Alignment main-dxp with legacy/5.X

ios/.swiftformat

@@ -10,7 +10,5 @@
 
 --enable markTypes
 
---enable isEmpty
-
 --funcattributes "prev-line"
 --maxwidth 160

ios/RCTVideo.xcodeproj/project.pbxproj

@@ -49,6 +49,11 @@
 		0177D39827170A7A00F5BE18 /* RCTVideo-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RCTVideo-Bridging-Header.h"; path = "Video/RCTVideo-Bridging-Header.h"; sourceTree = "<group>"; };
 		0177D39927170A7A00F5BE18 /* RCTVideo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RCTVideo.swift; path = Video/RCTVideo.swift; sourceTree = "<group>"; };
 		134814201AA4EA6300B7C361 /* libRCTVideo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTVideo.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCF8FEFD2C1A174E00CCA6B0 /* CurrentVideos.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CurrentVideos.h; path = Video/CurrentVideos.h; sourceTree = "<group>"; };
+		DCF8FEFE2C1A174E00CCA6B0 /* CurrentVideos.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CurrentVideos.m; path = Video/CurrentVideos.m; sourceTree = "<group>"; };
+		DCF8FEFF2C1A18AC00CCA6B0 /* WeakVideoRef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WeakVideoRef.h; path = Video/WeakVideoRef.h; sourceTree = "<group>"; };
+		DCF8FF002C1A18AC00CCA6B0 /* WeakVideoRef.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = WeakVideoRef.m; path = Video/WeakVideoRef.m; sourceTree = "<group>"; };
+		DCF8FF322C1AF64800CCA6B0 /* M3U8Kit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = M3U8Kit; path = Video/M3U8Kit; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -87,10 +92,15 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				DCF8FF322C1AF64800CCA6B0 /* M3U8Kit */,
 				01489050272001A100E69940 /* DataStructures */,
 				01489051272001A100E69940 /* Features */,
 				0177D39527170A7A00F5BE18 /* RCTSwiftLog */,
 				0177D39927170A7A00F5BE18 /* RCTVideo.swift */,
+				DCF8FEFD2C1A174E00CCA6B0 /* CurrentVideos.h */,
+				DCF8FEFE2C1A174E00CCA6B0 /* CurrentVideos.m */,
+				DCF8FEFF2C1A18AC00CCA6B0 /* WeakVideoRef.h */,
+				DCF8FF002C1A18AC00CCA6B0 /* WeakVideoRef.m */,
 				0177D39727170A7A00F5BE18 /* RCTVideoManager.m */,
 				0177D39227170A7A00F5BE18 /* RCTVideoManager.swift */,
 				0177D39427170A7A00F5BE18 /* RCTVideoPlayerViewController.swift */,

ios/Video/CurrentVideos.h

@@ -0,0 +1,19 @@
+//
+//  CurrentVideos.h
+//  react-native-video
+//
+//  Created by marcin.dziennik on 9/8/23.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCTVideo;
+@interface CurrentVideos : NSObject
++ (instancetype)shared;
+- (void)add:(RCTVideo*)video forTag:(NSNumber*)tag;
+- (nullable RCTVideo*)videoForTag:(NSNumber*)tag;
+@end
+
+NS_ASSUME_NONNULL_END

ios/Video/CurrentVideos.m

@@ -0,0 +1,54 @@
+//
+//  CurrentVideos.m
+//  react-native-video
+//
+//  Created by marcin.dziennik on 9/8/23.
+//
+
+#import "CurrentVideos.h"
+#import "WeakVideoRef.h"
+
+@interface CurrentVideos ()
+@property(strong) NSMutableDictionary<NSNumber*, WeakVideoRef*>* videos;
+@end
+
+@implementation CurrentVideos
+
++ (nonnull instancetype)shared {
+  static CurrentVideos* instance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    instance = [[self alloc] init];
+  });
+  return instance;
+}
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _videos = [[NSMutableDictionary alloc] init];
+  }
+
+  return self;
+}
+
+- (void)add:(nonnull RCTVideo*)video forTag:(nonnull NSNumber*)tag {
+  [self cleanup];
+  WeakVideoRef* ref = [[WeakVideoRef alloc] init];
+  ref.video = video;
+  [_videos setObject:ref forKey:tag];
+}
+
+- (nullable RCTVideo*)videoForTag:(nonnull NSNumber*)tag {
+  [self cleanup];
+  return [[_videos objectForKey:tag] video];
+}
+
+- (void)cleanup {
+  for (NSNumber* key in [_videos allKeys]) {
+    if (_videos[key].video == nil) {
+      [_videos removeObjectForKey:key];
+    }
+  }
+}
+
+@end

ios/Video/Features/RCTPlayerOperations.swift

@@ -1,5 +1,6 @@
 import AVFoundation
 import MediaAccessibility
+import MediaPlayer
 
 let RCTVideoUnset = -1
 
@@ -9,6 +10,8 @@ let RCTVideoUnset = -1
  * Collection of mutating functions
  */
 enum RCTPlayerOperations {
+    static var remoteCommandHandlerForSpatialAudio: Any?
+
     static func setSideloadedText(player: AVPlayer?, textTracks: [TextTrack], criteria: SelectedTrackCriteria?) {
         let type = criteria?.type
 
@@ -116,12 +119,20 @@ enum RCTPlayerOperations {
                 }
             }
         } else { // default. invalid type or "system"
-            await player?.currentItem?.selectMediaOptionAutomatically(in: group)
+            #if os(tvOS)
+            // Do noting. Fix for tvOS native audio menu language selector
+            #else
+                await player?.currentItem?.selectMediaOptionAutomatically(in: group)
+            #endif
             return
         }
-
         // If a match isn't found, option will be nil and text tracks will be disabled
-        await player?.currentItem?.select(mediaOption, in: group)
+        #if os(tvOS)
+        // Do noting. Fix for tvOS native audio menu language selector
+        #else
+            // If a match isn't found, option will be nil and text tracks will be disabled
+            await player?.currentItem?.select(mediaOption, in: group)
+        #endif
     }
 
     static func seek(player: AVPlayer, playerItem: AVPlayerItem, paused: Bool, seekTime: Float, seekTolerance: Float, completion: @escaping (Bool) -> Void) {
@@ -196,4 +207,27 @@ enum RCTPlayerOperations {
             }
         }
     }
+
+    // MARK: - Spatial Audio / Dolby Atmos Workaround
+
+    /* These functions are a temporarily workaround to enable the rendering of Dolby Atmos on
+     * iOS 15 and above.
+     */
+
+    static func addSpatialAudioRemoteCommandHandler() {
+        let command = MPRemoteCommandCenter.shared().playCommand
+
+        remoteCommandHandlerForSpatialAudio = command.addTarget(handler: { _ in
+            MPRemoteCommandHandlerStatus.success
+        })
+    }
+
+    static func removeSpatialAudioRemoteCommandHandler() {
+        let command = MPRemoteCommandCenter.shared().playCommand
+
+        if let remoteCommand = RCTPlayerOperations.remoteCommandHandlerForSpatialAudio {
+            command.removeTarget(remoteCommand)
+            RCTPlayerOperations.remoteCommandHandlerForSpatialAudio = nil
+        }
+    }
 }

ios/Video/M3U8Kit/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Sun Jin <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

ios/Video/M3U8Kit/Source/M3U8ExtXByteRange.h

@@ -0,0 +1,44 @@
+//
+//  M3U8ExtXByteRange.h
+//  M3U8Kit
+//
+//  Created by Frank on 2020/10/1.
+//  Copyright © 2020 M3U8Kit. All rights reserved.
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Sun Jin <[email protected]>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface M3U8ExtXByteRange : NSObject
+
+- (instancetype)initWithAtString:(NSString*)atString;
+- (instancetype)initWithLength:(NSInteger)length offset:(NSInteger)offset;
+
+@property(nonatomic, assign, readonly) NSInteger length;
+@property(nonatomic, assign, readonly) NSInteger offset;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/Video/M3U8Kit/Source/M3U8ExtXByteRange.m

@@ -0,0 +1,54 @@
+//
+//  M3U8ExtXByteRange.m
+//  M3U8Kit
+//
+//  Created by Frank on 2020/10/1.
+//  Copyright © 2020 M3U8Kit. All rights reserved.
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Sun Jin <[email protected]>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#import "M3U8ExtXByteRange.h"
+
+@implementation M3U8ExtXByteRange
+
+- (instancetype)initWithAtString:(NSString*)atString {
+  NSArray<NSString*>* params = [atString componentsSeparatedByString:@"@"];
+  NSInteger length = params.firstObject.integerValue;
+  NSInteger offset = 0;
+  if (params.count > 1) {
+    offset = MAX(0, params[1].integerValue);
+  }
+
+  return [self initWithLength:length offset:offset];
+}
+
+- (instancetype)initWithLength:(NSInteger)length offset:(NSInteger)offset {
+  self = [super init];
+  if (self) {
+    _length = length;
+    _offset = offset;
+  }
+  return self;
+}
+
+@end

ios/Video/M3U8Kit/Source/M3U8ExtXKey.h

@@ -0,0 +1,40 @@
+//
+//  M3U8ExtXKey.h
+//  M3U8Kit
+//
+//  Created by Pierre Perrin on 01/02/2019.
+//  Copyright © 2019 M3U8Kit. All rights reserved.
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Sun Jin <[email protected]>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#import <Foundation/Foundation.h>
+@interface M3U8ExtXKey : NSObject
+
+- (instancetype)initWithDictionary:(NSDictionary*)dictionary;
+
+- (NSString*)method;
+- (NSString*)url;
+- (NSString*)keyFormat;
+- (NSString*)iV;
+
+@end