From 20a18e37c3afc4ca7752f010b5ccb29d17abfb17 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 12 Jul 2024 18:39:56 +0200 Subject: [PATCH] [AVKit] Implement Xcode 15 + Xcode 16.0 beta 1, beta 2 and beta 3 changes. (#20849) Note: there were no changes in beta 2 or beta 3. --- src/AVKit/Enums.cs | 1 + src/avkit.cs | 20 +++++++++++++++++++ .../Documentation.KnownFailures.txt | 10 ++++++++++ .../api-annotations-dotnet/iOS-AVKit.todo | 5 ----- .../api-annotations-dotnet/macOS-AVKit.todo | 1 - .../api-annotations-dotnet/tvOS-AVKit.todo | 1 - tests/xtro-sharpie/iOS-AVKit.todo | 5 ----- tests/xtro-sharpie/macOS-AVKit.todo | 1 - tests/xtro-sharpie/tvOS-AVKit.todo | 1 - 9 files changed, 31 insertions(+), 14 deletions(-) delete mode 100644 tests/xtro-sharpie/api-annotations-dotnet/iOS-AVKit.todo delete mode 100644 tests/xtro-sharpie/iOS-AVKit.todo diff --git a/src/AVKit/Enums.cs b/src/AVKit/Enums.cs index b1cc949601d7..b4b182765c04 100644 --- a/src/AVKit/Enums.cs +++ b/src/AVKit/Enums.cs @@ -35,6 +35,7 @@ public enum AVKitError : long { ContentRatingUnknown = -1100, ContentDisallowedByPasscode = -1101, ContentDisallowedByProfile = -1102, + RecordingFailed = -1200, } [NoWatch] diff --git a/src/avkit.cs b/src/avkit.cs index 100c1446607b..9a5fff31e2eb 100644 --- a/src/avkit.cs +++ b/src/avkit.cs @@ -50,6 +50,18 @@ #endif namespace AVKit { + [NoWatch, NoTV, Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)] + [Native] + enum AVVideoFrameAnalysisType : ulong { + AVVideoFrameAnalysisTypeNone = 0, + AVVideoFrameAnalysisTypeDefault = 1 << 0, + AVVideoFrameAnalysisTypeText = 1 << 1, + AVVideoFrameAnalysisTypeSubject = 1 << 2, + AVVideoFrameAnalysisTypeVisualSearch = 1 << 3, + [NoMac, NoMacCatalyst] + AVVideoFrameAnalysisTypeMachineReadableCode = 1 << 4, + } + /// Provides video playback in a floating, resizable window on larger devices. /// /// Apple documentation for AVPictureInPictureController @@ -365,6 +377,14 @@ interface AVPlayerViewController { [iOS (16, 0), MacCatalyst (16, 0), NoMac, NoWatch, TV (16, 0)] [Export ("selectSpeed:")] void SelectSpeed (AVPlaybackSpeed speed); + + [iOS (17, 0), MacCatalyst (18, 0), NoTV, NoWatch, NoMac] + [Export ("videoFrameAnalysisTypes")] + AVVideoFrameAnalysisType VideoFrameAnalysisTypes { get; set; } + + [iOS (17, 0), MacCatalyst (18, 0), NoTV, NoWatch, NoMac] + [Export ("toggleLookupAction")] + UIAction ToggleLookupAction { get; } } /// Interface representing the required methods (if any) of the protocol . diff --git a/tests/cecil-tests/Documentation.KnownFailures.txt b/tests/cecil-tests/Documentation.KnownFailures.txt index 94d821e2a216..1bd3922aae8a 100644 --- a/tests/cecil-tests/Documentation.KnownFailures.txt +++ b/tests/cecil-tests/Documentation.KnownFailures.txt @@ -5571,6 +5571,7 @@ F:AVKit.AVKitError.ContentDisallowedByProfile F:AVKit.AVKitError.ContentRatingUnknown F:AVKit.AVKitError.None F:AVKit.AVKitError.PictureInPictureStartFailed +F:AVKit.AVKitError.RecordingFailed F:AVKit.AVKitError.Unknown F:AVKit.AVPlayerViewControlsStyle.Default F:AVKit.AVPlayerViewControlsStyle.Floating @@ -5586,6 +5587,12 @@ F:AVKit.AVRoutePickerViewButtonState.NormalHighlighted F:AVKit.AVRoutePickerViewButtonStyle.Custom F:AVKit.AVRoutePickerViewButtonStyle.Plain F:AVKit.AVRoutePickerViewButtonStyle.System +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeDefault +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeMachineReadableCode +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeNone +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeSubject +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeText +F:AVKit.AVVideoFrameAnalysisType.AVVideoFrameAnalysisTypeVisualSearch F:AVRouting.AVCustomRoutingEventReason.Activate F:AVRouting.AVCustomRoutingEventReason.Deactivate F:AVRouting.AVCustomRoutingEventReason.Reactivate @@ -57782,11 +57789,13 @@ P:AVKit.AVPlayerViewController.SkipBackwardEnabled P:AVKit.AVPlayerViewController.SkipForwardEnabled P:AVKit.AVPlayerViewController.SkippingBehavior P:AVKit.AVPlayerViewController.Speeds +P:AVKit.AVPlayerViewController.ToggleLookupAction P:AVKit.AVPlayerViewController.TransportBarCustomMenuItems P:AVKit.AVPlayerViewController.TransportBarIncludesTitleView P:AVKit.AVPlayerViewController.UnobscuredContentGuide P:AVKit.AVPlayerViewController.UpdatesNowPlayingInfoCenter P:AVKit.AVPlayerViewController.VideoBounds +P:AVKit.AVPlayerViewController.VideoFrameAnalysisTypes P:AVKit.AVPlayerViewController.VideoGravity P:AVKit.AVPlayerViewController.WeakDelegate P:AVKit.AVPlayerViewController.WeakVideoGravity @@ -77842,6 +77851,7 @@ T:AVKit.AVPlayerViewTrimResult T:AVKit.AVRoutePickerViewButtonState T:AVKit.AVRoutePickerViewButtonStyle T:AVKit.AVRoutePickerViewDelegate +T:AVKit.AVVideoFrameAnalysisType T:AVKit.IAVCaptureViewDelegate T:AVKit.IAVCustomRoutingControllerDelegate T:AVKit.IAVPictureInPictureSampleBufferPlaybackDelegate diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-AVKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-AVKit.todo deleted file mode 100644 index ab6088855d99..000000000000 --- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-AVKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-enum! AVVideoFrameAnalysisType not bound -!missing-enum-value! AVKitError native value AVKitErrorRecordingFailed = -1200 not bound -!missing-selector! AVPlayerViewController::setVideoFrameAnalysisTypes: not bound -!missing-selector! AVPlayerViewController::toggleLookupAction not bound -!missing-selector! AVPlayerViewController::videoFrameAnalysisTypes not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.todo index 915896b5dc8b..940f89e893a6 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AVKit.todo @@ -1,3 +1,2 @@ -!missing-enum! AVVideoFrameAnalysisType not bound !missing-selector! AVPlayerView::setVideoFrameAnalysisTypes: not bound !missing-selector! AVPlayerView::videoFrameAnalysisTypes not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-AVKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-AVKit.todo index 59928ac6a442..468c14674123 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-AVKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-AVKit.todo @@ -1,4 +1,3 @@ -!missing-enum-value! AVKitError native value AVKitErrorRecordingFailed = -1200 not bound !missing-null-allowed! 'System.Void AVKit.AVPlayerViewController::set_InfoViewActions(UIKit.UIAction[])' is missing an [NullAllowed] on parameter #0 !missing-protocol! AVContinuityDevicePickerViewControllerDelegate not bound !missing-selector! +AVContinuityDevicePickerViewController::isSupported not bound diff --git a/tests/xtro-sharpie/iOS-AVKit.todo b/tests/xtro-sharpie/iOS-AVKit.todo deleted file mode 100644 index ab6088855d99..000000000000 --- a/tests/xtro-sharpie/iOS-AVKit.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-enum! AVVideoFrameAnalysisType not bound -!missing-enum-value! AVKitError native value AVKitErrorRecordingFailed = -1200 not bound -!missing-selector! AVPlayerViewController::setVideoFrameAnalysisTypes: not bound -!missing-selector! AVPlayerViewController::toggleLookupAction not bound -!missing-selector! AVPlayerViewController::videoFrameAnalysisTypes not bound diff --git a/tests/xtro-sharpie/macOS-AVKit.todo b/tests/xtro-sharpie/macOS-AVKit.todo index 915896b5dc8b..940f89e893a6 100644 --- a/tests/xtro-sharpie/macOS-AVKit.todo +++ b/tests/xtro-sharpie/macOS-AVKit.todo @@ -1,3 +1,2 @@ -!missing-enum! AVVideoFrameAnalysisType not bound !missing-selector! AVPlayerView::setVideoFrameAnalysisTypes: not bound !missing-selector! AVPlayerView::videoFrameAnalysisTypes not bound diff --git a/tests/xtro-sharpie/tvOS-AVKit.todo b/tests/xtro-sharpie/tvOS-AVKit.todo index 59928ac6a442..468c14674123 100644 --- a/tests/xtro-sharpie/tvOS-AVKit.todo +++ b/tests/xtro-sharpie/tvOS-AVKit.todo @@ -1,4 +1,3 @@ -!missing-enum-value! AVKitError native value AVKitErrorRecordingFailed = -1200 not bound !missing-null-allowed! 'System.Void AVKit.AVPlayerViewController::set_InfoViewActions(UIKit.UIAction[])' is missing an [NullAllowed] on parameter #0 !missing-protocol! AVContinuityDevicePickerViewControllerDelegate not bound !missing-selector! +AVContinuityDevicePickerViewController::isSupported not bound