[video_player_avfoundation] Adds Swift Package Manager compatibility #6634

vashworth · 2024-05-01T20:24:00Z

Makes video_player_avfoundation available as a Swift Package to Flutter. Also, remains compatible with CocoaPods.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

vashworth · 2024-05-01T21:53:38Z

...avfoundation/darwin/video_player_avfoundation/Sources/video_player_avfoundation/messages.g.m

@@ -4,7 +4,7 @@
 // Autogenerated from Pigeon (v18.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon

-#import "messages.g.h"
+#import "./include/video_player_avfoundation/messages.g.h"


I changed this manually. This will get overwritten by pigeon until flutter/flutter#147587 is fixed.

vashworth · 2024-05-02T19:40:18Z

packages/video_player/video_player_avfoundation/example/macos/Runner/AppDelegate.swift

@@ -5,7 +5,7 @@
 import Cocoa
 import FlutterMacOS

-@NSApplicationMain
+@main


@NSApplicationMain was deprecated, tool migrated it: flutter/flutter#146848

vashworth · 2024-05-02T19:41:05Z

packages/video_player/video_player_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		78CF8D742BC5CEA80051231B /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 78CF8D732BC5CEA80051231B /* OCMock */; };


Note: pbxproj file does not contain Swift Package Manager migration changes so that it will continue to build with stable. Migration will happen on the fly.

loic-sharma · 2024-05-02T22:54:31Z

@vashworth From my poor understanding, this doesn't quite follow the WIP migration guide because the guide assumes that macOS and iOS are implemented in separate plugins. Is video_player_avfoundation's pattern of 1 plugin for both macOS & iOS common? If yes, do you think it's worthwhile to add a separate migration guide for this pattern?

loic-sharma

This looks good to me but my understanding here is shaky! 😅

stuartmorgan-g · 2024-05-03T17:05:36Z

packages/video_player/video_player_avfoundation/darwin/video_player_avfoundation/Package.swift

+        .headerSearchPath("include/video_player_avfoundation")
+      ]
+    ),
+    .target(


Interesting, so SPM doesn't allow source filtering without making separate targets?

Correct, it doesn't allow you to conditionalize by platform very much, only target dependencies, CSettings, CXXSettings, SwiftSettings, and LinkerSettings.

Sources can only be nil or an array of strings

stuartmorgan-g · 2024-05-03T17:06:15Z

...on/darwin/video_player_avfoundation/Sources/video_player_avfoundation/FVPVideoPlayerPlugin.m

-#import "messages.g.h"
+#import "./include/video_player_avfoundation/AVAssetTrackUtils.h"
+#import "./include/video_player_avfoundation/FVPDisplayLink.h"
+#import "./include/video_player_avfoundation/messages.g.h"


Do we know why include paths aren't taking care of this?

So for most of the headers, include paths is sufficient. However, messages.g.h is a problem when there's multiple plugins that also have a messages.g.h. Seems like it can't resolve which to use. More explanation here: flutter/flutter#147587 (comment)

So I decided to change all of them to relative paths to keep it uniform

stuartmorgan-g · 2024-05-03T17:07:45Z

packages/video_player/video_player_avfoundation/pubspec.yaml

@@ -2,7 +2,7 @@ name: video_player_avfoundation
 description: iOS and macOS implementation of the video_player plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.5.7
+version: 2.5.8


Optional: I would probably make this a minor bump, since it's more of a new feature than a fix.

- **Rename getCountryCode to country code for ios and android IAP** - **Add changelog** fixes flutter/flutter#147230

flutter/flutter@bf7191f...f1037a0 2024-05-03 [email protected] Roll Flutter Engine from 445c3bfc0d5b to 8cce00433073 (1 revision) (flutter/flutter#147778) 2024-05-03 [email protected] Roll Flutter Engine from 1f9edbeeceb3 to 445c3bfc0d5b (1 revision) (flutter/flutter#147776) 2024-05-03 [email protected] Roll Flutter Engine from 75eb18090510 to 1f9edbeeceb3 (1 revision) (flutter/flutter#147769) 2024-05-03 [email protected] Improved documentation for SpringSimulation (flutter/flutter#146674) 2024-05-03 [email protected] Roll Flutter Engine from b8d81a4f6e5a to 75eb18090510 (1 revision) (flutter/flutter#147766) 2024-05-03 [email protected] Roll Flutter Engine from d8c8cf4384f0 to b8d81a4f6e5a (2 revisions) (flutter/flutter#147765) 2024-05-03 [email protected] Move snippets package back into flutter repo (flutter/flutter#147690) 2024-05-03 [email protected] Roll Flutter Engine from 98a800b00cfc to d8c8cf4384f0 (2 revisions) (flutter/flutter#147763) 2024-05-03 [email protected] Roll Flutter Engine from c380e9fd4122 to 98a800b00cfc (3 revisions) (flutter/flutter#147761) 2024-05-03 [email protected] Roll Flutter Engine from fc71b650a70a to c380e9fd4122 (4 revisions) (flutter/flutter#147759) 2024-05-03 [email protected] Roll pub packages (flutter/flutter#147741) 2024-05-03 [email protected] Roll Flutter Engine from 3f1f81915620 to fc71b650a70a (2 revisions) (flutter/flutter#147753) 2024-05-02 [email protected] Roll Flutter Engine from 5088f63ecee2 to 3f1f81915620 (3 revisions) (flutter/flutter#147748) 2024-05-02 [email protected] [web] skip debug mode CanvasKit e2e tests due to flakiness; unskip all other modes (flutter/flutter#147736) 2024-05-02 [email protected] Control flow collections: `flutter_tools/` (flutter/flutter#147450) 2024-05-02 [email protected] Add default arguments to `AnimatedPhysicalModel` (flutter/flutter#147424) 2024-05-02 [email protected] Roll Flutter Engine from 9982b5ffd913 to 5088f63ecee2 (3 revisions) (flutter/flutter#147740) 2024-05-02 [email protected] `_RenderDecorator.computeDryBaseline` (flutter/flutter#146365) 2024-05-02 [email protected] Roll Flutter Engine from e1126e59b698 to 9982b5ffd913 (1 revision) (flutter/flutter#147727) 2024-05-02 [email protected] [web] increase chromedriver logging level (flutter/flutter#147687) 2024-05-02 [email protected] Roll Flutter Engine from 1fb36ac9d718 to e1126e59b698 (1 revision) (flutter/flutter#147720) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…lutter#6426) Fix unnecessary toList/fromList calls during encode/decode process. also makes some kotlin code more idiomatic. removes the ability to have collisions with the name `list`. fixes flutter/flutter#119351

…r#3586) This PR is for enabling fps and bitrate control of recorded video. Allow users to more control over recorded video size. `CameraPlatform.createCameraWithSettings` is added, leaving original `CameraPlatform.createCamera` commented as deprecated. So this is not breaking change. Tested on a set of mobile devices. Web support depends on browser (perfect with Firefox). Fixes flutter/flutter#54339

…ter#6608) Adds logic + documentation to prevent the usage of unsupported (by CameraX) concurrent camera use cases. The CameraX plugin should only support the concurrent camera use cases supported by Camerax; see [their documentation](https://developer.android.com/media/camera/camerax/architecture#combine-use-cases) for more information. To avoid the usage of unsupported concurrent use cases, this PR changes the plugin so that it behaves according to the following: * If the preview is paused (via `pausePreview`), concurrent video recording and image streaming (via `startVideoCapturing(cameraId, VideoCaptureOptions(streamCallback:...))`) is supported. * If the preview is not paused * **and** the camera device is at least supported hardware [`LIMITED`](https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED), then concurrent image capture and video recording is supported. * **and** the camera device is at least supported hardware [`LEVEL_3`](https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3), then concurrent video recording and image streaming is supported, but if used, concurrent image capture alongside this is not supported. Also changes `Surface` constants to match Dart style and small documentation nits I noticed. Fixes flutter/flutter#146395, fixes flutter/flutter#144414.

vashworth · 2024-05-06T15:16:43Z

Shoot I did something wrong with git. I'm going to start over this PR

vashworth · 2024-05-06T15:17:46Z

@vashworth From my poor understanding, this doesn't quite follow the WIP migration guide because the guide assumes that macOS and iOS are implemented in separate plugins. Is video_player_avfoundation's pattern of 1 plugin for both macOS & iOS common? If yes, do you think it's worthwhile to add a separate migration guide for this pattern?

If you look at "Converting an existing Objective-C Flutter Plugin to a Swift Package" Step 1, it tells you to use either ios, macos, or darwin (darwin being when it's shared between iOS and macOS). The steps are the same, you just replace ios with darwin. Maybe my explanation of that isn't clear?

Other resources:
https://docs.flutter.dev/packages-and-plugins/developing-packages#shared-ios-and-macos-implementations
https://docs.flutter.dev/packages-and-plugins/developing-packages#step-2c-add-ios-platform-code-swift-h-m

…6675) Makes `video_player_avfoundation` available as a Swift Package to Flutter. Also, remains compatible with CocoaPods. Fixes flutter/flutter#146921. Redo of #6634.

…lutter#6675) Makes `video_player_avfoundation` available as a Swift Package to Flutter. Also, remains compatible with CocoaPods. Fixes flutter/flutter#146921. Redo of flutter#6634.

…(#6675) Makes `video_player_avfoundation` available as a Swift Package to Flutter. Also, remains compatible with CocoaPods. Fixes flutter/flutter#146921. Redo of flutter/packages#6634.

vashworth added 2 commits May 1, 2024 15:21

Convert video_player_avfoundation into a Swift Package

e9a4fe1

Update changelog and version

2cc1aa0

github-actions bot added platform-ios platform-macos p: video_player labels May 1, 2024

vashworth added 3 commits May 1, 2024 16:42

fix tests

df171d2

remove duplicate sources

356a233

Make header imports relative

d7274e5

vashworth commented May 1, 2024

View reviewed changes

Merge branch 'main' into video_player_avfoundation_swift_package

074b22a

vashworth commented May 2, 2024

View reviewed changes

vashworth marked this pull request as ready for review May 2, 2024 19:42

vashworth requested a review from hellohuanlin as a code owner May 2, 2024 19:42

vashworth requested review from stuartmorgan-g and loic-sharma and removed request for hellohuanlin May 2, 2024 19:42

loic-sharma approved these changes May 2, 2024

View reviewed changes

stuartmorgan-g reviewed May 3, 2024

View reviewed changes

reidbaker and others added 5 commits May 6, 2024 10:11

[in_app_purchase] implement countryCode correctly (flutter#6636)

c2b86e1

- **Rename getCountryCode to country code for ios and android IAP** - **Add changelog** fixes flutter/flutter#147230

vashworth requested review from LouiseHsu, gmackall, camsim99, tarrinneal and bparrishMines as code owners May 6, 2024 15:11

github-actions bot added p: pigeon p: camera p: in_app_purchase platform-android platform-windows labels May 6, 2024

vashworth removed request for LouiseHsu, gmackall, camsim99, tarrinneal and bparrishMines May 6, 2024 15:15

vashworth closed this May 6, 2024

vashworth mentioned this pull request May 6, 2024

[video_player_avfoundation] Adds Swift Package Manager compatibility #6675

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[video_player_avfoundation] Adds Swift Package Manager compatibility #6634

[video_player_avfoundation] Adds Swift Package Manager compatibility #6634

Uh oh!

vashworth commented May 1, 2024

Uh oh!

vashworth May 1, 2024 •

edited

Loading

Uh oh!

vashworth May 2, 2024

Uh oh!

vashworth May 2, 2024

Uh oh!

loic-sharma commented May 2, 2024

Uh oh!

loic-sharma left a comment

Uh oh!

stuartmorgan-g May 3, 2024

Uh oh!

vashworth May 6, 2024

Uh oh!

stuartmorgan-g May 3, 2024

Uh oh!

vashworth May 6, 2024

Uh oh!

stuartmorgan-g May 3, 2024

Uh oh!

vashworth commented May 6, 2024

Uh oh!

vashworth commented May 6, 2024

Uh oh!

Uh oh!

[video_player_avfoundation] Adds Swift Package Manager compatibility #6634

[video_player_avfoundation] Adds Swift Package Manager compatibility #6634

Uh oh!

Conversation

vashworth commented May 1, 2024

Pre-launch Checklist

Uh oh!

vashworth May 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vashworth May 2, 2024

Choose a reason for hiding this comment

Uh oh!

vashworth May 2, 2024

Choose a reason for hiding this comment

Uh oh!

loic-sharma commented May 2, 2024

Uh oh!

loic-sharma left a comment

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g May 3, 2024

Choose a reason for hiding this comment

Uh oh!

vashworth May 6, 2024

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g May 3, 2024

Choose a reason for hiding this comment

Uh oh!

vashworth May 6, 2024

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g May 3, 2024

Choose a reason for hiding this comment

Uh oh!

vashworth commented May 6, 2024

Uh oh!

vashworth commented May 6, 2024

Uh oh!

Uh oh!

vashworth May 1, 2024 •

edited

Loading