[camera] Convert Windows to Pigeon by stuartmorgan-g · Pull Request #6925 · flutter/packages

stuartmorgan-g · 2024-06-14T14:45:09Z

Replaces all of the manual method channel code in camera_windows with Pigeon.

I attempted to change the structure as little as possible, since this was already a large change. I don't particularly like the way the native result callback objects are managed (passed to Camera and tracked in a map), but I decided that redesigning that would be out of scope and introduced a std::variant to allow minimal changes to that structure. That does slightly undermine the type safety of the callbacks, but it's still strictly enforced at the level of the helpers that interact with the map.

Fixesflutter/flutter#117905

Pre-launch Checklist

stuartmorgan-g

Some overview of the changes to help with review:

stuartmorgan-g · 2024-06-14T14:49:02Z

+}
+
+// Pigeon version of the relevant subset of VideoCaptureOptions.
+class PlatformVideoCaptureOptions {


I fully expect this to contain other things later, thus the use of the wrapper now.

stuartmorgan-g · 2024-06-14T14:53:47Z

 // Returns an error result if the result has already been added.
- virtual bool AddPendingResult(PendingResultType type,
- std::unique_ptr<MethodResult<>> result) = 0;
+ virtual bool AddPendingVoidResult(


These new methods are because callbacks are no longer one generic type. I could have just changed the existing API to take the new variant, but I opted to hide that to minimize the number of places where we are essentially dropping type safety.
That will also make it simpler to change to something fully type-safe later since it will be internal to this one class.

stuartmorgan-g · 2024-06-14T14:56:43Z

 using Microsoft::WRL::ComPtr;

-// Camera resolution presets. Used to request a capture resolution.
-enum class ResolutionPreset {


This is replaced by a Pigeon-generated enum.

stuartmorgan-g · 2024-06-14T14:57:26Z

-// Allows to tune recorded video parameters, such as resolution, frame rate,
-// bitrate. If [fps], [video_bitrate] or [audio_bitrate] are passed, they must
-// be greater than zero.
-struct RecordSettings {


This struct is replaced by a Pigeon-generated data class.

stuartmorgan-g · 2024-06-27T16:26:07Z

@cbracken Ping on this review in case you missed the notification while you were out.

cbracken · 2024-07-09T16:56:55Z

Back as of yesterday and mostly caught up on mail. Looking!

cbracken

flutter/packages@14341d1...ea35fc6 2024-07-10 737941+loic-sharma@users.noreply.github.com [camera_avfoundation] Adds Swift Package Manager compatibility (flutter/packages#7080) 2024-07-10 737941+loic-sharma@users.noreply.github.com [webview_flutter_wkwebview] Adds Swift Package Manager compatibility (flutter/packages#7091) 2024-07-10 contact@thaun.dev [webview_flutter_web] Migrate to package:web. (flutter/packages#6792) 2024-07-10 stuartmorgan@google.com [camera] Clean up `maxDuration` code (flutter/packages#7039) 2024-07-10 reidbaker@google.com Update espresso dependencies (flutter/packages#7048) 2024-07-09 stuartmorgan@google.com [camera] Fix iOS torch mode regression (flutter/packages#7085) 2024-07-09 stuartmorgan@google.com [google_maps_flutter] Convert Obj-C->Dart calls to Pigeon (flutter/packages#7086) 2024-07-09 engine-flutter-autoroll@skia.org Roll Flutter from fafd67d to 5103d75 (27 revisions) (flutter/packages#7084) 2024-07-09 30872003+misos1@users.noreply.github.com [camera_avfoundation] fix sample times not being numeric after pause/resume. (flutter/packages#6897) 2024-07-09 stuartmorgan@google.com [camera] Convert Windows to Pigeon (flutter/packages#6925) 2024-07-09 stuartmorgan@google.com [camera] Deprecate `maxDuration` in platform interface (flutter/packages#7078) 2024-07-09 stuartmorgan@google.com [google_maps_flutter] Semi-convert remaining iOS host API calls to Pigeon (flutter/packages#7079) 2024-07-09 stuartmorgan@google.com [path_provider] Remove `win32` (flutter/packages#7073) 2024-07-08 stuartmorgan@google.com [google_maps_flutter] Move iOS inspector to Pigeon (flutter/packages#6937) 2024-07-08 49699333+dependabot[bot]@users.noreply.github.com [camera]: Bump com.android.tools.build:gradle from 7.3.0 to 8.5.0 in /packages/camera/camera_android_camerax/android (flutter/packages#7072) 2024-07-08 49699333+dependabot[bot]@users.noreply.github.com [local_auth]: Bump com.android.tools.build:gradle from 7.3.1 to 8.5.0 in /packages/local_auth/local_auth_android/android (flutter/packages#7069) 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-flutter-autoroll Please CC flutter-ecosystem@google.com,rmistry@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: 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

Replaces all of the manual method channel code in `camera_windows` with Pigeon. I attempted to change the structure as little as possible, since this was already a large change. I don't particularly like the way the native result callback objects are managed (passed to `Camera` and tracked in a map), but I decided that redesigning that would be out of scope and introduced a `std::variant` to allow minimal changes to that structure. That does slightly undermine the type safety of the callbacks, but it's still strictly enforced at the level of the helpers that interact with the map. Fixesflutter/flutter#117905

stuartmorgan-g added 12 commits June 11, 2024 15:17

Initial Host API specification
1ff1424

Pubspec adjustments
a93173d

Partial pass at initial implementation, not complete
0cce79d

Pigeon update
0475cc2

More implementation
3235d1a

Update Dart tests
05cc9fe

Rename pigeon method
103672c

Native cleanup
656a2f2

Native compilation fixes
dca6192

fixup: autoformat
0c2d8dc

Update native unit tests for API changes
9fc1981

version bump
a64c5a2

stuartmorgan-g requested a review from cbracken as a code owner June 14, 2024 14:45

github-actionsBot added p: camera platform-windows labels Jun 14, 2024

stuartmorgan-g commented Jun 14, 2024
View reviewed changes

cbracken reviewed Jul 9, 2024
View reviewed changes

Comment threadpackages/camera/camera_windows/pigeons/messages.dart Outdated

cbracken reviewed Jul 9, 2024
View reviewed changes

Comment threadpackages/camera/camera_windows/pigeons/messages.dart Outdated

cbracken reviewed Jul 9, 2024
View reviewed changes

Comment threadpackages/camera/camera_windows/test/camera_windows_test.dart

cbracken approved these changes Jul 9, 2024
View reviewed changes

stuartmorgan-g added 2 commits July 9, 2024 14:42

Merge branch 'main' into camera-windows-pigeon
9ab95af

Fix comments
d2d2472

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 9, 2024

auto-submitBot merged commit 5cc6418 into flutter:mainJul 9, 2024

engine-flutter-autoroll mentioned this pull request Jul 10, 2024
Roll Packages from 14341d1800f4 to 01527175e38e (11 revisions) flutter/flutter#151538
Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2024
5cc6418[camera] Convert Windows to Pigeon (flutter/packages#6925)
ea87256

engine-flutter-autoroll mentioned this pull request Jul 10, 2024
Roll Packages from 14341d1800f4 to 17188b758b44 (13 revisions) flutter/flutter#151541
Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2024
5cc6418[camera] Convert Windows to Pigeon (flutter/packages#6925)
c4d2b86

engine-flutter-autoroll mentioned this pull request Jul 10, 2024
Roll Packages from 14341d1800f4 to c47614c6d984 (14 revisions) flutter/flutter#151549
Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2024
5cc6418[camera] Convert Windows to Pigeon (flutter/packages#6925)
2d78644

engine-flutter-autoroll mentioned this pull request Jul 10, 2024
Roll Packages from 14341d1800f4 to 57d42e447c6a (15 revisions) flutter/flutter#151555
Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2024
5cc6418[camera] Convert Windows to Pigeon (flutter/packages#6925)
fbdb807

engine-flutter-autoroll mentioned this pull request Jul 10, 2024
Roll Packages from 14341d1800f4 to ea35fc6fb86a (16 revisions) flutter/flutter#151556
Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 10, 2024
5cc6418[camera] Convert Windows to Pigeon (flutter/packages#6925)
628cd81

reidbaker mentioned this pull request Jul 25, 2024
[many] Ignore NewerVersionAvailable in android lint #7218
Merged
11 tasks

stuartmorgan-g mentioned this pull request Nov 1, 2024
[camera] Use Pigeon for Windows C++->Dart #8001
Merged
11 tasks

Navigation Menu

Uh oh!

[camera] Convert Windows to Pigeon - #6925

[camera] Convert Windows to Pigeon#6925
auto-submit[bot] merged 14 commits into
flutter:mainfrom
stuartmorgan-g:camera-windows-pigeon

stuartmorgan-g commented Jun 14, 2024

Uh oh!

stuartmorgan-g left a comment

Uh oh!

Uh oh!

Uh oh!

stuartmorgan-gJun 14, 2024

Uh oh!

stuartmorgan-gJun 14, 2024

Uh oh!

Uh oh!

stuartmorgan-gJun 14, 2024

Uh oh!

stuartmorgan-gJun 14, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stuartmorgan-g commented Jun 27, 2024

Uh oh!

cbracken commented Jul 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cbracken left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

stuartmorgan-g commented Jun 14, 2024

Pre-launch Checklist

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

stuartmorgan-gJun 14, 2024

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-gJun 14, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

stuartmorgan-gJun 14, 2024

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-gJun 14, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stuartmorgan-g commented Jun 27, 2024

Uh oh!

cbracken commented Jul 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cbracken left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants