Skip to content

quick fix #3997

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

Open
Jiayi-Ye02 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

quick fix #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b2766
quick fix
Jiayi-Ye02 Mar 5, 2026
8a4b448
Merge branch 'master' into quick-fix-0305
Nero-Hu Apr 1, 2026
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
908 changes: 908 additions & 0 deletions RTC_NG_API_CPP.ditamap
View file
Open in desktop

Large diffs are not rendered by default.

823 changes: 823 additions & 0 deletions RTC_NG_API_iOS.ditamap
View file
Open in desktop

Large diffs are not rendered by default.

781 changes: 781 additions & 0 deletions RTC_NG_API_macOS.ditamap
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions dita/RTC-AIDOC/API/api_irtcengineex_addhandlerex.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_irtcengineex_addhandlerex">
<title><ph keyref="addHandlerEx"/></title>
<shortdesc id="short"><ph id="shortdesc" props="android">添加 <xref keyref="IRtcEngineEventHandler"/> 实例并指定连接。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="addHandlerEx"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<p outputclass="codeblock">
<codeblock props="android" outputclass="language-java">public abstract void addHandlerEx(IRtcEngineEventHandler handler, RtcConnection connection);</codeblock>
</p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title"/>
<section id="parameters" deliveryTarget="details" props="android">
<title>参数</title>
<parml>
<plentry props="android">
<pt>handler</pt>
<pd>事件回调接口。详见 <xref keyref="IRtcEngineEventHandler"/>。</pd>
</plentry>
<plentry props="android">
<pt>connection</pt>
<pd>用于控制不同连接实例的对象。详见 <xref keyref="RtcConnection"/>。</pd>
</plentry>
</parml>
</section>
</refbody>
</reference>
34 changes: 34 additions & 0 deletions dita/RTC-AIDOC/API/api_irtcengineex_removehandlerex.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_irtcengineex_removehandlerex">
<title><ph keyref="removeHandlerEx"/></title>
<shortdesc id="short"><ph id="shortdesc" props="android">移除指定连接的 <xref keyref="IRtcEngineEventHandler"/> 实例。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="removeHandlerEx"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<p outputclass="codeblock">
<codeblock props="android" outputclass="language-java">public abstract void removeHandlerEx(IRtcEngineEventHandler handler, RtcConnection connection);</codeblock>
</p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title"/>
<section id="parameters" deliveryTarget="details" props="android">
<title>参数</title>
<parml>
<plentry props="android">
<pt>handler</pt>
<pd>事件回调接口实例。详见 <xref keyref="IRtcEngineEventHandler"/>。</pd>
</plentry>
<plentry props="android">
<pt>connection</pt>
<pd>用于标识不同连接实例的对象。详见 <xref keyref="RtcConnection"/>。</pd>
</plentry>
</parml>
</section>
</refbody>
</reference>
4 changes: 2 additions & 2 deletions dita/RTC-AIDOC/API/class_localvideostats.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
</plentry>
<plentry props="ios">
<pt>codecType</pt>
<pd>本地视频的编码格式。详见 <xref keyref="VIDEO_CODEC_TYPE"/>。</pd>
<pd>本地视频流的首选编码器类型。详见 <xref keyref="VIDEO_CODEC_TYPE"/>。</pd>
</plentry>
<plentry props="ios">
<pt>hwEncoderAccelerating</pt>
Expand Down Expand Up @@ -524,7 +524,7 @@
</plentry>
<plentry props="mac">
<pt>codecType</pt>
<pd>本地视频的编码格式。详见 <xref keyref="VIDEO_CODEC_TYPE"/>。</pd>
<pd>本地视频流的首选编码器类型。详见 <xref keyref="VIDEO_CODEC_TYPE"/>。</pd>
</plentry>
<plentry props="mac">
<pt>hwEncoderAccelerating</pt>
Expand Down
4 changes: 0 additions & 4 deletions dita/RTC-AIDOC/API/enum_videocodectype.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
<pt>VIDEO_CODEC_GENERIC</pt>
<pd>（6）：通用类型。用于传输原始视频数据，例如加密的视频帧。SDK 会在回调中返回此类型的视频帧，需由用户自行解码和渲染。</pd>
</plentry>
<plentry props="cpp">
<pt>VIDEO_CODEC_GENERIC_H264</pt>
<pd>（7）：通用 H.264 编解码器类型。该类型已废弃。</pd>
</plentry>
<plentry props="cpp">
<pt>VIDEO_CODEC_VP9</pt>
<pd>（13）：VP9 编解码器。</pd>
Expand Down
8 changes: 8 additions & 0 deletions dita/RTC-AIDOC/API/rtc_api_overview.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<stentry><xref keyref="addHandler"/></stentry>
<stentry><ph conkeyref="addHandler/shortdesc"/></stentry>
</strow>
<strow props="android">
<stentry><xref keyref="addHandlerEx"/></stentry>
<stentry><ph conkeyref="addHandlerEx/shortdesc"/></stentry>
</strow>
<strow props="android ios mac">
<stentry><xref keyref="destroy1"/></stentry>
<stentry><ph conkeyref="destroy1/shortdesc"/></stentry>
Expand All @@ -39,6 +43,10 @@
<stentry><xref keyref="removeHandler"/></stentry>
<stentry><ph conkeyref="removeHandler/shortdesc"/></stentry>
</strow>
<strow props="android">
<stentry><xref keyref="removeHandlerEx"/></stentry>
<stentry><ph conkeyref="removeHandlerEx/shortdesc"/></stentry>
</strow>
<strow props="cpp">
<stentry><xref keyref="RtcEngineReleaseCallback"/></stentry>
<stentry><ph conkeyref="RtcEngineReleaseCallback/shortdesc"/></stentry>
Expand Down
2 changes: 2 additions & 0 deletions dita/RTC-AIDOC/RTC_NG_API_Android.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@
<topicref href="API/tongxin_api.dita" props="electron"/>
<topicref href="API/toc_initialize.dita" chunk="to-content">
<topicref keyref="addHandler" toc="no"/>
<topicref keyref="addHandlerEx" toc="no"/>
<topicref keyref="create" toc="no"/>
<topicref keyref="destroy1" toc="no"/>
<topicref keyref="initialize" toc="no"/>
<topicref keyref="release" toc="no"/>
<topicref keyref="removeHandler" toc="no"/>
<topicref keyref="removeHandlerEx" toc="no"/>
<topicref keyref="onEngineReleased" toc="no"/>
</topicref>
<topicref href="API/toc_channel.dita" chunk="to-content">
Expand Down
14 changes: 14 additions & 0 deletions dita/RTC-AIDOC/config/keys-rtc-ng-api-java.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="addHandlerEx" href="../API/api_irtcengineex_addhandlerex.dita">
<topicmeta>
<keywords>
<keyword>addHandlerEx</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="addOrUpdateVideoEffect" href="../API/api_ivideoeffectobject_addorupdatevideoeffect.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -2654,6 +2661,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="removeHandlerEx" href="../API/api_irtcengineex_removehandlerex.dita">
<topicmeta>
<keywords>
<keyword>removeHandlerEx</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="removeOldCache" href="../API/api_imediaplayercachemanager_removeoldcache.dita">
<topicmeta>
<keywords>
Expand Down
2 changes: 2 additions & 0 deletions dita/RTC-AIDOC/config/relations-rtc-ng-api-java.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@
</relrow>
<relrow>
<relcell>
<topicref keyref="addHandlerEx"/>
<topicref keyref="addVideoWatermarkEx"/>
<topicref keyref="addVideoWatermarkEx1"/>
<topicref keyref="adjustUserPlaybackSignalVolumeEx"/>
Expand Down Expand Up @@ -753,6 +754,7 @@
<topicref keyref="playEffectEx2"/>
<topicref keyref="preloadEffectEx"/>
<topicref keyref="preloadEffectEx2"/>
<topicref keyref="removeHandlerEx"/>
<topicref keyref="removeVideoWatermarkEx"/>
<topicref keyref="resumeAllChannelMediaRelayEx"/>
<topicref keyref="sendCustomReportMessageEx"/>
Expand Down
20 changes: 10 additions & 10 deletions dita/rtc_api.xpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@
<scenarioAssociation-array>
<scenarioAssociation>
<field name="url">
<String>RTC-AIDOC/RTC_NG_API_CPP.ditamap</String>
<String>RTC-AIDOC/RTC_NG_API_Android.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA Map HTML5 - NG CPP</String>
<String>DITA Map HTML5 - NG Android</String>
</list>
</field>
<field name="scenarioTypes">
Expand All @@ -222,11 +222,11 @@
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>RTC-AIDOC/RTC_NG_API_Android.ditamap</String>
<String>RTC-AIDOC/RTC_NG_API_macOS.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA Map HTML5 - NG Android</String>
<String>DITA Map HTML5 - NG macOS</String>
</list>
</field>
<field name="scenarioTypes">
Expand All @@ -242,11 +242,11 @@
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>RTC-NG/RTC_NG_API_macOS.ditamap</String>
<String>RTC-AIDOC/RTC_NG_API_CPP.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA Map HTML5 - NG macOS</String>
<String>DITA Map HTML5 - NG CPP</String>
</list>
</field>
<field name="scenarioTypes">
Expand All @@ -262,11 +262,11 @@
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>RTC-AIDOC/RTC_NG_API_macOS.ditamap</String>
<String>RTC-AIDOC/RTC_NG_API_iOS.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA Map HTML5 - NG macOS</String>
<String>DITA Map HTML5 - NG iOS</String>
</list>
</field>
<field name="scenarioTypes">
Expand All @@ -282,11 +282,11 @@
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>RTC-AIDOC/RTC_NG_API_iOS.ditamap</String>
<String>RTC-NG/RTC_NG_API_macOS.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA Map HTML5 - NG iOS</String>
<String>DITA Map HTML5 - NG macOS</String>
</list>
</field>
<field name="scenarioTypes">
Expand Down
Loading