Merge pull request #3353 from AgoraIO/release/rtc-ng/4.2.3

Release/rtc ng/4.2.3
AgoraIO · Sep 25, 2023 · 62f69f4 · 62f69f4
2 parents 4ed94ab + e69094e
commit 62f69f4
Show file tree

Hide file tree

Showing 14 changed files with 571 additions and 73 deletions.
diff --git a/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita b/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita
@@ -15,10 +15,9 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">public abstract boolean isFeatureAvailableOnDevice(int type);</codeblock>
             <codeblock props="ios mac" outputclass="language-objectivec">- (BOOL)isFeatureAvailableOnDevice:(AgoraFeatureType)type;</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0;</codeblock>
-            <codeblock props="electron" outputclass="language-typescript"/>
-            <codeblock props="unity cs" outputclass="language-csharp"/>
-            <codeblock props="rn" outputclass="language-typescript">abstract isFeatureAvailableOnDevice(type: FeatureType): boolean;</codeblock>
+            <codeblock props="cpp unreal bp" outputclass="language-cpp">virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0;</codeblock>
+            <codeblock props="unity cs" outputclass="language-csharp">public abstract bool IsFeatureAvailableOnDevice(FeatureType type);</codeblock>
+            <codeblock props="electron rn" outputclass="language-typescript">abstract isFeatureAvailableOnDevice(type: FeatureType): boolean;</codeblock>
             <codeblock props="flutter" outputclass="language-dart">Future&lt;bool&gt; isFeatureAvailableOnDevice(FeatureType type);</codeblock> </p>
         </section>
         <section id="detailed_desc">

diff --git a/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita b/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita
@@ -16,10 +16,9 @@
             <codeblock props="android" outputclass="language-java">public abstract int enableContentInspectEx(
       boolean enabled, ContentInspectConfig config, RtcConnection connection);</codeblock>
             <codeblock props="ios mac" outputclass="language-objectivec">- (int)enableContentInspectEx:(BOOL)enabled config:(AgoraContentInspectConfig* _Nonnull)config connection:(AgoraRtcConnection * _Nonnull)connection NS_SWIFT_NAME(enableContentInspectEx(_:config:connection:));</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &amp;config, const RtcConnection&amp; connection) = 0;</codeblock>
-            <codeblock props="electron" outputclass="language-typescript"/>
-            <codeblock props="unity cs" outputclass="language-csharp"/>
-            <codeblock props="rn" outputclass="language-typescript">abstract enableContentInspectEx(
+            <codeblock props="cpp unreal bp" outputclass="language-cpp">virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &amp;config, const RtcConnection&amp; connection) = 0;</codeblock>
+            <codeblock props="unity cs" outputclass="language-csharp">public abstract int EnableContentInspectEx(bool enabled, ContentInspectConfig config, RtcConnection connection);</codeblock>
+            <codeblock props="electron rn" outputclass="language-typescript">abstract enableContentInspectEx(
     enabled: boolean,
     config: ContentInspectConfig,
     connection: RtcConnection

diff --git a/dita/RTC-NG/API/class_contentinspectconfig.dita b/dita/RTC-NG/API/class_contentinspectconfig.dita
@@ -59,6 +59,8 @@
 
   extraInfo?: string;
 
+  serverConfig?: string;
+
   modules?: ContentInspectModule[];
 
   moduleCount?: number;

diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita
@@ -1820,6 +1820,7 @@
             <li><xref keyref="EXPERIENCE_POOR_REASON"/></li>
             <li><xref keyref="EXPERIENCE_QUALITY_TYPE"/></li>
             <li><xref keyref="EXTERNAL_VIDEO_SOURCE_TYPE"/></li>
+            <li><xref keyref="FeatureType"/></li>
             <li><xref keyref="FRAME_RATE"/></li>
             <li><xref keyref="HEADPHONE_EQUALIZER_PRESET"/></li>
             <li><xref keyref="INTERFACE_ID_TYPE"/></li>

diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap
@@ -284,6 +284,7 @@
             <topicref href="API/toc_video_prenpro.dita" chunk="to-content">
                 <topicref href="API/toc_snapshot.dita" chunk="to-content">
                     <topicref keyref="enableContentInspect" toc="no"/>
+                    <topicref keyref="enableContentInspectEx" toc="no"/>
                     <topicref keyref="takeSnapshot" toc="no"/>
                     <topicref keyref="takeSnapshotEx" toc="no"/>
                     <topicref keyref="onSnapshotTaken" toc="no"/>
@@ -676,6 +677,7 @@
             <topicref keyref="getNetworkType" toc="no"/>
             <topicref keyref="getNtpWallTimeInMs" toc="no"/>
             <topicref keyref="getVersion" toc="no"/>
+            <topicref keyref="isFeatureAvailableOnDevice" toc="no"/>
             <topicref keyref="rate" toc="no"/>
             <topicref keyref="sendCustomReportMessage" toc="no"/>
             <topicref keyref="sendCustomReportMessageEx" toc="no"/>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap
@@ -3328,6 +3328,13 @@
                     </keywords>
                 </topicmeta>
             </keydef>
+        <keydef keys="enableContentInspectEx" href="../API/api_irtcengineex_enablecontentinspectex.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>enableContentInspectEx</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
         </topichead>
         <topichead navtitle="其他方法">
             <keydef keys="enableVideoImageSource" href="../API/api_irtcengine_enablevideoimagesource.dita">
@@ -3421,6 +3428,13 @@
                     </keywords>
                 </topicmeta>
             </keydef>
+            <keydef keys="isFeatureAvailableOnDevice" href="../API/api_irtcengine_isfeatureavailableondevice.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>isFeatureAvailableOnDevice</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
             <keydef keys="rate" href="../API/api_irtcengine_rate.dita">
                 <topicmeta>
                     <keywords>
@@ -5607,6 +5621,13 @@
                     <keyword>ContentInspectSupervise</keyword>
                 </keywords>
             </topicmeta>
+        <keydef keys="CONTENT_INSPECT_IMAGE_MODERATION">
+            <topicmeta>
+                <keywords>
+                    <keyword>ContentInspectImageModeration</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         </keydef>
             <keydef keys="COMPRESSION_PREFERENCE" href="../API/enum_compressionpreference.dita">
                 <topicmeta>
@@ -7967,6 +7988,27 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="FeatureType" href="../API/enum_featuretype.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>FeatureType</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+            <keydef keys="VIDEO_VIRTUAL_BACKGROUND">
+                <topicmeta>
+                    <keywords>
+                        <keyword>videoVirtualBackground</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+            <keydef keys="VIDEO_BEAUTY_EFFECT">
+                <topicmeta>
+                    <keywords>
+                        <keyword>videoBeautyEffect</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>            
         <keydef keys="FRAME_RATE" href="../API/enum_framerate.dita">
             <topicmeta>
                 <keywords>
@@ -8401,6 +8443,62 @@
                     </keywords>
                 </topicmeta>
             </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_NOT_SUPPORTED">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureWindowNotSupported</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureNoPermission</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCapturePaused</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureResumed</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureWindowHidden</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureWindowRecoverFromHidden</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureWindowRecoverFromMinimized</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_FAILURE">
+            <topicmeta>
+                <keywords>
+                    <keyword>LocalVideoStreamErrorScreenCaptureFailure</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
             <keydef keys="LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE">
                 <topicmeta>
                     <keywords>
@@ -9192,6 +9290,13 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="NETWORK_TYPE_MOBILE_5G">
+            <topicmeta>
+                <keywords>
+                    <keyword>NetworkTypeMobile5g</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="ORIENTATION_MODE" href="../API/enum_orientationmode.dita">
             <topicmeta>
                 <keywords>
@@ -10949,6 +11054,27 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="VIDEO_TEXTURE_ID3D11TEXTURE2D">
+            <topicmeta>
+                <keywords>
+                    <keyword>VideoTextureId3d11texture2d</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="VIDEO_TEXTURE_2D">
+            <topicmeta>
+                <keywords>
+                    <keyword>VideoTexture2d</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="VIDEO_TEXTURE_OES">
+            <topicmeta>
+                <keywords>
+                    <keyword>VideoTextureOes</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="VIDEO_PROFILE_TYPE" href="../API/enum_videoprofiletype.dita">
             <topicmeta>
                 <keywords>

diff --git a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap
@@ -2293,7 +2293,7 @@
                 <topicref keyref="isCameraFocusSupported" props="android ios cpp unreal bp flutter unity rn"/>
                 <topicref keyref="isCameraTorchSupported" props="android ios cpp unreal bp flutter unity rn"/>
                 <topicref keyref="isCameraZoomSupported" props="android ios cpp unreal bp flutter unity rn"/>
-                <topicref keyref="isFeatureAvailableOnDevice" props="native rn flutter unity"/>
+                <topicref keyref="isFeatureAvailableOnDevice" props="native electron rn flutter unity"/>
                 <topicref keyref="isSpeakerphoneEnabled" props="android ios cpp unreal bp flutter rn unity"/>
                 <topicref keyref="isTextureEncodeSupported" props="android"/>
                 <topicref keyref="joinChannel1" props="native unreal unity"/>

diff --git a/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita b/en-US/dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita
@@ -15,10 +15,9 @@
             <p outputclass="codeblock">
             <codeblock props="android" outputclass="language-java">public abstract boolean isFeatureAvailableOnDevice(int type);</codeblock>
             <codeblock props="ios mac" outputclass="language-objectivec">- (BOOL)isFeatureAvailableOnDevice:(AgoraFeatureType)type;</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0;</codeblock>
-            <codeblock props="electron" outputclass="language-typescript" />
-            <codeblock props="unity cs" outputclass="language-csharp" />
-            <codeblock props="rn" outputclass="language-typescript">abstract isFeatureAvailableOnDevice(type: FeatureType): boolean;</codeblock>
+            <codeblock props="cpp unreal bp" outputclass="language-cpp">virtual bool isFeatureAvailableOnDevice(FeatureType type) = 0;</codeblock>
+            <codeblock props="unity cs" outputclass="language-csharp">public abstract bool IsFeatureAvailableOnDevice(FeatureType type);</codeblock>
+            <codeblock props="electron rn" outputclass="language-typescript">abstract isFeatureAvailableOnDevice(type: FeatureType): boolean;</codeblock>
             <codeblock props="flutter" outputclass="language-dart">Future&lt;bool&gt; isFeatureAvailableOnDevice(FeatureType type);</codeblock> </p>
         </section>
         <section id="detailed_desc">

diff --git a/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita b/en-US/dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita
@@ -16,10 +16,9 @@
             <codeblock props="android" outputclass="language-java">public abstract int enableContentInspectEx(
       boolean enabled, ContentInspectConfig config, RtcConnection connection);</codeblock>
             <codeblock props="ios mac" outputclass="language-objectivec">- (int)enableContentInspectEx:(BOOL)enabled config:(AgoraContentInspectConfig* _Nonnull)config connection:(AgoraRtcConnection * _Nonnull)connection NS_SWIFT_NAME(enableContentInspectEx(_:config:connection:));</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &amp;config, const RtcConnection&amp; connection) = 0;</codeblock>
-            <codeblock props="electron" outputclass="language-typescript" />
-            <codeblock props="unity cs" outputclass="language-csharp" />
-            <codeblock props="rn" outputclass="language-typescript">abstract enableContentInspectEx(
+            <codeblock props="cpp unreal bp" outputclass="language-cpp">virtual int enableContentInspectEx(bool enabled, const media::ContentInspectConfig &amp;config, const RtcConnection&amp; connection) = 0;</codeblock>
+            <codeblock props="unity cs" outputclass="language-csharp">public abstract int EnableContentInspectEx(bool enabled, ContentInspectConfig config, RtcConnection connection);</codeblock>
+            <codeblock props="electron rn" outputclass="language-typescript">abstract enableContentInspectEx(
     enabled: boolean,
     config: ContentInspectConfig,
     connection: RtcConnection

diff --git a/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita b/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita
@@ -59,6 +59,8 @@
 
   extraInfo?: string;
 
+  serverConfig?: string;
+
   modules?: ContentInspectModule[];
 
   moduleCount?: number;