Move code from Plugin_Test file to different files

flutter · Dec 2, 2024 · 927ff35 · 927ff35
1 parent 0055ea3
commit 927ff35
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 93 deletions.
diff --git a/...aps_flutter_ios/example/ios14/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...aps_flutter_ios/example/ios14/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/packages/video_player/video_player/example/ios/Runner.xcodeproj/project.pbxproj b/packages/video_player/video_player/example/ios/Runner.xcodeproj/project.pbxproj
@@ -170,7 +170,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/...o_player/video_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...o_player/video_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml
@@ -25,10 +25,16 @@ dependencies:
   flutter:
     sdk: flutter
   html: ^0.15.0
-  video_player_android: ^2.3.5
-  video_player_avfoundation: ^2.5.6
-  video_player_platform_interface: ^6.2.0
-  video_player_web: ^2.1.0
+  # video_player_android: ^2.3.5
+  video_player_android:
+    path: ../video_player_android
+  # video_player_avfoundation: ^2.5.6
+  video_player_avfoundation:
+    path: ../video_player_avfoundation
+  # video_player_platform_interface: ^6.2.0
+  video_player_platform_interface:
+    path: ../video_player_platform_interface
+  # video_player_web: ^2.1.0
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/video_player/video_player_android/example/android/settings.gradle b/packages/video_player/video_player_android/example/android/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.5.1" apply false
+    id "com.android.application" version "8.4.0" apply false
     id "org.jetbrains.kotlin.android" version "1.9.0" apply false
     id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
 }

diff --git a/packages/video_player/video_player_android/example/pubspec.yaml b/packages/video_player/video_player_android/example/pubspec.yaml
@@ -16,7 +16,9 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  video_player_platform_interface: ">=6.1.0 <7.0.0"
+  # video_player_platform_interface: ">=6.1.0 <7.0.0"
+  video_player_platform_interface:
+    path: ../../video_player_platform_interface
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml
@@ -20,7 +20,9 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  video_player_platform_interface: ">=6.1.0 <7.0.0"
+  # video_player_platform_interface: ">=6.1.0 <7.0.0"
+  video_player_platform_interface:
+    path: ../video_player_platform_interface
 
 dev_dependencies:
   flutter_test:

diff --git a/...ndation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPAVFactory.m b/...ndation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPAVFactory.m
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <AVFoundation/AVFoundation.h>
+
+#import "FVPAVFactory.h"
+
+@implementation FVPDefaultAVFactory
+- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem {
+  return [AVPlayer playerWithPlayerItem:playerItem];
+}
+- (AVPlayerItemVideoOutput *)videoOutputWithPixelBufferAttributes:
+    (NSDictionary<NSString *, id> *)attributes {
+  return [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:attributes];
+}
+@end
diff --git a/...darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPVideoPlayerPlugin.m b/...darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPVideoPlayerPlugin.m
@@ -6,6 +6,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+#import "./include/video_player_avfoundation/FVPAVFactory.h"
 #import "./include/video_player_avfoundation/FVPDisplayLink.h"
 #import "./include/video_player_avfoundation/FVPFrameUpdater.h"
 #import "./include/video_player_avfoundation/FVPVideoPlayer.h"
@@ -16,19 +17,6 @@
 #error Code Requires ARC.
 #endif
 
-@interface FVPDefaultAVFactory : NSObject <FVPAVFactory>
-@end
-
-@implementation FVPDefaultAVFactory
-- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem {
-  return [AVPlayer playerWithPlayerItem:playerItem];
-}
-- (AVPlayerItemVideoOutput *)videoOutputWithPixelBufferAttributes:
-    (NSDictionary<NSString *, id> *)attributes {
-  return [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:attributes];
-}
-@end
-
 /// Non-test implementation of the diplay link factory.
 @interface FVPDefaultDisplayLinkFactory : NSObject <FVPDisplayLinkFactory>
 @end

diff --git a/...dation/Sources/video_player_avfoundation/include/video_player_avfoundation/FVPAVFactory.h b/...dation/Sources/video_player_avfoundation/include/video_player_avfoundation/FVPAVFactory.h
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <AVFoundation/AVFoundation.h>
+
+/// Protocol for AVFoundation object instance factory. Used for injecting framework objects in
+/// tests.
+@protocol FVPAVFactory
+/// Creates and returns an AVPlayer instance with the specified AVPlayerItem.
+@required
+- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem;
+
+/// Creates and returns an AVPlayerItemVideoOutput instance with the specified pixel buffer
+/// attributes.
+- (AVPlayerItemVideoOutput *)videoOutputWithPixelBufferAttributes:
+    (NSDictionary<NSString *, id> *)attributes;
+@end
+
+@interface FVPDefaultAVFactory : NSObject <FVPAVFactory>
+@end
diff --git a/...tion/Sources/video_player_avfoundation/include/video_player_avfoundation/FVPVideoPlayer.h b/...tion/Sources/video_player_avfoundation/include/video_player_avfoundation/FVPVideoPlayer.h
@@ -10,22 +10,32 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+#import "FVPAVFactory.h"
 #import "FVPDisplayLink.h"
 #import "FVPFrameUpdater.h"
-#import "FVPVideoPlayerPlugin_Test.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /// FVPVideoPlayer is responsible for managing video playback using AVPlayer.
 /// It provides methods to control playback, adjust volume, handle seeking, and
 /// notify the Flutter engine about new video frames.
-@interface FVPVideoPlayer ()
+@interface FVPVideoPlayer : NSObject <FlutterStreamHandler, FlutterTexture>
 /// The Flutter event channel used to communicate with the Flutter engine.
 @property(nonatomic) FlutterEventChannel *eventChannel;
 /// Indicates whether the video player has been disposed.
 @property(nonatomic, readonly) BOOL disposed;
 /// Indicates whether the video player is set to loop.
 @property(nonatomic) BOOL isLooping;
+/// The AVPlayer instance used for video playback.
+@property(readonly, nonatomic, nonnull) AVPlayer *player;
+// 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.
+@property(nonatomic, nonnull) AVPlayerLayer *playerLayer;
+/// The current playback position of the video, in milliseconds.
+@property(readonly, nonatomic) int64_t position;
 
 /// Initializes a new instance of FVPVideoPlayer with the given URL, frame updater, display link,
 /// HTTP headers, AV factory, and registrar.
@@ -79,6 +89,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// Tells the player to run its frame updater until it receives a frame, regardless of the
 /// play/pause state.
 - (void)expectFrame;
+
+/// Called when the texture is unregistered.
+/// This method is used to clean up resources associated with the texture.
+- (void)onTextureUnregistered:(nullable NSObject<FlutterTexture> *)texture;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/...s/video_player_avfoundation/include/video_player_avfoundation/FVPVideoPlayerPlugin_Test.h b/...s/video_player_avfoundation/include/video_player_avfoundation/FVPVideoPlayerPlugin_Test.h
@@ -2,21 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FVPVideoPlayerPlugin.h"
-
-#import <AVFoundation/AVFoundation.h>
-
+#import "FVPAVFactory.h"
 #import "FVPDisplayLink.h"
+#import "FVPVideoPlayer.h"
+#import "FVPVideoPlayerPlugin.h"
 #import "messages.g.h"
 
-// Protocol for AVFoundation object instance factory. Used for injecting framework objects in tests.
-@protocol FVPAVFactory
-@required
-- (AVPlayer *)playerWithPlayerItem:(AVPlayerItem *)playerItem;
-- (AVPlayerItemVideoOutput *)videoOutputWithPixelBufferAttributes:
-    (NSDictionary<NSString *, id> *)attributes;
-@end
-
 // Protocol for an AVPlayer instance factory. Used for injecting display links in tests.
 @protocol FVPDisplayLinkFactory
 - (FVPDisplayLink *)displayLinkWithRegistrar:(id<FlutterPluginRegistrar>)registrar
@@ -25,22 +16,6 @@
 
 #pragma mark -
 
-// TODO(stuartmorgan): Move this whole class to its own files.
-@interface FVPVideoPlayer : NSObject <FlutterStreamHandler, FlutterTexture>
-@property(readonly, nonatomic) AVPlayer *player;
-// 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.
-@property(readonly, nonatomic) AVPlayerLayer *playerLayer;
-@property(readonly, nonatomic) int64_t position;
-
-- (void)onTextureUnregistered:(NSObject<FlutterTexture> *)texture;
-@end
-
-#pragma mark -
-
 @interface FVPVideoPlayerPlugin () <FVPAVFoundationVideoPlayerApi>
 
 @property(readonly, strong, nonatomic)

diff --git a/packages/video_player/video_player_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj b/packages/video_player/video_player_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj
@@ -611,6 +611,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = V8MTLZV499;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -625,7 +626,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.videoPlayerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.videoPlayerExampleee;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -635,6 +636,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = V8MTLZV499;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -649,7 +651,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.videoPlayerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.videoPlayerExampleee;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -693,7 +695,9 @@
 			baseConfigurationReference = 6CDC4DA5940705A6E7671616 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = V8MTLZV499;
 				INFOPLIST_FILE = RunnerTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -703,6 +707,9 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
 			};
 			name = Debug;
@@ -712,7 +719,9 @@
 			baseConfigurationReference = 2A2EA522BDC492279A91AB75 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = V8MTLZV499;
 				INFOPLIST_FILE = RunnerTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -722,6 +731,9 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
 			};
 			name = Release;

diff --git a/...o_player_avfoundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...o_player_avfoundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/..._player_avfoundation/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/..._player_avfoundation/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/packages/video_player/video_player_avfoundation/example/ios/Runner/Info.plist b/packages/video_player/video_player_avfoundation/example/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,6 +29,8 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -48,9 +52,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>
diff --git a/...ges/video_player/video_player_avfoundation/example/macos/Runner.xcodeproj/project.pbxproj b/...ges/video_player/video_player_avfoundation/example/macos/Runner.xcodeproj/project.pbxproj
@@ -220,7 +220,6 @@
 				331C80D1294CF70F00263BE5 /* Sources */,
 				331C80D2294CF70F00263BE5 /* Frameworks */,
 				331C80D3294CF70F00263BE5 /* Resources */,
-				0D0E54DEED2C6FB4DAE44CD9 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -331,23 +330,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0D0E54DEED2C6FB4DAE44CD9 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;