Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.3.1 bugfix 0530 #3641

Merged
merged 6 commits into from
May 31, 2024
Merged

4.3.1 bugfix 0530 #3641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2110744
1
Cilla-luodan May 28, 2024
6813abe
1
Cilla-luodan May 28, 2024
a015919
reorg
Cilla-luodan May 28, 2024
d52de84
1
Cilla-luodan May 28, 2024
b477a96
1
Cilla-luodan May 29, 2024
6227f33
Update api_irtcengine_startaudiomixing.dita
Suri539 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dita/RTC-NG/API/api_irtcengine_startaudiomixing.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
</dlentry>
</dl>
<p id="audiomixing_detailed">该方法支持将本地或在线音乐文件和麦克风采集的音频进行混音或替换。成功播放音乐文件后，本地会触发 <xref keyref="onAudioMixingStateChanged" /> (<apiname keyref="AUDIO_MIXING_STATE_PLAYING" />) 回调。播放结束后，本地会触发 <apiname keyref="onAudioMixingStateChanged" /> (<apiname keyref="AUDIO_MIXING_STATE_STOPPED" />) 回调。</p>
<p id="uri" props="android">该方法支持播放以 <codeph>content://</codeph> 开头的 URI 文件。</p>
<note type="attention" id="audiomixing_note">
<ul>
<li>该方法在加入频道前后均可调用。如需多次调用 <apiname keyref="startAudioMixing" />，请确保调用间隔大于 500 ms。</li>
Expand Down
1 change: 1 addition & 0 deletions dita/RTC-NG/API/callback_irtcengineeventhandler_onnetworkquality.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<section id="detailed_desc">
<p id="desc1">该回调描述每个用户在通话中的 last mile 网络状态，其中 last mile 是指设备到声网边缘服务器的网络状态。</p>
<p id="desc2">该回调每 2 秒触发一次。如果远端有多个用户，该回调每 2 秒会被触发多次。</p>
<p>该回调通过频道内的广播包反馈网络质量。过多的广播包可能引发广播风暴。为防止广播风暴导致频道内大量数据传输，该回调默认支持同时反馈最多 4 个远端主播的网络质量。</p>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

过多的广播包可能引发广播风暴。为防止广播风暴导致频道内大量数据传输，该回调默认支持同时反馈最多 4 个远端主播的网络质量。-> 过多的广播包可能引发广播风暴，从而导致频道内大量数据传输，因此该回调xxxxx。整合了一下原来的描述，还有一个问题不太确定，原文的描述是默认最多支持反馈 4 个远端用户的网络，意思是可以通过私参或者其他手段支持更多吗？

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

也不行，技术支持也木有手段，多于 4 个会导致所有的回调都变成 0，我把默认删了，就是支持 4 个

<note type="note"><ph>用户不发流时，<parmname>txQuality</parmname> 为 <codeph props="cpp unreal bp android unity">UNKNOWN</codeph><codeph props="ios mac electron rn">Unknown</codeph>；用户不收流时，<parmname>rxQuality</parmname> 为 <codeph props="cpp unreal bp android unity">UNKNOWN</codeph><codeph props="ios mac electron rn">Unknown</codeph>。</ph></note> </section>
<section id="parameters">
<title><ph keyref="callback-section-title" /></title>
Expand Down
21 changes: 12 additions & 9 deletions dita/RTC-NG/API/callback_ivideoframeobserver_getvideoformatpreference.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,7 @@
<section id="return_values">
<title>返回值</title>
<p><ph>设置 SDK 输出的原始数据格式。</ph><ph props="cpp bp unreal apple">详见 <xref keyref="VIDEO_PIXEL_FORMAT"/>。</ph></p>
<p>在默认情况下，原始视频像素格式 (<ph keyref="VIDEO_PIXEL_DEFAULT"/>) 存在以下类型：
<ul><li props="cpp bp unreal">在 Android 平台上，默认的视频帧类型可能为 I420Buffer 或 TextureBuffer。自 v4.2.3 起，TextureBuffer 类型的纹理格式不再包括 OES 格式，仅为 RGB 格式。你需要在处理视频数据时增加对 I420、RGB 纹理格式的适配。</li>
<li props="android">默认的视频帧类型可能为 I420Buffer 或 TextureBuffer。自 v4.2.3 起，TextureBuffer 类型的纹理格式不再包括 OES 格式，仅为 RGB 格式。你需要在处理视频数据时增加对 I420、RGB 纹理格式的适配。</li>
<li props="cpp unreal bp">在 iOS 和 macOS 平台上，默认的视频帧类型可能为 I420 或 CVPixelBufferRef。</li>
<li props="apple">默认的视频帧类型可能为 I420 或 CVPixelBufferRef。</li>
<li props="cpp unreal bp">在 Windows 平台上，默认为 YUV420。</li></ul></p>
<p props="android">
<ul>
<ul props="android">
<li><ph keyref="VIDEO_PIXEL_DEFAULT"/>(0): 原始视频像素格式。</li>
<li><ph keyref="VIDEO_PIXEL_I420"/>(1): I420 格式。</li>
<li props="hide"><ph keyref="VIDEO_PIXEL_BGRA"/>(2): BGRA 格式。</li>
Expand All @@ -50,7 +43,17 @@
<li props="hide"><ph keyref="VIDEO_PIXEL_NV12"/>(8): NV12 格式。</li>
<li props="hide"><ph keyref="VIDEO_TEXTURE_2D"/>(10)：TEXTURE_2D 格式。</li>
<li><ph keyref="VIDEO_PIXEL_I422"/>(16): I422 格式。</li>
</ul></p>
</ul>
<note>
<p>在默认情况下，原始视频像素格式 (<ph keyref="VIDEO_PIXEL_DEFAULT"/>) 存在以下类型：<ul>
<li props="android cpp bp unreal">在 Android 平台上，默认的视频帧类型可能为 I420Buffer 或 TextureBuffer。自 v4.2.3 起，TextureBuffer 类型的纹理格式不再包括 OES 格式，仅为 RGB 格式。你需要在处理视频数据时增加对 I420、RGB 纹理格式的适配。视频帧类型固定为 I420Buffer 的情况包括但不限于：<ul>
<li>特定机型，例如：LG G5 SE (H848)，Google Pixel 4a，Samsung Galaxy A7 或 Xiaomi Mi Max。</li>
<li>已集成视频增强插件并开启视频降噪或暗光增强功能。</li>
</ul></li>
<li props="cpp unreal bp">在 iOS 和 macOS 平台上，默认的视频帧类型可能为 I420 或 CVPixelBufferRef。</li>
<li props="apple">默认的视频帧类型可能为 I420 或 CVPixelBufferRef。</li>
<li props="cpp unreal bp">在 Windows 平台上，默认为 YUV420。</li></ul></p>
</note>
</section>
</refbody>
</reference>
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Android.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -469,7 +470,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Blueprint.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -452,7 +453,6 @@
<topicref keyref="setLoopCount" toc="no"/>
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no" props="hide"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_CPP.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -476,7 +477,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_CS.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -451,7 +452,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no" props="hide"/>
<topicref keyref="setPlayerOption2" toc="no" props="hide"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Electron.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -453,7 +454,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Flutter.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -460,7 +461,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_RN.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -453,7 +454,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Unity.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -461,7 +462,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_Unreal.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -454,7 +455,6 @@
<topicref keyref="setLoopCount" toc="no"/>
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no" props="hide"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_iOS.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="updateSelfTransform" toc="no"/>
Expand Down Expand Up @@ -474,7 +475,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/RTC_NG_API_macOS.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
<topicref keyref="setPlayerAttenuation" toc="no"/>
<topicref keyref="setRemoteAudioAttenuation" toc="no"/>
<topicref keyref="setRemoteUserSpatialAudioParams" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setZones" toc="no"/>
<topicref keyref="updatePlayerPositionInfo" toc="no"/>
<topicref keyref="enableSpatialAudio" toc="no"/>
Expand Down Expand Up @@ -461,7 +462,6 @@
<topicref keyref="setPlaybackSpeed" toc="no"/>
<topicref keyref="setPlayerOption" toc="no"/>
<topicref keyref="setPlayerOption2" toc="no"/>
<topicref keyref="setSpatialAudioParams" toc="no"/>
<topicref keyref="setView" toc="no"/>
</topicref>
<topicref href="API/toc_mediaplayer_control.dita" chunk="to-content">
Expand Down
Loading