[TIMOB-19040] iOS: Replace MPMoviePlayerController in Ti.Media.VideoPlayer with AVPlayerViewController

iphone/Classes/MediaModule.h

@@ -94,10 +94,9 @@
 @property(nonatomic,readonly) NSNumber* VIDEO_CONTROL_DEFAULT;
 @property(nonatomic,readonly) NSNumber* VIDEO_CONTROL_HIDDEN;
 
-@property(nonatomic,readonly) NSNumber* VIDEO_SCALING_NONE;
-@property(nonatomic,readonly) NSNumber* VIDEO_SCALING_ASPECT_FIT;
-@property(nonatomic,readonly) NSNumber* VIDEO_SCALING_ASPECT_FILL;
-@property(nonatomic,readonly) NSNumber* VIDEO_SCALING_MODE_FILL;
+@property(nonatomic,readonly) NSString* VIDEO_SCALING_MODE_RESIZE;
+@property(nonatomic,readonly) NSString* VIDEO_SCALING_MODE_RESIZE_ASPECT;
+@property(nonatomic,readonly) NSString* VIDEO_SCALING_MODE_RESIZE_ASPECT_FILL;
 
 @property(nonatomic,readonly) NSNumber* QUALITY_HIGH;
 @property(nonatomic,readonly) NSNumber* QUALITY_MEDIUM;
@@ -189,9 +188,18 @@
 
 
 // NOTE: these are introduced in 3.2
+/* REMOVED since iOS9
 @property(nonatomic,readonly) NSNumber* VIDEO_CONTROL_NONE;			// No controls
 @property(nonatomic,readonly) NSNumber* VIDEO_CONTROL_EMBEDDED;		// Controls for an embedded view
 @property(nonatomic,readonly) NSNumber* VIDEO_CONTROL_FULLSCREEN;	// Controls for fullscreen playback
+*/
+
+// New constants
+@property(nonatomic,readonly) NSString* VIDEO_SCALE_MODE_KEY;
+@property(nonatomic,readonly) NSString* VIDEO_SCALE_MODE_FIT;
+@property(nonatomic,readonly) NSString* VIDEO_SCALE_MODE_RESIZE;
+@property(nonatomic,readonly) NSString* VIDEO_SCALE_MODE_RESIZE_ASPECT;
+@property(nonatomic,readonly) NSString* VIDEO_SCALE_MODE_RESIZE_ASPECT_FILL;
 
 @property(nonatomic,readonly) NSNumber* VIDEO_MEDIA_TYPE_NONE;
 @property(nonatomic,readonly) NSNumber* VIDEO_MEDIA_TYPE_VIDEO;

iphone/Classes/MediaModule.m

@@ -319,32 +319,17 @@ -(NSString*)MEDIA_TYPE_LIVEPHOTO
 MAKE_SYSTEM_PROP(VIDEO_MEDIA_TYPE_VIDEO,MPMovieMediaTypeMaskVideo);
 MAKE_SYSTEM_PROP(VIDEO_MEDIA_TYPE_AUDIO,MPMovieMediaTypeMaskAudio);
 
-//Constants for VideoPlayer complete event
-MAKE_SYSTEM_PROP(VIDEO_FINISH_REASON_PLAYBACK_ENDED,MPMovieFinishReasonPlaybackEnded);
-MAKE_SYSTEM_PROP(VIDEO_FINISH_REASON_PLAYBACK_ERROR,MPMovieFinishReasonPlaybackError);
-MAKE_SYSTEM_PROP(VIDEO_FINISH_REASON_USER_EXITED,MPMovieFinishReasonUserExited);
-
 //Constants for VideoPlayer mediaControlStyle
-MAKE_SYSTEM_PROP(VIDEO_CONTROL_DEFAULT, MPMovieControlStyleDefault);
-MAKE_SYSTEM_PROP(VIDEO_CONTROL_NONE,MPMovieControlStyleNone);
-MAKE_SYSTEM_PROP(VIDEO_CONTROL_EMBEDDED,MPMovieControlStyleEmbedded);
-MAKE_SYSTEM_PROP(VIDEO_CONTROL_FULLSCREEN,MPMovieControlStyleFullscreen);
-
--(NSNumber*)VIDEO_CONTROL_HIDDEN
-{
-    return [self VIDEO_CONTROL_NONE];
-}
+MAKE_SYSTEM_STR(VIDEO_SCALE_MODE_KEY,AVVideoScalingModeKey);
+MAKE_SYSTEM_STR(VIDEO_SCALE_MODE_FIT,AVVideoScalingModeFit);
+MAKE_SYSTEM_STR(VIDEO_SCALE_MODE_RESIZE,AVVideoScalingModeResize);
+MAKE_SYSTEM_STR(VIDEO_SCALE_MODE_RESIZE_ASPECT,AVVideoScalingModeResizeAspect);
+MAKE_SYSTEM_STR(VIDEO_SCALE_MODE_RESIZE_ASPECT_FILL,AVVideoScalingModeResizeAspectFill);
 
 //Constants for VideoPlayer scalingMode
-MAKE_SYSTEM_PROP(VIDEO_SCALING_NONE,MPMovieScalingModeNone);
-MAKE_SYSTEM_PROP(VIDEO_SCALING_ASPECT_FIT,MPMovieScalingModeAspectFit);
-MAKE_SYSTEM_PROP(VIDEO_SCALING_ASPECT_FILL,MPMovieScalingModeAspectFill);
-MAKE_SYSTEM_PROP(VIDEO_SCALING_MODE_FILL,MPMovieScalingModeFill);
-
-//Constants for VideoPlayer sourceType
-MAKE_SYSTEM_PROP(VIDEO_SOURCE_TYPE_UNKNOWN,MPMovieSourceTypeUnknown);
-MAKE_SYSTEM_PROP(VIDEO_SOURCE_TYPE_FILE,MPMovieSourceTypeFile);
-MAKE_SYSTEM_PROP(VIDEO_SOURCE_TYPE_STREAMING,MPMovieSourceTypeStreaming);
+MAKE_SYSTEM_STR(VIDEO_SCALING_MODE_RESIZE,AVLayerVideoGravityResize);
+MAKE_SYSTEM_STR(VIDEO_SCALING_RESIZE_ASPECT,AVLayerVideoGravityResizeAspect);
+MAKE_SYSTEM_STR(VIDEO_SCALING_RESIZE_ASPECT_FILL,AVLayerVideoGravityResizeAspectFill);
 
 //Constants for VideoPlayer playbackState
 MAKE_SYSTEM_PROP(VIDEO_PLAYBACK_STATE_STOPPED,MPMoviePlaybackStateStopped);
@@ -363,10 +348,6 @@ -(NSNumber*)VIDEO_CONTROL_HIDDEN
 //Constants for VideoPlayer repeateMode
 MAKE_SYSTEM_PROP(VIDEO_REPEAT_MODE_NONE,MPMovieRepeatModeNone);
 MAKE_SYSTEM_PROP(VIDEO_REPEAT_MODE_ONE,MPMovieRepeatModeOne);
-
-//Other Constants
-MAKE_SYSTEM_PROP(VIDEO_TIME_OPTION_NEAREST_KEYFRAME,MPMovieTimeOptionNearestKeyFrame);
-MAKE_SYSTEM_PROP(VIDEO_TIME_OPTION_EXACT,MPMovieTimeOptionExact);
 #endif
 
 #ifdef USE_TI_MEDIAMUSICPLAYER
@@ -439,6 +420,25 @@ -(void)setAudioSessionMode:(NSNumber*)mode
 
 }
 
+-(NSNumber*)audioSessionMode
+{
+    DebugLog(@"[WARN] Deprecated; use 'audioSessionCategory'");
+    NSString* category = [self audioSessionCategory];
+    if ([category isEqualToString:[self AUDIO_SESSION_CATEGORY_AMBIENT]]) {
+        return [self AUDIO_SESSION_MODE_AMBIENT];
+    } else if ([category isEqualToString:[self AUDIO_SESSION_CATEGORY_SOLO_AMBIENT]]) {
+        return [self AUDIO_SESSION_MODE_SOLO_AMBIENT];
+    } else if ([category isEqualToString:[self AUDIO_SESSION_CATEGORY_PLAYBACK]]) {
+        return [self AUDIO_SESSION_MODE_PLAYBACK];
+    } else if ([category isEqualToString:[self AUDIO_SESSION_CATEGORY_RECORD]]) {
+        return [self AUDIO_SESSION_MODE_RECORD];
+    } else if ([category isEqualToString:[self AUDIO_SESSION_CATEGORY_PLAY_AND_RECORD]]) {
+        return [self AUDIO_SESSION_MODE_PLAY_AND_RECORD];
+    } else {
+        return NUMINT(-1);
+    }
+}
+
 #if defined(USE_TI_MEDIAAUDIOPLAYER) || defined(USE_TI_MEDIAMUSICPLAYER) || defined(USE_TI_MEDIASOUND) || defined (USE_TI_MEDIAVIDEOPLAYER) || defined(USE_TI_MEDIAAUDIORECORDER)
 -(void)setAudioSessionCategory:(NSString*)mode
 {

iphone/Classes/TiMediaVideoPlayer.h

@@ -8,17 +8,19 @@
 
 #import "TiUIView.h"
 #import <MediaPlayer/MediaPlayer.h>
+#import <AVKit/AVKit.h>
+#import <AVFoundation/AVFoundation.h>
 
 @interface TiMediaVideoPlayer : TiUIView {
 @private
-	MPMoviePlayerController *controller;
+	AVPlayerViewController *controller;
 	UIActivityIndicatorView *spinner;
 
 	BOOL loaded;
 }
 
--(id)initWithPlayer:(MPMoviePlayerController*)controller proxy:(TiProxy*)proxy loaded:(BOOL)loaded_;
--(void)setMovie:(MPMoviePlayerController*)controller;
+-(id)initWithPlayer:(AVPlayerViewController*)controller proxy:(TiProxy*)proxy loaded:(BOOL)loaded_;
+-(void)setMovie:(AVPlayerViewController*)controller;
 -(void)movieLoaded;
 
 @end

iphone/Classes/TiMediaVideoPlayer.m

@@ -23,7 +23,7 @@ -(void)initializeTiLayoutView
 }
 #endif
 
--(id)initWithPlayer:(MPMoviePlayerController*)controller_ proxy:(TiProxy*)proxy_ loaded:(BOOL)loaded_
+-(id)initWithPlayer:(AVPlayerViewController*)controller_ proxy:(TiProxy*)proxy_ loaded:(BOOL)loaded_
 {
 	if (self = [super init])
 	{
@@ -59,7 +59,7 @@ -(void)movieLoaded
 	loaded = YES;
 }
 
--(void)setMovie:(MPMoviePlayerController*)controller_
+-(void)setMovie:(AVPlayerViewController*)controller_
 {
 	if (controller_ == controller) {
         // don't add the movie more than once if the same

iphone/Classes/TiMediaVideoPlayerProxy.h

@@ -7,13 +7,16 @@
 #ifdef USE_TI_MEDIAVIDEOPLAYER
 
 #import <MediaPlayer/MediaPlayer.h>
+#import <AVFoundation/AVFoundation.h>
+#import <AVKit/AVKit.h>
 #import "TiViewProxy.h"
 #import "TiColor.h"
 #import "TiFile.h"
 
 @interface TiMediaVideoPlayerProxy : TiViewProxy {
 @protected
-	MPMoviePlayerController *movie;
+	AVPlayerViewController *movie;
+    AVPlayerItem *item;
 	NSRecursiveLock* playerLock;
 	BOOL playing;
 @private
@@ -24,6 +27,7 @@
 	TiFile *tempFile;
 	KrollCallback *thumbnailCallback;
 	NSUInteger callbackRequestCount;
+    BOOL seekToZeroBeforePlay;
 
 	NSMutableDictionary* loadProperties; // Used to set properties when the player is created
 	BOOL sizeSet;
@@ -45,6 +49,8 @@
 @property(nonatomic,readwrite,assign) TiColor* backgroundColor;
 @property(nonatomic,readonly) NSNumber* playing;
 @property(nonatomic,copy)	NSNumber *volume;
+@property(nonatomic,readwrite,assign) id pictureInPictureEnabled;
+
 
 -(void)add:(id)proxy;
 -(void)remove:(id)proxy;