From 2855ed6cf99635c5a37a6bb5edac840052f34878 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:32:10 +0800 Subject: [PATCH] sync with NMS-23842 --- dita/RTC-NG/API/api_irtcengine_enableextension.dita | 4 ++-- dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita | 6 +++--- dita/RTC-NG/API/api_irtcengine_getextensionproperty2.dita | 6 +++--- .../api_irtcengine_querycamerafocallengthcapability.dita | 2 +- dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita | 2 +- dita/RTC-NG/API/api_irtcengine_registerextension.dita | 4 ++-- dita/RTC-NG/API/api_irtcengine_setextensionproperty.dita | 2 +- .../API/api_irtcengine_setextensionproviderproperty.dita | 2 +- ..._irtcengineeventhandler_onextensionerrorwithcontext.dita | 2 +- ..._irtcengineeventhandler_onextensioneventwithcontext.dita | 2 +- ...rtcengineeventhandler_onextensionstartedwithcontext.dita | 2 +- ...rtcengineeventhandler_onextensionstoppedwithcontext.dita | 2 +- dita/RTC-NG/API/class_audiopcmframe.dita | 2 +- dita/RTC-NG/API/class_imediafilterextensiondelegate.dita | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_enableextension.dita b/dita/RTC-NG/API/api_irtcengine_enableextension.dita index 4c6dff8cd0d..5ece6e8d0ca 100644 --- a/dita/RTC-NG/API/api_irtcengine_enableextension.dita +++ b/dita/RTC-NG/API/api_irtcengine_enableextension.dita @@ -16,8 +16,8 @@ public abstract int enableExtension( String provider, String extension, boolean enable, Constants.MediaSourceType sourceType); public abstract enableExtension(provider:string,extension:string,enable:boolean,extensionInfo:ExtensionInfo):number; - - (int)enableExtensionWithVendor:(NSString * __nonnull)provider - extension:(NSString * __nonnull)extension + - (int)enableExtensionWithVendor:(NSString * _Nonnull)provider + extension:(NSString * _Nonnull)extension enabled:(BOOL)enabled sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(enableExtension(withVendor:extension:enabled:sourceType:)); virtual int enableExtension(const char* provider, const char* extension, bool enable=true, agora::media::MEDIA_SOURCE_TYPE type = agora::media::UNKNOWN_MEDIA_SOURCE) = 0; diff --git a/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita b/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita index 3ade1028cf7..b36b03b411d 100644 --- a/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita +++ b/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita @@ -16,9 +16,9 @@ public abstract String getExtensionProperty(String provider, String extension, String key); - - (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * __nonnull)provider - extension:(NSString * __nonnull)extension - key:(NSString * __nonnull)key; + - (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * _Nonnull)provider + extension:(NSString * _Nonnull)extension + key:(NSString * _Nonnull)key; diff --git a/dita/RTC-NG/API/api_irtcengine_getextensionproperty2.dita b/dita/RTC-NG/API/api_irtcengine_getextensionproperty2.dita index 1624297ac80..4e72f2088b7 100644 --- a/dita/RTC-NG/API/api_irtcengine_getextensionproperty2.dita +++ b/dita/RTC-NG/API/api_irtcengine_getextensionproperty2.dita @@ -17,9 +17,9 @@ String provider, String extension, String key, Constants.MediaSourceType sourceType); - - (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * __nonnull)provider - extension:(NSString * __nonnull)extension - key:(NSString * __nonnull)key + - (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * _Nonnull)provider + extension:(NSString * _Nonnull)extension + key:(NSString * _Nonnull)key sourceType:(AgoraMediaSourceType)sourceType; virtual int getExtensionProperty( diff --git a/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita b/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita index 9d8f545981e..9afe84579f9 100644 --- a/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita +++ b/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita @@ -15,7 +15,7 @@

public AgoraFocalLengthInfo[] queryCameraFocalLengthCapability(); - - (NSArray<AgoraFocalLengthInfo *>* __nullable)queryCameraFocalLengthCapability NS_SWIFT_NAME(queryCameraFocalLengthCapability()); + - (NSArray<AgoraFocalLengthInfo *>* _Nullable)queryCameraFocalLengthCapability NS_SWIFT_NAME(queryCameraFocalLengthCapability()); virtual int queryCameraFocalLengthCapability(agora::rtc::FocalLengthInfo* focalLengthInfos, int& size) = 0; UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") int QueryCameraFocalLengthCapability(const TArray<FFocalLengthInfo> & focalLengthInfos); diff --git a/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita b/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita index 4cf769bd79b..e8cc8fa00d6 100644 --- a/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita +++ b/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita @@ -15,7 +15,7 @@

public abstract CodecCapInfo[] queryCodecCapability(); - - (NSArray <AgoraVideoCodecCapInfo *> *__nullable)queryCodecCapability; + - (NSArray <AgoraVideoCodecCapInfo *> *_Nullable)queryCodecCapability; virtual int queryCodecCapability(CodecCapInfo* codecInfo, int& size) = 0; UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") diff --git a/dita/RTC-NG/API/api_irtcengine_registerextension.dita b/dita/RTC-NG/API/api_irtcengine_registerextension.dita index c7b7cd4e971..1b9cb96a234 100644 --- a/dita/RTC-NG/API/api_irtcengine_registerextension.dita +++ b/dita/RTC-NG/API/api_irtcengine_registerextension.dita @@ -16,8 +16,8 @@ public abstract int registerExtension( String provider, String extension, Constants.MediaSourceType sourceType); - - (int)registerExtensionWithVendor:(NSString * __nonnull)provider - extension:(NSString * __nonnull)extension + - (int)registerExtensionWithVendor:(NSString * _Nonnull)provider + extension:(NSString * _Nonnull)extension sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(registerExtension(withVendor:extension:sourceType:)); virtual int registerExtension(const char* provider, const char* extension, agora::media::MEDIA_SOURCE_TYPE type = agora::media::UNKNOWN_MEDIA_SOURCE) = 0; diff --git a/dita/RTC-NG/API/api_irtcengine_setextensionproperty.dita b/dita/RTC-NG/API/api_irtcengine_setextensionproperty.dita index fc9fe130b03..cf278c9a910 100644 --- a/dita/RTC-NG/API/api_irtcengine_setextensionproperty.dita +++ b/dita/RTC-NG/API/api_irtcengine_setextensionproperty.dita @@ -17,7 +17,7 @@ String provider, String extension, String key, String value); - - (int)setExtensionPropertyWithVendor:(NSString * __nonnull)provider extension:(NSString * __nonnull)extension key:(NSString * __nonnull)key value:(NSString * __nonnull)value; + - (int)setExtensionPropertyWithVendor:(NSString * _Nonnull)provider extension:(NSString * _Nonnull)extension key:(NSString * _Nonnull)key value:(NSString * _Nonnull)value; virtual int setExtensionProperty( const char* provider, const char* extension, diff --git a/dita/RTC-NG/API/api_irtcengine_setextensionproviderproperty.dita b/dita/RTC-NG/API/api_irtcengine_setextensionproviderproperty.dita index 054f643fd3a..6814e7f83fc 100644 --- a/dita/RTC-NG/API/api_irtcengine_setextensionproviderproperty.dita +++ b/dita/RTC-NG/API/api_irtcengine_setextensionproviderproperty.dita @@ -16,7 +16,7 @@ public abstract int setExtensionProviderProperty(String provider, String key, String value); - - (int) setExtensionProviderPropertyWithVendor:(NSString * __nonnull)provider key:(NSString * __nonnull)key value:(NSString * __nonnull)value; + - (int) setExtensionProviderPropertyWithVendor:(NSString * _Nonnull)provider key:(NSString * _Nonnull)key value:(NSString * _Nonnull)value; virtual int setExtensionProviderProperty( const char* provider, const char* key, const char* value) = 0; diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita index c42887ddcb5..61ffbb07393 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita @@ -15,7 +15,7 @@

void onErrorWithContext(ExtensionContext extContext, int error, String message){}; onError?:(err:number,message:string) => void - - (void)onExtensionErrorWithContext:(AgoraExtensionContext * __nonnull)context + - (void)onExtensionErrorWithContext:(AgoraExtensionContext * _Nonnull)context error:(int)error message:(NSString * __nullable)message NS_SWIFT_NAME(onExtensionErrorWithContext(_:error:message:)); virtual void onExtensionErrorWithContext(const ExtensionContext &context, int error, const char* message) { diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita index 2f4a21c50c8..4c06c619acc 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita @@ -15,7 +15,7 @@

void onEventWithContext(ExtensionContext extContext, String key, String value){}; - - (void)onEventWithContext:(AgoraExtensionContext * __nonnull)context + - (void)onEventWithContext:(AgoraExtensionContext * _Nonnull)context key:(NSString * __nullable)key value:(NSString * __nullable)value NS_SWIFT_NAME(onEventWithContext(_:key:value:)); virtual void onExtensionEventWithContext(const ExtensionContext &context, const char* key, const char* value) { diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita index 9f9b609866c..9d64d7d082c 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita @@ -15,7 +15,7 @@

void onStartedWithContext(ExtensionContext extContext){}; - - (void)onExtensionStartedWithContext:(AgoraExtensionContext * __nonnull)context NS_SWIFT_NAME(onExtensionStartedWithContext(_:)); + - (void)onExtensionStartedWithContext:(AgoraExtensionContext * _Nonnull)context NS_SWIFT_NAME(onExtensionStartedWithContext(_:)); virtual void onExtensionStartedWithContext(const ExtensionContext &context) { (void)context; } diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita index 3bdaec83dba..f33cd4a97c7 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita @@ -15,7 +15,7 @@

void onStoppedWithContext(ExtensionContext extContext){}; - - (void)onExtensionStoppedWithContext:(AgoraExtensionContext * __nonnull)context NS_SWIFT_NAME(onExtensionStoppedWithContext(_:)); + - (void)onExtensionStoppedWithContext:(AgoraExtensionContext * _Nonnull)context NS_SWIFT_NAME(onExtensionStoppedWithContext(_:)); virtual void onExtensionStoppedWithContext(const ExtensionContext &context) { (void)context; } diff --git a/dita/RTC-NG/API/class_audiopcmframe.dita b/dita/RTC-NG/API/class_audiopcmframe.dita index 1a6baddd3fb..e03b197b65c 100644 --- a/dita/RTC-NG/API/class_audiopcmframe.dita +++ b/dita/RTC-NG/API/class_audiopcmframe.dita @@ -13,7 +13,7 @@ @property (assign, nonatomic) size_t samplesPerChannel; @property (assign, nonatomic) int sampleRateHz; @property (assign, nonatomic) size_t channelNumbers; - @property (strong, nonatomic) NSData* __nonnull pcmBuffer; + @property (strong, nonatomic) NSData* _Nonnull pcmBuffer; @property (assign, nonatomic) BytesPerSampleType bytesPerSample; @end diff --git a/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita b/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita index 8ee650b0645..9de358b8a61 100644 --- a/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita +++ b/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita @@ -9,7 +9,7 @@ @protocol AgoraMediaFilterExtensionDelegate <NSObject> -- (NSString * __nonnull)vendor; +- (NSString * _Nonnull)vendor; @end