From 52588c88367f66160176f37d82a2458715ac2db8 Mon Sep 17 00:00:00 2001
From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:06:34 +0800
Subject: [PATCH] sync

---
 dita/RTC-NG/API/rtc_api_overview.dita         |  24 ++++
 dita/RTC-NG/RTC_NG_API_iOS.ditamap            |   7 ++
 dita/RTC-NG/RTC_NG_API_macOS.ditamap          |   7 ++
 .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 114 ++++++++++++++++++
 .../config/keys-rtc-ng-api-macos.ditamap      | 114 ++++++++++++++++++
 5 files changed, 266 insertions(+)

diff --git a/dita/RTC-NG/API/rtc_api_overview.dita b/dita/RTC-NG/API/rtc_api_overview.dita
index 4774af050a7..cde4add44f6 100644
--- a/dita/RTC-NG/API/rtc_api_overview.dita
+++ b/dita/RTC-NG/API/rtc_api_overview.dita
@@ -548,6 +548,18 @@
                     <stentry><xref keyref="updateSelfTransform"/></stentry>
                     <stentry><ph conkeyref="updateSelfTransform/shortdesc"/></stentry>
                 </strow>
+                <strow>
+                    <stentry><xref keyref="startLocalAudioMixer"/></stentry>
+                    <stentry><ph conkeyref="startLocalAudioMixer/shortdesc"/></stentry>
+                </strow>
+                <strow>
+                    <stentry><xref keyref="updateLocalAudioMixerConfiguration"/></stentry>
+                    <stentry><ph conkeyref="updateLocalAudioMixerConfiguration/shortdesc"/></stentry>
+                </strow>
+                <strow>
+                    <stentry><xref keyref="stopLocalAudioMixer"/></stentry>
+                    <stentry><ph conkeyref="stopLocalAudioMixer/shortdesc"/></stentry>
+                </strow>
             </simpletable>
         </section>
         <section id="audio_raw" props="native unreal flutter unity cs electron rn">
@@ -911,6 +923,10 @@
                     <stentry><xref keyref="queryScreenCaptureCapability"/></stentry>
                     <stentry><ph conkeyref="queryScreenCaptureCapability/shortdesc"/><ph props="cpp unreal bp flutter rn unity">（仅适用于 Android 和 iOS）</ph></stentry>
                 </strow>
+                <strow props="android cpp">
+                    <stentry><xref keyref="setExternalMediaProjection"/></stentry>
+                    <stentry><ph conkeyref="setExternalMediaProjection/shortdesc"/><ph props="cpp">（仅适用于 Android）</ph></stentry>
+                </strow>
                 <strow props="android hmos cpp unreal bp ios flutter rn unity">
                     <stentry><xref keyref="startScreenCapture"/></stentry>
                     <stentry><ph conkeyref="startScreenCapture/shortdesc"/><ph props="cpp unreal bp flutter rn unity">（仅适用于 Android 和 iOS）</ph></stentry>
@@ -1174,6 +1190,14 @@
                     <stentry><xref keyref="setRemoteRenderModeEx"/></stentry>
                     <stentry><ph conkeyref="setRemoteRenderModeEx/shortdesc"/></stentry>
                 </strow>
+                <strow>
+                    <stentry><xref keyref="setLocalRenderTargetFps"/></stentry>
+                    <stentry><ph conkeyref="setLocalRenderTargetFps/shortdesc"/></stentry>
+                </strow>
+                <strow>
+                    <stentry><xref keyref="setRemoteRenderTargetFps"/></stentry>
+                    <stentry><ph conkeyref="setRemoteRenderTargetFps/shortdesc"/></stentry>
+                </strow>
                 <strow props="android cpp apple framework">
                     <stentry><xref keyref="setView"/></stentry>
                     <stentry><ph conkeyref="setView/shortdesc"/></stentry>
diff --git a/dita/RTC-NG/RTC_NG_API_iOS.ditamap b/dita/RTC-NG/RTC_NG_API_iOS.ditamap
index 07de44de4a0..df8c48eba86 100644
--- a/dita/RTC-NG/RTC_NG_API_iOS.ditamap
+++ b/dita/RTC-NG/RTC_NG_API_iOS.ditamap
@@ -196,6 +196,11 @@
                     <topicref keyref="updateSelfTransform" toc="no"/>
                     <topicref keyref="enableSpatialAudio" toc="no"/>
                 </topicref>
+                <topicref href="API/toc_audiomixer.dita" chunk="to-content">
+                    <topicref keyref="startLocalAudioMixer" toc="no"/>
+                    <topicref keyref="stopLocalAudioMixer" toc="no"/>
+                    <topicref keyref="updateLocalAudioMixerConfiguration" toc="no"/>
+                </topicref>
             </topicref>
             <topicref href="API/toc_audio_raw.dita" chunk="to-content">
                 <topicref keyref="registerAudioFrameObserver" toc="no"/>
@@ -361,9 +366,11 @@
                 <topicref keyref="enableInstantMediaRendering" toc="no"/>
                 <topicref keyref="setLocalRenderMode1" toc="no"/>
                 <topicref keyref="setLocalRenderMode2" toc="no"/>
+                <topicref keyref="setLocalRenderTargetFps" toc="no"/>
                 <topicref keyref="setLocalVideoMirrorMode" toc="no"/>
                 <topicref keyref="setRemoteRenderMode2" toc="no"/>
                 <topicref keyref="setRemoteRenderModeEx" toc="no"/>
+                <topicref keyref="setRemoteRenderTargetFps" toc="no"/>
                 <topicref keyref="setRenderMode" toc="no"/>
                 <topicref keyref="setupLocalVideo" toc="no"/>
                 <topicref keyref="setupRemoteVideo" toc="no"/>
diff --git a/dita/RTC-NG/RTC_NG_API_macOS.ditamap b/dita/RTC-NG/RTC_NG_API_macOS.ditamap
index 6177cb9c259..1300565d1dd 100644
--- a/dita/RTC-NG/RTC_NG_API_macOS.ditamap
+++ b/dita/RTC-NG/RTC_NG_API_macOS.ditamap
@@ -192,6 +192,11 @@
                     <topicref keyref="updatePlayerPositionInfo" toc="no"/>
                     <topicref keyref="enableSpatialAudio" toc="no"/>
                 </topicref>
+                <topicref href="API/toc_audiomixer.dita" chunk="to-content">
+                    <topicref keyref="startLocalAudioMixer" toc="no"/>
+                    <topicref keyref="stopLocalAudioMixer" toc="no"/>
+                    <topicref keyref="updateLocalAudioMixerConfiguration" toc="no"/>
+                </topicref>
             </topicref>
             <topicref href="API/toc_audio_raw.dita" chunk="to-content">
                 <topicref keyref="registerAudioFrameObserver" toc="no"/>
@@ -354,9 +359,11 @@
                 <topicref keyref="enableInstantMediaRendering" toc="no"/>
                 <topicref keyref="setLocalRenderMode1" toc="no"/>
                 <topicref keyref="setLocalRenderMode2" toc="no"/>
+                <topicref keyref="setLocalRenderTargetFps" toc="no"/>
                 <topicref keyref="setLocalVideoMirrorMode" toc="no"/>
                 <topicref keyref="setRemoteRenderMode2" toc="no"/>
                 <topicref keyref="setRemoteRenderModeEx" toc="no"/>
+                <topicref keyref="setRemoteRenderTargetFps" toc="no"/>
                 <topicref keyref="setRenderMode" toc="no"/>
                 <topicref keyref="setupLocalVideo" toc="no"/>
                 <topicref keyref="setupRemoteVideo" toc="no"/>
diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap
index 1bdc38893e8..212a37a8f25 100644
--- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap
+++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap
@@ -1068,6 +1068,20 @@
                     </keywords>
                 </topicmeta>
             </keydef>
+            <keydef keys="setLocalRenderTargetFps" href="../API/api_irtcengine_setlocalrendertargetfps.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>setLocalRenderTargetFps</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+            <keydef keys="setRemoteRenderTargetFps" href="../API/api_irtcengine_setremoterendertargetfps.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>setRemoteRenderTargetFps</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
             <keydef keys="startPreview" href="../API/api_irtcengine_startpreview.dita">
                 <topicmeta>
                     <keywords>
@@ -3345,6 +3359,29 @@
                 </topicmeta>
             </keydef>
         </topichead>
+        <topichead navtitle="本地音频合流">
+            <keydef keys="startLocalAudioMixer" href="../API/api_irtcengine_startlocalaudiomixer.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>startLocalAudioMixer</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+        <keydef keys="stopLocalAudioMixer" href="../API/api_irtcengine_stoplocalaudiomixer.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>stopLocalAudioMixer</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="updateLocalAudioMixerConfiguration" href="../API/api_irtcengine_updatelocalaudiomixerconfiguration.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>updateLocalAudioMixerConfiguration</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        </topichead>
         <topichead navtitle="多设备采集">
             <keydef keys="enableMultiCamera" href="../API/api_irtcengine_enablemulticamera.dita">
                 <topicmeta>
@@ -4932,6 +4969,20 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="MixedAudioStream" href="../API/class_mixedaudiostream.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraMixedAudioStream</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LocalAudioMixerConfiguration" href="../API/class_localaudiomixerconfiguration.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraLocalAudioMixerConfiguration</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="LowlightEnhanceOptions" href="../API/class_lowlightenhanceoptions.dita">
             <topicmeta>
                 <keywords>
@@ -5767,6 +5818,69 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="AUDIO_SOURCE_TYPE" href="../API/enum_audiosourcetype.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceType</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MICROPHONE">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMicrophone</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_CUSTOM">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceCustom</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MEDIA_PLAYER">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMediaPlayer</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_LOOPBACK_RECORDING">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceLoopbackRecording</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MIXED_STREAM">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMixedStream</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_REMOTE_USER">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceRemoteUser</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_REMOTE_CHANNEL">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceRemoteChannel</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_UNKNOWN">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceTypeUnknown</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="BACKGROUND_BLUR_DEGREE" href="../API/enum_backgroundblurdegree.dita">
             <topicmeta>
                 <keywords>
diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap
index 1b4ef97a989..e8d46dcf048 100644
--- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap
+++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap
@@ -1025,6 +1025,20 @@
                     </keywords>
                 </topicmeta>
             </keydef>
+            <keydef keys="setLocalRenderTargetFps" href="../API/api_irtcengine_setlocalrendertargetfps.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>setLocalRenderTargetFps</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+            <keydef keys="setRemoteRenderTargetFps" href="../API/api_irtcengine_setremoterendertargetfps.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>setRemoteRenderTargetFps</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
             <keydef keys="startPreview" href="../API/api_irtcengine_startpreview.dita">
                 <topicmeta>
                     <keywords>
@@ -3098,6 +3112,29 @@
                 </topicmeta>
             </keydef>
         </topichead>
+        <topichead navtitle="本地音频合流">
+            <keydef keys="startLocalAudioMixer" href="../API/api_irtcengine_startlocalaudiomixer.dita">
+                <topicmeta>
+                    <keywords>
+                        <keyword>startLocalAudioMixer</keyword>
+                    </keywords>
+                </topicmeta>
+            </keydef>
+        <keydef keys="stopLocalAudioMixer" href="../API/api_irtcengine_stoplocalaudiomixer.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>stopLocalAudioMixer</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="updateLocalAudioMixerConfiguration" href="../API/api_irtcengine_updatelocalaudiomixerconfiguration.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>updateLocalAudioMixerConfiguration</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        </topichead>
         <topichead navtitle="多设备采集">
             <keydef keys="startCameraCapture" href="../API/api_irtcengine_startcameracapture.dita">
                 <topicmeta>
@@ -4606,6 +4643,20 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="MixedAudioStream" href="../API/class_mixedaudiostream.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraMixedAudioStream</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="LocalAudioMixerConfiguration" href="../API/class_localaudiomixerconfiguration.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraLocalAudioMixerConfiguration</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="LowlightEnhanceOptions" href="../API/class_lowlightenhanceoptions.dita">
             <topicmeta>
                 <keywords>
@@ -5385,6 +5436,69 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="AUDIO_SOURCE_TYPE" href="../API/enum_audiosourcetype.dita">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceType</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MICROPHONE">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMicrophone</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_CUSTOM">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceCustom</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MEDIA_PLAYER">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMediaPlayer</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_LOOPBACK_RECORDING">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceLoopbackRecording</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_MIXED_STREAM">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceMixedStream</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_REMOTE_USER">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceRemoteUser</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_REMOTE_CHANNEL">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceRemoteChannel</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="AUDIO_SOURCE_UNKNOWN">
+            <topicmeta>
+                <keywords>
+                    <keyword>AgoraAudioSourceTypeUnknown</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="BACKGROUND_BLUR_DEGREE" href="../API/enum_backgroundblurdegree.dita">
             <topicmeta>
                 <keywords>