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.

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

Release/rtc ng/4.2.3 #3338

Merged
merged 60 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ae090ff
Merge branch 'api-reorg' into release/rtc-ng/4.2.3
Sep 11, 2023
cb09013
Sync cn prototype to en prototype
Cilla-luodan Sep 11, 2023
1c5edd9
Merge pull request #3327 from AgoraIO/auto/sync-cn-proto-to-en-patch-…
github-actions[bot] Sep 11, 2023
32a0b0d
add
Sep 12, 2023
85c5b39
1
Sep 13, 2023
0fdddef
fix codeph+xref keref format
Sep 12, 2023
877e839
add error-code reference
Sep 13, 2023
f560040
add isFeatureAvailableOnDevice
Nero-Hu Sep 14, 2023
82746f4
update isFeatureAvailableOnDevice
Nero-Hu Sep 14, 2023
d192c55
add contentinspectEx & IMAGE_MODERATION
Nero-Hu Sep 14, 2023
096886f
1
jinyuagora Sep 18, 2023
828b717
2
jinyuagora Sep 19, 2023
3455bc2
3
jinyuagora Sep 19, 2023
bc93860
add serverConfig
Nero-Hu Sep 19, 2023
284bd05
4.2.3 ✌️
Suri539 Sep 19, 2023
6df170b
Revert "4.2.3 ✌️"
Suri539 Sep 19, 2023
61ad697
Update class_contentinspectconfig.dita
jinyuagora Sep 19, 2023
7028d4b
Merge branch '4.2.3-ld' of github.com:AgoraIO/agora_doc_source into 4…
Sep 19, 2023
5a65a31
1
Sep 19, 2023
2eabc49
Update class_externalvideoframe.dita
jinyuagora Sep 19, 2023
c968df5
Update api_imediaengine_pushvideoframe.dita
Sep 19, 2023
2c2e950
Merge branch '4.2.3-ld' of github.com:AgoraIO/agora_doc_source into 4…
Sep 19, 2023
c84200e
update contentinspect
Nero-Hu Sep 19, 2023
77c8a7b
remove electron
Nero-Hu Sep 19, 2023
692c03c
update isfeatureavailableondevice
Nero-Hu Sep 19, 2023
d8dd73c
fix pr review comments
Nero-Hu Sep 19, 2023
88efc53
remove unexpected "s"
Nero-Hu Sep 19, 2023
22ec675
remove redundant period
Nero-Hu Sep 19, 2023
cd81a6c
fix contentinspectconfig
Nero-Hu Sep 19, 2023
cf97354
add rn
Nero-Hu Sep 19, 2023
cd3024c
fix
Nero-Hu Sep 19, 2023
d25850a
add 4.2.3
Sep 19, 2023
e9f510b
Merge pull request #3335 from AgoraIO/4.2.3-hh
Nero-Hu Sep 19, 2023
6026cd7
Sync cn prototype to en prototype
Nero-Hu Sep 19, 2023
ea4f7a5
Merge pull request #3337 from AgoraIO/auto/sync-cn-proto-to-en-patch-…
github-actions[bot] Sep 19, 2023
2a89ec3
1
Sep 19, 2023
ac77927
Merge branch 'release/rtc-ng/4.2.3' of github.com:AgoraIO/agora_doc_s…
Sep 19, 2023
dec16e4
review comments
Sep 20, 2023
ac5d200
Merge pull request #3334 from AgoraIO/4.2.3-ld
Cilla-luodan Sep 20, 2023
6c523a5
Sync cn prototype to en prototype
Cilla-luodan Sep 20, 2023
f157ffb
Merge pull request #3339 from AgoraIO/auto/sync-cn-proto-to-en-patch-…
github-actions[bot] Sep 20, 2023
5b25fce
Update release_notes.dita
Suri539 Sep 20, 2023
ef1a2e3
Merge branch 'release/rtc-ng/4.2.3' of github.com:AgoraIO/agora_doc_s…
Suri539 Sep 20, 2023
bad5eb6
fix review comments
Suri539 Sep 20, 2023
6886f7f
review comments
Sep 20, 2023
77c834d
review comments
Sep 20, 2023
d3027cf
fix api peer review issues
Nero-Hu Sep 20, 2023
fbf5e7e
update release
Nero-Hu Sep 20, 2023
5521bba
删掉小弟
Suri539 Sep 20, 2023
e09ccd8
Merge branch 'release/rtc-ng/4.2.3' of github.com:AgoraIO/agora_doc_s…
Suri539 Sep 20, 2023
9f1e96c
fix filepath in recording
Nero-Hu Sep 20, 2023
ced8fa2
fix
Sep 20, 2023
b360554
1
Sep 20, 2023
a3abe09
Update enum_networktype.dita
Suri539 Sep 21, 2023
b6246b6
两个无罪释放
Suri539 Sep 21, 2023
ef68c48
Electron: add get/setPlaybackDeviceMute
Nero-Hu Sep 21, 2023
220db98
无罪释放
jinyuagora Sep 21, 2023
99c9c58
Merge branch 'release/rtc-ng/4.2.3' of https://github.com/AgoraIO/ago…
jinyuagora Sep 21, 2023
27ab3ec
keysmap
jinyuagora Sep 21, 2023
1e762d5
Merge branch 'master' into release/rtc-ng/4.2.3
Sep 21, 2023
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
4 changes: 4 additions & 0 deletions dita/RTC-NG/API/api_imediaengine_pushvideoframe.dita
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
<p id="desc1"> <ph props="android ios mac">调用 <xref keyref="setExternalVideoSource"/> 方法,设置 <parmname>enabled</parmname> 参数为 <codeph><ph keyref="true"/></codeph>、<parmname>encodedFrame</parmname> 参数为 <codeph><ph keyref="false"/></codeph> 后,你可以调用本方法将未编码的外部视频帧推送到 SDK。</ph> <ph props="unity cpp unreal bp flutter rn electron cs">调用 <xref keyref="createCustomVideoTrack"/> 方法获得视频轨道 ID,在每个频道的 <xref keyref="ChannelMediaOptions"/> 中,将 <parmname>customVideoTrackId</parmname> 参数设置为你想要发布的视频轨道 ID,并将 <parmname>publishCustomVideoTrack</parmname> 设置为 <codeph><ph keyref="true"/></codeph>后,你可以调用本方法将未编码的外部视频帧推送到 SDK。</ph></p>
<p props="android">调用该方法或 <xref keyref="pushVideoFrame2"/> 均能将视频帧数据传递给SDK。区别为 <apiname keyref="pushVideoFrame"/> 方法不支持 texture 格式的视频数据。</p>
</section>
<section props="cpp">
<title>适用场景</title>
<p>SDK 自 v4.2.3 起支持 ID3D11Texture2D 类型的视频格式,该类型在游戏场景下应用较为广泛。当你需要将该类型的视频帧推送的 SDK 时,需要调用该方法,并设置 <parmname>frame</parmname> 中的 <parmname>format</parmname> 为 <codeph>VIDEO_TEXTURE_ID3D11TEXTURE2D</codeph>、设置 <parmname>d3d11_texture_2d</parmname> 和 <parmname>texture_slice_index</parmname> 成员,将视频帧的格式设置为 ID3D11Texture2D。</p>
</section>
<section id="parameters">
<title>参数</title>
<parml>
Expand Down
22 changes: 10 additions & 12 deletions dita/RTC-NG/API/api_irtcengine_enablecontentinspect.dita
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_irtcengine_enablecontentinspect">
<title><ph keyref="enableContentInspect"/></title>
<shortdesc id="short"><ph id="shortdesc"><ph>开启/关闭视频截图上传。</ph><ph props="hide">开启/关闭视频内容审核。</ph></ph></shortdesc>
<shortdesc id="short"><ph id="shortdesc">开启/关闭视频截图上传。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
Expand Down Expand Up @@ -32,28 +32,26 @@
<section id="detailed_desc">
<title>详情</title>
<p>开启视频截图上传后,SDK 会根据你在 <xref keyref="ContentInspectConfig"/> 中设置的模块类型和频率对本地用户发送的视频进行截图和上传。截图完成后,声网服务器会以 HTTPS 请求的形式,向你的服务器发送回调通知,并将所有截图发送至你指定的第三方云存储。</p>
<p props="hide">开启视频内容审核后,SDK 会根据你在 <xref keyref="ContentInspectConfig"/> 中设置的内容审核模块类型和频率对本地用户发送的视频进行截图、审核和上传。审核完成后,声网内容审核服务器会以 HTTPS 请求的形式,向你的服务器发送审核结果,并将指定类型的截图发送至你指定的第三方云存储。</p>
<note>
<ul>
<li><ph>调用该方法前,请确保已<xref keyref="ticket-link"/>开通视频截图上传服务。</ph><ph props="hide">调用该方法前,请确保已<xref keyref="ticket-link"/>开通视频内容审核服务。详见 <xref keyref="enable-content-inspect"/>。</ph></li>
<li>该方法依赖于视频截图上传动态库 <codeph><ph keyref="moderation"/></codeph>,如果删除该动态库会导致无法正常开启该功能。</li>
</ul></note> </section>
<note>调用该方法前,请确保已<xref keyref="ticket-link"/>开通视频截图上传服务。</note>
</section>
<section id="parameters">
<title>参数</title>
<parml>
<plentry>
<plentry id="enabled">
<pt>enabled</pt>
<pd>设置是否开启<ph>视频截图上传</ph><ph props="hide">视频内容审核</ph>:


<ul>
<li><codeph><ph keyref="true"/></codeph>:<ph>开启视频截图上传</ph>。<ph props="hide">开启视频内容审核。</ph></li>
<li><codeph><ph keyref="false"/></codeph>:<ph>关闭视频截图上传</ph>。<ph props="hide">关闭视频内容审核。</ph></li>
<li><codeph><ph keyref="true"/></codeph>:开启视频截图上传</li>
<li><codeph><ph keyref="false"/></codeph>:关闭视频截图上传</li>
</ul></pd>
</plentry>
<plentry>
<plentry id="config">
<pt>config</pt>
<pd><ph>视频截图上传配置。</ph><ph props="hide">视频内容审核配置。</ph><ph>详见 <xref keyref="ContentInspectConfig"/>。</ph></pd>
<pd><ph>视频截图上传配置。详见 <xref keyref="ContentInspectConfig"/>。</ph>
<note>视频审核模块选择声网自研插件截图上传(<ph keyref="CONTENT_INSPECT_SUPERVISE"/>)时需集成视频截图上传动态库 <codeph><ph keyref="moderation"/></codeph>,如果删除该动态库会导致无法正常开启视频截图上传功能。</note>
</pd>
</plentry>
</parml> </section>
<section id="return_values">
Expand Down
60 changes: 60 additions & 0 deletions dita/RTC-NG/API/api_irtcengine_isfeatureavailableondevice.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_irtcengine_isfeatureavailableondevice">
<title><ph keyref="isFeatureAvailableOnDevice"/></title>
<shortdesc id="short"><ph id="shortdesc">查询设备是否支持指定进阶功能。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="isFeatureAvailableOnDevice"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<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 bp" 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="flutter" outputclass="language-dart">Future&lt;bool&gt; isFeatureAvailableOnDevice(FeatureType type);</codeblock> </p>
</section>
<section id="detailed_desc">
<title>详情</title>
<dl outputclass="since">
<dlentry props="native">
<dt>自从</dt>
<dd>v4.2.3</dd>
</dlentry>
</dl>
<p>查询当前设备能力是否满足虚拟背景、美颜等进阶功能的要求。</p>
</section>
<section id="scenario">
<title>适用场景</title>
<p>在使用进阶音视频功能前,你可以根据查询结果判断当前设备是否支持这些功能,从而避免在低端设备上开启进阶功能导致性能下降或功能不可用的问题。你可以根据该方法的返回值,决定是否显示或启用相应的功能按钮,或者在设备能力不足时,为用户提示相应信息。。</p>
</section>
<section id="parameters">
<title>参数</title>
<parml>
<plentry>
<pt>type</pt>
<pd props="cpp apple framework">进阶功能类型,详见 <xref keyref="FeatureType"/>。</pd>
<pd props="android">
<p>进阶功能类型:
<ul>
<li><ph keyref="VIDEO_VIRTUAL_BACKGROUND" /> (1):虚拟背景功能。</li>
<li><ph keyref="VIDEO_BEAUTY_EFFECT" /> (2):美颜功能。</li>
</ul></p>
</pd>
</plentry>
</parml> </section>
<section id="return_values">
<title>返回值</title>
<ul>
<li><codeph><ph keyref="true" /></codeph>: 设备支持指定进阶功能。</li>
<li><codeph><ph keyref="false" /></codeph>: 设备不支持指定进阶功能。</li>
</ul> </section>
</refbody>
</reference>
67 changes: 67 additions & 0 deletions dita/RTC-NG/API/api_irtcengineex_enablecontentinspectex.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_irtcengineex_enablecontentinspectex">
<title><ph keyref="enableContentInspectEx"/></title>
<shortdesc id="short"><ph id="shortdesc">开启/关闭视频截图上传。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="enableContentInspectEx"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<p outputclass="codeblock">
<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 bp" 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(
enabled: boolean,
config: ContentInspectConfig,
connection: RtcConnection
): number;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;void&gt; enableContentInspectEx(
{required bool enabled,
required ContentInspectConfig config,
required RtcConnection connection});</codeblock> </p>
</section>
<section id="detailed_desc">
<title>详情</title>
<dl outputclass="since">
<dlentry props="native">
<dt>自从</dt>
<dd>v4.2.3</dd>
</dlentry>
</dl>
<p>该方法可以对多条视频流截图并上传。开启视频截图上传后,SDK 会根据你在 <xref keyref="ContentInspectConfig"/> 中设置的模块类型和频率对本地用户发送的视频进行截图和上传。截图完成后,声网服务器会以 HTTPS 请求的形式,向你的服务器发送回调通知,并将所有截图发送至你指定的第三方云存储。</p>
<note>调用该方法前,请确保已<xref keyref="ticket-link"/>开通视频截图上传服务。</note>
</section>
<section id="parameters">
<title>参数</title>
<parml>
<plentry conkeyref="enableContentInspect/enabled">
<pt/>
<pd/>
</plentry>
<plentry conkeyref="enableContentInspect/config">
<pt/>
<pd/>
</plentry>
<plentry conkeyref="joinChannelEx/connection">
<pt/>
<pd/>
</plentry>
</parml> </section>
<section id="return_values">
<title><ph keyref="return-section-title"/></title>
<p props="flutter">方法成功调用时,无返回值;方法调用失败时,会抛出 <xref keyref="AgoraRtcException"/> 异常,你需要捕获异常并进行处理。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></p>
<ul>
<li props="native unreal bp unity rn electron cs">0: 方法调用成功。</li>
<li>&lt; 0: 方法调用失败。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></li>
</ul></section>
</refbody>
</reference>
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
<pd props="ios mac cpp unreal bp unity electron rn flutter cs">本地音频出错原因。详见 <xref keyref="LOCAL_AUDIO_STREAM_ERROR" />。</pd>
<pd props="android">本地音频出错原因。
<ul>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_OK" /> 0: 本地音频状态正常。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_FAILURE" /> 1: 本地音频出错原因不明确。建议提示用户尝试重新加入频道。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_DEVICE_NO_PERMISSION" /> 2: 没有权限启动本地音频采集设备。请提示用户开启权限。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_DEVICE_BUSY" /> 3: 本地音频采集设备已经在使用中。请提示用户检查麦克风是否被其他应用占用。麦克风空闲约 5 秒后本地音频采集会自动恢复,你也可以在麦克风空闲后尝试重新加入频道。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_RECORD_FAILURE" /> 4: 本地音频采集失败。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_ENCODE_FAILURE" /> 5: 本地音频编码失败。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_INTERRUPTED" /> 8: 本地音频采集被系统来电、Siri、闹钟中断。如需恢复本地音频采集,请用户中止电话、Siri、闹钟。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_OK" /> (0): 本地音频状态正常。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_FAILURE" /> (1): 本地音频出错原因不明确。建议提示用户尝试重新加入频道。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_DEVICE_NO_PERMISSION" /> (2): 没有权限启动本地音频采集设备。请提示用户开启权限。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_DEVICE_BUSY" /> (3): 本地音频采集设备已经在使用中。请提示用户检查麦克风是否被其他应用占用。麦克风空闲约 5 秒后本地音频采集会自动恢复,你也可以在麦克风空闲后尝试重新加入频道。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_RECORD_FAILURE" /> (4): 本地音频采集失败。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_ENCODE_FAILURE" /> (5): 本地音频编码失败。</li>
<li><ph keyref="LOCAL_AUDIO_STREAM_ERROR_INTERRUPTED" /> (8): 本地音频采集被系统来电、Siri、闹钟中断。如需恢复本地音频采集,请用户中止电话、Siri、闹钟。</li>
</ul></pd>
</plentry>
</parml> </section>
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/API/class_audiorecordingconfiguration.dita
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<parml>
<plentry id="filepath">
<pt>filePath</pt>
<pd>录音文件在本地保存的绝对路径,需精确到文件名及格式。例如:<codeph><ph keyref="filePath-example" /></codeph>。
<pd>录音文件在本地保存的绝对路径,需精确到文件名及格式。例如:<codeph><ph keyref="recordingPath-example" /></codeph>。



Expand Down
Loading
Loading