Skip to content

Speech macOS xcode15.0 b3

Haritha Mohan edited this page Sep 20, 2023 · 3 revisions

#Speech.framework https://github.com/xamarin/xamarin-macios/pull/19075

diff -ruN /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFAnalysisContext_Private.h /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFAnalysisContext_Private.h
--- /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFAnalysisContext_Private.h	2023-06-08 15:10:22
+++ /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFAnalysisContext_Private.h	2023-06-23 13:40:48
@@ -11,11 +11,16 @@
 
 @class AnalysisContext;
 
+extern NSString *const _SFAnalysisContextTagLeftContext;
+extern NSString *const _SFAnalysisContextTagRightContext;
+extern NSString *const _SFAnalysisContextTagSelectedText;
+extern NSString *const _SFAnalysisContextTagGeoLMRegionID;
+extern NSString *const _SFAnalysisContextTagContextualNamedEntities;
+
+// TODO: Remove these after Core Speech updated. rdar://110343916
 extern NSString *const SFAnalysisContextTagLeftContext;
 extern NSString *const SFAnalysisContextTagRightContext;
 extern NSString *const SFAnalysisContextTagSelectedText;
-extern NSString *const SFAnalysisContextTagGeoLMRegionID;
-extern NSString *const SFAnalysisContextTagContextualNamedEntities;
 /*
  */
 
diff -ruN /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence.h /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence.h
--- /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence.h	2023-06-08 15:10:22
+++ /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence.h	1969-12-31 19:00:00
@@ -1,17 +0,0 @@
-//
-//  SFCommandRecognizerArgumentPresence.h
-//  Speech
-//
-//  Copyright © 2023 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <stdint.h>
-
-NS_SWIFT_SENDABLE
-typedef NS_ENUM(int8_t, SFCommandRecognizerArgumentPresence) {
-    SFCommandRecognizerArgumentPresencePresentAndDelimited = 0,
-    SFCommandRecognizerArgumentPresencePresentMaybeIncomplete = 1,
-    SFCommandRecognizerArgumentPresenceMissingMaybeExpected = 2,
-    SFCommandRecognizerArgumentPresenceMissing = 3
-} API_AVAILABLE(macos(14), ios(17));
diff -ruN /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence_Private.h /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence_Private.h
--- /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence_Private.h	1969-12-31 19:00:00
+++ /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFCommandRecognizerArgumentPresence_Private.h	2023-06-23 13:40:48
@@ -0,0 +1,23 @@
+//
+//  SFCommandRecognizerArgumentPresence_Private.h
+//  Speech
+//
+//  Copyright © 2023 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <stdint.h>
+
+NS_SWIFT_SENDABLE
+typedef NS_ENUM(int8_t, _SFCommandRecognizerArgumentPresence) {
+    _SFCommandRecognizerArgumentPresencePresentAndDelimited = 0,
+    _SFCommandRecognizerArgumentPresencePresentMaybeIncomplete = 1,
+    _SFCommandRecognizerArgumentPresenceMissingMaybeExpected = 2,
+    _SFCommandRecognizerArgumentPresenceMissing = 3,
+    
+    // TODO: Remove once Core Speech no longer uses these symbols. rdar://110343916
+    SFCommandRecognizerArgumentPresencePresentAndDelimited = 0,
+    SFCommandRecognizerArgumentPresencePresentMaybeIncomplete = 1,
+    SFCommandRecognizerArgumentPresenceMissingMaybeExpected = 2,
+    SFCommandRecognizerArgumentPresenceMissing = 3,
+} API_AVAILABLE(macos(14), ios(17));
diff -ruN /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFErrors.h /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFErrors.h
--- /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFErrors.h	2023-06-08 15:10:21
+++ /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFErrors.h	2023-06-23 13:40:48
@@ -10,43 +10,20 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSErrorDomain const SFSpeechErrorDomain;
+extern NSErrorDomain const SFSpeechErrorDomain
+API_AVAILABLE(macos(14), ios(17));
+
 typedef NS_ERROR_ENUM (SFSpeechErrorDomain, SFSpeechErrorCode) {
     /** Error may include `NSUnderlyingErrorKey` in `userInfo`.*/
     SFSpeechErrorCodeInternalServiceError = 1,
-
-    /** Audio input timestamp overlaps or precedes prior audio input. */
-    SFSpeechErrorCodeAudioDisordered,
     
-    /**
-     Audio input is in unexpected format.
-     
-     The back end may be able to cope by loading matching models on demand, but this is still an error the client really ought to resolve on its end.
-     */
-    SFSpeechErrorCodeUnexpectedAudioFormat,
-    
-    /** Selected locale/options does not have an appropriate model available or downloadable. */
-    SFSpeechErrorCodeNoModel,
-    
-    /** The selected modules do not have an audio format in common. */
-    SFSpeechErrorCodeIncompatibleAudioFormats,
-  
-    /** Querying the SpeechRecognizerWorker's JIT LME profile failed. */
-    SFSpeechErrorCodeInvalidJitProfile,
-    
     // MARK: CustomLM data related errors
-    /** templates were malformed **/
-    SFSpeechErrorCodeUndefinedTemplateClassName,
-
-    /** A custom language model file was malformed **/
-    SFSpeechErrorCodeMalformedSupplementalModel,
     
-    /** An abstract base class method was called **/
-    SFSpeechErrorCodeUnimplementedFunctionality,
+    /** Templates were malformed **/
+    SFSpeechErrorCodeUndefinedTemplateClassName = 7,
     
-    // MARK: Objective-C output wrapper related errors
-    /** Module's result task failed  **/
-    SFSpeechErrorCodeModuleOutputFailed
-};
+    /** A custom language model file was malformed **/
+    SFSpeechErrorCodeMalformedSupplementalModel = 8,
+} API_AVAILABLE(macos(14), ios(17));
 
 NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFSpeechAnalyzer_Private.h /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFSpeechAnalyzer_Private.h
--- /Applications/Xcode_15.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFSpeechAnalyzer_Private.h	2023-06-08 15:10:22
+++ /Applications/Xcode_15.0.0-beta3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Speech.framework/Headers/SFSpeechAnalyzer_Private.h	2023-06-23 17:10:19
@@ -9,7 +9,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 #import <CoreMedia/CoreMedia.h>
-#import <Speech/SFCommandRecognizerArgumentPresence.h>
+#import <Speech/SFCommandRecognizerArgumentPresence_Private.h>
 #import <Speech/SFEARResultType_Private.h>
 #import <Speech/SFSpeechAnalyzerOutputWrapper_Private.h>
 #import <Speech/SFSpeechRecognitionTaskHint.h>
@@ -79,7 +79,6 @@
 
 // TODO: inputAudioFormat getter?
 
-- (void)cancelInputTask;
 /// The time value will be invalid if there is no start time. Use `CMTIME_IS_INVALID` to check.
 - (void)getNextBufferStartTimeWithCompletion:(void (^)(CMTime))completion;
 
@@ -323,11 +322,11 @@
 @interface _SFCommandRecognizerArgument : NSObject
 // corresponds to CommandRecognizer.Argument
 
-@property (nonatomic, readonly) SFCommandRecognizerArgumentPresence presence;
+@property (nonatomic, readonly) _SFCommandRecognizerArgumentPresence presence;
 @property (nonatomic, readonly, copy) NSIndexSet *indexes;
 @property (nonatomic, readonly, copy) NSIndexSet *adpositionIndexes;
 
-- (instancetype)initWithPresence:(SFCommandRecognizerArgumentPresence)presence
+- (instancetype)initWithPresence:(_SFCommandRecognizerArgumentPresence)presence
         indexes:(NSIndexSet *)indexes
         adpositionIndexes:(NSIndexSet *)adpositionIndexes;
 
Clone this wiki locally