Releases/v4.1.0 (#248)

* fix: improve AVPlayer currentItem transition handling (#247) * fix: dispatch view end when AVPlayerItem changes end the view when there is a new AVPlayerItem * fix: skip dispatching view init when player has no player item * build: update core library dependency
muxinc · Aug 16, 2024 · dec068f · dec068f
1 parent 705cb2b
commit dec068f
Show file tree

Hide file tree

Showing 36 changed files with 127 additions and 113 deletions.
diff --git a/MUXSDKStats.json b/MUXSDKStats.json
@@ -21,5 +21,6 @@
     "3.6.0": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.6.0/MUXSDKStats.xcframework.zip",
     "3.6.1": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.6.1/MUXSDKStats.xcframework.zip",
     "3.6.2": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v3.6.2/MUXSDKStats.xcframework.zip",
-    "4.0.0": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v4.0.0/MUXSDKStats.xcframework.zip"
+    "4.0.0": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v4.0.0/MUXSDKStats.xcframework.zip",
+    "4.1.0": "https://github.com/muxinc/mux-stats-sdk-avplayer/releases/download/v4.1.0/MUXSDKStats.xcframework.zip"
 }
diff --git a/MUXSDKStats/MUXSDKStats.xcodeproj/project.pbxproj b/MUXSDKStats/MUXSDKStats.xcodeproj/project.pbxproj
@@ -773,7 +773,7 @@
 					"@loader_path/Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsVision/module.modulemap";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -821,7 +821,7 @@
 					"@loader_path/Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsVision/module.modulemap";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
@@ -917,7 +917,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsTv/module.modulemap";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTv;
@@ -951,7 +951,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				MODULEMAP_FILE = "$(SRCROOT)/MUXSDKStatsTv/module.modulemap";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.tvos.MUXSDKStatsTv;
 				PRODUCT_NAME = MUXSDKStats;
@@ -1134,7 +1134,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.ios.MUXSDKStats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1168,7 +1168,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mux.stats.ios.MUXSDKStats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1284,7 +1284,7 @@
 			repositoryURL = "https://github.com/muxinc/stats-sdk-objc";
 			requirement = {
 				kind = exactVersion;
-				version = 5.0.1;
+				version = 5.1.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m b/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m
@@ -14,7 +14,7 @@
 
 // SDK constants.
 NSString *const MUXSDKPluginName = @"apple-mux";
-NSString *const MUXSDKPluginVersion = @"4.0.0";
+NSString *const MUXSDKPluginVersion = @"4.1.0";
 NSString *const MUXSessionDataPrefix = @"io.litix.data.";
 
 // Min number of seconds between timeupdate events. (100ms)
@@ -367,15 +367,16 @@ - (void) safelyRemovePlayerItemObserverForKeyPath:(NSString *)keyPath {
 }
 
 - (void)detachAVPlayer {
+//    NSLog(@"%s: Detaching AVPlayer", __PRETTY_FUNCTION__);
+    if (_playerItem) {
+        [self stopMonitoringAVPlayerItem];
+    }
     [self safelyRemoveTimeObserverForPlayer];
     [self safelyRemovePlayerObserverForKeyPath:@"rate"];
     [self safelyRemovePlayerObserverForKeyPath:@"status"];
     [self safelyRemovePlayerObserverForKeyPath:@"currentItem"];
     [self safelyRemovePlayerObserverForKeyPath:@"timeControlStatus"];
     _player = nil;
-    if (_playerItem) {
-        [self stopMonitoringAVPlayerItem];
-    }
     if (_timeUpdateTimer) {
         [_timeUpdateTimer invalidate];
         _timeUpdateTimer = nil;
@@ -390,9 +391,14 @@ - (void)monitorAVPlayerItem {
         if (_didTriggerManualVideoChange) {
             _didTriggerManualVideoChange = false;
         }
+//        NSLog(@"%s: Dispatching View End", __PRETTY_FUNCTION__);
+        [self dispatchViewEnd];
         [self stopMonitoringAVPlayerItem];
 
-        [self.playDispatchDelegate videoChangedForPlayer:_name];
+        if (_player.currentItem) {
+            NSLog(@"Player: %@ Current Item: %@", _player, _player.currentItem);
+            [self.playDispatchDelegate videoChangedForPlayer:_name];
+        }
 
         //
         // Special case for AVQueuePlayer
@@ -461,13 +467,13 @@ - (void)dispatchSessionData {
 }
 
 - (void)stopMonitoringAVPlayerItem {
-    if (!_isAdPlaying) {
-        [MUXSDKCore destroyPlayer: _name];
-    }
-
     [self safelyRemovePlayerItemObserverForKeyPath:@"status"];
     [self safelyRemovePlayerItemObserverForKeyPath:@"playbackBufferEmpty"];
     _playerItem = nil;
+    if (!_isAdPlaying) {
+//        NSLog(@"%s: MUXSDKCore destroyPlayer", __PRETTY_FUNCTION__);
+        [MUXSDKCore destroyPlayer: _name];
+    }
 }
 
 - (void) programChangedForPlayer {

diff --git a/Mux-Stats-AVPlayer.podspec b/Mux-Stats-AVPlayer.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = 'Mux-Stats-AVPlayer'
 
-  s.version          = '4.0.0'
+  s.version          = '4.1.0'
   s.source           = { :git => 'https://github.com/muxinc/mux-stats-sdk-avplayer.git',
                          :tag => "v#{s.version}" }
 
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.license          = 'Apache 2.0'
   s.author           = { 'Mux' => '[email protected]' }
 
-  s.dependency 'Mux-Stats-Core', '5.0.1'
+  s.dependency 'Mux-Stats-Core', '5.1.0'
 
   s.ios.deployment_target = '12.0'
   s.ios.vendored_frameworks = 'XCFramework/MUXSDKStats.xcframework'

diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/muxinc/stats-sdk-objc.git",
-            exact: "5.0.1"
+            exact: "5.1.0"
         )
     ],
     targets: [

diff --git a/[email protected] b/[email protected]
@@ -14,7 +14,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/muxinc/stats-sdk-objc.git",
-            exact: "5.0.1"
+            exact: "5.1.0"
         )
     ],
     targets: [

diff --git a/XCFramework/MUXSDKStats.xcframework/Info.plist b/XCFramework/MUXSDKStats.xcframework/Info.plist
@@ -25,24 +25,21 @@
 			<key>BinaryPath</key>
 			<string>MUXSDKStats.framework/MUXSDKStats</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64_x86_64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>MUXSDKStats.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>MUXSDKStats.framework/MUXSDKStats</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>MUXSDKStats.framework</string>
 			<key>SupportedArchitectures</key>
@@ -51,29 +48,32 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>MUXSDKStats.framework/MUXSDKStats</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>MUXSDKStats.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>MUXSDKStats.framework/MUXSDKStats</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>xros-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>MUXSDKStats.framework</string>
 			<key>SupportedArchitectures</key>
@@ -82,7 +82,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>xros</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>

diff --git a/XCFramework/MUXSDKStats.xcframework/_CodeSignature/CodeDirectory b/XCFramework/MUXSDKStats.xcframework/_CodeSignature/CodeDirectory
diff --git a/XCFramework/MUXSDKStats.xcframework/_CodeSignature/CodeRequirements-1 b/XCFramework/MUXSDKStats.xcframework/_CodeSignature/CodeRequirements-1