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

apidoc/Titanium/Media/VideoPlayer.yml

@@ -156,11 +156,6 @@ examples:
 methods:
 
   - name: cancelAllThumbnailImageRequests
-    deprecated:
-        platforms: [iphone, ipad]
-        since: '7.0.0'
-        notes: This method has been removed for iOS in Titanium SDK 7.0.0 as of the official deprecation by Apple.
-        removed: '7.0.0'
     summary: Cancels all pending asynchronous thumbnail requests.
     description: |
         Asynchronous thumbnail requests initiated with
@@ -610,7 +605,6 @@ properties:
 
   - name: fullscreen
     deprecated:
-        platforms: [iphone, ipad]
         since: '7.0.0'
         notes: This method has been removed for iOS in Titanium SDK 7.0.0 as of the official deprecation by Apple.
         removed: '7.0.0'
@@ -639,7 +633,6 @@ properties:
 
   - name: loadState
     deprecated:
-        platforms: [iphone, ipad]
         since: "7.0.0"
         notes: On iOS, use <Titanium.Media.VideoPlayer.moviePlayerStatus> instead.
     summary: Returns the network load state of the movie player.
@@ -654,9 +647,8 @@ properties:
 
   - name: mediaControlStyle
     deprecated:
-        platforms: [iphone, ipad]
         since: "7.0.0"
-        notes: On iOS, use <Titanium.Media.VideoPlayer.scalingMode> instead.
+        notes: On iOS, use <Titanium.Media.VideoPlayer.showsControls> instead.
     summary: The style of the playback controls.
     description: |
         Mobile web only supports <Titanium.Media.VIDEO_CONTROL_NONE> and
@@ -768,7 +760,6 @@ properties:
 
   - name: repeatMode
     deprecated:
-        platforms: [iphone, ipad]
         since: '7.0.0'
         notes: This method has been removed for iOS in Titanium SDK 7.0.0 as of the official deprecation by Apple.
         removed: '7.0.0'

iphone/Classes/MediaModule.m

@@ -39,6 +39,9 @@
 #import <AssetsLibrary/AssetsLibrary.h>
 #endif
 #import "TiUIiOSLivePhoto.h"
+#ifdef USE_TI_MEDIAVIDEOPLAYER
+#import "TiMediaVideoPlayerProxy.h"
+#endif
 
 // by default, we want to make the camera fullscreen and
 // these transform values will scale it when we have our own overlay
@@ -351,6 +354,9 @@ - (NSString *)MEDIA_TYPE_LIVEPHOTO
 MAKE_SYSTEM_PROP(VIDEO_LOAD_STATE_UNKNOWN, AVPlayerStatusUnknown);
 MAKE_SYSTEM_PROP(VIDEO_LOAD_STATE_PLAYABLE, AVPlayerStatusReadyToPlay);
 MAKE_SYSTEM_PROP(VIDEO_LOAD_STATE_FAILED, AVPlayerStatusFailed);
+
+MAKE_SYSTEM_PROP(VIDEO_TIME_OPTION_NEAREST_KEYFRAME, VideoTimeOptionNearestKeyFrame);
+MAKE_SYSTEM_PROP(VIDEO_TIME_OPTION_EXACT, VideoTimeOptionExact);
 #endif
 
 - (TiMediaMusicPlayer *)systemMusicPlayer

iphone/Classes/TiMediaVideoPlayerProxy.h

@@ -13,9 +13,15 @@
 #import <AVKit/AVKit.h>
 #import <MediaPlayer/MediaPlayer.h>
 
+enum {
+  VideoTimeOptionNearestKeyFrame = 0,
+  VideoTimeOptionExact,
+};
+
 @interface TiMediaVideoPlayerProxy : TiViewProxy {
   @protected
   AVPlayerViewController *movie;
+  MPMoviePlayerViewController *cont;
   AVPlayerItem *item;
   NSRecursiveLock *playerLock;
   BOOL playing;

iphone/Classes/TiMediaVideoPlayerProxy.m

@@ -205,6 +205,7 @@ - (void)setOverlayView:(id)proxy
 - (void)setBackgroundView:(id)proxy
 {
   DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.backgroundView", @"7.0.0", @"7.0.0", @"Media.VideoPlayer.overlayView");
+  [self setOverlayView:proxy];
 }
 
 - (NSNumber *)playing
@@ -258,12 +259,12 @@ - (NSNumber *)allowsAirPlay
 
 - (void)setMediaControlStyle:(NSNumber *)value
 {
-  DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.mediaControlStyle", @"4.1.0", @"7.0.0", @"Media.VideoPlayer.scalingMode");
+  DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.mediaControlStyle", @"4.1.0", @"7.0.0", @"Media.VideoPlayer.showsControls");
 }
 
 - (NSNumber *)mediaControlStyle
 {
-  DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.mediaControlStyle", @"4.1.0", @"7.0.0", @"Media.VideoPlayer.scalingMode");
+  DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.mediaControlStyle", @"4.1.0", @"7.0.0", @"Media.VideoPlayer.showsControls");
   return NUMINT(0);
 }
 
@@ -380,6 +381,59 @@ - (void)setVolume:(NSNumber *)newVolume
       YES);
 }
 
+- (void)requestThumbnailImagesAtTimes:(id)args
+{
+  ENSURE_ARG_COUNT(args, 3);
+  ENSURE_TYPE([args objectAtIndex:0], NSArray);
+  ENSURE_TYPE([args objectAtIndex:1], NSNumber);
+  ENSURE_TYPE([args objectAtIndex:2], KrollCallback);
+
+  NSArray *array = [args objectAtIndex:0];
+  if ([array count] > 0) {
+    NSMutableArray *cmTimeArray = [NSMutableArray arrayWithCapacity:[array count]];
+
+    for (NSNumber *time in array) {
+      CMTime cmTime = CMTimeMakeWithSeconds([time floatValue], 1);
+      [cmTimeArray addObject:[NSValue valueWithCMTime:cmTime]];
+    }
+    TiThreadPerformOnMainThread(^{
+      AVAssetImageGenerator *imageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:[[[movie player] currentItem] asset]];
+      NSNumber *option = [args objectAtIndex:1];
+
+      if ([option intValue] == VideoTimeOptionExact) {
+        imageGenerator.requestedTimeToleranceBefore = kCMTimeZero;
+        imageGenerator.requestedTimeToleranceAfter = kCMTimeZero;
+      }
+
+      [imageGenerator cancelAllCGImageGeneration];
+
+      RELEASE_TO_NIL(thumbnailCallback);
+      callbackRequestCount = [array count];
+      thumbnailCallback = [[args objectAtIndex:2] retain];
+
+      [imageGenerator generateCGImagesAsynchronouslyForTimes:cmTimeArray
+                                           completionHandler:^(CMTime requestedTime, CGImageRef _Nullable imageRef, CMTime actualTime, AVAssetImageGeneratorResult result, NSError *_Nullable error) {
+                                             NSMutableDictionary *event = [TiUtils dictionaryWithCode:[error code] message:[TiUtils messageFromError:error]];
+
+                                             if (error == nil) {
+                                               UIImage *image = [[UIImage alloc] initWithCGImage:imageRef];
+                                               TiBlob *blob = [[[TiBlob alloc] _initWithPageContext:[self pageContext] andImage:image] autorelease];
+                                               [event setObject:blob forKey:@"image"];
+                                               [image release];
+                                             }
+                                             [event setObject:NUMDOUBLE(actualTime.value / actualTime.timescale) forKey:@"time"];
+
+                                             [self _fireEventToListener:@"thumbnail" withObject:event listener:thumbnailCallback thisObject:nil];
+
+                                             if (--callbackRequestCount <= 0) {
+                                               RELEASE_TO_NIL(thumbnailCallback);
+                                             }
+                                           }];
+    },
+        NO);
+  }
+}
+
 - (NSNumber *)pictureInPictureEnabled
 {
   return NUMBOOL([TiUtils isIOS9OrGreater] && [movie allowsPictureInPicturePlayback]);
@@ -404,7 +458,11 @@ - (void)setShowsControls:(NSNumber *)value
 
 - (void)cancelAllThumbnailImageRequests:(id)value
 {
-  DEPRECATED_REMOVED(@"Media.VideoPlayer.cancelAllThumbnailImageRequests", @"7.0.0", @"7.0.0")
+  TiThreadPerformOnMainThread(^{
+    AVAssetImageGenerator *imageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:[[[movie player] currentItem] asset]];
+    [imageGenerator cancelAllCGImageGeneration];
+  },
+      NO);
 }
 
 - (TiBlob *)thumbnailImageAtTime:(id)args