Merge pull request #25 from muxinc/dj/video-source-duration

bugfix: do not re-ask for currentItem.asset.duration
muxinc · Oct 15, 2019 · 7ba216a · 7ba216a
2 parents a310c75 + fa1c344
commit 7ba216a
Show file tree

Hide file tree

Showing 30 changed files with 16 additions and 18 deletions.
diff --git a/Frameworks/iOS/fat/MUXSDKStats.framework.dSYM/Contents/Info.plist b/Frameworks/iOS/fat/MUXSDKStats.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/Frameworks/iOS/fat/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats b/Frameworks/iOS/fat/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats
diff --git a/Frameworks/iOS/fat/MUXSDKStats.framework/Info.plist b/Frameworks/iOS/fat/MUXSDKStats.framework/Info.plist
diff --git a/Frameworks/iOS/fat/MUXSDKStats.framework/MUXSDKStats b/Frameworks/iOS/fat/MUXSDKStats.framework/MUXSDKStats
diff --git a/Frameworks/iOS/release/MUXSDKStats.framework.dSYM/Contents/Info.plist b/Frameworks/iOS/release/MUXSDKStats.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/Frameworks/iOS/release/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats b/Frameworks/iOS/release/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats
diff --git a/Frameworks/iOS/release/MUXSDKStats.framework/Info.plist b/Frameworks/iOS/release/MUXSDKStats.framework/Info.plist
diff --git a/Frameworks/iOS/release/MUXSDKStats.framework/MUXSDKStats b/Frameworks/iOS/release/MUXSDKStats.framework/MUXSDKStats
diff --git a/Frameworks/iOS/simulator/MUXSDKStats.framework.dSYM/Contents/Info.plist b/Frameworks/iOS/simulator/MUXSDKStats.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/Frameworks/iOS/simulator/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats b/Frameworks/iOS/simulator/MUXSDKStats.framework.dSYM/Contents/Resources/DWARF/MUXSDKStats
diff --git a/Frameworks/iOS/simulator/MUXSDKStats.framework/Info.plist b/Frameworks/iOS/simulator/MUXSDKStats.framework/Info.plist
diff --git a/Frameworks/iOS/simulator/MUXSDKStats.framework/MUXSDKStats b/Frameworks/iOS/simulator/MUXSDKStats.framework/MUXSDKStats
diff --git a/Frameworks/iOS/simulator/MUXSDKStats.framework/_CodeSignature/CodeResources b/Frameworks/iOS/simulator/MUXSDKStats.framework/_CodeSignature/CodeResources
@@ -14,7 +14,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		kroQTbTgWCopfUtPc0wXTdi3JsI=
+		3M48mEVBCS4jouEeXq9pQH2A6MU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>

diff --git a/Frameworks/tvOS/fat/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist b/Frameworks/tvOS/fat/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>0.0.6</string>
 	</dict>

diff --git a/Frameworks/tvOS/fat/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv b/Frameworks/tvOS/fat/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/fat/MUXSDKStatsTv.framework/Info.plist b/Frameworks/tvOS/fat/MUXSDKStatsTv.framework/Info.plist
diff --git a/Frameworks/tvOS/fat/MUXSDKStatsTv.framework/MUXSDKStatsTv b/Frameworks/tvOS/fat/MUXSDKStatsTv.framework/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/release/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist b/Frameworks/tvOS/release/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>0.0.6</string>
 	</dict>

diff --git a/Frameworks/tvOS/release/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv b/Frameworks/tvOS/release/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/release/MUXSDKStatsTv.framework/Info.plist b/Frameworks/tvOS/release/MUXSDKStatsTv.framework/Info.plist
diff --git a/Frameworks/tvOS/release/MUXSDKStatsTv.framework/MUXSDKStatsTv b/Frameworks/tvOS/release/MUXSDKStatsTv.framework/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist b/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.0.1</string>
+		<string>1.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>0.0.6</string>
 	</dict>

diff --git a/...eworks/tvOS/simulator/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv b/...eworks/tvOS/simulator/MUXSDKStatsTv.framework.dSYM/Contents/Resources/DWARF/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/Info.plist b/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/Info.plist
diff --git a/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/MUXSDKStatsTv b/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/MUXSDKStatsTv
diff --git a/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/_CodeSignature/CodeResources b/Frameworks/tvOS/simulator/MUXSDKStatsTv.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		BJMoQbLxuqWxdjTnU7vMRusnRfo=
+		1bYNYxHlNZ1GXQiUCj+ZYJJB54A=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>

diff --git a/MUXSDKStats/MUXSDKStats/Info.plist b/MUXSDKStats/MUXSDKStats/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m b/MUXSDKStats/MUXSDKStats/MUXSDKPlayerBinding.m
@@ -279,13 +279,11 @@ - (void)checkVideoData {
             [videoData setVideoSourceIsLive:@"true"];
         } else {
             [videoData setVideoSourceIsLive:@"false"];
-            if (_player.currentItem && _player.currentItem.asset) {
-                float sec = CMTimeGetSeconds(_player.currentItem.asset.duration);
-                if (sec && sec > 0) {
-                    float ms = sec * 1000;
-                    NSNumber *timeMs = [NSNumber numberWithFloat:ms];
-                    [videoData setVideoSourceDuration:[NSNumber numberWithLongLong:[timeMs longLongValue]]];
-                }
+            float sec = CMTimeGetSeconds(_videoDuration);
+            if (sec && sec > 0) {
+                float ms = sec * 1000;
+                NSNumber *timeMs = [NSNumber numberWithFloat:ms];
+                [videoData setVideoSourceDuration:[NSNumber numberWithLongLong:[timeMs longLongValue]]];
             }
         }
         if (_videoURL) {

diff --git a/MUXSDKStats/MUXSDKStatsTv/Info.plist b/MUXSDKStats/MUXSDKStatsTv/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

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          = '1.0.1'
+  s.version          = '1.0.2'
   s.source           = { :git => 'https://github.com/muxinc/mux-stats-sdk-avplayer.git',
                          :tag => "v#{s.version}" }