[video_player] Move more Obj-C logic to Dart (#9685)

Moves some logic from native code to Dart:
- Asset -> URL lookup.
- Conversion from native buffer range format (start+duration) to Dart range format (start+end).

Also does some minor native cleanup:
- Removes unnecessary state from `FVPVideoPlayerPlugin`; several registrar-vended objects were being stored, and later changes required storing the registrar itself, so now we can just get those from the registrar on demand.
- Removes nil player handling; the player can never return nil now.
- Removes `formatHint` from the Pigeon interface; it was only ever used on Android, so doesn't need to be sent across the language boundary.

Part of flutter/flutter#172763

## Pre-Review Checklist

**Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

[^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

Author: stuartmorgan-g

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.8.1
+
+* Restructures internal logic to move more code to Dart.
+
 ## 2.8.0
 
 * Adds platform view support for macOS.

packages/video_player/video_player_avfoundation/darwin/RunnerTests/VideoPlayerTests.m

@@ -168,32 +168,6 @@ - (instancetype)init {
 
 @implementation VideoPlayerTests
 
-- (void)testCreateWithOptionsReturnsErrorForInvalidAssetPath {
-  NSObject<FlutterPluginRegistrar> *registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));
-  OCMStub([registrar lookupKeyForAsset:[OCMArg any]]).andReturn(nil);
-  FVPVideoPlayerPlugin *videoPlayerPlugin =
-      [[FVPVideoPlayerPlugin alloc] initWithRegistrar:registrar];
-
-  FlutterError *initializationError;
-  [videoPlayerPlugin initialize:&initializationError];
-  XCTAssertNil(initializationError);
-
-  FVPCreationOptions *create =
-      [FVPCreationOptions makeWithAsset:@"invalid/path/to/asset"
-                                    uri:nil
-                            packageName:nil
-                             formatHint:nil
-                            httpHeaders:@{}
-                               viewType:FVPPlatformVideoViewTypeTextureView];
-
-  FlutterError *createError;
-  NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&createError];
-
-  XCTAssertNil(playerIdentifier);
-  XCTAssertNotNil(createError);
-  XCTAssertEqualObjects(createError.code, @"video_player");
-}
-
 - (void)testBlankVideoBugWithEncryptedVideoStreamAndInvertedAspectRatioBugForSomeVideoStream {
   // 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
@@ -218,12 +192,9 @@ - (void)testBlankVideoBugWithEncryptedVideoStreamAndInvertedAspectRatioBugForSom
   XCTAssertNil(error);
 
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
   XCTAssertNil(error);
   XCTAssertNotNil(playerIdentifier);
@@ -253,12 +224,9 @@ - (void)testPlayerForPlatformViewDoesNotRegisterTexture {
   [videoPlayerPlugin initialize:&initalizationError];
   XCTAssertNil(initalizationError);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypePlatformView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypePlatformView];
   FlutterError *createError;
   [videoPlayerPlugin createWithOptions:create error:&createError];
 
@@ -284,12 +252,9 @@ - (void)testSeekToWhilePausedStartsDisplayLinkTemporarily {
   [videoPlayerPlugin initialize:&initalizationError];
   XCTAssertNil(initalizationError);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   FlutterError *createError;
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&createError];
   FVPTextureBasedVideoPlayer *player =
@@ -344,12 +309,9 @@ - (void)testInitStartsDisplayLinkTemporarily {
   [videoPlayerPlugin initialize:&initalizationError];
   XCTAssertNil(initalizationError);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   FlutterError *createError;
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&createError];
 
@@ -393,12 +355,9 @@ - (void)testSeekToWhilePlayingDoesNotStopDisplayLink {
   [videoPlayerPlugin initialize:&initalizationError];
   XCTAssertNil(initalizationError);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   FlutterError *createError;
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&createError];
   FVPTextureBasedVideoPlayer *player =
@@ -451,12 +410,9 @@ - (void)testPauseWhileWaitingForFrameDoesNotStopDisplayLink {
   [videoPlayerPlugin initialize:&initalizationError];
   XCTAssertNil(initalizationError);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/hls/bee.m3u8"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   FlutterError *createError;
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&createError];
   FVPTextureBasedVideoPlayer *player =
@@ -481,12 +437,9 @@ - (void)testDeregistersFromPlayer {
   XCTAssertNil(error);
 
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
   XCTAssertNil(error);
   XCTAssertNotNil(playerIdentifier);
@@ -513,12 +466,9 @@ - (void)testBufferingStateFromPlayer {
   XCTAssertNil(error);
 
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
   XCTAssertNil(error);
   XCTAssertNotNil(playerIdentifier);
@@ -709,12 +659,9 @@ - (void)testDoesNotCrashOnRateObservationAfterDisposal {
     XCTAssertNil(error);
 
     FVPCreationOptions *create = [FVPCreationOptions
-        makeWithAsset:nil
-                  uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-          packageName:nil
-           formatHint:nil
-          httpHeaders:@{}
-             viewType:FVPPlatformVideoViewTypeTextureView];
+        makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+        httpHeaders:@{}
+           viewType:FVPPlatformVideoViewTypeTextureView];
     NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
     XCTAssertNil(error);
     XCTAssertNotNil(playerIdentifier);
@@ -763,12 +710,9 @@ - (void)testHotReloadDoesNotCrash {
     XCTAssertNil(error);
 
     FVPCreationOptions *create = [FVPCreationOptions
-        makeWithAsset:nil
-                  uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-          packageName:nil
-           formatHint:nil
-          httpHeaders:@{}
-             viewType:FVPPlatformVideoViewTypeTextureView];
+        makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+        httpHeaders:@{}
+           viewType:FVPPlatformVideoViewTypeTextureView];
     NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
     XCTAssertNil(error);
     XCTAssertNotNil(playerIdentifier);
@@ -830,13 +774,9 @@ - (void)testFailedToLoadVideoEventShouldBeAlwaysSent {
 
   [videoPlayerPlugin initialize:&error];
 
-  FVPCreationOptions *create =
-      [FVPCreationOptions makeWithAsset:nil
-                                    uri:@""
-                            packageName:nil
-                             formatHint:nil
-                            httpHeaders:@{}
-                               viewType:FVPPlatformVideoViewTypeTextureView];
+  FVPCreationOptions *create = [FVPCreationOptions makeWithUri:@""
+                                                   httpHeaders:@{}
+                                                      viewType:FVPPlatformVideoViewTypeTextureView];
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
   FVPVideoPlayer *player = videoPlayerPlugin.playersByIdentifier[playerIdentifier];
   XCTAssertNotNil(player);
@@ -896,12 +836,9 @@ - (void)testPlayerShouldNotDropEverySecondFrame {
   [videoPlayerPlugin initialize:&error];
   XCTAssertNil(error);
   FVPCreationOptions *create = [FVPCreationOptions
-      makeWithAsset:nil
-                uri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
-        packageName:nil
-         formatHint:nil
-        httpHeaders:@{}
-           viewType:FVPPlatformVideoViewTypeTextureView];
+      makeWithUri:@"https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"
+      httpHeaders:@{}
+         viewType:FVPPlatformVideoViewTypeTextureView];
   NSNumber *playerIdentifier = [videoPlayerPlugin createWithOptions:create error:&error];
   FVPTextureBasedVideoPlayer *player =
       (FVPTextureBasedVideoPlayer *)videoPlayerPlugin.playersByIdentifier[playerIdentifier];

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

@@ -31,18 +31,6 @@ @interface FVPTextureBasedVideoPlayer ()
 @end
 
 @implementation FVPTextureBasedVideoPlayer
-- (instancetype)initWithAsset:(NSString *)asset
-                 frameUpdater:(FVPFrameUpdater *)frameUpdater
-                  displayLink:(NSObject<FVPDisplayLink> *)displayLink
-                    avFactory:(id<FVPAVFactory>)avFactory
-                 viewProvider:(NSObject<FVPViewProvider> *)viewProvider {
-  return [self initWithURL:[NSURL fileURLWithPath:[FVPVideoPlayer absolutePathForAssetName:asset]]
-              frameUpdater:frameUpdater
-               displayLink:displayLink
-               httpHeaders:@{}
-                 avFactory:avFactory
-              viewProvider:viewProvider];
-}
 
 - (instancetype)initWithURL:(NSURL *)url
                frameUpdater:(FVPFrameUpdater *)frameUpdater

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

@@ -17,14 +17,6 @@
 static void *rateContext = &rateContext;
 
 @implementation FVPVideoPlayer
-- (instancetype)initWithAsset:(NSString *)asset
-                    avFactory:(id<FVPAVFactory>)avFactory
-                 viewProvider:(NSObject<FVPViewProvider> *)viewProvider {
-  return [self initWithURL:[NSURL fileURLWithPath:[FVPVideoPlayer absolutePathForAssetName:asset]]
-               httpHeaders:@{}
-                 avFactory:avFactory
-              viewProvider:viewProvider];
-}
 
 - (instancetype)initWithURL:(NSURL *)url
                 httpHeaders:(nonnull NSDictionary<NSString *, NSString *> *)headers
@@ -122,19 +114,6 @@ - (void)dispose {
   [_eventChannel setStreamHandler:nil];
 }
 
-+ (NSString *)absolutePathForAssetName:(NSString *)assetName {
-  NSString *path = [[NSBundle mainBundle] pathForResource:assetName ofType:nil];
-#if TARGET_OS_OSX
-  // See https://github.com/flutter/flutter/issues/135302
-  // TODO(stuartmorgan): Remove this if the asset APIs are adjusted to work better for macOS.
-  if (!path) {
-    path = [NSURL URLWithString:assetName relativeToURL:NSBundle.mainBundle.bundleURL].path;
-  }
-#endif
-
-  return path;
-}
-
 - (void)addObserversForItem:(AVPlayerItem *)item player:(AVPlayer *)player {
   [item addObserver:self
          forKeyPath:@"loadedTimeRanges"
@@ -250,8 +229,10 @@ - (void)observeValueForKeyPath:(NSString *)path
       NSMutableArray<NSArray<NSNumber *> *> *values = [[NSMutableArray alloc] init];
       for (NSValue *rangeValue in [object loadedTimeRanges]) {
         CMTimeRange range = [rangeValue CMTimeRangeValue];
-        int64_t start = FVPCMTimeToMillis(range.start);
-        [values addObject:@[ @(start), @(start + FVPCMTimeToMillis(range.duration)) ]];
+        [values addObject:@[
+          @(FVPCMTimeToMillis(range.start)),
+          @(FVPCMTimeToMillis(range.duration)),
+        ]];
       }
       _eventSink(@{@"event" : @"bufferingUpdate", @"values" : values});
     }