[video_player_avfoundation] Platform view support

packages/video_player/video_player/example/pubspec.yaml

@@ -35,3 +35,15 @@ flutter:
     - assets/bumble_bee_captions.srt
     - assets/bumble_bee_captions.vtt
     - assets/Audio.mp3
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
+dependency_overrides:
+  {
+    video_player_avfoundation:
+      { path: ../../../../packages/video_player/video_player_avfoundation },
+    video_player_platform_interface:
+      {
+        path: ../../../../packages/video_player/video_player_platform_interface,
+      },
+  }

packages/video_player/video_player/pubspec.yaml

@@ -37,3 +37,13 @@ dev_dependencies:
 topics:
   - video
   - video-player
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
+dependency_overrides:
+  {
+    video_player_avfoundation:
+      { path: ../../../packages/video_player/video_player_avfoundation },
+    video_player_platform_interface:
+      { path: ../../../packages/video_player/video_player_platform_interface },
+  }

packages/video_player/video_player_android/example/pubspec.yaml

@@ -31,3 +31,13 @@ flutter:
   assets:
     - assets/flutter-mark-square-64.png
     - assets/Butterfly-209.mp4
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
+dependency_overrides:
+  {
+    video_player_platform_interface:
+      {
+        path: ../../../../packages/video_player/video_player_platform_interface,
+      },
+  }

packages/video_player/video_player_android/pubspec.yaml

@@ -30,3 +30,11 @@ dev_dependencies:
 topics:
   - video
   - video-player
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins
+dependency_overrides:
+  {
+    video_player_platform_interface:
+      { path: ../../../packages/video_player/video_player_platform_interface },
+  }

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 2.7.0
 
+* Adds support for platform views as an optional way of displaying a video.
 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
 
 ## 2.6.5

packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPVideoPlayer.m

@@ -16,38 +16,8 @@
 static void *playbackLikelyToKeepUpContext = &playbackLikelyToKeepUpContext;
 static void *rateContext = &rateContext;
 
-@interface FVPVideoPlayer ()
-/// The AVPlayerItemVideoOutput associated with this video player.
-@property(nonatomic, readonly) AVPlayerItemVideoOutput *videoOutput;
-/// The plugin registrar, to obtain view information from.
-@property(nonatomic, readonly) NSObject<FlutterPluginRegistrar> *registrar;
-/// The CALayer associated with the Flutter view this plugin is associated with, if any.
-@property(nonatomic, readonly) CALayer *flutterViewLayer;
-/// The Flutter event sink used to send events to the Flutter engine.
-@property(nonatomic) FlutterEventSink eventSink;
-/// The preferred transform for the video. It can be used to handle the rotation of the video.
-@property(nonatomic) CGAffineTransform preferredTransform;
-/// Indicates whether the video player is currently playing.
-@property(nonatomic, readonly) BOOL isPlaying;
-/// Indicates whether the video player has been initialized.
-@property(nonatomic, readonly) BOOL isInitialized;
-/// The updater that drives callbacks to the engine to indicate that a new frame is ready.
-@property(nonatomic) FVPFrameUpdater *frameUpdater;
-/// The display link that drives frameUpdater.
-@property(nonatomic) FVPDisplayLink *displayLink;
-/// Whether a new frame needs to be provided to the engine regardless of the current play/pause
-/// state (e.g., after a seek while paused). If YES, the display link should continue to run until
-/// the next frame is successfully provided.
-@property(nonatomic, assign) BOOL waitingForFrame;
-
-/// Updates the playing state of the video player.
-- (void)updatePlayingState;
-@end
-
 @implementation FVPVideoPlayer
 - (instancetype)initWithAsset:(NSString *)asset
-                 frameUpdater:(FVPFrameUpdater *)frameUpdater
-                  displayLink:(FVPDisplayLink *)displayLink
                     avFactory:(id<FVPAVFactory>)avFactory
                     registrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   NSString *path = [[NSBundle mainBundle] pathForResource:asset ofType:nil];
@@ -59,16 +29,12 @@ - (instancetype)initWithAsset:(NSString *)asset
   }
 #endif
   return [self initWithURL:[NSURL fileURLWithPath:path]
-              frameUpdater:frameUpdater
-               displayLink:displayLink
                httpHeaders:@{}
                  avFactory:avFactory
                  registrar:registrar];
 }
 
 - (instancetype)initWithURL:(NSURL *)url
-               frameUpdater:(FVPFrameUpdater *)frameUpdater
-                displayLink:(FVPDisplayLink *)displayLink
                 httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers
                   avFactory:(id<FVPAVFactory>)avFactory
                   registrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -78,23 +44,16 @@ - (instancetype)initWithURL:(NSURL *)url
   }
   AVURLAsset *urlAsset = [AVURLAsset URLAssetWithURL:url options:options];
   AVPlayerItem *item = [AVPlayerItem playerItemWithAsset:urlAsset];
-  return [self initWithPlayerItem:item
-                     frameUpdater:frameUpdater
-                      displayLink:(FVPDisplayLink *)displayLink
-                        avFactory:avFactory
-                        registrar:registrar];
+  return [self initWithPlayerItem:item avFactory:avFactory registrar:registrar];
 }
 
 - (instancetype)initWithPlayerItem:(AVPlayerItem *)item
-                      frameUpdater:(FVPFrameUpdater *)frameUpdater
-                       displayLink:(FVPDisplayLink *)displayLink
                          avFactory:(id<FVPAVFactory>)avFactory
                          registrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   self = [super init];
   NSAssert(self, @"super init cannot be nil");
 
   _registrar = registrar;
-  _frameUpdater = frameUpdater;
 
   AVAsset *asset = [item asset];
   void (^assetCompletionHandler)(void) = ^{
@@ -128,22 +87,12 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem *)item
   _player = [avFactory playerWithPlayerItem:item];
   _player.actionAtItemEnd = AVPlayerActionAtItemEndNone;
 
-  // This is to fix 2 bugs: 1. blank video for encrypted video streams on iOS 16
-  // (https://github.com/flutter/flutter/issues/111457) and 2. swapped width and height for some
-  // video streams (not just iOS 16).  (https://github.com/flutter/flutter/issues/109116). An
-  // invisible AVPlayerLayer is used to overwrite the protection of pixel buffers in those streams
-  // for issue #1, and restore the correct width and height for issue #2.
-  _playerLayer = [AVPlayerLayer playerLayerWithPlayer:_player];
-  [self.flutterViewLayer addSublayer:_playerLayer];
-
   // Configure output.
-  _displayLink = displayLink;
   NSDictionary *pixBuffAttributes = @{
     (id)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA),
     (id)kCVPixelBufferIOSurfacePropertiesKey : @{}
   };
   _videoOutput = [avFactory videoOutputWithPixelBufferAttributes:pixBuffAttributes];
-  frameUpdater.videoOutput = _videoOutput;
 
   [self addObserversForItem:item player:_player];
 
@@ -327,9 +276,6 @@ - (void)updatePlayingState {
   } else {
     [_player pause];
   }
-  // If the texture is still waiting for an expected frame, the display link needs to keep
-  // running until it arrives regardless of the play/pause state.
-  _displayLink.running = _isPlaying || self.waitingForFrame;
 }
 
 - (void)sendFailedToLoadVideoEvent {
@@ -432,7 +378,6 @@ - (int64_t)duration {
 }
 
 - (void)seekTo:(int64_t)location completionHandler:(void (^)(BOOL))completionHandler {
-  CMTime previousCMTime = _player.currentTime;
   CMTime targetCMTime = CMTimeMake(location, 1000);
   CMTimeValue duration = _player.currentItem.asset.duration.value;
   // Without adding tolerance when seeking to duration,
@@ -443,27 +388,12 @@ - (void)seekTo:(int64_t)location completionHandler:(void (^)(BOOL))completionHan
         toleranceBefore:tolerance
          toleranceAfter:tolerance
       completionHandler:^(BOOL completed) {
-        if (CMTimeCompare(self.player.currentTime, previousCMTime) != 0) {
-          // Ensure that a frame is drawn once available, even if currently paused. In theory a race
-          // is possible here where the new frame has already drawn by the time this code runs, and
-          // the display link stays on indefinitely, but that should be relatively harmless. This
-          // must use the display link rather than just informing the engine that a new frame is
-          // available because the seek completing doesn't guarantee that the pixel buffer is
-          // already available.
-          [self expectFrame];
-        }
-
         if (completionHandler) {
           completionHandler(completed);
         }
       }];
 }
 
-- (void)expectFrame {
-  self.waitingForFrame = YES;
-  self.displayLink.running = YES;
-}
-
 - (void)setIsLooping:(BOOL)isLooping {
   _isLooping = isLooping;
 }
@@ -496,38 +426,6 @@ - (void)setPlaybackSpeed:(double)speed {
   _player.rate = speed;
 }
 
-- (CVPixelBufferRef)copyPixelBuffer {
-  CVPixelBufferRef buffer = NULL;
-  CMTime outputItemTime = [_videoOutput itemTimeForHostTime:CACurrentMediaTime()];
-  if ([_videoOutput hasNewPixelBufferForItemTime:outputItemTime]) {
-    buffer = [_videoOutput copyPixelBufferForItemTime:outputItemTime itemTimeForDisplay:NULL];
-  } else {
-    // If the current time isn't available yet, use the time that was checked when informing the
-    // engine that a frame was available (if any).
-    CMTime lastAvailableTime = self.frameUpdater.lastKnownAvailableTime;
-    if (CMTIME_IS_VALID(lastAvailableTime)) {
-      buffer = [_videoOutput copyPixelBufferForItemTime:lastAvailableTime itemTimeForDisplay:NULL];
-    }
-  }
-
-  if (self.waitingForFrame && buffer) {
-    self.waitingForFrame = NO;
-    // If the display link was only running temporarily to pick up a new frame while the video was
-    // paused, stop it again.
-    if (!self.isPlaying) {
-      self.displayLink.running = NO;
-    }
-  }
-
-  return buffer;
-}
-
-- (void)onTextureUnregistered:(NSObject<FlutterTexture> *)texture {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self dispose];
-  });
-}
-
 - (FlutterError *_Nullable)onCancelWithArguments:(id _Nullable)arguments {
   _eventSink = nil;
   return nil;
@@ -565,8 +463,6 @@ - (void)disposeSansEventChannel {
   }
 
   _disposed = YES;
-  [_playerLayer removeFromSuperlayer];
-  _displayLink = nil;
   [self removeKeyValueObservers];
 
   [self.player replaceCurrentItemWithPlayerItem:nil];
@@ -578,20 +474,6 @@ - (void)dispose {
   [_eventChannel setStreamHandler:nil];
 }
 
-- (CALayer *)flutterViewLayer {
-#if TARGET_OS_OSX
-  return self.registrar.view.layer;
-#else
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  // TODO(hellohuanlin): Provide a non-deprecated codepath. See
-  // https://github.com/flutter/flutter/issues/104117
-  UIViewController *root = UIApplication.sharedApplication.keyWindow.rootViewController;
-#pragma clang diagnostic pop
-  return root.view.layer;
-#endif
-}
-
 /// Removes all key-value observers set up for the player.
 ///
 /// This is called from dealloc, so must not use any methods on self.