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.5.0 framework #3843

Merged
merged 53 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
775331a
Update keys-rtc-ng-api-blueprint.ditamap
lemon-chen Nov 15, 2024
3d4a73d
add 4.5.0 app methods and enums
lemon-chen Nov 18, 2024
99d28f6
RN/Electron: proto 1 and 3
Nero-Hu Nov 18, 2024
f1ac001
++
Suri539 Nov 18, 2024
59754da
section 1
Suri539 Nov 18, 2024
31eb573
section 3
Suri539 Nov 18, 2024
e8ff300
Electron/RN: proto 2
Nero-Hu Nov 18, 2024
f705ae6
Merge branch 'release/rtc-ng/4.5.0-framework' of https://github.com/A…
Nero-Hu Nov 18, 2024
297eefe
add props for faceshape
Nero-Hu Nov 18, 2024
1349111
add proto
Suri539 Nov 18, 2024
2ef827a
Merge branch 'release/rtc-ng/4.5.0-framework' of github.com:AgoraIO/a…
Suri539 Nov 18, 2024
2aaa70a
add bp keys and prototype
lemon-chen Nov 19, 2024
5c6669d
change key map
lemon-chen Nov 19, 2024
e5db5a2
bp updates
lemon-chen Nov 19, 2024
f7a97b3
add area code for hamonyos
Suri539 Nov 19, 2024
f636ee1
RN: add setExternalRemoteEglContext
Nero-Hu Nov 19, 2024
a88bb65
RN/Electron: add color space
Nero-Hu Nov 19, 2024
818d059
add color space in external video frame
Suri539 Nov 19, 2024
3a62680
more color
Suri539 Nov 19, 2024
95fcaa6
bp keys and framework
lemon-chen Nov 20, 2024
22fecc1
shipei
Nero-Hu Nov 20, 2024
7379bad
fix
Nero-Hu Nov 20, 2024
7312546
450 framework
Suri539 Nov 20, 2024
f96c0da
pr review comment
lemon-chen Nov 20, 2024
19f0e76
done
Suri539 Nov 20, 2024
7254d0c
Merge branch 'release/rtc-ng/4.5.0-framework' into 4.5.0-framework-fyy
Suri539 Nov 20, 2024
2db229b
Merge pull request #3835 from AgoraIO/4.5.0-chenmeng
lemon-chen Nov 20, 2024
8d8085e
Update class_mediarecorderconfiguration.dita
Suri539 Nov 20, 2024
fbe62f0
fix
Nero-Hu Nov 20, 2024
7e8bc4c
Merge pull request #3838 from AgoraIO/4.5.0-framework-fyy
Suri539 Nov 20, 2024
53ffe6b
Merge pull request #3836 from AgoraIO/4.5.0-rnelectron
Nero-Hu Nov 20, 2024
6337543
fix advanced-beauty
Nero-Hu Nov 20, 2024
6b893e9
exclude rte
Suri539 Nov 20, 2024
29ca0e0
Merge branch 'release/rtc-ng/4.5.0-framework' of github.com:AgoraIO/a…
Suri539 Nov 20, 2024
0785662
rn: add setExternalMediaProjection
Nero-Hu Nov 20, 2024
9d7e82b
map reorg
Suri539 Nov 20, 2024
c2dcfbc
unreal and bp api
lemon-chen Nov 20, 2024
58927f3
Merge branch 'release/rtc-ng/4.5.0-framework' of https://github.com/A…
lemon-chen Nov 20, 2024
84c60ed
prototype updates
lemon-chen Nov 21, 2024
43430ff
Create RTC_NG_Release_Blueprint.ditamap
lemon-chen Nov 21, 2024
6f6d418
update unity proto
Suri539 Nov 21, 2024
caf6b1f
Merge branch 'release/rtc-ng/4.5.0-framework' of github.com:AgoraIO/a…
Suri539 Nov 21, 2024
02bf048
add props
Suri539 Nov 21, 2024
4620648
remove hide props for set/getrecordingdevicemute
Suri539 Nov 21, 2024
5401a29
Electron: add get/setRecordingDeviceMute
Nero-Hu Nov 21, 2024
ec05fe9
Merge branch 'release/rtc-ng/4.5.0-framework' of https://github.com/A…
Nero-Hu Nov 21, 2024
2b1cefe
RN/Electron: reorder dualstream and video transcoder
Nero-Hu Nov 21, 2024
9ba5dfb
RN/Electron: move toc_mediaplayer_cache
Nero-Hu Nov 21, 2024
07271cb
Update release_notes.dita
Suri539 Nov 21, 2024
4aab2fd
Merge branch 'release/rtc-ng/4.5.0-framework' of github.com:AgoraIO/a…
Suri539 Nov 21, 2024
9377afb
delete desc about android screen share in release
Suri539 Nov 21, 2024
44ec53e
restore xpr file
Suri539 Nov 25, 2024
f9c5aa3
Merge branch 'master' into release/rtc-ng/4.5.0-framework
Suri539 Nov 25, 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
33 changes: 21 additions & 12 deletions dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,20 @@
<codeblock props="hmos" outputclass="language-arkts"/>
<codeblock props="ios mac" outputclass="language-objectivec">- (AgoraFaceShapeAreaOptions * _Nullable)getFaceShapeAreaOptions:(AgoraFaceShapeArea) area sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeAreaOptions(_:sourceType:));</codeblock>
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int getFaceShapeAreaOptions(agora::rtc::FaceShapeAreaOptions::FACE_SHAPE_AREA shapeArea, FaceShapeAreaOptions&amp; options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0;</codeblock>
<codeblock props="bp" outputclass="language-cpp"/>
<codeblock props="electron" outputclass="language-typescript"/>
<codeblock props="unity cs" outputclass="language-csharp"/>
<codeblock props="rn" outputclass="language-typescript"/>
<codeblock props="flutter" outputclass="language-dart"/> </p>
<codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine")
int GetFaceShapeAreaOptions(EUABT_FACE_SHAPE_AREA shapeArea, FUABT_FaceShapeAreaOptions&amp; options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="electron" outputclass="language-typescript">abstract getFaceShapeAreaOptions(
shapeArea: FaceShapeArea,
type?: MediaSourceType
): FaceShapeAreaOptions;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public abstract int GetFaceShapeAreaOptions(FACE_SHAPE_AREA shapeArea, ref FaceShapeAreaOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="rn" outputclass="language-typescript">abstract getFaceShapeAreaOptions(
shapeArea: FaceShapeArea,
type?: MediaSourceType
): FaceShapeAreaOptions;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;FaceShapeAreaOptions> getFaceShapeAreaOptions(
{required FaceShapeArea shapeArea,
MediaSourceType type = MediaSourceType.primaryCameraSource});</codeblock> </p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since">
Expand All @@ -40,7 +49,7 @@
<section id="timing" deliveryTarget="details">
<title>调用时机</title>
<p>请在 <xref keyref="enableVideo" /> 之后调用该方法。</p>
</section>
</section>
<section id="restriction" deliveryTarget="details">
<title>调用限制</title>
<p>无。</p>
Expand All @@ -49,8 +58,8 @@
<title>参数</title>
<parml>
<plentry id="area">
<pt props="android ios">shapeArea</pt>
<pt props="cpp unreal bp unity flutter rn electron cs">area</pt>
<pt props="ios mac">area</pt>
<pt props="android cpp unreal bp unity flutter rn electron cs">shapeArea</pt>
<pd>
<p props="cpp ios mac unreal bp unity flutter electron rn cs">美型部位。详见 <xref keyref="FACE_SHAPE_AREA" />。</p>
<p props="android hmos">美型部位:
Expand All @@ -72,7 +81,7 @@
</p>
</pd>
</plentry>
<plentry conkeyref="setFaceShapeAreaOptions/options" props="cpp">
<plentry conkeyref="setFaceShapeAreaOptions/options" props="cpp unreal bp unity cs">
<pt/>
<pd/>
</plentry>
Expand All @@ -83,12 +92,12 @@
</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 props="cpp unreal bp electron unity rn cs">
<p props="flutter">方法成功调用时,返回 <apiname keyref="FaceShapeAreaOptions"/> 对象;方法调用失败时,会抛出 <xref keyref="AgoraRtcException"/> 异常,你需要捕获异常并进行处理。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></p>
<ul props="cpp unreal bp unity cs">
<li>0: 方法调用成功。</li>
<li>&lt; 0: 方法调用失败。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></li>
</ul>
<ul props="apple android">
<ul props="apple android electron rn">
<li>方法调用成功,返回 <apiname keyref="FaceShapeAreaOptions"/> 对象。</li>
<li>方法调用失败,返回 <ph keyref="NULL"/>。</li>
</ul> </section>
Expand Down
26 changes: 16 additions & 10 deletions dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@
<codeblock props="hmos" outputclass="language-arkts"/>
<codeblock props="ios mac" outputclass="language-objectivec">- (AgoraFaceShapeBeautyOptions * _Nullable)getFaceShapeBeautyOptions:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeBeautyOptions(_:));</codeblock>
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int getFaceShapeBeautyOptions(FaceShapeBeautyOptions&amp; options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0;</codeblock>
<codeblock props="bp" outputclass="language-cpp"/>
<codeblock props="electron" outputclass="language-typescript"/>
<codeblock props="unity cs" outputclass="language-csharp"/>
<codeblock props="rn" outputclass="language-typescript"/>
<codeblock props="flutter" outputclass="language-dart"/> </p>
<codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine")
int GetFaceShapeBeautyOptions(FUABT_FaceShapeBeautyOptions &amp; options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="electron" outputclass="language-typescript">abstract getFaceShapeBeautyOptions(
type?: MediaSourceType
): FaceShapeBeautyOptions;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public abstract int GetFaceShapeBeautyOptions(ref FaceShapeBeautyOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="rn" outputclass="language-typescript">abstract getFaceShapeBeautyOptions(
type?: MediaSourceType
): FaceShapeBeautyOptions;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;FaceShapeBeautyOptions> getFaceShapeBeautyOptions(
{MediaSourceType type = MediaSourceType.primaryCameraSource});</codeblock> </p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since">
Expand All @@ -40,15 +46,15 @@
<section id="timing" deliveryTarget="details">
<title>调用时机</title>
<p>请在 <xref keyref="enableVideo" /> 之后调用该方法。</p>
</section>
</section>
<section id="restriction" deliveryTarget="details">
<title>调用限制</title>
<p>无。</p>
</section>
<section id="parameters" deliveryTarget="details">
<title>参数</title>
<parml>
<plentry conkeyref="setFaceShapeBeautyOptions/options" props="cpp">
<plentry conkeyref="setFaceShapeBeautyOptions/options" props="cpp unreal bp unity cs">
<pt/>
<pd/>
</plentry>
Expand All @@ -60,12 +66,12 @@
</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 props="cpp unreal bp electron unity rn cs">
<p props="flutter">方法成功调用时,返回 <apiname keyref="FaceShapeBeautyOptions"/> 对象;方法调用失败时,会抛出 <xref keyref="AgoraRtcException"/> 异常,你需要捕获异常并进行处理。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></p>
<ul props="cpp unreal bp unity cs">
<li>0: 方法调用成功。</li>
<li>&lt; 0: 方法调用失败。<ph props="cn">详见<xref keyref="error-code-link"/>了解详情和解决建议。</ph></li>
</ul>
<ul props="apple android">
<ul props="apple android electron rn">
<li>方法调用成功,返回 <apiname keyref="FaceShapeBeautyOptions"/> 对象。</li>
<li>方法调用失败,返回 <ph keyref="NULL"/>。</li>
</ul> </section>
Expand Down
10 changes: 5 additions & 5 deletions dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setExternalMediaProjection(void* mediaProjection) = 0;</codeblock>
<codeblock props="bp" outputclass="language-cpp"/>
<codeblock props="electron" outputclass="language-typescript"/>
<codeblock props="unity cs" outputclass="language-csharp"/>
<codeblock props="rn" outputclass="language-typescript"/>
<codeblock props="flutter" outputclass="language-dart"/> </p>
<codeblock props="unity cs" outputclass="language-csharp">public abstract int SetExternalMediaProjection(IntPtr mediaProjection);</codeblock>
<codeblock props="rn" outputclass="language-typescript">abstract setExternalMediaProjection(mediaProjection: any): number;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;void> setExternalMediaProjection(int mediaProjection);</codeblock> </p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since">
Expand All @@ -30,7 +30,7 @@
<dd>v4.5.0</dd>
</dlentry>
</dl>
<note type="attention" props="cpp">该方法仅适用于 Android。</note>
<note type="attention" props="cpp unreal unity rn flutter">该方法仅适用于 Android。</note>
<p>成功调用该方法后,你设置的外部 <codeph>MediaProjection</codeph> 会替换掉 SDK 申请的 <codeph>MediaProjection</codeph> 采集屏幕视频流。</p>
<p>当停止屏幕共享或销毁 <xref keyref="IRtcEngine"/> 时,SDK 会自动释放 MediaProjection。</p>
</section>
Expand All @@ -44,7 +44,7 @@
<section id="timing" deliveryTarget="details">
<title>调用时机</title>
<p>该方法需要在 <xref keyref="startScreenCapture"/> 之前调用。</p>
</section>
</section>
<section id="restriction" deliveryTarget="details">
<title>调用限制</title>
<p>在调用该方法前,必须先申请 <codeph>MediaProjection</codeph> 权限。</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setExternalRemoteEglContext(void* eglContext) = 0;</codeblock>
<codeblock props="bp" outputclass="language-cpp"/>
<codeblock props="electron" outputclass="language-typescript"/>
<codeblock props="unity cs" outputclass="language-csharp"/>
<codeblock props="rn" outputclass="language-typescript"/>
<codeblock props="flutter" outputclass="language-dart"/> </p>
<codeblock props="unity cs" outputclass="language-csharp">public abstract int SetExternalRemoteEglContext(IntPtr eglContext);</codeblock>
<codeblock props="rn" outputclass="language-typescript">abstract setExternalRemoteEglContext(eglContext: any): number;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;void> setExternalRemoteEglContext(int eglContext);</codeblock> </p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since">
Expand Down
25 changes: 17 additions & 8 deletions dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,20 @@
<codeblock props="hmos" outputclass="language-arkts"/>
<codeblock props="ios mac" outputclass="language-objectivec">- (int)setFaceShapeAreaOptions:(AgoraFaceShapeAreaOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFaceShapeAreaOptions(_:sourceType:));</codeblock>
<codeblock props="cpp unreal" outputclass="language-cpp">virtual int setFaceShapeAreaOptions(const FaceShapeAreaOptions&amp; options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0;</codeblock>
<codeblock props="bp" outputclass="language-cpp"/>
<codeblock props="electron" outputclass="language-typescript"/>
<codeblock props="unity cs" outputclass="language-csharp"/>
<codeblock props="rn" outputclass="language-typescript"/>
<codeblock props="flutter" outputclass="language-dart"/> </p>
<codeblock props="bp" outputclass="language-cpp">UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine")
int SetFaceShapeAreaOptions(const FUABT_FaceShapeAreaOptions&amp; options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="electron" outputclass="language-typescript">abstract setFaceShapeAreaOptions(
options: FaceShapeAreaOptions,
type?: MediaSourceType
): number;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public abstract int SetFaceShapeAreaOptions(FaceShapeAreaOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE);</codeblock>
<codeblock props="rn" outputclass="language-typescript">abstract setFaceShapeAreaOptions(
options: FaceShapeAreaOptions,
type?: MediaSourceType
): number;</codeblock>
<codeblock props="flutter" outputclass="language-dart">Future&lt;void> setFaceShapeAreaOptions(
{required FaceShapeAreaOptions options,
MediaSourceType type = MediaSourceType.primaryCameraSource});</codeblock> </p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since">
Expand All @@ -31,14 +40,14 @@
<dd>v4.5.0</dd>
</dlentry>
</dl>
<p>如果在 <xref keyref="setFaceShapeBeautyOptions"/> 方法中实现的预设美型效果达不到预期,你可以通过该方法设置美型部位选项,对人脸的各个部位单独微调,实现更加精细的美型效果详见<xref keyref="advanced-beauty"/>。</p>
<p>如果在 <xref keyref="setFaceShapeBeautyOptions"/> 方法中实现的预设美型效果达不到预期,你可以通过该方法设置美型部位选项,对人脸的各个部位单独微调,实现更加精细的美型效果。<ph props="cpp apple android">详见<xref keyref="advanced-beauty"/>。</ph></p>
<p props="android apple">该方法和 <xref keyref="setFaceShapeAreaOptions2"/> 均可用于设置美型部位选项,区别在于该方法支持指定应用美型效果的媒体源。</p>
<note conkeyref="setFaceShapeBeautyOptions/billing"/>
</section>
<section id="timing" deliveryTarget="details">
<title>调用时机</title>
<p>请在 <xref keyref="setFaceShapeBeautyOptions"/><ph props="apple android"> 或 <xref keyref="setFaceShapeBeautyOptions2" /></ph> 之后调用该方法。</p>
</section>
</section>
<section id="restriction" deliveryTarget="details" conkeyref="setFaceShapeBeautyOptions/restriction">
</section>
<section id="parameters" deliveryTarget="details">
Expand All @@ -63,7 +72,7 @@
<li>-4:当前设备不支持该功能,可能的原因有:
<ul>
<li>当前设备能力不满足美颜的使用要求,建议更换性能更高的设备。</li>
<li props="android rn unity flutter cs">当前设备版本低于 Android 4.4,不支持该操作,建议更换设备或升级操作系统。</li>
<li props="android rn unity flutter cpp bp unreal">当前设备版本低于 Android 4.4,不支持该操作,建议更换设备或升级操作系统。</li>
</ul>
</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dd>v4.5.0</dd>
</dlentry>
</dl>
<p>如果在 <xref keyref="setFaceShapeBeautyOptions"/> 方法中实现的预设美型效果达不到预期,你可以通过该方法设置美型部位选项,对人脸的各个部位单独微调,实现更加精细的美型效果详见<xref keyref="advanced-beauty"/>。</p>
<p>如果在 <xref keyref="setFaceShapeBeautyOptions"/> 方法中实现的预设美型效果达不到预期,你可以通过该方法设置美型部位选项,对人脸的各个部位单独微调,实现更加精细的美型效果。<ph props="cpp apple android">详见<xref keyref="advanced-beauty"/>。</ph></p>
<note conkeyref="setFaceShapeBeautyOptions/billing"/>
</section>
<section id="timing" deliveryTarget="details">
Expand Down
Loading
Loading