Skip to content

Commit 48a5fd6

Browse files
lemon-chenlemon-chen
committed
minor updates
1 parent 4084efe commit 48a5fd6

8 files changed

+26
-18
lines changed

‎dita/RTC-NG/API/api_irtcengine_setsimulcastconfig.dita‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<codeblock props="android" outputclass="language-java">public abstract int setSimulcastConfig(SimulcastConfig simulcastConfig);</codeblock>
1717
<codeblock props="hmos" outputclass="language-arkts"/>
1818
<codeblock props="ios mac" outputclass="language-objectivec">- (int)setSimulcastConfig:(AgoraSimulcastConfig* _Nonnull)simulcastConfig NS_SWIFT_NAME(setSimulcastConfig(_:));</codeblock>
19-
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfig(const SimulcastConfig&amp;amp; simulcastConfig) = 0;</codeblock>
19+
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfig(const SimulcastConfig&amp; simulcastConfig) = 0;</codeblock>
2020
<codeblock props="bp" outputclass="language-cpp"/>
2121
<codeblock props="electron" outputclass="language-typescript"/>
2222
<codeblock props="unity cs" outputclass="language-csharp"/>

‎dita/RTC-NG/API/api_irtcengineex_setsimulcastconfigex.dita‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<codeblock props="android" outputclass="language-java">public abstract int setSimulcastConfigEx(SimulcastConfig simulcastConfig, RtcConnection connection);</codeblock>
1717
<codeblock props="hmos" outputclass="language-arkts"/>
1818
<codeblock props="ios mac" outputclass="language-objectivec">- (int)setSimulcastConfigEx:(AgoraSimulcastConfig*)simulcastConfig connection:(AgoraRtcConnection* _Nonnull)connection NS_SWIFT_NAME(setDualStreamModeEx(_:connection:));</codeblock>
19-
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfigEx(const SimulcastConfig&amp;amp; simulcastConfig, const RtcConnection&amp;amp; connection) = 0;</codeblock>
19+
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfigEx(const SimulcastConfig&amp; simulcastConfig, const RtcConnection&amp; connection) = 0;</codeblock>
2020
<codeblock props="bp" outputclass="language-cpp"/>
2121
<codeblock props="electron" outputclass="language-typescript"/>
2222
<codeblock props="unity cs" outputclass="language-csharp"/>

‎dita/RTC-NG/API/callback_irtcengineeventhandler_onconnectionstatechanged.dita‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@
9797
<li><ph keyref="CONNECTION_CHANGED_LOST" /> (16)：SDK 和服务器失去连接。</li>
9898
<li><ph keyref="CONNECTION_CHANGED_ECHO_TEST" /> (17)：连接状态变化由回声测试引起。</li>
9999
<li><ph keyref="CONNECTION_CHANGED_CLIENT_IP_ADDRESS_CHANGED_BY_USER" /> (18)：本地 IP 地址被用户更改。</li>
100-
<li><ph keyref="CONNECTION_CHANGED_SAME_UID_LOGIN" /> (19)：使用相同的 UID 从不同的设备加入同一频道。</li>
100+
<li><ph keyref="CONNECTION_CHANGED_SAME_UID_LOGIN" /> (19)：使用相同的 UID 从不同的设备加入同一频道。
101+
<p>
102+
<note type="caution">
103+
使用相同 UID 加入同一频道为未定义行为，声网不保证所有类似情况都会收到 <codeph>reason</codeph> 19。
104+
</note>
105+
</p></li>
101106
<li><ph keyref="CONNECTION_CHANGED_TOO_MANY_BROADCASTERS" /> (20)：频道内主播人数已达上限。</li>
102107
</ul> </p>
103108
</pd>

‎dita/RTC-NG/API/enum_connectionchangedreasontype.dita‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<plentry>
4444
<pt><ph keyref="CONNECTION_CHANGED_INVALID_TOKEN"/></pt>
4545
<pd>
46-
<p>8: Token 无效。一般有以下原因：
46+
<p>8: Token 无效。一般有以下原因：
4747
<ul>
4848
<li>你的项目启用了 App Certificate，但加入频道未使用 Token。</li>
4949
<li>在调用 <apiname keyref="joinChannel2"/> 加入频道时指定的用户 ID 与生成 Token 时传入的用户 ID 不一致。</li>
@@ -62,7 +62,7 @@
6262
<plentry>
6363
<pt><ph keyref="CONNECTION_CHANGED_REJECTED_BY_SERVER"/></pt>
6464
<pd>
65-
<p>10: 此用户被服务器禁止。一般有以下原因：
65+
<p>10: 此用户被服务器禁止。一般有以下原因：
6666
<ul>
6767
<li>用户已进入频道，再次调用加入频道的 API，例如 <apiname keyref="joinChannel2"/>，会返回此状态。停止调用该方法即可。</li>
6868
<li>用户在进行通话测试时尝试加入频道。等待通话测试结束后再加入频道即可。</li>

‎dita/RTC-NG/RTC_NG_API_CPP.ditamap‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@
495495
<topicref keyref="AudioBitsPerSample" toc="no"/>
496496
<topicref keyref="AudioChannels" toc="no"/>
497497
<topicref keyref="AudioSampleRate" toc="no"/>
498+
<topicref keyref="Canvas_Canvas" toc="no" />
498499
<topicref keyref="Code" toc="no"/>
499500
<topicref keyref="CurrentUrl" toc="no"/>
500501
<topicref keyref="Destroy_Rte" toc="no"/>
@@ -660,6 +661,7 @@
660661
<topicref keyref="createMusicPlayer" toc="no"/>
661662
<topicref keyref="destroyMusicPlayer" toc="no"/>
662663
<topicref keyref="getCaches" toc="no"/>
664+
<topicref keyref="getCount_MusicChartCollection" toc="no"/>
663665
<topicref keyref="getCount_MusicCollection" toc="no"/>
664666
<topicref keyref="get" toc="no"/>
665667
<topicref keyref="getInternalSongCode" toc="no"/>
@@ -921,6 +923,7 @@
921923
<topicref keyref="onEncryptionError" toc="no"/>
922924
<topicref keyref="onLastmileProbeResult" toc="no"/>
923925
<topicref keyref="onLastmileQuality" toc="no"/>
926+
<topicref keyref="onMultipathStats" toc="no" />
924927
<topicref keyref="onNetworkQuality" toc="no"/>
925928
<topicref keyref="onNetworkTypeChanged" toc="no"/>
926929
<topicref keyref="onPermissionError" toc="no"/>
@@ -934,4 +937,4 @@
934937
<topicref href="API/rtc_api_data_type.dita"/>
935938
<topicref href="API/rtc_api_sunset.dita"/>
936939
</topichead>
937-
</map>
940+
</map>

‎dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636
<keydef keys="addVideoWatermark3" href="../API/api_irtcengine_addvideowatermark3.dita">
637637
<topicmeta>
638638
<keywords>
639-
<keyword>addVideoWatermark</keyword>
639+
<keyword>addVideoWatermark [3/3]</keyword>
640640
</keywords>
641641
</topicmeta>
642642
</keydef>
@@ -3768,14 +3768,14 @@
37683768
<keydef keys="addVideoWatermark1" href="../API/api_irtcengine_addvideowatermark.dita">
37693769
<topicmeta>
37703770
<keywords>
3771-
<keyword>addVideoWatermark [1/2]</keyword>
3771+
<keyword>addVideoWatermark [1/3]</keyword>
37723772
</keywords>
37733773
</topicmeta>
37743774
</keydef>
37753775
<keydef keys="addVideoWatermark2" href="../API/api_irtcengine_addvideowatermark2.dita">
37763776
<topicmeta>
37773777
<keywords>
3778-
<keyword>addVideoWatermark [2/2]</keyword>
3778+
<keyword>addVideoWatermark [2/3]</keyword>
37793779
</keywords>
37803780
</topicmeta>
37813781
</keydef>
@@ -15276,4 +15276,4 @@
1527615276
</topicmeta>
1527715277
</keydef>
1527815278
</topichead>
15279-
</map>
15279+
</map>

‎dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@
594594
<keydef keys="addVideoWatermark3" href="../API/api_irtcengine_addvideowatermark3.dita">
595595
<topicmeta>
596596
<keywords>
597-
<keyword>addVideoWatermark</keyword>
597+
<keyword>addVideoWatermark [3/3]</keyword>
598598
</keywords>
599599
</topicmeta>
600600
</keydef>
@@ -608,7 +608,7 @@
608608
<keydef keys="addVideoWatermarkEx1" href="../API/api_irtcengineex_addvideowatermarkex1.dita">
609609
<topicmeta>
610610
<keywords>
611-
<keyword>addVideoWatermarkEx</keyword>
611+
<keyword>addVideoWatermarkEx [2/2]</keyword>
612612
</keywords>
613613
</topicmeta>
614614
</keydef>
@@ -2192,7 +2192,7 @@
21922192
<keydef keys="addVideoWatermarkEx" href="../API/api_irtcengineex_addvideowatermarkex.dita">
21932193
<topicmeta>
21942194
<keywords>
2195-
<keyword>addVideoWatermarkEx</keyword>
2195+
<keyword>addVideoWatermarkEx [1/2]</keyword>
21962196
</keywords>
21972197
</topicmeta>
21982198
</keydef>
@@ -4091,14 +4091,14 @@
40914091
<keydef keys="addVideoWatermark1" href="../API/api_irtcengine_addvideowatermark.dita">
40924092
<topicmeta>
40934093
<keywords>
4094-
<keyword>addVideoWatermark [1/2]</keyword>
4094+
<keyword>addVideoWatermark [1/3]</keyword>
40954095
</keywords>
40964096
</topicmeta>
40974097
</keydef>
40984098
<keydef keys="addVideoWatermark2" href="../API/api_irtcengine_addvideowatermark2.dita">
40994099
<topicmeta>
41004100
<keywords>
4101-
<keyword>addVideoWatermark [2/2]</keyword>
4101+
<keyword>addVideoWatermark [2/3]</keyword>
41024102
</keywords>
41034103
</topicmeta>
41044104
</keydef>
@@ -14632,4 +14632,4 @@
1463214632
</topicmeta>
1463314633
</keydef>
1463414634
</topichead>
14635-
</map>
14635+
</map>

‎dita/RTC-NG/release/release_notes.dita‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<title>新增特性</title>
7979
<body>
8080
<ol>
81-
<li><ph><b>ABR 同源多流</b></ph>
82-
<p><ph>该版本支持针对同一视频源设置同时发送多路不同分辨率视频流，并支持多频道场景。你可以通过 <codeph><xref keyref="setSimulcastConfig"/></codeph> 配置不同分辨率的视频流，（最多四层分辨率，一个最高分辨率的主流和三层其他较低分辨率的视频流），并可以通过 <codeph><xref keyref="SimulcastConfig"/></codeph> 设置视频流的分辨率、码率、是否在上行网络或设备性能较差时自动关闭多流。启用分层推流回退后，SDK 会在弱网环境下自动回退到低分辨率的视频流，确保流畅的观看体验。</ph>
81+
<li><ph><b>多路分辨率视频流</b></ph>
82+
<p><ph>该版本新增多路分辨率视频流（Adaptive Bitrate Video Streaming，简称 ABR）功能，支持对同一视频源设置同时发送多路不同分辨率的视频流，并支持多频道场景。接收端通过自动/手动订阅目标分辨率的视频流。你可以通过 <codeph><xref keyref="setSimulcastConfig"/></codeph> 配置不同分辨率的视频流，（最多四层分辨率，一个最高分辨率的主流和三层其他较低分辨率的视频流），并可以通过 <codeph><xref keyref="SimulcastConfig"/></codeph> 设置视频流的分辨率、码率、是否在上行网络或设备性能较差时自动关闭多流。启用分层推流回退后，SDK 会在弱网环境下自动回退到低分辨率的视频流，确保流畅的观看体验。</ph>
8383
<ph>订阅端可根据实际需求，通过 <codeph><xref keyref="setRemoteVideoStreamType"/></codeph> 选择想要接收的视频流。适用于会议场景、大班课、互动直播等多终端、多网络环境，可显著提升弱网下的观看体验。</ph></p>
8484
</li>
8585
<li><ph><b>多路径网络传输</b></ph>

0 commit comments

Comments
 (0)