Merge branch 'main' into feature/#60048-ios-picture-in-picture

# Conflicts:
#	packages/video_player/video_player/CHANGELOG.md
#	packages/video_player/video_player_avfoundation/CHANGELOG.md
#	packages/video_player/video_player_avfoundation/darwin/Classes/FVPVideoPlayerPlugin.m
#	packages/video_player/video_player_avfoundation/pubspec.yaml
#	packages/video_player/video_player_platform_interface/CHANGELOG.md

packages/video_player/video_player/CHANGELOG.md

@@ -1,5 +1,6 @@
-## 2.9.0
+## NEXT
 
+* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 * Adds support for picture-in-picture on iOS.
 
 ## 2.8.1

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * Adds support for picture-in-picture.
 
+## 2.5.2
+
+* Fixes flickering and seek-while-paused on macOS.
+
 ## 2.5.1
 
 * Updates to  Pigeon 13.

packages/video_player/video_player_avfoundation/darwin/Classes/FVPVideoPlayerPlugin.m

@@ -84,17 +84,10 @@ - (FVPDisplayLink *)displayLinkWithRegistrar:(id<FlutterPluginRegistrar>)registr
 
 @end
 
-@interface FVPVideoPlayer
-    : NSObject <FlutterTexture, FlutterStreamHandler, AVPictureInPictureControllerDelegate>
-@property(readonly, nonatomic) AVPlayer *player;
+#pragma mark -
+
+@interface FVPVideoPlayer () <AVPictureInPictureControllerDelegate>
 @property(readonly, nonatomic) AVPlayerItemVideoOutput *videoOutput;
-// 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.
-// It is also used to start picture-in-picture
-@property(readonly, nonatomic) AVPlayerLayer *playerLayer;
 @property(nonatomic) AVPictureInPictureController *pictureInPictureController;
 // The plugin registrar, to obtain view information from.
 @property(nonatomic, weak) NSObject<FlutterPluginRegistrar> *registrar;
@@ -108,16 +101,14 @@ @interface FVPVideoPlayer
 @property(nonatomic) BOOL isLooping;
 @property(nonatomic, readonly) BOOL isInitialized;
 @property(nonatomic) BOOL isPictureInPictureStarted;
-// TODO(stuartmorgan): Extract and abstract the display link to remove all the display-link-related
-// ifdefs from this file.
-#if TARGET_OS_OSX
-// The display link to trigger frame reads from the video player.
-@property(nonatomic, assign) CVDisplayLinkRef displayLink;
-// A dispatch source to move display link callbacks to the main thread.
-@property(nonatomic, strong) dispatch_source_t displayLinkSource;
-#else
-@property(nonatomic) CADisplayLink *displayLink;
-#endif
+// 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;
 
 - (instancetype)initWithURL:(NSURL *)url
                frameUpdater:(FVPFrameUpdater *)frameUpdater
@@ -344,7 +335,18 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem *)item
 
   [self setupPiPController];
 
-  [self createVideoOutputAndDisplayLink:frameUpdater];
+  // Configure output.
+  _displayLink = displayLink;
+  NSDictionary *pixBuffAttributes = @{
+    (id)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA),
+    (id)kCVPixelBufferIOSurfacePropertiesKey : @{}
+  };
+  _videoOutput = [avFactory videoOutputWithPixelBufferAttributes:pixBuffAttributes];
+  frameUpdater.videoOutput = _videoOutput;
+#if TARGET_OS_IOS
+  // See TODO on this property in FVPFrameUpdater.
+  frameUpdater.skipBufferAvailabilityCheck = YES;
+#endif
 
   [self addObserversForItem:item player:_player];
 

packages/video_player/video_player_platform_interface/CHANGELOG.md

@@ -1,5 +1,6 @@
-## 6.3.0
+## NEXT
 
+* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
 * Adds support for picture-in-picture.
 
 ## 6.2.1