sync with NMS-23842

AgoraIO · Oct 25, 2024 · 2855ed6 · 2855ed6
1 parent 578f21b
commit 2855ed6
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/dita/RTC-NG/API/api_irtcengine_enableextension.dita b/dita/RTC-NG/API/api_irtcengine_enableextension.dita
@@ -16,8 +16,8 @@
             <codeblock props="android" outputclass="language-java">public abstract int enableExtension(
       String provider, String extension, boolean enable, Constants.MediaSourceType sourceType);</codeblock>
             <codeblock props="hmos" outputclass="language-arkts">public abstract enableExtension(provider:string,extension:string,enable:boolean,extensionInfo:ExtensionInfo):number;</codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (int)enableExtensionWithVendor:(NSString * __nonnull)provider
-                       extension:(NSString * __nonnull)extension
+            <codeblock props="ios mac" outputclass="language-objectivec">- (int)enableExtensionWithVendor:(NSString * _Nonnull)provider
+                       extension:(NSString * _Nonnull)extension
                          enabled:(BOOL)enabled
                       sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(enableExtension(withVendor:extension:enabled:sourceType:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual int enableExtension(const char* provider, const char* extension, bool enable=true, agora::media::MEDIA_SOURCE_TYPE type = agora::media::UNKNOWN_MEDIA_SOURCE) = 0;</codeblock>

diff --git a/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita b/dita/RTC-NG/API/api_irtcengine_getextensionproperty.dita
@@ -16,9 +16,9 @@
             <codeblock props="android" outputclass="language-java">public abstract String getExtensionProperty(String provider, String extension, String key);
 </codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * __nonnull)provider
-                                             extension:(NSString * __nonnull)extension
-                                                   key:(NSString * __nonnull)key;
+            <codeblock props="ios mac" outputclass="language-objectivec">- (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * _Nonnull)provider
+                                             extension:(NSString * _Nonnull)extension
+                                                   key:(NSString * _Nonnull)key;
 </codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp" />
             <codeblock props="electron" outputclass="language-typescript" />

diff --git 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);
 </codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * __nonnull)provider
-                                             extension:(NSString * __nonnull)extension
-                                                   key:(NSString * __nonnull)key
+            <codeblock props="ios mac" outputclass="language-objectivec">- (NSString * _Nullable)getExtensionPropertyWithVendor:(NSString * _Nonnull)provider
+                                             extension:(NSString * _Nonnull)extension
+                                                   key:(NSString * _Nonnull)key
                                             sourceType:(AgoraMediaSourceType)sourceType;
 </codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual int getExtensionProperty(

diff --git a/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita b/dita/RTC-NG/API/api_irtcengine_querycamerafocallengthcapability.dita
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">public AgoraFocalLengthInfo[] queryCameraFocalLengthCapability();</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (NSArray&lt;AgoraFocalLengthInfo *>* __nullable)queryCameraFocalLengthCapability NS_SWIFT_NAME(queryCameraFocalLengthCapability());</codeblock>
+            <codeblock props="ios mac" outputclass="language-objectivec">- (NSArray&lt;AgoraFocalLengthInfo *>* _Nullable)queryCameraFocalLengthCapability NS_SWIFT_NAME(queryCameraFocalLengthCapability());</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual int queryCameraFocalLengthCapability(agora::rtc::FocalLengthInfo* focalLengthInfos, int&amp; size) = 0;</codeblock>
          <codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = &quot;Agora|IRtcEngine&quot;)
 	int QueryCameraFocalLengthCapability(const TArray&lt;FFocalLengthInfo&gt; &amp; focalLengthInfos);</codeblock>

diff --git a/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita b/dita/RTC-NG/API/api_irtcengine_querycodeccapability.dita
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">public abstract CodecCapInfo[] queryCodecCapability();</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (NSArray &lt;AgoraVideoCodecCapInfo *> *__nullable)queryCodecCapability;</codeblock>
+            <codeblock props="ios mac" outputclass="language-objectivec">- (NSArray &lt;AgoraVideoCodecCapInfo *> *_Nullable)queryCodecCapability;</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual int queryCodecCapability(CodecCapInfo* codecInfo, int&amp; size) = 0;
 </codeblock>
          <codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = &quot;Agora|IRtcEngine&quot;)

diff --git a/dita/RTC-NG/API/api_irtcengine_registerextension.dita b/dita/RTC-NG/API/api_irtcengine_registerextension.dita
@@ -16,8 +16,8 @@
             <codeblock props="android" outputclass="language-java">public abstract int registerExtension(
       String provider, String extension, Constants.MediaSourceType sourceType);</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (int)registerExtensionWithVendor:(NSString * __nonnull)provider
-                         extension:(NSString * __nonnull)extension
+            <codeblock props="ios mac" outputclass="language-objectivec">- (int)registerExtensionWithVendor:(NSString * _Nonnull)provider
+                         extension:(NSString * _Nonnull)extension
                         sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(registerExtension(withVendor:extension:sourceType:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual int registerExtension(const char* provider, const char* extension,
                         agora::media::MEDIA_SOURCE_TYPE type = agora::media::UNKNOWN_MEDIA_SOURCE) = 0;</codeblock>

diff --git 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);
 </codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (int)setExtensionPropertyWithVendor:(NSString * __nonnull)provider extension:(NSString * __nonnull)extension key:(NSString * __nonnull)key value:(NSString * __nonnull)value;
+            <codeblock props="ios mac" outputclass="language-objectivec">- (int)setExtensionPropertyWithVendor:(NSString * _Nonnull)provider extension:(NSString * _Nonnull)extension key:(NSString * _Nonnull)key value:(NSString * _Nonnull)value;
 </codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">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
@@ -16,7 +16,7 @@
             <codeblock props="android" outputclass="language-java">public abstract int setExtensionProviderProperty(String provider, String key, String value);
 </codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (int) setExtensionProviderPropertyWithVendor:(NSString * __nonnull)provider key:(NSString * __nonnull)key value:(NSString * __nonnull)value;
+            <codeblock props="ios mac" outputclass="language-objectivec">- (int) setExtensionProviderPropertyWithVendor:(NSString * _Nonnull)provider key:(NSString * _Nonnull)key value:(NSString * _Nonnull)value;
 </codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">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
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">void onErrorWithContext(ExtensionContext extContext, int error, String message){};</codeblock>
             <codeblock props="hmos" outputclass="language-arkts">onError?:(err:number,message:string) =&gt; void</codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionErrorWithContext:(AgoraExtensionContext * __nonnull)context
+            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionErrorWithContext:(AgoraExtensionContext * _Nonnull)context
                    error:(int)error
                  message:(NSString * __nullable)message NS_SWIFT_NAME(onExtensionErrorWithContext(_:error:message:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual void onExtensionErrorWithContext(const ExtensionContext &amp;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
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">void onEventWithContext(ExtensionContext extContext, String key, String value){};</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onEventWithContext:(AgoraExtensionContext * __nonnull)context
+            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onEventWithContext:(AgoraExtensionContext * _Nonnull)context
             key:(NSString * __nullable)key
           value:(NSString * __nullable)value NS_SWIFT_NAME(onEventWithContext(_:key:value:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual void onExtensionEventWithContext(const ExtensionContext &amp;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
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">void onStartedWithContext(ExtensionContext extContext){};</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionStartedWithContext:(AgoraExtensionContext * __nonnull)context NS_SWIFT_NAME(onExtensionStartedWithContext(_:));</codeblock>
+            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionStartedWithContext:(AgoraExtensionContext * _Nonnull)context NS_SWIFT_NAME(onExtensionStartedWithContext(_:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual void onExtensionStartedWithContext(const ExtensionContext &amp;context) {
     (void)context;
   }</codeblock>

diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita
@@ -15,7 +15,7 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">void onStoppedWithContext(ExtensionContext extContext){};</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
-            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionStoppedWithContext:(AgoraExtensionContext * __nonnull)context NS_SWIFT_NAME(onExtensionStoppedWithContext(_:));</codeblock>
+            <codeblock props="ios mac" outputclass="language-objectivec">- (void)onExtensionStoppedWithContext:(AgoraExtensionContext * _Nonnull)context NS_SWIFT_NAME(onExtensionStoppedWithContext(_:));</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp">virtual void onExtensionStoppedWithContext(const ExtensionContext &amp;context) {
     (void)context;
   }</codeblock>

diff --git 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
             </codeblock>

diff --git a/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita b/dita/RTC-NG/API/class_imediafilterextensiondelegate.dita
@@ -9,7 +9,7 @@
             <codeblock props="android" outputclass="language-java"/>
             <codeblock props="hmos" outputclass="language-arkts"></codeblock>
             <codeblock props="ios mac" outputclass="language-objectivec">@protocol AgoraMediaFilterExtensionDelegate &lt;NSObject>
-- (NSString * __nonnull)vendor;
+- (NSString * _Nonnull)vendor;
 @end</codeblock>
             <codeblock props="cpp unreal" outputclass="language-cpp"/>
             <codeblock props="electron" outputclass="language-typescript"/>