Merge pull request #20 from muxinc/dj/extract-ima-listener

Extract ima listener

Frameworks/iOS/fat/MUXSDKStats.framework.dSYM/Contents/Info.plist

@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.1.5</string>
+		<string>1.0.0</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

Frameworks/iOS/fat/MUXSDKStats.framework/Headers/MUXSDKPlayerBinding.h

@@ -0,0 +1,89 @@
+#ifndef MUXSDKPlayerBinding_h
+#define MUXSDKPlayerBinding_h
+
+#import <Foundation/Foundation.h>
+
+@import AVKit;
+@import AVFoundation;
+#if TARGET_OS_IOS
+@import MuxCore;
+#else
+@import MuxCoreTv;
+#endif
+
+typedef NS_ENUM(NSUInteger, MUXSDKPlayerState) {
+    MUXSDKPlayerStateReady,
+    MUXSDKPlayerStateViewInit,
+    MUXSDKPlayerStatePlay,
+    MUXSDKPlayerStateBuffering,
+    MUXSDKPlayerStatePlaying,
+    MUXSDKPlayerStatePaused,
+    MUXSDKPlayerStateError,
+    MUXSDKPlayerStateViewEnd,
+};
+
+
+@interface MUXSDKPlayerBinding : NSObject {
+@private
+    NSString *_name;
+    NSString *_software;
+    AVPlayer *_player;
+    AVPlayerItem *_playerItem;
+    id _timeObserver;
+    MUXSDKPlayerState _state;
+    CGSize _videoSize;
+    CMTime _videoDuration;
+    BOOL _videoIsLive;
+    NSString *_videoURL;
+    CFAbsoluteTime _lastTimeUpdate;
+    NSTimer *_timeUpdateTimer;
+    CFAbsoluteTime _lastPlayheadTimeUpdated;
+    float _lastPlayheadTimeMs;
+    BOOL _seeking;
+    BOOL _started;
+    NSUInteger _lastMediaRequest;
+    NSUInteger _lastMediaRequestBytes;
+    NSUInteger _lastErrorLogEventCount;
+    NSUInteger _lastTransferEventCount;
+    double _lastTransferDuration;
+    long long _lastTransferredBytes;
+}
+
+- (id)initWithName:(NSString *)name andSoftware:(NSString *)software;
+- (void)attachAVPlayer:(AVPlayer *)player;
+- (void)detachAVPlayer;
+- (CGRect)getViewBounds;
+- (void)dispatchViewInit;
+- (void)dispatchPlayerReady;
+- (void)dispatchPlay;
+- (void)dispatchPlaying;
+- (void)dispatchPause;
+- (void)dispatchTimeUpdateEvent:(CMTime)time;
+- (void)dispatchError;
+- (void)dispatchViewEnd;
+- (void)dispatchAdEvent:(MUXSDKPlaybackEvent *)event;
+- (float)getCurrentPlayheadTimeMs;
+@end
+
+
+@interface MUXSDKAVPlayerViewControllerBinding : MUXSDKPlayerBinding {
+@private
+    AVPlayerViewController *_viewController;
+}
+
+- (id)initWithName:(NSString *)name software:(NSString *)software andView:(AVPlayerViewController *)view;
+
+@end
+
+
+@interface MUXSDKAVPlayerLayerBinding : MUXSDKPlayerBinding {
+@private
+    AVPlayerLayer *_view;
+}
+
+- (id)initWithName:(NSString *)name software:(NSString *)software andView:(AVPlayerLayer *)view;
+
+@end
+
+
+#endif

Frameworks/iOS/fat/MUXSDKStats.framework/Headers/MUXSDKStats.h

@@ -26,10 +26,10 @@
 @import AVFoundation;
 #if TARGET_OS_IOS
 @import MuxCore;
-#import "MUXSDKImaListener.h"
 #else
 @import MuxCoreTv;
 #endif
+#import "MUXSDKPlayerBinding.h"
 
 FOUNDATION_EXPORT
 @interface MUXSDKStats : NSObject
@@ -44,9 +44,10 @@ FOUNDATION_EXPORT
  @param       name A name for this instance of the player
  @param       playerData A MUXSDKCustomerPlayerData object with player metadata
  @param       videoData A MUXSDKCustomerVideoData object with video metadata
+ @return      an instance of MUXSDKAVPlayerLayerBinding or null
  @discussion  Use this method to start a Mux player monitor on the given AVPlayerViewController. The player must have a name which is globally unique. The config provided should match the specifications in the Mux docs at https://docs.mux.com
  */
-+ (void)monitorAVPlayerViewController:(nonnull AVPlayerViewController *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
++ (MUXSDKPlayerBinding *_Nullable)monitorAVPlayerViewController:(nonnull AVPlayerViewController *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
 /*!
  @method      updateAVPlayerViewController:withPlayerName
@@ -64,9 +65,10 @@ FOUNDATION_EXPORT
  @param       name A name for this instance of the player
  @param       playerData A MUXSDKCustomerPlayerData object with player metadata
  @param       videoData A MUXSDKCustomerVideoData object with video metadata
+ @return      an instance of MUXSDKAVPlayerLayerBinding or null
  @discussion  Use this method to start a Mux player monitor on the given AVPlayerLayer. The player must have a name which is globally unique. The config provided should match the specifications in the Mux docs at https://docs.mux.com
  */
-+ (void)monitorAVPlayerLayer:(nonnull AVPlayerLayer *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
++ (MUXSDKPlayerBinding *_Nullable)monitorAVPlayerLayer:(nonnull AVPlayerLayer *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
 /*!
  @method      updateAVPlayerLayer:withPlayerName:
@@ -104,14 +106,4 @@ FOUNDATION_EXPORT
  */
 + (void)programChangeForPlayer:(nonnull NSString *)name withVideoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
-/*!
- @method      getImaAdsListener:
- @abstract    Return an IMA Ads listener for Ad analytic collection
- @param       name The name of the player
- @return      an IMA event listener
- @discussion  Use this method to return an IMA Ads listener to collect IMA Ad event and Ad error event.
- */
-#if TARGET_OS_IOS
-+ (MUXSDKImaListener *)getImaAdsListener:(nonnull NSString *)name;
-#endif
 @end

Frameworks/iOS/release/MUXSDKStats.framework.dSYM/Contents/Info.plist

@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.1.5</string>
+		<string>1.0.0</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

Frameworks/iOS/release/MUXSDKStats.framework/Headers/MUXSDKPlayerBinding.h

@@ -0,0 +1,89 @@
+#ifndef MUXSDKPlayerBinding_h
+#define MUXSDKPlayerBinding_h
+
+#import <Foundation/Foundation.h>
+
+@import AVKit;
+@import AVFoundation;
+#if TARGET_OS_IOS
+@import MuxCore;
+#else
+@import MuxCoreTv;
+#endif
+
+typedef NS_ENUM(NSUInteger, MUXSDKPlayerState) {
+    MUXSDKPlayerStateReady,
+    MUXSDKPlayerStateViewInit,
+    MUXSDKPlayerStatePlay,
+    MUXSDKPlayerStateBuffering,
+    MUXSDKPlayerStatePlaying,
+    MUXSDKPlayerStatePaused,
+    MUXSDKPlayerStateError,
+    MUXSDKPlayerStateViewEnd,
+};
+
+
+@interface MUXSDKPlayerBinding : NSObject {
+@private
+    NSString *_name;
+    NSString *_software;
+    AVPlayer *_player;
+    AVPlayerItem *_playerItem;
+    id _timeObserver;
+    MUXSDKPlayerState _state;
+    CGSize _videoSize;
+    CMTime _videoDuration;
+    BOOL _videoIsLive;
+    NSString *_videoURL;
+    CFAbsoluteTime _lastTimeUpdate;
+    NSTimer *_timeUpdateTimer;
+    CFAbsoluteTime _lastPlayheadTimeUpdated;
+    float _lastPlayheadTimeMs;
+    BOOL _seeking;
+    BOOL _started;
+    NSUInteger _lastMediaRequest;
+    NSUInteger _lastMediaRequestBytes;
+    NSUInteger _lastErrorLogEventCount;
+    NSUInteger _lastTransferEventCount;
+    double _lastTransferDuration;
+    long long _lastTransferredBytes;
+}
+
+- (id)initWithName:(NSString *)name andSoftware:(NSString *)software;
+- (void)attachAVPlayer:(AVPlayer *)player;
+- (void)detachAVPlayer;
+- (CGRect)getViewBounds;
+- (void)dispatchViewInit;
+- (void)dispatchPlayerReady;
+- (void)dispatchPlay;
+- (void)dispatchPlaying;
+- (void)dispatchPause;
+- (void)dispatchTimeUpdateEvent:(CMTime)time;
+- (void)dispatchError;
+- (void)dispatchViewEnd;
+- (void)dispatchAdEvent:(MUXSDKPlaybackEvent *)event;
+- (float)getCurrentPlayheadTimeMs;
+@end
+
+
+@interface MUXSDKAVPlayerViewControllerBinding : MUXSDKPlayerBinding {
+@private
+    AVPlayerViewController *_viewController;
+}
+
+- (id)initWithName:(NSString *)name software:(NSString *)software andView:(AVPlayerViewController *)view;
+
+@end
+
+
+@interface MUXSDKAVPlayerLayerBinding : MUXSDKPlayerBinding {
+@private
+    AVPlayerLayer *_view;
+}
+
+- (id)initWithName:(NSString *)name software:(NSString *)software andView:(AVPlayerLayer *)view;
+
+@end
+
+
+#endif

Frameworks/iOS/release/MUXSDKStats.framework/Headers/MUXSDKStats.h

@@ -26,10 +26,10 @@
 @import AVFoundation;
 #if TARGET_OS_IOS
 @import MuxCore;
-#import "MUXSDKImaListener.h"
 #else
 @import MuxCoreTv;
 #endif
+#import "MUXSDKPlayerBinding.h"
 
 FOUNDATION_EXPORT
 @interface MUXSDKStats : NSObject
@@ -44,9 +44,10 @@ FOUNDATION_EXPORT
  @param       name A name for this instance of the player
  @param       playerData A MUXSDKCustomerPlayerData object with player metadata
  @param       videoData A MUXSDKCustomerVideoData object with video metadata
+ @return      an instance of MUXSDKAVPlayerLayerBinding or null
  @discussion  Use this method to start a Mux player monitor on the given AVPlayerViewController. The player must have a name which is globally unique. The config provided should match the specifications in the Mux docs at https://docs.mux.com
  */
-+ (void)monitorAVPlayerViewController:(nonnull AVPlayerViewController *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
++ (MUXSDKPlayerBinding *_Nullable)monitorAVPlayerViewController:(nonnull AVPlayerViewController *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
 /*!
  @method      updateAVPlayerViewController:withPlayerName
@@ -64,9 +65,10 @@ FOUNDATION_EXPORT
  @param       name A name for this instance of the player
  @param       playerData A MUXSDKCustomerPlayerData object with player metadata
  @param       videoData A MUXSDKCustomerVideoData object with video metadata
+ @return      an instance of MUXSDKAVPlayerLayerBinding or null
  @discussion  Use this method to start a Mux player monitor on the given AVPlayerLayer. The player must have a name which is globally unique. The config provided should match the specifications in the Mux docs at https://docs.mux.com
  */
-+ (void)monitorAVPlayerLayer:(nonnull AVPlayerLayer *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
++ (MUXSDKPlayerBinding *_Nullable)monitorAVPlayerLayer:(nonnull AVPlayerLayer *)player withPlayerName:(nonnull NSString *)name playerData:(nonnull MUXSDKCustomerPlayerData *)playerData videoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
 /*!
  @method      updateAVPlayerLayer:withPlayerName:
@@ -104,14 +106,4 @@ FOUNDATION_EXPORT
  */
 + (void)programChangeForPlayer:(nonnull NSString *)name withVideoData:(nullable MUXSDKCustomerVideoData *)videoData;
 
-/*!
- @method      getImaAdsListener:
- @abstract    Return an IMA Ads listener for Ad analytic collection
- @param       name The name of the player
- @return      an IMA event listener
- @discussion  Use this method to return an IMA Ads listener to collect IMA Ad event and Ad error event.
- */
-#if TARGET_OS_IOS
-+ (MUXSDKImaListener *)getImaAdsListener:(nonnull NSString *)name;
-#endif
 @end

Frameworks/iOS/simulator/MUXSDKStats.framework.dSYM/Contents/Info.plist

@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>0.1.5</string>
+		<string>1.0.0</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>