From 775331a55662b5454c52e9d4505698e7e729bd82 Mon Sep 17 00:00:00 2001 From: chenmeng Date: Fri, 15 Nov 2024 17:44:38 +0800 Subject: [PATCH 01/19] Update keys-rtc-ng-api-blueprint.ditamap --- .../config/keys-rtc-ng-api-blueprint.ditamap | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap index ec9e6afed07..dbe9fded58f 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap @@ -6592,6 +6592,13 @@ + + + + PREFER_COMPRESSION_AUTO + + + @@ -11716,6 +11723,13 @@ + + + + APPLICATION_SCENARIO_LIVESHOW + + + @@ -12934,4 +12948,4 @@ - \ No newline at end of file + From 3d4a73d996ad48c11c70eba9820b16b1c16bd934 Mon Sep 17 00:00:00 2001 From: chenmeng Date: Mon, 18 Nov 2024 10:27:11 +0800 Subject: [PATCH 02/19] add 4.5.0 app methods and enums --- .../config/keys-rtc-ng-api-blueprint.ditamap | 7 + .../config/keys-rtc-ng-api-unreal.ditamap | 340 +++++++++++++++++- dita/rtc_api.xpr | 44 +-- 3 files changed, 368 insertions(+), 23 deletions(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap index dbe9fded58f..f16502f2971 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap @@ -8223,6 +8223,13 @@ + + + + MAINTAIN_AUTO + + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap index e4216b8eb72..f0b40a28e35 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap @@ -1166,6 +1166,20 @@ + + + + setLocalRenderTargetFps + + + + + + + setRemoteRenderTargetFps + + + @@ -1261,6 +1275,20 @@ + + + + getFaceShapeAreaOptions + + + + + + + getFaceShapeBeautyOptions + + + @@ -1296,6 +1324,27 @@ + + + + setFaceShapeAreaOptions + + + + + + + setFaceShapeBeautyOptions + + + + + + + setFilterEffectOptions + + + @@ -1543,6 +1592,13 @@ + + + + takeSnapshotEx [2/2] + + + @@ -1685,6 +1741,13 @@ + + + + setExternalMediaProjection + + + @@ -2684,6 +2747,29 @@ + + + + + startLocalAudioMixer + + + + + + + stopLocalAudioMixer + + + + + + + updateLocalAudioMixerConfiguration + + + + @@ -3955,6 +4041,13 @@ + + + + takeSnapshot [2/2] + + + @@ -5344,6 +5437,27 @@ + + + + FaceShapeAreaOptions + + + + + + + FaceShapeBeautyOptions + + + + + + + FilterEffectOptions + + + @@ -5477,6 +5591,13 @@ + + + + MixedAudioStream + + + @@ -5708,6 +5829,13 @@ + + + + SnapshotConfig + + + @@ -6242,6 +6370,69 @@ + + + + AUDIO_SOURCE_TYPE + + + + + + + AUDIO_SOURCE_MICROPHONE + + + + + + + AUDIO_SOURCE_CUSTOM + + + + + + + AUDIO_SOURCE_MEDIA_PLAYER + + + + + + + AUDIO_SOURCE_LOOPBACK_RECORDING + + + + + + + AUDIO_SOURCE_MIXED_STREAM + + + + + + + AUDIO_SOURCE_REMOTE_USER + + + + + + + AUDIO_SOURCE_REMOTE_CHANNEL + + + + + + + AUDIO_SOURCE_UNKNOWN + + + @@ -6536,6 +6727,13 @@ + + + + PREFER_COMPRESSION_AUTO + + + @@ -8300,6 +8498,13 @@ + + + + MAINTAIN_AUTO + + + @@ -8930,6 +9135,125 @@ + + + + FACE_SHAPE_AREA + + + + + + + FACE_SHAPE_AREA_NONE + + + + + + + FACE_SHAPE_AREA_HEADSCALE + + + + + + + FACE_SHAPE_AREA_FOREHEAD + + + + + + + FACE_SHAPE_AREA_FACECONTOUR + + + + + + + FACE_SHAPE_AREA_FACELENGTH + + + + + + + FACE_SHAPE_AREA_FACEWIDTH + + + + + + + FACE_SHAPE_AREA_CHEEKBONE + + + + + + + FACE_SHAPE_AREA_CHEEK + + + + + + + FACE_SHAPE_AREA_CHIN + + + + + + + FACE_SHAPE_AREA_EYESCALE + + + + + + + FACE_SHAPE_AREA_NOSELENGTH + + + + + + + FACE_SHAPE_AREA_NOSEWIDTH + + + + + + + FACE_SHAPE_AREA_MOUTHSCALE + + + + + + + FACE_SHAPE_BEAUTY_STYLE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_FEMALE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_MALE + + + @@ -11093,6 +11417,13 @@ + + + + RecorderStreamType + + + @@ -11793,6 +12124,13 @@ + + + + APPLICATION_SCENARIO_LIVESHOW + + + @@ -13515,4 +13853,4 @@ - \ No newline at end of file + diff --git a/dita/rtc_api.xpr b/dita/rtc_api.xpr index 11952bb119b..c4874483445 100644 --- a/dita/rtc_api.xpr +++ b/dita/rtc_api.xpr @@ -202,11 +202,11 @@ - RTC-NG/RTC_NG_API_CPP.ditamap + RTC-NG/RTC_NG_API_Blueprint.ditamap - DITA Map HTML5 - NG CPP + DITA Map HTML5 - NG Blueprint @@ -240,26 +240,6 @@ - - - RTC-NG/RTC_NG_API_Blueprint.ditamap - - - - DITA Map HTML5 - NG Blueprint - - - - - DITAMAP - - - - - 2 - - - RTC-NG/RTC_NG_API_Harmony.ditamap @@ -763,6 +743,26 @@ + + + RTC-NG/RTC_NG_API_CPP.ditamap + + + + DITA Map HTML5 - NG CPP + + + + + DITAMAP + + + + + 2 + + + From 99d28f6ec379a94139b562b38f5742752ca711b3 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Mon, 18 Nov 2024 14:43:28 +0800 Subject: [PATCH 03/19] RN/Electron: proto 1 and 3 --- ...pi_irtcengine_getfaceshapeareaoptions.dita | 10 +- ..._irtcengine_getfaceshapebeautyoptions.dita | 8 +- ...irtcengine_setexternalmediaprojection.dita | 2 +- ...pi_irtcengine_setfaceshapeareaoptions.dita | 10 +- ..._irtcengine_setfaceshapebeautyoptions.dita | 12 +- ...pi_irtcengine_setlocalrendertargetfps.dita | 10 +- ...i_irtcengine_setremoterendertargetfps.dita | 4 +- .../api_irtcengine_startlocalaudiomixer.dita | 4 +- .../api_irtcengine_stoplocalaudiomixer.dita | 4 +- ...ne_updatelocalaudiomixerconfiguration.dita | 8 +- dita/RTC-NG/API/class_audiotrackconfig.dita | 2 + .../API/class_faceshapeareaoptions.dita | 9 +- .../API/class_faceshapebeautyoptions.dita | 9 +- .../class_localaudiomixerconfiguration.dita | 12 +- dita/RTC-NG/API/class_mixedaudiostream.dita | 14 +- dita/RTC-NG/API/class_videoframe.dita | 2 + dita/RTC-NG/RTC_NG_API_Electron.ditamap | 12 + dita/RTC-NG/RTC_NG_API_RN.ditamap | 13 + .../config/keys-rtc-ng-api-electron.ditamap | 296 ++++++++++++++++ dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 331 +++++++++++++++++- ...rtcengine_setexternalremoteeglcontext.dita | 2 +- 21 files changed, 741 insertions(+), 33 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita index 676a696e2af..4a245a17182 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita @@ -19,9 +19,15 @@ - (AgoraFaceShapeAreaOptions * _Nullable)getFaceShapeAreaOptions:(AgoraFaceShapeArea) area sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeAreaOptions(_:sourceType:)); virtual int getFaceShapeAreaOptions(agora::rtc::FaceShapeAreaOptions::FACE_SHAPE_AREA shapeArea, FaceShapeAreaOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + abstract getFaceShapeAreaOptions( + shapeArea: FaceShapeArea, + type?: MediaSourceType + ): FaceShapeAreaOptions; - + abstract getFaceShapeAreaOptions( + shapeArea: FaceShapeArea, + type?: MediaSourceType + ): FaceShapeAreaOptions;

diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita index 80c14bce42d..33a4b7f5526 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita @@ -19,9 +19,13 @@ - (AgoraFaceShapeBeautyOptions * _Nullable)getFaceShapeBeautyOptions:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeBeautyOptions(_:)); virtual int getFaceShapeBeautyOptions(FaceShapeBeautyOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + abstract getFaceShapeBeautyOptions( + type?: MediaSourceType + ): FaceShapeBeautyOptions; - + abstract getFaceShapeBeautyOptions( + type?: MediaSourceType + ): FaceShapeBeautyOptions;

diff --git a/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita b/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita index da31e5d7584..42910d71c88 100644 --- a/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita +++ b/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita @@ -20,7 +20,7 @@ - + abstract setExternalMediaProjection(mediaProjection: any): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita index ce79afa1326..60422c14037 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita @@ -19,9 +19,15 @@ - (int)setFaceShapeAreaOptions:(AgoraFaceShapeAreaOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFaceShapeAreaOptions(_:sourceType:)); virtual int setFaceShapeAreaOptions(const FaceShapeAreaOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + abstract setFaceShapeAreaOptions( + options: FaceShapeAreaOptions, + type?: MediaSourceType + ): number; - + abstract setFaceShapeAreaOptions( + options: FaceShapeAreaOptions, + type?: MediaSourceType + ): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita index b1a48a8e85c..6672598b421 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita @@ -19,9 +19,17 @@ - (int)setFaceShapeBeautyOptions:(BOOL)enable options:(AgoraFaceShapeBeautyOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFaceShapeBeautyOptions(_:options:sourceType:)); virtual int setFaceShapeBeautyOptions(bool enabled, const FaceShapeBeautyOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + abstract setFaceShapeBeautyOptions( + enabled: boolean, + options: FaceShapeBeautyOptions, + type?: MediaSourceType + ): number; - + abstract setFaceShapeBeautyOptions( + enabled: boolean, + options: FaceShapeBeautyOptions, + type?: MediaSourceType + ): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita index 1bc5b8e42fa..8d93088a195 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita @@ -19,9 +19,15 @@ targetFps:(int)targetFps; public abstract int setLocalRenderTargetFps(Constants.VideoSourceType sourceType, int targetFps); virtual int setLocalRenderTargetFps(VIDEO_SOURCE_TYPE sourceType, int targetFps) = 0; - + abstract setLocalRenderTargetFps( + sourceType: VideoSourceType, + targetFps: number + ): number; - + abstract setLocalRenderTargetFps( + sourceType: VideoSourceType, + targetFps: number + ): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita index bf998b2d33b..da37e4375ef 100644 --- a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita @@ -18,9 +18,9 @@ - (int)setRemoteRenderTargetFps:(int)targetFps; virtual int setRemoteRenderTargetFps(int targetFps) = 0; - + abstract setRemoteRenderTargetFps(targetFps: number): number; - + abstract setRemoteRenderTargetFps(targetFps: number): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita index 5e935eb83a3..4252ffe0d75 100644 --- a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita @@ -18,9 +18,9 @@ - (int)startLocalAudioMixer:(AgoraLocalAudioMixerConfiguration* _Nonnull)config NS_SWIFT_NAME(startLocalAudioMixer(_:)); virtual int startLocalAudioMixer(const LocalAudioMixerConfiguration& config) = 0; - + abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number; - + abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita index 30fb53839f4..1de4c459b36 100644 --- a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita @@ -18,9 +18,9 @@ - (int)stopLocalAudioMixer NS_SWIFT_NAME(stopLocalAudioMixer()); virtual int stopLocalAudioMixer() = 0; - + abstract stopLocalAudioMixer(): number; - + abstract stopLocalAudioMixer(): number;

diff --git a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita index 93a02ece0e0..2e7a6038868 100644 --- a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita @@ -18,9 +18,13 @@ - (int)updateLocalAudioMixerConfiguration:(AgoraLocalAudioMixerConfiguration* _Nonnull)config NS_SWIFT_NAME(updateLocalAudioMixerConfiguration(_:)); virtual int updateLocalAudioMixerConfiguration(const LocalAudioMixerConfiguration& config) = 0; - + abstract updateLocalAudioMixerConfiguration( + config: LocalAudioMixerConfiguration + ): number; - + abstract updateLocalAudioMixerConfiguration( + config: LocalAudioMixerConfiguration + ): number;

diff --git a/dita/RTC-NG/API/class_audiotrackconfig.dita b/dita/RTC-NG/API/class_audiotrackconfig.dita index 7c425f5025d..64af142135c 100644 --- a/dita/RTC-NG/API/class_audiotrackconfig.dita +++ b/dita/RTC-NG/API/class_audiotrackconfig.dita @@ -47,6 +47,7 @@ struct FAudioTrackConfig }; export class AudioTrackConfig { enableLocalPlayback?: boolean; + enableAudioProcessing?: boolean; } public class AudioTrackConfig { @@ -65,6 +66,7 @@ struct FAudioTrackConfig }; export class AudioTrackConfig { enableLocalPlayback?: boolean; + enableAudioProcessing?: boolean; } @JsonSerializable(explicitToJson: true, includeIfNull: false) class AudioTrackConfig { diff --git a/dita/RTC-NG/API/class_faceshapeareaoptions.dita b/dita/RTC-NG/API/class_faceshapeareaoptions.dita index 08daedaeacf..ca8161300b1 100644 --- a/dita/RTC-NG/API/class_faceshapeareaoptions.dita +++ b/dita/RTC-NG/API/class_faceshapeareaoptions.dita @@ -56,8 +56,15 @@ }; - + export class FaceShapeAreaOptions { + shapeArea?: FaceShapeArea; + shapeIntensity?: number; +} + export class FaceShapeAreaOptions { + shapeArea?: FaceShapeArea; + shapeIntensity?: number; +}

diff --git a/dita/RTC-NG/API/class_faceshapebeautyoptions.dita b/dita/RTC-NG/API/class_faceshapebeautyoptions.dita index 0d4c4250e0b..457ee8b7d77 100644 --- a/dita/RTC-NG/API/class_faceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/class_faceshapebeautyoptions.dita @@ -33,8 +33,15 @@ FaceShapeBeautyOptions() : shapeStyle(FACE_SHAPE_BEAUTY_STYLE_FEMALE), styleIntensity(50) {} }; - + export class FaceShapeBeautyOptions { + shapeStyle?: FaceShapeBeautyStyle; + styleIntensity?: number; +} + export class FaceShapeBeautyOptions { + shapeStyle?: FaceShapeBeautyStyle; + styleIntensity?: number; +}

diff --git a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita index 6f8f514341d..f2ae0904495 100644 --- a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita @@ -38,9 +38,17 @@ LocalAudioMixerConfiguration() : streamCount(0), syncWithLocalMic(true) {} }; - + export class LocalAudioMixerConfiguration { + streamCount?: number; + audioInputStreams?: MixedAudioStream[]; + syncWithLocalMic?: boolean; +} - + export class LocalAudioMixerConfiguration { + streamCount?: number; + audioInputStreams?: MixedAudioStream[]; + syncWithLocalMic?: boolean; +}

diff --git a/dita/RTC-NG/API/class_mixedaudiostream.dita b/dita/RTC-NG/API/class_mixedaudiostream.dita index 4fba9c0c8e8..aba54637086 100644 --- a/dita/RTC-NG/API/class_mixedaudiostream.dita +++ b/dita/RTC-NG/API/class_mixedaudiostream.dita @@ -49,9 +49,19 @@ trackId(track) {} }; - + export class MixedAudioStream { + sourceType?: AudioSourceType; + remoteUserUid?: number; + channelId?: string; + trackId?: number; +} - + export class MixedAudioStream { + sourceType?: AudioSourceType; + remoteUserUid?: number; + channelId?: string; + trackId?: number; +}

diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 15070bb10e9..5a652283888 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -559,6 +559,7 @@ struct FVideoFrame { alphaStitchMode?: AlphaStitchMode; + colorSpace?: ColorSpace; } public class VideoFrame { @@ -646,6 +647,7 @@ struct FVideoFrame { alphaStitchMode?: AlphaStitchMode; + colorSpace?: ColorSpace; } @JsonSerializable(explicitToJson: true, includeIfNull: false) class VideoFrame { diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 715d31e56c6..6f7040b917f 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -198,6 +198,11 @@ + + + + + @@ -298,8 +303,13 @@ + + + + + @@ -345,9 +355,11 @@ + + diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index 43b7a0febd2..ef80875541a 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -195,6 +195,11 @@ + + + + + @@ -273,6 +278,7 @@ + @@ -294,8 +300,13 @@ + + + + + @@ -345,9 +356,11 @@ + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap index f042a9914db..b5f30cfe27b 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -1203,6 +1203,20 @@ + + + + getFaceShapeAreaOptions + + + + + + + getFaceShapeBeautyOptions + + + @@ -1238,6 +1252,27 @@ + + + + setFaceShapeAreaOptions + + + + + + + setFaceShapeBeautyOptions + + + + + + + setFilterEffectOptions + + + @@ -2424,6 +2459,29 @@ + + + + + startLocalAudioMixer + + + + + + + stopLocalAudioMixer + + + + + + + updateLocalAudioMixerConfiguration + + + + @@ -4827,6 +4885,27 @@ + + + + FaceShapeAreaOptions + + + + + + + FaceShapeBeautyOptions + + + + + + + FilterEffectOptions + + + @@ -4943,6 +5022,20 @@ MediaSource + + + + + + + MixedAudioStream + + + + + + + LocalAudioMixerConfiguration @@ -5690,6 +5783,69 @@ + + + + AudioSourceType + + + + + + + AudioSourceMicrophone + + + + + + + AudioSourceCustom + + + + + + + AudioSourceMediaPlayer + + + + + + + AudioSourceLoopbackRecording + + + + + + + AudioSourceMixedStream + + + + + + + AudioSourceRemoteUser + + + + + + + AudioSourceRemoteChannel + + + + + + + AudioSourceUnknown + + + @@ -5872,6 +6028,13 @@ + + + + PreferCompressionAuto + + + @@ -7629,6 +7792,13 @@ + + + + MaintainAuto + + + @@ -8256,6 +8426,125 @@ ExperienceQualityBad + + + + + + + FaceShapeArea + + + + + + + FaceShapeAreaNone + + + + + + + FaceShapeAreaHeadscale + + + + + + + FaceShapeAreaForehead + + + + + + + FaceShapeAreaFacecontour + + + + + + + FaceShapeAreaFacelength + + + + + + + FaceShapeAreaFacewidth + + + + + + + FaceShapeAreaCheekbone + + + + + + + FaceShapeAreaCheek + + + + + + + FaceShapeAreaChin + + + + + + + FaceShapeAreaEyescale + + + + + + + FaceShapeAreaNoselength + + + + + + + FaceShapeAreaNosewidth + + + + + + + FaceShapeAreaMouthscale + + + + + + + FaceShapeBeautyStyle + + + + + + + FaceShapeBeautyStyleFemale + + + + + + + FaceShapeBeautyStyleMale @@ -10807,6 +11096,13 @@ + + + + ApplicationScenarioLiveshow + + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap index 80eba449e27..c24778205cf 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -1136,6 +1136,20 @@ + + + + setLocalRenderTargetFps + + + + + + + setRemoteRenderTargetFps + + + @@ -1220,13 +1234,6 @@ - - - - FocalLengthInfo - - - @@ -1245,6 +1252,20 @@ + + + + getFaceShapeAreaOptions + + + + + + + getFaceShapeBeautyOptions + + + @@ -1280,6 +1301,27 @@ + + + + setFaceShapeAreaOptions + + + + + + + setFaceShapeBeautyOptions + + + + + + + setFilterEffectOptions + + + @@ -2405,6 +2447,13 @@ + + + + setExternalRemoteEglContext + + + @@ -2464,6 +2513,29 @@ + + + + + startLocalAudioMixer + + + + + + + stopLocalAudioMixer + + + + + + + updateLocalAudioMixerConfiguration + + + + @@ -4787,6 +4859,34 @@ + + + + FaceShapeAreaOptions + + + + + + + FaceShapeBeautyOptions + + + + + + + FilterEffectOptions + + + + + + + FocalLengthInfo + + + @@ -4899,6 +4999,20 @@ + + + + MixedAudioStream + + + + + + + LocalAudioMixerConfiguration + + + @@ -5629,6 +5743,69 @@ + + + + AudioSourceType + + + + + + + AudioSourceMicrophone + + + + + + + AudioSourceCustom + + + + + + + AudioSourceMediaPlayer + + + + + + + AudioSourceLoopbackRecording + + + + + + + AudioSourceMixedStream + + + + + + + AudioSourceRemoteUser + + + + + + + AudioSourceRemoteChannel + + + + + + + AudioSourceUnknown + + + @@ -5853,6 +6030,13 @@ + + + + PreferCompressionAuto + + + @@ -7645,6 +7829,13 @@ + + + + MaintainAuto + + + @@ -8275,6 +8466,125 @@ + + + + FaceShapeArea + + + + + + + FaceShapeAreaNone + + + + + + + FaceShapeAreaHeadscale + + + + + + + FaceShapeAreaForehead + + + + + + + FaceShapeAreaFacecontour + + + + + + + FaceShapeAreaFacelength + + + + + + + FaceShapeAreaFacewidth + + + + + + + FaceShapeAreaCheekbone + + + + + + + FaceShapeAreaCheek + + + + + + + FaceShapeAreaChin + + + + + + + FaceShapeAreaEyescale + + + + + + + FaceShapeAreaNoselength + + + + + + + FaceShapeAreaNosewidth + + + + + + + FaceShapeAreaMouthscale + + + + + + + FaceShapeBeautyStyle + + + + + + + FaceShapeBeautyStyleFemale + + + + + + + FaceShapeBeautyStyleMale + + + @@ -10767,6 +11077,13 @@ + + + + ApplicationScenarioLiveshow + + + diff --git a/en-US/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita b/en-US/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita index bb303f9c7d5..e5e172da6bc 100644 --- a/en-US/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita +++ b/en-US/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita @@ -20,7 +20,7 @@ - + abstract setExternalRemoteEglContext(eglContext: any): number;

From f1ac001e145b6d3f798222faeec4dd599ae3eb1f Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 18 Nov 2024 14:45:15 +0800 Subject: [PATCH 04/19] ++ --- .../api_irtcengine_setexternalremoteeglcontext.dita | 4 ++-- .../API/api_irtcengine_setfiltereffectoptions.dita | 7 +++++-- dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita | 5 +++-- dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita | 7 +++++-- dita/RTC-NG/API/class_videoframe.dita | 10 +++++++++- dita/RTC-NG/API/rtc_api_data_type.dita | 6 ++++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita b/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita index 5a01a581576..aa88692f00d 100644 --- a/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita +++ b/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita @@ -19,9 +19,9 @@ virtual int setExternalRemoteEglContext(void* eglContext) = 0; - + public abstract int SetExternalRemoteEglContext(IntPtr eglContext); -

+ Future<void> setExternalRemoteEglContext(int eglContext);

diff --git a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita index b1732696a6c..7818a497c38 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita @@ -20,9 +20,12 @@ virtual int setFilterEffectOptions(bool enabled, const FilterEffectOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + public abstract int SetFilterEffectOptions(bool enabled, FilterEffectOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); -

+ Future<void> setFilterEffectOptions( + {required bool enabled, + required FilterEffectOptions options, + MediaSourceType type = MediaSourceType.primaryCameraSource});

diff --git a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita index e03d688bb42..f06e7380911 100644 --- a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita +++ b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita @@ -19,9 +19,10 @@ virtual int takeSnapshot(uid_t uid, const media::SnapshotConfig& config) = 0; - + public abstract int TakeSnapshot(uint uid, SnapshotConfig config); - + Future<void> takeSnapshotWithConfig( + {required int uid, required SnapshotConfig config});

diff --git a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita index ee7dec4acbe..b5fe53ae9ed 100644 --- a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita +++ b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita @@ -19,9 +19,12 @@ virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const media::SnapshotConfig& config) = 0; - + public abstract int TakeSnapshotEx(RtcConnection connection, uint uid, SnapshotConfig config); - + Future<void> takeSnapshotWithConfigEx( + {required RtcConnection connection, + required int uid, + required SnapshotConfig config});

diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 5a652283888..72566fa7917 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -608,6 +608,10 @@ struct FVideoFrame { public byte[] alphaBuffer; public ALPHA_STITCH_MODE alphaStitchMode; + + public IVideoFrameMetaInfo metaInfo; + + public ColorSpace colorSpace; }; export class VideoFrame { @@ -671,7 +675,8 @@ class VideoFrame { this.alphaBuffer, this.alphaStitchMode, this.pixelBuffer, - this.metaInfo}); + this.metaInfo; + this.colorSpace}); @JsonKey(name: 'type') final VideoPixelFormat? type; @@ -734,6 +739,9 @@ class VideoFrame { @JsonKey(name: 'metaInfo') final VideoFrameMetaInfo? metaInfo; + @JsonKey(name: 'colorSpace') + final ColorSpace? colorSpace; + factory VideoFrame.fromJson(Map<String, dynamic> json) => _$VideoFrameFromJson(json); diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index df1502856f5..57aacbb5425 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -654,6 +654,7 @@
    • +
    • @@ -701,6 +702,7 @@
    • +
    • @@ -1098,6 +1100,7 @@
    • +
    • @@ -1156,6 +1159,7 @@
    • +
    • @@ -1830,6 +1834,7 @@
    • +
    • @@ -2386,6 +2391,7 @@
    • +
    • From 59754da5f5886e76105fde3441f742af95e29ab5 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 18 Nov 2024 15:19:41 +0800 Subject: [PATCH 05/19] section 1 --- .../api_irtcengine_startlocalaudiomixer.dita | 4 +- .../api_irtcengine_stoplocalaudiomixer.dita | 4 +- ...ne_updatelocalaudiomixerconfiguration.dita | 5 +- dita/RTC-NG/API/class_audiotrackconfig.dita | 27 +++----- .../class_localaudiomixerconfiguration.dita | 26 +++++++- dita/RTC-NG/API/class_mixedaudiostream.dita | 31 ++++++++- dita/RTC-NG/API/rtc_api_data_type.dita | 2 + .../config/keys-rtc-ng-api-flutter.ditamap | 63 +++++++++++++++++++ .../config/keys-rtc-ng-api-unity.ditamap | 63 +++++++++++++++++++ 9 files changed, 198 insertions(+), 27 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita index 4252ffe0d75..5a2d42e09e2 100644 --- a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita @@ -19,9 +19,9 @@ virtual int startLocalAudioMixer(const LocalAudioMixerConfiguration& config) = 0; abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number; - + public abstract int StartLocalAudioMixer(LocalAudioMixerConfiguration config); abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number; -

    + Future<void> startLocalAudioMixer(LocalAudioMixerConfiguration config);

    diff --git a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita index 1de4c459b36..c97fe2dea37 100644 --- a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita @@ -19,9 +19,9 @@ virtual int stopLocalAudioMixer() = 0; abstract stopLocalAudioMixer(): number; - + public abstract int StopLocalAudioMixer(); abstract stopLocalAudioMixer(): number; -

    + Future<void> stopLocalAudioMixer();

    diff --git a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita index 2e7a6038868..bb3fb8b2761 100644 --- a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita @@ -21,11 +21,12 @@ abstract updateLocalAudioMixerConfiguration( config: LocalAudioMixerConfiguration ): number; - + public abstract int UpdateLocalAudioMixerConfiguration(LocalAudioMixerConfiguration config); abstract updateLocalAudioMixerConfiguration( config: LocalAudioMixerConfiguration ): number; -

    + Future<void> updateLocalAudioMixerConfiguration( + LocalAudioMixerConfiguration config);

    diff --git a/dita/RTC-NG/API/class_audiotrackconfig.dita b/dita/RTC-NG/API/class_audiotrackconfig.dita index 64af142135c..7efbc46b1c9 100644 --- a/dita/RTC-NG/API/class_audiotrackconfig.dita +++ b/dita/RTC-NG/API/class_audiotrackconfig.dita @@ -50,31 +50,24 @@ struct FAudioTrackConfig enableAudioProcessing?: boolean; } public class AudioTrackConfig - { - public bool enableLocalPlayback; - - public AudioTrackConfig(bool enableLocalPlayback) - { - this.enableLocalPlayback = enableLocalPlayback; - } - - public AudioTrackConfig() - { - enableLocalPlayback = true; - } - - }; +{ + public bool enableLocalPlayback; + public bool enableAudioProcessing; +} export class AudioTrackConfig { enableLocalPlayback?: boolean; enableAudioProcessing?: boolean; } - @JsonSerializable(explicitToJson: true, includeIfNull: false) -class AudioTrackConfig { - const AudioTrackConfig({this.enableLocalPlayback}); + class AudioTrackConfig { + const AudioTrackConfig( + {this.enableLocalPlayback, this.enableAudioProcessing}); @JsonKey(name: 'enableLocalPlayback') final bool? enableLocalPlayback; + @JsonKey(name: 'enableAudioProcessing') + final bool? enableAudioProcessing; + factory AudioTrackConfig.fromJson(Map<String, dynamic> json) => _$AudioTrackConfigFromJson(json); diff --git a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita index f2ae0904495..fd5499bc62a 100644 --- a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita @@ -43,13 +43,35 @@ audioInputStreams?: MixedAudioStream[]; syncWithLocalMic?: boolean; } - + public class LocalAudioMixerConfiguration +{ + public uint streamCount; + public MixedAudioStream[] audioInputStreams; + public bool syncWithLocalMic +} export class LocalAudioMixerConfiguration { streamCount?: number; audioInputStreams?: MixedAudioStream[]; syncWithLocalMic?: boolean; } -

    + class LocalAudioMixerConfiguration { + const LocalAudioMixerConfiguration( + {this.streamCount, this.audioInputStreams, this.syncWithLocalMic}); + + @JsonKey(name: 'streamCount') + final int? streamCount; + + @JsonKey(name: 'audioInputStreams') + final List<MixedAudioStream>? audioInputStreams; + + @JsonKey(name: 'syncWithLocalMic') + final bool? syncWithLocalMic; + + factory LocalAudioMixerConfiguration.fromJson(Map<String, dynamic> json) => + _$LocalAudioMixerConfigurationFromJson(json); + + Map<String, dynamic> toJson() => _$LocalAudioMixerConfigurationToJson(this); +}

    diff --git a/dita/RTC-NG/API/class_mixedaudiostream.dita b/dita/RTC-NG/API/class_mixedaudiostream.dita index aba54637086..5de318f4ce7 100644 --- a/dita/RTC-NG/API/class_mixedaudiostream.dita +++ b/dita/RTC-NG/API/class_mixedaudiostream.dita @@ -55,14 +55,41 @@ channelId?: string; trackId?: number; } - + public class MixedAudioStream +{ + public AUDIO_SOURCE_TYPE sourceType; + public uint remoteUserUid; + public string channelId; + public uint trackId; + } export class MixedAudioStream { sourceType?: AudioSourceType; remoteUserUid?: number; channelId?: string; trackId?: number; } -

    + class MixedAudioStream { + + const MixedAudioStream( + {this.sourceType, this.remoteUserUid, this.channelId, this.trackId}); + + @JsonKey(name: 'sourceType') + final AudioSourceType? sourceType; + + @JsonKey(name: 'remoteUserUid') + final int? remoteUserUid; + + @JsonKey(name: 'channelId') + final String? channelId; + + @JsonKey(name: 'trackId') + final int? trackId; + + factory MixedAudioStream.fromJson(Map<String, dynamic> json) => + _$MixedAudioStreamFromJson(json); + + Map<String, dynamic> toJson() => _$MixedAudioStreamToJson(this); +}

    diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 57aacbb5425..e75f6b2bebf 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1755,6 +1755,7 @@
    • +
    • @@ -2318,6 +2319,7 @@
    • +
    • diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap index 96fafab5e72..9302ab162cb 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -6858,6 +6858,69 @@ + + + + AudioSourceType + + + + + + + audioSourceMicrophone + + + + + + + audioSourceCustom + + + + + + + audioSourceMediaPlayer + + + + + + + audioSourceLoopbackRecording + + + + + + + audioSourceMixedStream + + + + + + + audioSourceRemoteUser + + + + + + + audioSourceRemoteChannel + + + + + + + audioSourceUnknown + + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap index b6083d7ce2f..5a28f47c0e6 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -6925,6 +6925,69 @@ + + + + AUDIO_SOURCE_TYPE + + + + + + + AUDIO_SOURCE_MICROPHONE + + + + + + + AUDIO_SOURCE_CUSTOM + + + + + + + AUDIO_SOURCE_MEDIA_PLAYER + + + + + + + AUDIO_SOURCE_LOOPBACK_RECORDING + + + + + + + AUDIO_SOURCE_MIXED_STREAM + + + + + + + AUDIO_SOURCE_REMOTE_USER + + + + + + + AUDIO_SOURCE_REMOTE_CHANNEL + + + + + + + AUDIO_SOURCE_UNKNOWN + + + From 31eb5733261f7bbf44e0163681f38a1347497dc7 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 18 Nov 2024 15:37:13 +0800 Subject: [PATCH 06/19] section 3 --- ...pi_irtcengine_getfaceshapeareaoptions.dita | 6 +- ..._irtcengine_getfaceshapebeautyoptions.dita | 5 +- ...irtcengine_setexternalmediaprojection.dita | 4 +- ...pi_irtcengine_setfaceshapeareaoptions.dita | 6 +- ..._irtcengine_setfaceshapebeautyoptions.dita | 7 +- ...pi_irtcengine_setlocalrendertargetfps.dita | 5 +- ...i_irtcengine_setremoterendertargetfps.dita | 4 +- .../API/class_faceshapebeautyoptions.dita | 25 +++- dita/RTC-NG/API/rtc_api_data_type.dita | 4 + .../config/keys-rtc-ng-api-flutter.ditamap | 119 ++++++++++++++++++ .../config/keys-rtc-ng-api-unity.ditamap | 119 ++++++++++++++++++ 11 files changed, 288 insertions(+), 16 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita index 4a245a17182..18aef54df6b 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita @@ -23,12 +23,14 @@ shapeArea: FaceShapeArea, type?: MediaSourceType ): FaceShapeAreaOptions; - + public abstract int GetFaceShapeAreaOptions(FACE_SHAPE_AREA shapeArea, ref FaceShapeAreaOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); abstract getFaceShapeAreaOptions( shapeArea: FaceShapeArea, type?: MediaSourceType ): FaceShapeAreaOptions; -

    + Future<FaceShapeAreaOptions> getFaceShapeAreaOptions( + {required FaceShapeArea shapeArea, + MediaSourceType type = MediaSourceType.primaryCameraSource});

    diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita index 33a4b7f5526..a2175d7b292 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita @@ -22,11 +22,12 @@ abstract getFaceShapeBeautyOptions( type?: MediaSourceType ): FaceShapeBeautyOptions; - + public abstract int GetFaceShapeBeautyOptions(ref FaceShapeBeautyOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); abstract getFaceShapeBeautyOptions( type?: MediaSourceType ): FaceShapeBeautyOptions; -

    + Future<FaceShapeBeautyOptions> getFaceShapeBeautyOptions( + {MediaSourceType type = MediaSourceType.primaryCameraSource});

    diff --git a/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita b/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita index 42910d71c88..f1fa41633c8 100644 --- a/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita +++ b/dita/RTC-NG/API/api_irtcengine_setexternalmediaprojection.dita @@ -19,9 +19,9 @@ virtual int setExternalMediaProjection(void* mediaProjection) = 0; - + public abstract int SetExternalMediaProjection(IntPtr mediaProjection); abstract setExternalMediaProjection(mediaProjection: any): number; -

    + Future<void> setExternalMediaProjection(int mediaProjection);

    diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita index 60422c14037..5556cf4e056 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita @@ -23,12 +23,14 @@ options: FaceShapeAreaOptions, type?: MediaSourceType ): number; - + public abstract int SetFaceShapeAreaOptions(FaceShapeAreaOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); abstract setFaceShapeAreaOptions( options: FaceShapeAreaOptions, type?: MediaSourceType ): number; -

    + Future<void> setFaceShapeAreaOptions( + {required FaceShapeAreaOptions options, + MediaSourceType type = MediaSourceType.primaryCameraSource});

    diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita index 6672598b421..1da9806e220 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita @@ -24,13 +24,16 @@ options: FaceShapeBeautyOptions, type?: MediaSourceType ): number; - + public abstract int SetFaceShapeBeautyOptions(bool enabled, FaceShapeBeautyOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); abstract setFaceShapeBeautyOptions( enabled: boolean, options: FaceShapeBeautyOptions, type?: MediaSourceType ): number; -

    + Future<void> setFaceShapeBeautyOptions( + {required bool enabled, + required FaceShapeBeautyOptions options, + MediaSourceType type = MediaSourceType.primaryCameraSource});

    diff --git a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita index 8d93088a195..50bbbbb5c2b 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita @@ -23,12 +23,13 @@ targetFps:(int)targetFps; sourceType: VideoSourceType, targetFps: number ): number; - + public abstract int SetLocalRenderTargetFps(VIDEO_SOURCE_TYPE sourceType, int targetFps); abstract setLocalRenderTargetFps( sourceType: VideoSourceType, targetFps: number ): number; -

    + Future<void> setLocalRenderTargetFps( + {required VideoSourceType sourceType, required int targetFps});

    diff --git a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita index da37e4375ef..f0426731116 100644 --- a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita @@ -19,9 +19,9 @@ virtual int setRemoteRenderTargetFps(int targetFps) = 0; abstract setRemoteRenderTargetFps(targetFps: number): number; - + public abstract int SetRemoteRenderTargetFps(int targetFps); abstract setRemoteRenderTargetFps(targetFps: number): number; -

    + Future<void> setRemoteRenderTargetFps(int targetFps);

    diff --git a/dita/RTC-NG/API/class_faceshapebeautyoptions.dita b/dita/RTC-NG/API/class_faceshapebeautyoptions.dita index 457ee8b7d77..1ce6a2174d2 100644 --- a/dita/RTC-NG/API/class_faceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/class_faceshapebeautyoptions.dita @@ -37,12 +37,33 @@ shapeStyle?: FaceShapeBeautyStyle; styleIntensity?: number; } - + public class FaceShapeBeautyOptions + { + public FACE_SHAPE_BEAUTY_STYLE shapeStyle; + + public int styleIntensity; + } export class FaceShapeBeautyOptions { shapeStyle?: FaceShapeBeautyStyle; styleIntensity?: number; } - + +class FaceShapeBeautyOptions { + + const FaceShapeBeautyOptions({this.shapeStyle, this.styleIntensity}); + + @JsonKey(name: 'shapeStyle') + final FaceShapeBeautyStyle? shapeStyle; + + @JsonKey(name: 'styleIntensity') + final int? styleIntensity; + + factory FaceShapeBeautyOptions.fromJson(Map<String, dynamic> json) => + _$FaceShapeBeautyOptionsFromJson(json); + + Map<String, dynamic> toJson() => _$FaceShapeBeautyOptionsToJson(this); +} +

    diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index e75f6b2bebf..42ebaede28d 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1787,6 +1787,8 @@
    • +
    • +
    • @@ -2350,6 +2352,8 @@
    • +
    • +
    • diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap index 9302ab162cb..7ccc1b456ad 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -8195,6 +8195,125 @@ + + + + FaceShapeArea + + + + + + + faceShapeAreaNone + + + + + + + faceShapeAreaHeadscale + + + + + + + faceShapeAreaForehead + + + + + + + faceShapeAreaFacecontour + + + + + + + faceShapeAreaFacelength + + + + + + + faceShapeAreaFacewidth + + + + + + + faceShapeAreaCheekbone + + + + + + + faceShapeAreaCheek + + + + + + + faceShapeAreaChin + + + + + + + faceShapeAreaEyescale + + + + + + + faceShapeAreaNoselength + + + + + + + faceShapeAreaNosewidth + + + + + + + faceShapeAreaMouthscale + + + + + + + FaceShapeBeautyStyle + + + + + + + faceShapeBeautyStyleFemale + + + + + + + faceShapeBeautyStyleMale + + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap index 5a28f47c0e6..b28c12b0fb9 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -8619,6 +8619,125 @@ + + + + FACE_SHAPE_AREA + + + + + + + FACE_SHAPE_AREA_NONE + + + + + + + FACE_SHAPE_AREA_HEADSCALE + + + + + + + FACE_SHAPE_AREA_FOREHEAD + + + + + + + FACE_SHAPE_AREA_FACECONTOUR + + + + + + + FACE_SHAPE_AREA_FACELENGTH + + + + + + + FACE_SHAPE_AREA_FACEWIDTH + + + + + + + FACE_SHAPE_AREA_CHEEKBONE + + + + + + + FACE_SHAPE_AREA_CHEEK + + + + + + + FACE_SHAPE_AREA_CHIN + + + + + + + FACE_SHAPE_AREA_EYESCALE + + + + + + + FACE_SHAPE_AREA_NOSELENGTH + + + + + + + FACE_SHAPE_AREA_NOSEWIDTH + + + + + + + FACE_SHAPE_AREA_MOUTHSCALE + + + + + + + FACE_SHAPE_BEAUTY_STYLE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_FEMALE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_MALE + + + From e8ff3005cf0dc6af341218c719caa78b44356979 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Mon, 18 Nov 2024 15:41:14 +0800 Subject: [PATCH 07/19] Electron/RN: proto 2 --- ...api_irtcengine_setfiltereffectoptions.dita | 12 ++- .../API/api_irtcengine_takesnapshot2.dita | 4 +- .../API/api_irtcengineex_takesnapshotex2.dita | 12 ++- .../RTC-NG/API/class_filtereffectoptions.dita | 9 +- .../API/class_mediarecorderconfiguration.dita | 38 ++++---- dita/RTC-NG/API/class_recorderstreaminfo.dita | 18 ++-- dita/RTC-NG/API/class_snapshotconfig.dita | 10 +- dita/RTC-NG/API/rtc_api_data_type.dita | 28 +++++- dita/RTC-NG/RTC_NG_API_Electron.ditamap | 2 + dita/RTC-NG/RTC_NG_API_RN.ditamap | 2 + .../config/keys-rtc-ng-api-electron.ditamap | 93 ++++++++++++++++--- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 51 +++++++++- .../config/keys-rtc-ng-links-electron.ditamap | 7 ++ .../config/keys-rtc-ng-links-rn.ditamap | 7 ++ 14 files changed, 234 insertions(+), 59 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita index 7818a497c38..1fdae57ce9e 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita @@ -19,9 +19,17 @@ - (int)setFilterEffectOptions:(BOOL)enable options:(AgoraFilterEffectOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFilterEffectOptions(_:options:sourceType:)); virtual int setFilterEffectOptions(bool enabled, const FilterEffectOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + abstract setFilterEffectOptions( + enabled: boolean, + options: FilterEffectOptions, + type?: MediaSourceType + ): number; public abstract int SetFilterEffectOptions(bool enabled, FilterEffectOptions options, MEDIA_SOURCE_TYPE type = MEDIA_SOURCE_TYPE.PRIMARY_CAMERA_SOURCE); - + abstract setFilterEffectOptions( + enabled: boolean, + options: FilterEffectOptions, + type?: MediaSourceType + ): number; Future<void> setFilterEffectOptions( {required bool enabled, required FilterEffectOptions options, diff --git a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita index f06e7380911..7ec49889a31 100644 --- a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita +++ b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita @@ -18,9 +18,9 @@ - (NSInteger)takeSnapshotWithConfig:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotWithConfig(_:config:)); virtual int takeSnapshot(uid_t uid, const media::SnapshotConfig& config) = 0; - + abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; public abstract int TakeSnapshot(uint uid, SnapshotConfig config); - + abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; Future<void> takeSnapshotWithConfig( {required int uid, required SnapshotConfig config});

    diff --git a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita index b5fe53ae9ed..9bc3bb1ce81 100644 --- a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita +++ b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita @@ -18,9 +18,17 @@ - (NSInteger)takeSnapshotExWithConfig:(AgoraRtcConnection * _Nonnull)connection uid:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotExWithConfig(_:uid:config:)); virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const media::SnapshotConfig& config) = 0; - + abstract takeSnapshotWithConfigEx( + connection: RtcConnection, + uid: number, + config: SnapshotConfig + ): number; public abstract int TakeSnapshotEx(RtcConnection connection, uint uid, SnapshotConfig config); - + abstract takeSnapshotWithConfigEx( + connection: RtcConnection, + uid: number, + config: SnapshotConfig + ): number; Future<void> takeSnapshotWithConfigEx( {required RtcConnection connection, required int uid, diff --git a/dita/RTC-NG/API/class_filtereffectoptions.dita b/dita/RTC-NG/API/class_filtereffectoptions.dita index 83e3c8ec375..de04fa8ef07 100644 --- a/dita/RTC-NG/API/class_filtereffectoptions.dita +++ b/dita/RTC-NG/API/class_filtereffectoptions.dita @@ -24,8 +24,15 @@ FilterEffectOptions() : path(OPTIONAL_NULLPTR), strength(0.5) {} }; - + export class FilterEffectOptions { + path?: string; + strength?: number; +} + export class FilterEffectOptions { + path?: string; + strength?: number; +}

    diff --git a/dita/RTC-NG/API/class_mediarecorderconfiguration.dita b/dita/RTC-NG/API/class_mediarecorderconfiguration.dita index 09476438c5d..d636807b823 100644 --- a/dita/RTC-NG/API/class_mediarecorderconfiguration.dita +++ b/dita/RTC-NG/API/class_mediarecorderconfiguration.dita @@ -138,17 +138,14 @@ struct FMediaRecorderConfiguration int recorderInfoUpdateInterval; };     export class MediaRecorderConfiguration { - - storagePath?: string; - - containerFormat?: MediaRecorderContainerFormat; - - streamType?: MediaRecorderStreamType; - - maxDurationMs?: number; - - recorderInfoUpdateInterval?: number; -} + recorderInfoUpdateInterval?: number; + width?: number; + height?: number; + fps?: number; + sample_rate?: number; + channel_num?: number; + videoSourceType?: VideoSourceType; + }     public struct MediaRecorderConfiguration { public string storagePath; public MediaRecorderContainerFormat containerFormat; @@ -157,17 +154,14 @@ struct FMediaRecorderConfiguration public int recorderInfoUpdateInterval; }; export class MediaRecorderConfiguration { - - storagePath?: string; - - containerFormat?: MediaRecorderContainerFormat; - - streamType?: MediaRecorderStreamType; - - maxDurationMs?: number; - - recorderInfoUpdateInterval?: number; -} + recorderInfoUpdateInterval?: number; + width?: number; + height?: number; + fps?: number; + sample_rate?: number; + channel_num?: number; + videoSourceType?: VideoSourceType; + }     class MediaRecorderConfiguration { const MediaRecorderConfiguration( diff --git a/dita/RTC-NG/API/class_recorderstreaminfo.dita b/dita/RTC-NG/API/class_recorderstreaminfo.dita index 5438c358061..7448a0fc74e 100644 --- a/dita/RTC-NG/API/class_recorderstreaminfo.dita +++ b/dita/RTC-NG/API/class_recorderstreaminfo.dita @@ -50,20 +50,22 @@ struct FRecorderStreamInfo { int64 uid; }; - export class RecorderStreamInfo { - channelId?: string; - uid?: number; -} + RecorderStreamInfo { + channelId?: string; + uid?: number; + type?: RecorderStreamType; + } public class RecorderStreamInfo { public string channelId; public uint uid; }; - export class RecorderStreamInfo { - channelId?: string; - uid?: number; -} + RecorderStreamInfo { + channelId?: string; + uid?: number; + type?: RecorderStreamType; + } @JsonSerializable(explicitToJson: true, includeIfNull: false) class RecorderStreamInfo { const RecorderStreamInfo({this.channelId, this.uid}); diff --git a/dita/RTC-NG/API/class_snapshotconfig.dita b/dita/RTC-NG/API/class_snapshotconfig.dita index 401653f3ae3..adfdd759df4 100644 --- a/dita/RTC-NG/API/class_snapshotconfig.dita +++ b/dita/RTC-NG/API/class_snapshotconfig.dita @@ -22,9 +22,15 @@ media::base::VIDEO_MODULE_POSITION position; SnapshotConfig() :filePath(NULL), position(media::base::POSITION_PRE_ENCODER) {} }; - + export class SnapshotConfig { + filePath?: string; + position?: VideoModulePosition; +} - + export class SnapshotConfig { + filePath?: string; + position?: VideoModulePosition; +}

    diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 57aacbb5425..812cc74589f 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -860,6 +860,9 @@
    • +
    • +
    • +
    • @@ -873,6 +876,7 @@
    • +
    • @@ -882,6 +886,7 @@
    • +
    • @@ -916,9 +921,10 @@
    • +
    • -
    • +
    • @@ -979,6 +985,9 @@
    • +
    • +
    • +
    • @@ -992,6 +1001,7 @@
    • +
    • @@ -1001,6 +1011,7 @@
    • +
    • @@ -1037,9 +1048,10 @@
    • +
    • -
    • +
    • @@ -2039,6 +2051,7 @@
    • +
    • @@ -2067,6 +2080,8 @@
    • +
    • +
    • @@ -2110,11 +2125,11 @@
    • +
    • -
    • @@ -2148,6 +2163,7 @@
    • +
    • @@ -2178,6 +2194,7 @@
    • +
    • @@ -2208,6 +2225,8 @@
    • +
    • +
    • @@ -2250,11 +2269,11 @@
    • +
    • -
    • @@ -2288,6 +2307,7 @@
    • +
    • diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 6f7040b917f..0ff17a3da87 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -296,7 +296,9 @@ + + diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index ef80875541a..895a3e8d860 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -293,7 +293,9 @@ + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap index b5f30cfe27b..89ef13dbb72 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -1108,6 +1108,20 @@ + + + + setLocalRenderTargetFps + + + + + + + setRemoteRenderTargetFps + + + @@ -1487,6 +1501,13 @@ + + + + takeSnapshotWithConfigEx + + + @@ -3531,6 +3552,13 @@ + + + + takeSnapshotWithConfig + + + @@ -5242,20 +5270,27 @@ - - - - SpatialAudioParams - - - - - - - SpatialAudioZone - - - + + + + SnapshotConfig + + + + + + + SpatialAudioParams + + + + + + + SpatialAudioZone + + + @@ -9304,6 +9339,13 @@ + + + + MediaDeviceStatePluggedIn + + + @@ -10452,6 +10494,27 @@ + + + + RecorderStreamType + + + + + + + Rtc + + + + + + + Preview + + + @@ -11194,7 +11257,7 @@ - + VideoDenoiserLevelStrength diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap index c24778205cf..58a1c6bbf10 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -1529,6 +1529,13 @@ + + + + takeSnapshotWithConfigEx + + + @@ -3524,6 +3531,13 @@ + + + + takeSnapshotWithConfig + + + @@ -5201,6 +5215,13 @@ SimulcastStreamConfig + + + + + SnapshotConfig + + @@ -9285,6 +9306,13 @@ + + + + MediaDeviceStatePluggedIn + + + @@ -10440,6 +10468,27 @@ + + + + RecorderStreamType + + + + + + + Rtc + + + + + + + Preview + + + @@ -11175,7 +11224,7 @@ - + VideoDenoiserLevelStrength diff --git a/dita/RTC-NG/config/keys-rtc-ng-links-electron.ditamap b/dita/RTC-NG/config/keys-rtc-ng-links-electron.ditamap index 1479630c116..69d62307cc2 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-links-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-links-electron.ditamap @@ -53,6 +53,13 @@ + diff --git a/dita/RTC-NG/config/keys-rtc-ng-links-rn.ditamap b/dita/RTC-NG/config/keys-rtc-ng-links-rn.ditamap index 834db554074..8a7050c9326 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-links-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-links-rn.ditamap @@ -67,6 +67,13 @@ + From 297eefec1579397d61e4b218739ed6d38c8fcb44 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Mon, 18 Nov 2024 15:44:13 +0800 Subject: [PATCH 08/19] add props for faceshape --- dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita index 1da9806e220..9071f5b2ba4 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita @@ -42,7 +42,7 @@
    v4.5.0
    -

    调用该方法可对人脸各部位进行修饰，使用预设的参数一次性实现瘦脸、大眼、瘦鼻等微整形效果，支持微调整体的修饰力度，详见。

    +

    调用该方法可对人脸各部位进行修饰，使用预设的参数一次性实现瘦脸、大眼、瘦鼻等微整形效果，支持微调整体的修饰力度。详见。

    该方法和 均可用于设置美型效果选项，区别在于该方法支持指定应用美型效果的媒体源。

    美型属于增值服务，计费方式详见。 From 13491110ffe5e4138b9bcfcb174173f96bce9592 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Mon, 18 Nov 2024 15:47:41 +0800 Subject: [PATCH 09/19] add proto --- dita/RTC-NG/API/class_snapshotconfig.dita | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/class_snapshotconfig.dita b/dita/RTC-NG/API/class_snapshotconfig.dita index adfdd759df4..8a9b15ddbb7 100644 --- a/dita/RTC-NG/API/class_snapshotconfig.dita +++ b/dita/RTC-NG/API/class_snapshotconfig.dita @@ -26,12 +26,30 @@ filePath?: string; position?: VideoModulePosition; }     - + public class SnapshotConfig + { + public string filePath; + + public VIDEO_MODULE_POSITION position; + } export class SnapshotConfig { filePath?: string; position?: VideoModulePosition; } - + class SnapshotConfig { + const SnapshotConfig({this.filePath, this.position}); + + @JsonKey(name: 'filePath') + final String? filePath; + + @JsonKey(name: 'position') + final VideoModulePosition? position; + + factory SnapshotConfig.fromJson(Map<String, dynamic> json) => + _$SnapshotConfigFromJson(json); + + Map<String, dynamic> toJson() => _$SnapshotConfigToJson(this); +}

    From 2aaa70a410e8e5812c0573136d877e9ad6bd9993 Mon Sep 17 00:00:00 2001 From: chenmeng Date: Tue, 19 Nov 2024 12:24:09 +0800 Subject: [PATCH 10/19] add bp keys and prototype --- ...pi_irtcengine_getfaceshapeareaoptions.dita | 5 +- ..._irtcengine_getfaceshapebeautyoptions.dita | 5 +- ...pi_irtcengine_setfaceshapeareaoptions.dita | 5 +- ..._irtcengine_setfaceshapebeautyoptions.dita | 5 +- ...api_irtcengine_setfiltereffectoptions.dita | 5 +- ...pi_irtcengine_setlocalrendertargetfps.dita | 5 +- ...irtcengine_setlowlightenhanceoptions2.dita | 5 +- ...i_irtcengine_setremoterendertargetfps.dita | 5 +- ...pi_irtcengine_setvideodenoiseroptions.dita | 8 +- ...i_irtcengine_setvideodenoiseroptions2.dita | 5 +- .../api_irtcengine_startlocalaudiomixer.dita | 5 +- .../api_irtcengine_stoplocalaudiomixer.dita | 5 +- .../API/api_irtcengine_takesnapshot2.dita | 7 +- ...ne_updatelocalaudiomixerconfiguration.dita | 5 +- .../API/api_irtcengineex_takesnapshotex2.dita | 5 +- .../API/class_faceshapeareaoptions.dita | 21 +- .../API/class_faceshapebeautyoptions.dita | 21 +- .../RTC-NG/API/class_filtereffectoptions.dita | 18 +- .../class_localaudiomixerconfiguration.dita | 16 +- .../API/class_lowlightenhanceoptions.dita | 35 +- dita/RTC-NG/API/class_mixedaudiostream.dita | 20 +- dita/RTC-NG/API/class_snapshotconfig.dita | 17 +- .../API/class_videodenoiseroptions.dita | 37 +- .../config/keys-rtc-ng-api-blueprint.ditamap | 330 +++++++++++++++++- .../config/keys-rtc-ng-api-unreal.ditamap | 4 +- 25 files changed, 490 insertions(+), 109 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita index 18aef54df6b..98c26e8b8c0 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapeareaoptions.dita @@ -18,7 +18,8 @@ - (AgoraFaceShapeAreaOptions * _Nullable)getFaceShapeAreaOptions:(AgoraFaceShapeArea) area sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeAreaOptions(_:sourceType:)); virtual int getFaceShapeAreaOptions(agora::rtc::FaceShapeAreaOptions::FACE_SHAPE_AREA shapeArea, FaceShapeAreaOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int GetFaceShapeAreaOptions(EUABT_FACE_SHAPE_AREA shapeArea, FUABT_FaceShapeAreaOptions& options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE); abstract getFaceShapeAreaOptions( shapeArea: FaceShapeArea, type?: MediaSourceType @@ -48,7 +49,7 @@
    调用时机

    请在 之后调用该方法。

    -
    +
    调用限制

    无。

    diff --git a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita index a2175d7b292..114a8fffaef 100644 --- a/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_getfaceshapebeautyoptions.dita @@ -18,7 +18,8 @@ - (AgoraFaceShapeBeautyOptions * _Nullable)getFaceShapeBeautyOptions:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(getFaceShapeBeautyOptions(_:)); virtual int getFaceShapeBeautyOptions(FaceShapeBeautyOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int GetFaceShapeBeautyOptions(FUABT_FaceShapeBeautyOptions & options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE); abstract getFaceShapeBeautyOptions( type?: MediaSourceType ): FaceShapeBeautyOptions; @@ -45,7 +46,7 @@
    调用时机

    请在 之后调用该方法。

    -
    +
    调用限制

    无。

    diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita index 5556cf4e056..89cb931c2a2 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapeareaoptions.dita @@ -18,7 +18,8 @@ - (int)setFaceShapeAreaOptions:(AgoraFaceShapeAreaOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFaceShapeAreaOptions(_:sourceType:)); virtual int setFaceShapeAreaOptions(const FaceShapeAreaOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetFaceShapeAreaOptions(const FUABT_FaceShapeAreaOptions& options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE); abstract setFaceShapeAreaOptions( options: FaceShapeAreaOptions, type?: MediaSourceType @@ -46,7 +47,7 @@
    调用时机

    请在 或 之后调用该方法。

    -
    +
    diff --git a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita index 9071f5b2ba4..a682bf28f19 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfaceshapebeautyoptions.dita @@ -18,7 +18,8 @@ - (int)setFaceShapeBeautyOptions:(BOOL)enable options:(AgoraFaceShapeBeautyOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFaceShapeBeautyOptions(_:options:sourceType:)); virtual int setFaceShapeBeautyOptions(bool enabled, const FaceShapeBeautyOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetFaceShapeBeautyOptions(bool enabled, const FUABT_FaceShapeBeautyOptions& options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE); abstract setFaceShapeBeautyOptions( enabled: boolean, options: FaceShapeBeautyOptions, @@ -49,7 +50,7 @@
    调用时机

    请在 之后调用该方法。

    -
    +
    调用限制
      diff --git a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita index 1fdae57ce9e..9b76ea0611f 100644 --- a/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setfiltereffectoptions.dita @@ -18,7 +18,8 @@ - (int)setFilterEffectOptions:(BOOL)enable options:(AgoraFilterEffectOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setFilterEffectOptions(_:options:sourceType:)); virtual int setFilterEffectOptions(bool enabled, const FilterEffectOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetFilterEffectOptions(bool enabled, const FUABT_FilterEffectOptions & options, EUABT_MEDIA_SOURCE_TYPE type = EUABT_MEDIA_SOURCE_TYPE::PRIMARY_CAMERA_SOURCE); abstract setFilterEffectOptions( enabled: boolean, options: FilterEffectOptions, @@ -47,7 +48,7 @@
      调用时机

      请在 之后调用该方法。

      -
      +
    调用限制
      diff --git a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita index 50bbbbb5c2b..f8abf9e020f 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlocalrendertargetfps.dita @@ -18,7 +18,8 @@ targetFps:(int)targetFps; public abstract int setLocalRenderTargetFps(Constants.VideoSourceType sourceType, int targetFps); virtual int setLocalRenderTargetFps(VIDEO_SOURCE_TYPE sourceType, int targetFps) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetLocalRenderTargetFps(EUABT_VIDEO_SOURCE_TYPE sourceType, int targetFps); abstract setLocalRenderTargetFps( sourceType: VideoSourceType, targetFps: number @@ -47,7 +48,7 @@ targetFps:(int)targetFps;
      调用时机

      该方法在加入频道前后均可调用。

      -
      +
    调用限制

    无。

    diff --git a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita index db2ac1fcb35..5fdad8974bf 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita @@ -17,8 +17,9 @@ boolean enabled, LowLightEnhanceOptions options, Constants.MediaSourceType sourceType); - (int)setLowlightEnhanceOptions:(BOOL)enable options:(AgoraLowlightEnhanceOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setLowlightEnhanceOptions(_:options:sourceType:)); - - + virtual int setLowlightEnhanceOptions(bool enabled, const LowlightEnhanceOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetLowlightEnhanceOptions(bool enabled, const FUABT_LowlightEnhanceOptions& options, EUABT_MEDIA_SOURCE_TYPE type); diff --git a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita index f0426731116..fc6b677c86b 100644 --- a/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita +++ b/dita/RTC-NG/API/api_irtcengine_setremoterendertargetfps.dita @@ -17,7 +17,8 @@ - (int)setRemoteRenderTargetFps:(int)targetFps; virtual int setRemoteRenderTargetFps(int targetFps) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetRemoteRenderTargetFps(int targetFps); abstract setRemoteRenderTargetFps(targetFps: number): number; public abstract int SetRemoteRenderTargetFps(int targetFps); abstract setRemoteRenderTargetFps(targetFps: number): number; @@ -39,7 +40,7 @@
    调用时机

    该方法在加入频道前后均可调用。

    -
    +
    调用限制

    无。

    diff --git a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions.dita b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions.dita index ceb120c42c0..eb1ead83b89 100644 --- a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions.dita @@ -19,8 +19,8 @@ - (int)setVideoDenoiserOptions:(BOOL)enable options:(AgoraVideoDenoiserOptions* _Nullable)options NS_SWIFT_NAME(setVideoDenoiserOptions(_:options:)); virtual int setVideoDenoiserOptions(bool enabled, const VideoDenoiserOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") - int SetVideoDenoiserOptions(bool enabled, const FVideoDenoiserOptions& options, EMEDIA_SOURCE_TYPE type); + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetVideoDenoiserOptions(bool enabled, const FUABT_VideoDenoiserOptions& options, EUABT_MEDIA_SOURCE_TYPE type); abstract setVideoDenoiserOptions( enabled: boolean, options: VideoDenoiserOptions, @@ -56,7 +56,7 @@
    调用时机

    请在 后调用该方法。

    -
    +
    调用限制
      @@ -71,7 +71,7 @@ enabled enable 是否开启视频降噪功能： - +
      • : 开启视频降噪功能。
      • :（默认）关闭视频降噪功能。
        • diff --git a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita index 5679567d32d..bbe07c49625 100644 --- a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita @@ -17,8 +17,9 @@ boolean enabled, VideoDenoiserOptions options, Constants.MediaSourceType sourceType); - (int)setVideoDenoiserOptions:(BOOL)enable options:(AgoraVideoDenoiserOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setVideoDenoiserOptions(_:options:sourceType:)); - - + virtual int setVideoDenoiserOptions(bool enabled, const VideoDenoiserOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetVideoDenoiserOptions(bool enabled, const FUABT_VideoDenoiserOptions& options, EUABT_MEDIA_SOURCE_TYPE type); diff --git a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita index 5a2d42e09e2..bca1600974f 100644 --- a/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_startlocalaudiomixer.dita @@ -17,7 +17,8 @@ - (int)startLocalAudioMixer:(AgoraLocalAudioMixerConfiguration* _Nonnull)config NS_SWIFT_NAME(startLocalAudioMixer(_:)); virtual int startLocalAudioMixer(const LocalAudioMixerConfiguration& config) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int StartLocalAudioMixer(const FUABT_LocalAudioMixerConfiguration& config); abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number; public abstract int StartLocalAudioMixer(LocalAudioMixerConfiguration config); abstract startLocalAudioMixer(config: LocalAudioMixerConfiguration): number; @@ -47,7 +48,7 @@
        调用时机

        该方法在加入频道前后均可调用。

        -
        +
    调用限制

    为了保证音频质量，建议参与本地合流的音频流数量不超过 10 个。

    diff --git a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita index c97fe2dea37..d9e10fff443 100644 --- a/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita +++ b/dita/RTC-NG/API/api_irtcengine_stoplocalaudiomixer.dita @@ -17,7 +17,8 @@ - (int)stopLocalAudioMixer NS_SWIFT_NAME(stopLocalAudioMixer()); virtual int stopLocalAudioMixer() = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int StopLocalAudioMixer(); abstract stopLocalAudioMixer(): number; public abstract int StopLocalAudioMixer(); abstract stopLocalAudioMixer(): number; @@ -35,7 +36,7 @@
    调用时机

    该方法需要在 之后调用。

    -
    +
    调用限制

    无。

    diff --git a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita index 7ec49889a31..fedaa9b656d 100644 --- a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita +++ b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita @@ -17,7 +17,8 @@ - (NSInteger)takeSnapshotWithConfig:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotWithConfig(_:config:)); virtual int takeSnapshot(uid_t uid, const media::SnapshotConfig& config) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int TakeSnapshot(int64 uid, const FUABT_SnapshotConfig& config); abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; public abstract int TakeSnapshot(uint uid, SnapshotConfig config); abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; @@ -31,10 +32,10 @@
    调用时机

    该方法需要在加入频道后调用。

    -
    +
    调用限制 -
      +
      • 该方法是异步操作，调用返回时 SDK 并没有真正获取截图。
      • 调用该方法返回时 SDK 并没有真正获取截图。
      • 该方法用于本地视频截图时，是对 中指定发布的视频流进行截图。
        • diff --git a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita index bb3fb8b2761..106c8d301ee 100644 --- a/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/api_irtcengine_updatelocalaudiomixerconfiguration.dita @@ -17,7 +17,8 @@ - (int)updateLocalAudioMixerConfiguration:(AgoraLocalAudioMixerConfiguration* _Nonnull)config NS_SWIFT_NAME(updateLocalAudioMixerConfiguration(_:)); virtual int updateLocalAudioMixerConfiguration(const LocalAudioMixerConfiguration& config) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int UpdateLocalAudioMixerConfiguration(const FUABT_LocalAudioMixerConfiguration& config); abstract updateLocalAudioMixerConfiguration( config: LocalAudioMixerConfiguration ): number; @@ -40,7 +41,7 @@
        调用时机

        该方法需要在 之后调用。

        -
        +
    调用限制
    diff --git a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita index 9bc3bb1ce81..ac4bd3823d5 100644 --- a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita +++ b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita @@ -17,7 +17,8 @@ - (NSInteger)takeSnapshotExWithConfig:(AgoraRtcConnection * _Nonnull)connection uid:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotExWithConfig(_:uid:config:)); virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const media::SnapshotConfig& config) = 0; - + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int TakeSnapshotEx(const FUABT_RtcConnection& connection, int64 uid, const FUABT_SnapshotConfig& config); abstract takeSnapshotWithConfigEx( connection: RtcConnection, uid: number, @@ -39,7 +40,7 @@
    调用时机

    该方法需要在 后调用。

    -
    +
    - \ No newline at end of file + diff --git a/dita/RTC-NG/API/class_filtereffectoptions.dita b/dita/RTC-NG/API/class_filtereffectoptions.dita index de04fa8ef07..c83bb8de808 100644 --- a/dita/RTC-NG/API/class_filtereffectoptions.dita +++ b/dita/RTC-NG/API/class_filtereffectoptions.dita @@ -19,11 +19,23 @@ struct FilterEffectOptions { const char * path; float strength; - + FilterEffectOptions(const char * lut3dPath, float filterStrength) : path(lut3dPath), strength(filterStrength) {} FilterEffectOptions() : path(OPTIONAL_NULLPTR), strength(0.5) {} }; - + USTRUCT(BlueprintType) +struct FUABT_FilterEffectOptions { + GENERATED_BODY() + +public: + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + FString path; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + float strength = 0.5; +}; + export class FilterEffectOptions { path?: string; strength?: number; @@ -66,4 +78,4 @@ LUT_3D_SIZE 32
    - \ No newline at end of file + diff --git a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita index fd5499bc62a..9f5ae20307c 100644 --- a/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita +++ b/dita/RTC-NG/API/class_localaudiomixerconfiguration.dita @@ -37,7 +37,19 @@ bool syncWithLocalMic; LocalAudioMixerConfiguration() : streamCount(0), syncWithLocalMic(true) {} };     - + USTRUCT(BlueprintType) +struct FUABT_LocalAudioMixerConfiguration { + + GENERATED_BODY() + +public: + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + TArray sourceStreams; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + bool syncWithLocalMic; +}; export class LocalAudioMixerConfiguration { streamCount?: number; audioInputStreams?: MixedAudioStream[]; @@ -95,7 +107,7 @@ syncWithLocalMic - 合流后的音频流是否使用本地麦克风采集的音频帧时间戳： + 合流后的音频流是否使用本地麦克风采集的音频帧时间戳：
    • ：（默认）使用本地麦克风采集的音频帧时间戳。如果要所有本地采集的音频流保持同步，你可以将参数设置为该值。
    • ：不使用本地麦克风采集的音频帧时间戳，SDK 会采用合流的音频帧被构建时的时间戳。
      • diff --git a/dita/RTC-NG/API/class_lowlightenhanceoptions.dita b/dita/RTC-NG/API/class_lowlightenhanceoptions.dita index 90074b48bd5..2ba954f9884 100644 --- a/dita/RTC-NG/API/class_lowlightenhanceoptions.dita +++ b/dita/RTC-NG/API/class_lowlightenhanceoptions.dita @@ -49,27 +49,16 @@ }; USTRUCT(BlueprintType) -struct FLowlightEnhanceOptions +struct FUABT_LowlightEnhanceOptions { GENERATED_BODY() + public: - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|LowlightEnhanceOptions") - ELOW_LIGHT_ENHANCE_MODE mode = ELOW_LIGHT_ENHANCE_MODE::LOW_LIGHT_ENHANCE_AUTO; - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|LowlightEnhanceOptions") - ELOW_LIGHT_ENHANCE_LEVEL level = ELOW_LIGHT_ENHANCE_LEVEL::LOW_LIGHT_ENHANCE_LEVEL_HIGH_QUALITY; - FLowlightEnhanceOptions(){} - FLowlightEnhanceOptions(const agora::rtc::LowlightEnhanceOptions & AgoraData){ - mode = static_cast<ELOW_LIGHT_ENHANCE_MODE>(AgoraData.mode); - level = static_cast<ELOW_LIGHT_ENHANCE_LEVEL>(AgoraData.level); - } - agora::rtc::LowlightEnhanceOptions CreateAgoraData() const { - agora::rtc::LowlightEnhanceOptions AgoraData; - AgoraData.mode = static_cast<agora::rtc::LowlightEnhanceOptions::LOW_LIGHT_ENHANCE_MODE>(mode); - AgoraData.level = static_cast<agora::rtc::LowlightEnhanceOptions::LOW_LIGHT_ENHANCE_LEVEL>(level); - return AgoraData; - } - void FreeAgoraData(agora::rtc::LowlightEnhanceOptions& AgoraData) const { - } + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_LOW_LIGHT_ENHANCE_MODE mode = EUABT_LOW_LIGHT_ENHANCE_MODE::LOW_LIGHT_ENHANCE_AUTO; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_LOW_LIGHT_ENHANCE_LEVEL level = EUABT_LOW_LIGHT_ENHANCE_LEVEL::LOW_LIGHT_ENHANCE_LEVEL_HIGH_QUALITY; }; public class LowlightEnhanceOptions { @@ -89,15 +78,15 @@ public: } }; export class LowlightEnhanceOptions { - + mode?: LowLightEnhanceMode; - + level?: LowLightEnhanceLevel; } export class LowlightEnhanceOptions { - + mode?: LowLightEnhanceMode; - + level?: LowLightEnhanceLevel; } class LowlightEnhanceOptions { @@ -114,7 +103,7 @@ public: _$LowlightEnhanceOptionsFromJson(json); Map<String, dynamic> toJson() => _$LowlightEnhanceOptionsToJson(this); -} +}

      diff --git a/dita/RTC-NG/API/class_mixedaudiostream.dita b/dita/RTC-NG/API/class_mixedaudiostream.dita index 5de318f4ce7..86e51d272c2 100644 --- a/dita/RTC-NG/API/class_mixedaudiostream.dita +++ b/dita/RTC-NG/API/class_mixedaudiostream.dita @@ -48,7 +48,25 @@ channelId(channel), trackId(track) {} }; - + USTRUCT(BlueprintType) +struct FUABT_MixedAudioStream { + + GENERATED_BODY() + +public: + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_AUDIO_SOURCE_TYPE sourceType = EUABT_AUDIO_SOURCE_TYPE::AUDIO_SOURCE_MICROPHONE; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + int64 remoteUserUid; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + FString channelName; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + int64 trackId; +}; export class MixedAudioStream { sourceType?: AudioSourceType; remoteUserUid?: number; diff --git a/dita/RTC-NG/API/class_snapshotconfig.dita b/dita/RTC-NG/API/class_snapshotconfig.dita index 8a9b15ddbb7..3b5139befca 100644 --- a/dita/RTC-NG/API/class_snapshotconfig.dita +++ b/dita/RTC-NG/API/class_snapshotconfig.dita @@ -21,6 +21,19 @@ media::base::VIDEO_MODULE_POSITION position; SnapshotConfig() :filePath(NULL), position(media::base::POSITION_PRE_ENCODER) {} +}; + USTRUCT(BlueprintType) +struct FUABT_SnapshotConfig { + + GENERATED_BODY() + +public: + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + FString filePath; + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_VIDEO_MODULE_POSITION position = EUABT_VIDEO_MODULE_POSITION::POSITION_PRE_ENCODER; }; export class SnapshotConfig { filePath?: string; @@ -49,7 +62,7 @@ _$SnapshotConfigFromJson(json); Map<String, dynamic> toJson() => _$SnapshotConfigToJson(this); -} +}

      @@ -65,4 +78,4 @@
      - \ No newline at end of file + diff --git a/dita/RTC-NG/API/class_videodenoiseroptions.dita b/dita/RTC-NG/API/class_videodenoiseroptions.dita index 22cd91a5b51..fbf71090e43 100644 --- a/dita/RTC-NG/API/class_videodenoiseroptions.dita +++ b/dita/RTC-NG/API/class_videodenoiseroptions.dita @@ -50,32 +50,21 @@ }; USTRUCT(BlueprintType) -struct FVideoDenoiserOptions +struct FUABT_VideoDenoiserOptions { GENERATED_BODY() + public: - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|VideoDenoiserOptions") - EVIDEO_DENOISER_MODE mode = EVIDEO_DENOISER_MODE::VIDEO_DENOISER_AUTO; - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|VideoDenoiserOptions") - EVIDEO_DENOISER_LEVEL level = EVIDEO_DENOISER_LEVEL::VIDEO_DENOISER_LEVEL_HIGH_QUALITY; - FVideoDenoiserOptions(){} - FVideoDenoiserOptions(const agora::rtc::VideoDenoiserOptions & AgoraData){ - mode = static_cast<EVIDEO_DENOISER_MODE>(AgoraData.mode); - level = static_cast<EVIDEO_DENOISER_LEVEL>(AgoraData.level); - } - agora::rtc::VideoDenoiserOptions CreateAgoraData() const { - agora::rtc::VideoDenoiserOptions AgoraData; - AgoraData.mode = static_cast<agora::rtc::VideoDenoiserOptions::VIDEO_DENOISER_MODE>(mode); - AgoraData.level = static_cast<agora::rtc::VideoDenoiserOptions::VIDEO_DENOISER_LEVEL>(level); - return AgoraData; - } - void FreeAgoraData(agora::rtc::VideoDenoiserOptions& AgoraData) const { - } + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_VIDEO_DENOISER_MODE mode = EUABT_VIDEO_DENOISER_MODE::VIDEO_DENOISER_AUTO; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + EUABT_VIDEO_DENOISER_LEVEL level = EUABT_VIDEO_DENOISER_LEVEL ::VIDEO_DENOISER_LEVEL_HIGH_QUALITY; }; export class VideoDenoiserOptions { - + mode?: VideoDenoiserMode; - + level?: VideoDenoiserLevel; } public class VideoDenoiserOptions @@ -96,9 +85,9 @@ public: } }; export class VideoDenoiserOptions { - + mode?: VideoDenoiserMode; - + level?: VideoDenoiserLevel; } class VideoDenoiserOptions { @@ -114,7 +103,7 @@ public: _$VideoDenoiserOptionsFromJson(json); Map<String, dynamic> toJson() => _$VideoDenoiserOptionsToJson(this); -} +}

      @@ -140,4 +129,4 @@ public:
      - \ No newline at end of file + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap index f16502f2971..0bf38767be9 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap @@ -1215,6 +1215,20 @@ + + + + SetLocalRenderTargetFps + + + + + + + SetRemoteRenderTargetFps + + + @@ -1310,6 +1324,20 @@ + + + + GetFaceShapeAreaOptions + + + + + + + GetFaceShapeBeautyOptions + + + @@ -1324,14 +1352,14 @@ - + SetLowlightEnhanceOptions - + SetVideoDenoiserOptions @@ -1345,6 +1373,27 @@ + + + + SetFaceShapeAreaOptions + + + + + + + SetFaceShapeBeautyOptions + + + + + + + SetFilterEffectOptions + + + @@ -2726,6 +2775,29 @@ + + + + + StartLocalAudioMixer + + + + + + + StopLocalAudioMixer + + + + + + + UpdateLocalAudioMixerConfiguration + + + + @@ -5407,6 +5479,41 @@ + + + + FUABT_FaceShapeAreaOptions + + + + + + + FUABT_FaceShapeBeautyOptions + + + + + + + FUABT_FaceShapeAreaOptions + + + + + + + FUABT_FaceShapeBeautyOptions + + + + + + + FUABT_FilterEffectOptions + + + @@ -5533,10 +5640,24 @@ + + + + FUABT_MixedAudioStream + + + + + + + FUABT_LocalAudioMixerConfiguration + + + - FLowlightEnhanceOptions + FUABT_LowlightEnhanceOptions @@ -5676,7 +5797,7 @@ - FRtcConnection + FUABT_RtcConnection @@ -5764,6 +5885,13 @@ + + + + FUABT_SnapshotConfig + + + @@ -5837,7 +5965,7 @@ - FVideoDenoiserOptions + FUABT_VideoDenoiserOptions @@ -5934,6 +6062,69 @@ + + + + EUABT_AUDIO_SOURCE_TYPE + + + + + + + AUDIO_SOURCE_MICROPHONE + + + + + + + AUDIO_SOURCE_CUSTOM + + + + + + + AUDIO_SOURCE_MEDIA_PLAYER + + + + + + + AUDIO_SOURCE_LOOPBACK_RECORDING + + + + + + + AUDIO_SOURCE_MIXED_STREAM + + + + + + + AUDIO_SOURCE_REMOTE_USER + + + + + + + AUDIO_SOURCE_REMOTE_CHANNEL + + + + + + + AUDIO_SOURCE_UNKNOWN + + + @@ -8860,6 +9051,125 @@ + + + + EUABT_FACE_SHAPE_AREA + + + + + + + FACE_SHAPE_AREA_NONE + + + + + + + FACE_SHAPE_AREA_HEADSCALE + + + + + + + FACE_SHAPE_AREA_FOREHEAD + + + + + + + FACE_SHAPE_AREA_FACECONTOUR + + + + + + + FACE_SHAPE_AREA_FACELENGTH + + + + + + + FACE_SHAPE_AREA_FACEWIDTH + + + + + + + FACE_SHAPE_AREA_CHEEKBONE + + + + + + + FACE_SHAPE_AREA_CHEEK + + + + + + + FACE_SHAPE_AREA_CHIN + + + + + + + FACE_SHAPE_AREA_EYESCALE + + + + + + + FACE_SHAPE_AREA_NOSELENGTH + + + + + + + FACE_SHAPE_AREA_NOSEWIDTH + + + + + + + FACE_SHAPE_AREA_MOUTHSCALE + + + + + + + EUABT_FACE_SHAPE_BEAUTY_STYLE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_FEMALE + + + + + + + FACE_SHAPE_BEAUTY_STYLE_MALE + + + @@ -9570,7 +9880,7 @@ - ELOW_LIGHT_ENHANCE_LEVEL + EUABT_LOW_LIGHT_ENHANCE_LEVEL @@ -10074,7 +10384,7 @@ - EMEDIA_SOURCE_TYPE + EUABT_MEDIA_SOURCE_TYPE @@ -11817,7 +12127,7 @@ - EVIDEO_DENOISER_LEVEL + EUABT_VIDEO_DENOISER_LEVEL @@ -11845,7 +12155,7 @@ - EVIDEO_SOURCE_TYPE + EUABT_VIDEO_SOURCE_TYPE @@ -12272,7 +12582,7 @@ - EVIDEO_MODULE_POSITION + EUABT_VIDEO_MODULE_POSITION diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap index f0b40a28e35..8d60162f161 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap @@ -1303,14 +1303,14 @@ - + setLowlightEnhanceOptions - + setVideoDenoiserOptions From 5c6669dda2191121d4f33633aa8e05bcc9e6db1f Mon Sep 17 00:00:00 2001 From: chenmeng Date: Tue, 19 Nov 2024 12:30:02 +0800 Subject: [PATCH 11/19] change key map --- .../API/api_irtcengine_setlowlightenhanceoptions.dita | 10 +++++----- dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap | 4 ++-- dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions.dita b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions.dita index f00c47f8182..fdde3c159e6 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions.dita @@ -19,8 +19,8 @@ - (int)setLowlightEnhanceOptions:(BOOL)enable options:(AgoraLowlightEnhanceOptions* _Nullable)options NS_SWIFT_NAME(setLowlightEnhanceOptions(_:options:)); virtual int setLowlightEnhanceOptions(bool enabled, const LowlightEnhanceOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") - int SetLowlightEnhanceOptions(bool enabled, const FLowlightEnhanceOptions& options, EMEDIA_SOURCE_TYPE type); + UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") + int SetLowlightEnhanceOptions(bool enabled, const FUABT_LowlightEnhanceOptions& options, EUABT_MEDIA_SOURCE_TYPE type); abstract setLowlightEnhanceOptions( enabled: boolean, options: LowlightEnhanceOptions, @@ -48,7 +48,7 @@
      调用时机

      请在 后调用该方法。

      -
      +
      调用限制
        @@ -56,8 +56,8 @@
      • 暗光增强对设备性能有一定要求。开启暗光增强后，如果设备出现严重发烫等问题，建议你将暗光增强等级修改为消耗性能较少的等级或关闭暗光增强功能。
      • 如果要实现优先画质 () 的暗光增强，需要先调用 实现视频降噪，具体对应关系如下：
          -
        • 暗光增强为自动模式 () 时，视频降噪需设置为优先画质 ()、自动模式 ()。
          • -
        • 暗光增强为手动模式 () 时，视频降噪需设置为优先画质 ()、手动模式 ()。
          • +
        • 暗光增强为自动模式 () 时，视频降噪需设置为优先画质 ()、自动模式 ()。
          • +
        • 暗光增强为手动模式 () 时，视频降噪需设置为优先画质 ()、手动模式 ()。
      diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap index 0bf38767be9..5a9f93b2af3 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap @@ -1352,14 +1352,14 @@ - + SetLowlightEnhanceOptions - + SetVideoDenoiserOptions diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap index 8d60162f161..f0b40a28e35 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unreal.ditamap @@ -1303,14 +1303,14 @@ - + setLowlightEnhanceOptions - + setVideoDenoiserOptions From e5db5a2d4cc5245f03e28c145a4f8ff0a1e6fed8 Mon Sep 17 00:00:00 2001 From: chenmeng Date: Tue, 19 Nov 2024 14:39:24 +0800 Subject: [PATCH 12/19] bp updates --- dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita | 2 +- .../API/api_irtcengineex_takesnapshotex2.dita | 2 +- .../config/keys-rtc-ng-api-blueprint.ditamap | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita index fedaa9b656d..4058dfacb7e 100644 --- a/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita +++ b/dita/RTC-NG/API/api_irtcengine_takesnapshot2.dita @@ -18,7 +18,7 @@ - (NSInteger)takeSnapshotWithConfig:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotWithConfig(_:config:)); virtual int takeSnapshot(uid_t uid, const media::SnapshotConfig& config) = 0; UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") - int TakeSnapshot(int64 uid, const FUABT_SnapshotConfig& config); + int TakeSnapshotWithConfig(int64 uid, const FUABT_SnapshotConfig& config); abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; public abstract int TakeSnapshot(uint uid, SnapshotConfig config); abstract takeSnapshotWithConfig(uid: number, config: SnapshotConfig): number; diff --git a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita index ac4bd3823d5..19474953c6a 100644 --- a/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita +++ b/dita/RTC-NG/API/api_irtcengineex_takesnapshotex2.dita @@ -18,7 +18,7 @@ - (NSInteger)takeSnapshotExWithConfig:(AgoraRtcConnection * _Nonnull)connection uid:(NSInteger)uid config:(AgoraSnapshotConfig* _Nonnull)config NS_SWIFT_NAME(takeSnapshotExWithConfig(_:uid:config:)); virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const media::SnapshotConfig& config) = 0; UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") - int TakeSnapshotEx(const FUABT_RtcConnection& connection, int64 uid, const FUABT_SnapshotConfig& config); + int TakeSnapshotWithConfigEx(const FUABT_RtcConnection& connection, int64 uid, const FUABT_SnapshotConfig& config); abstract takeSnapshotWithConfigEx( connection: RtcConnection, uid: number, diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap index 5a9f93b2af3..a2d9887bc22 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-blueprint.ditamap @@ -1641,6 +1641,13 @@ + + + + TakeSnapshotWithConfigEx + + + @@ -4090,6 +4097,13 @@ + + + + TakeSnapshotWithConfig + + + From f7a97b3b8695ef12ed0c1b29c31ae68623f4c066 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Tue, 19 Nov 2024 17:31:48 +0800 Subject: [PATCH 13/19] add area code for hamonyos --- dita/RTC-NG/API/class_rtcengineconfig.dita | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dita/RTC-NG/API/class_rtcengineconfig.dita b/dita/RTC-NG/API/class_rtcengineconfig.dita index 341c2fdefc7..ab411ecf5cd 100644 --- a/dita/RTC-NG/API/class_rtcengineconfig.dita +++ b/dita/RTC-NG/API/class_rtcengineconfig.dita @@ -18,7 +18,7 @@ public IMediaExtensionObserver mExtensionObserver; public LogConfig mLogConfig; public String mNativeLibPath; - public boolean mDomainLimit; + public boolean mDomainLimit; public void addExtension(String providerName) { mExtensionList.add(providerName); @@ -26,11 +26,12 @@ } export class RtcEngineConfig{ - public mContext:Context | null = null; - public mAppId:string | null = null; - public mEventHandler: IRtcEngineEventHandler | null = null; - public mLogConfig?:LogConfig; -} + public mContext:Context; + public mAppId:string; + public mEventHandler: IRtcEngineEventHandler ; + public mLogConfig?:LogConfig; + public areaCode: Constants.AreaCode = Constants.AreaCode.GLOB; + } __attribute__((visibility("default"))) @interface AgoraRtcEngineConfig: NSObject @property (copy, nonatomic) NSString * _Nullable appId; @@ -70,19 +71,19 @@ struct FRtcEngineContext EAgoraBPuEventHandlerType EventHandlerCreationType = EAgoraBPuEventHandlerType::EventHandler; UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") FString appId = ""; - - + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") ECHANNEL_PROFILE_TYPE channelProfile = ECHANNEL_PROFILE_TYPE::CHANNEL_PROFILE_LIVE_BROADCASTING; UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") FString license = ""; UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") EAUDIO_SCENARIO_TYPE audioScenario = EAUDIO_SCENARIO_TYPE::AUDIO_SCENARIO_DEFAULT; - - + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") FENUMWRAP_AREA_CODE areaCode = EENUMCUSTOM_AREA_CODE::AREA_CODE_GLOB; - + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|RtcEngineContext") FLogConfig logConfig; @@ -100,11 +101,11 @@ struct FRtcEngineContext FRtcEngineContext() {} agora::rtc::RtcEngineContext CreateAgoraData() const { agora::rtc::RtcEngineContext AgoraData; - + SET_UABT_FSTRING_TO_CONST_CHAR___MEMALLOC(AgoraData.appId, this->appId) - + AgoraData.channelProfile = (agora::CHANNEL_PROFILE_TYPE)channelProfile; - + SET_UABT_FSTRING_TO_CONST_CHAR___MEMALLOC(AgoraData.license, this->license) AgoraData.audioScenario = (agora::rtc::AUDIO_SCENARIO_TYPE)audioScenario; AgoraData.areaCode = areaCode.GetRawValue(); @@ -113,7 +114,7 @@ struct FRtcEngineContext AgoraData.useExternalEglContext = useExternalEglContext; AgoraData.domainLimit = domainLimit; AgoraData.autoRegisterAgoraExtensions = autoRegisterAgoraExtensions; - + return AgoraData; } From f636ee13e07156fea478f7dd9e9bf7798be7ec9b Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Tue, 19 Nov 2024 17:43:06 +0800 Subject: [PATCH 14/19] RN: add setExternalRemoteEglContext --- dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita | 2 +- dita/RTC-NG/RTC_NG_API_RN.ditamap | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita b/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita index aa88692f00d..efa4a2d784b 100644 --- a/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita +++ b/dita/RTC-NG/API/api_irtcengine_setexternalremoteeglcontext.dita @@ -20,7 +20,7 @@ public abstract int SetExternalRemoteEglContext(IntPtr eglContext); - + abstract setExternalRemoteEglContext(eglContext: any): number; Future<void> setExternalRemoteEglContext(int eglContext);

      diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index 895a3e8d860..ce26af31007 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -389,6 +389,7 @@ + From a88bb65d3526a35e625888b90838219c70af241b Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Tue, 19 Nov 2024 17:53:02 +0800 Subject: [PATCH 15/19] RN/Electron: add color space --- dita/RTC-NG/API/class_externalvideoframe.dita | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index b2de1d3b9ae..4eedcbf5053 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -175,6 +175,7 @@ struct ExternalVideoFrame { alphaStitchMode?: AlphaStitchMode; d3d11Texture2d?: any; textureSliceIndex?: number; + colorSpace?: ColorSpace; } public class ExternalVideoFrame { @@ -220,6 +221,7 @@ struct ExternalVideoFrame { alphaBuffer?: Uint8Array; fillAlphaBuffer?: boolean; alphaStitchMode?: AlphaStitchMode; + colorSpace?: ColorSpace; } @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExternalVideoFrame { From 818d059bcb6fc0fddad48690581c180c11bbd8ae Mon Sep 17 00:00:00 2001 From: Suri539 Date: Tue, 19 Nov 2024 18:08:06 +0800 Subject: [PATCH 16/19] add color space in external video frame --- dita/RTC-NG/API/class_externalvideoframe.dita | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 4eedcbf5053..6460ba4ac78 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -200,6 +200,7 @@ struct ExternalVideoFrame { public ALPHA_STITCH_MODE alphaStitchMode; public IntPtr d3d11Texture2d; public int textureSliceIndex; + public ColorSpace colorSpace; }; export class ExternalVideoFrame { type?: VideoBufferType; @@ -311,6 +312,9 @@ class ExternalVideoFrame { @JsonKey(name: 'textureSliceIndex') final int? textureSliceIndex; + @JsonKey(name: 'colorSpace') + final ColorSpace? colorSpace; + factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => _$ExternalVideoFrameFromJson(json); From 3a62680e73640c6dfc52bee96766648cbb327b4f Mon Sep 17 00:00:00 2001 From: Suri539 Date: Tue, 19 Nov 2024 18:17:20 +0800 Subject: [PATCH 17/19] more color --- dita/RTC-NG/API/class_externalvideoframe.dita | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 6460ba4ac78..ce670948a22 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -247,7 +247,8 @@ class ExternalVideoFrame { this.fillAlphaBuffer, this.alphaStitchMode, this.d3d11Texture2d, - this.textureSliceIndex}); + this.textureSliceIndex, + this.colorSpace}); @JsonKey(name: 'type') final VideoBufferType? type; From 731254654401110bd5bbe58a9a34052770f0303a Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 20 Nov 2024 12:06:56 +0800 Subject: [PATCH 18/19] 450 framework --- ...irtcengine_setlowlightenhanceoptions2.dita | 4 - ...i_irtcengine_setvideodenoiseroptions2.dita | 9 +- .../API/class_mediarecorderconfiguration.dita | 87 ++++++++++++++----- dita/RTC-NG/API/class_recorderstreaminfo.dita | 10 ++- dita/RTC-NG/API/rtc_api_overview.dita | 2 +- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita index 5fdad8974bf..d0517612f6e 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlowlightenhanceoptions2.dita @@ -43,10 +43,6 @@ - - type - 媒体资源类型，详见 。 - diff --git a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita index bbe07c49625..5e0bb5aed26 100644 --- a/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setvideodenoiseroptions2.dita @@ -17,9 +17,8 @@ boolean enabled, VideoDenoiserOptions options, Constants.MediaSourceType sourceType); - (int)setVideoDenoiserOptions:(BOOL)enable options:(AgoraVideoDenoiserOptions* _Nullable)options sourceType:(AgoraMediaSourceType)sourceType NS_SWIFT_NAME(setVideoDenoiserOptions(_:options:sourceType:)); - virtual int setVideoDenoiserOptions(bool enabled, const VideoDenoiserOptions& options, agora::media::MEDIA_SOURCE_TYPE type = agora::media::PRIMARY_CAMERA_SOURCE) = 0; - UFUNCTION(BlueprintCallable, Category = "Agora|IRtcEngine") - int SetVideoDenoiserOptions(bool enabled, const FUABT_VideoDenoiserOptions& options, EUABT_MEDIA_SOURCE_TYPE type); + + @@ -45,10 +44,6 @@ - - - - diff --git a/dita/RTC-NG/API/class_mediarecorderconfiguration.dita b/dita/RTC-NG/API/class_mediarecorderconfiguration.dita index d636807b823..8b389f73709 100644 --- a/dita/RTC-NG/API/class_mediarecorderconfiguration.dita +++ b/dita/RTC-NG/API/class_mediarecorderconfiguration.dita @@ -51,15 +51,15 @@ } } export class MediaRecorderConfiguration { - + public storagePath: string; - + public containerFormat: number = AgoraMediaRecorder.CONTAINER_MP4; - + public streamType: number = AgoraMediaRecorder.STREAM_TYPE_BOTH; - + public maxDurationMs: number = 120000; - + public recorderInfoUpdateInterval: number = 0; public constructor(storagePath: string, containerFormat: number, streamType: number, maxDurationMs: number, recorderInfoUpdateInterval: number) { @@ -138,38 +138,59 @@ struct FMediaRecorderConfiguration int recorderInfoUpdateInterval; }; export class MediaRecorderConfiguration { - recorderInfoUpdateInterval?: number; + storagePath?: string; + containerFormat?: MediaRecorderContainerFormat; + streamType?: MediaRecorderStreamType; + maxDurationMs?: number; + recorderInfoUpdateInterval?: number; width?: number; height?: number; fps?: number; sample_rate?: number; channel_num?: number; videoSourceType?: VideoSourceType; - } +} public struct MediaRecorderConfiguration { public string storagePath; public MediaRecorderContainerFormat containerFormat; public MediaRecorderStreamType streamType; public int maxDurationMs; public int recorderInfoUpdateInterval; + public int width; + public int height; + public int fps; + public int sample_rate; + public int channel_num; + public VIDEO_SOURCE_TYPE videoSourceType; }; export class MediaRecorderConfiguration { - recorderInfoUpdateInterval?: number; + storagePath?: string; + containerFormat?: MediaRecorderContainerFormat; + streamType?: MediaRecorderStreamType; + maxDurationMs?: number; + recorderInfoUpdateInterval?: number; width?: number; height?: number; fps?: number; sample_rate?: number; channel_num?: number; videoSourceType?: VideoSourceType; - } - class MediaRecorderConfiguration { - +} + @JsonSerializable(explicitToJson: true, includeIfNull: false) +class MediaRecorderConfiguration { + /// @nodoc const MediaRecorderConfiguration( {this.storagePath, this.containerFormat, this.streamType, this.maxDurationMs, - this.recorderInfoUpdateInterval}); + this.recorderInfoUpdateInterval, + this.width, + this.height, + this.fps, + this.sampleRate, + this.channelNum, + this.videoSourceType}); @JsonKey(name: 'storagePath') final String? storagePath; @@ -186,6 +207,24 @@ struct FMediaRecorderConfiguration @JsonKey(name: 'recorderInfoUpdateInterval') final int? recorderInfoUpdateInterval; + @JsonKey(name: 'width') + final int? width; + + @JsonKey(name: 'height') + final int? height; + + @JsonKey(name: 'fps') + final int? fps; + + @JsonKey(name: 'sample_rate') + final int? sampleRate; + + @JsonKey(name: 'channel_num') + final int? channelNum; + + @JsonKey(name: 'videoSourceType') + final VideoSourceType? videoSourceType; + factory MediaRecorderConfiguration.fromJson(Map<String, dynamic> json) => _$MediaRecorderConfigurationFromJson(json); @@ -233,49 +272,49 @@ struct FMediaRecorderConfiguration recorderInfoUpdateInterval 录制信息更新间隔，单位为毫秒，取值范围为 [1000,10000]。SDK 会根据该值的设置触发 回调，报告更新后的录制信息。 - + width 录制视频的宽度 (px)，宽 × 高的最大值不应超过 3840 × 2160。 - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。 - + height 录制视频的高度 (px)，宽 × 高的最大值不超过 3840 × 2160。 - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。 - + fps 录制视频的帧率，最高值不超过 30，如： 5、10、15、24、30 等。 - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。 - + sample_rate 录制音频的采样率 (Hz)，可设置为 16000，32000，44100 或 48000。 - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。 - + channel_num 录制音频的声道数:
      • 1: 单声道
      • 2: 双声道
      - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。       - + videoSourceType 录制视频源的类型。详见 。 - 该参数仅在 调用 且将 中的 type设置为 时需要传入。 + 该参数仅在 调用 且将 中的 type设置为 时需要传入。 该参数仅在 调用 且将 的 recorderStreamType 为 0 时需要传入。 diff --git a/dita/RTC-NG/API/class_recorderstreaminfo.dita b/dita/RTC-NG/API/class_recorderstreaminfo.dita index 7448a0fc74e..cd7bade353e 100644 --- a/dita/RTC-NG/API/class_recorderstreaminfo.dita +++ b/dita/RTC-NG/API/class_recorderstreaminfo.dita @@ -12,9 +12,9 @@ public int recorderStreamType; } export class RecorderStreamInfo { - + public uid: number = 0; - + public channelId: string; public constructor() { this.uid = 0; @@ -59,6 +59,7 @@ struct FRecorderStreamInfo { { public string channelId; public uint uid; + public RecorderStreamType type; }; RecorderStreamInfo { @@ -76,6 +77,9 @@ class RecorderStreamInfo { @JsonKey(name: 'uid') final int? uid; + @JsonKey(name: 'type') + final RecorderStreamType? type; + factory RecorderStreamInfo.fromJson(Map<String, dynamic> json) => _$RecorderStreamInfoFromJson(json); @@ -101,7 +105,7 @@ class RecorderStreamInfo { uid 需录制的用户 ID。 - + type 需录制的视频流类型，详见 。 diff --git a/dita/RTC-NG/API/rtc_api_overview.dita b/dita/RTC-NG/API/rtc_api_overview.dita index 080b7c27cf0..85c168b6cc8 100644 --- a/dita/RTC-NG/API/rtc_api_overview.dita +++ b/dita/RTC-NG/API/rtc_api_overview.dita @@ -1028,7 +1028,7 @@ - + From 19f0e7686a0b62a129946054005d23fa3c72dfe1 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 20 Nov 2024 15:11:01 +0800 Subject: [PATCH 19/19] done --- dita/RTC-NG/API/rtc_api_data_type.dita | 6 + dita/RTC-NG/RTC_NG_API_Flutter.ditamap | 20 +- dita/RTC-NG/RTC_NG_API_Unity.ditamap | 24 +- .../config/keys-rtc-ng-api-flutter.ditamap | 205 +++++++++++++++++- .../config/keys-rtc-ng-api-unity.ditamap | 195 ++++++++++++++++- .../config/relations-rtc-ng-api.ditamap | 2 +- 6 files changed, 436 insertions(+), 16 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 60965d6cede..74be6f71bab 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -653,6 +653,8 @@
      • +
      • +
      • @@ -666,6 +668,7 @@
      • +
      • @@ -1112,6 +1115,8 @@
      • +
      • +
      • @@ -1122,6 +1127,7 @@
      • +
      • diff --git a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap index 6a7db2377bf..c6bc5e67d36 100644 --- a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap @@ -303,13 +303,16 @@ - + + + + @@ -322,8 +325,13 @@ + + + + + @@ -362,8 +370,15 @@ + + + + + + + @@ -383,7 +398,8 @@ - + + diff --git a/dita/RTC-NG/RTC_NG_API_Unity.ditamap b/dita/RTC-NG/RTC_NG_API_Unity.ditamap index 1ef6abcd172..21096838852 100644 --- a/dita/RTC-NG/RTC_NG_API_Unity.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Unity.ditamap @@ -192,6 +192,11 @@ + + + + + @@ -270,6 +275,7 @@ + @@ -282,13 +288,15 @@ - + + + @@ -296,8 +304,13 @@ + + + + + @@ -349,9 +362,9 @@ - + @@ -361,6 +374,8 @@ + + @@ -383,7 +398,8 @@ - + + @@ -772,4 +788,4 @@ - + \ No newline at end of file diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap index 7ccc1b456ad..241aac64017 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -1151,6 +1151,20 @@ + + + + setLocalRenderTargetFps + + + + + + + setRemoteRenderTargetFps + + + @@ -1246,6 +1260,20 @@ + + + + getFaceShapeAreaOptions + + + + + + + getFaceShapeBeautyOptions + + + @@ -1281,6 +1309,27 @@ + + + + setFaceShapeAreaOptions + + + + + + + setFaceShapeBeautyOptions + + + + + + + setFilterEffectOptions + + + @@ -1495,6 +1544,13 @@ + + + + takeSnapshotWithConfigEx + + + @@ -1581,6 +1637,13 @@ + + + + setExternalMediaProjection + + + @@ -2441,6 +2504,13 @@ + + + + setExternalRemoteEglContext + + + @@ -2500,6 +2570,29 @@ + + + + + startLocalAudioMixer + + + + + + + stopLocalAudioMixer + + + + + + + updateLocalAudioMixerConfiguration + + + + @@ -3610,6 +3703,13 @@ + + + + takeSnapshotWithConfig + + + @@ -4728,13 +4828,6 @@ - - - - AudioTrackConfig - - - @@ -4742,6 +4835,13 @@ + + + + AudioTrackConfig + + + @@ -4903,6 +5003,27 @@ + + + + FaceShapeAreaOptions + + + + + + + FaceShapeBeautyOptions + + + + + + + FilterEffectOptions + + + @@ -5015,6 +5136,20 @@ + + + + MixedAudioStream + + + + + + + LocalAudioMixerConfiguration + + + @@ -5232,6 +5367,13 @@ + + + + SnapshotConfig + + + @@ -5948,6 +6090,13 @@ + + + + preferCompressionAuto + + + @@ -7565,6 +7714,13 @@ + + + + maintainAuto + + + @@ -9077,6 +9233,13 @@ + + + + mediaDeviceStatePluggedIn + + + @@ -10372,6 +10535,27 @@ + + + + RecorderStreamType + + + + + + + rtc + + + + + + + preview + + + @@ -11002,6 +11186,13 @@ + + + + applicationScenarioLiveshow + + + diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap index b28c12b0fb9..87987551dcd 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -1089,6 +1089,20 @@ + + + + SetLocalRenderTargetFps + + + + + + + SetRemoteRenderTargetFps + + + @@ -1177,6 +1191,20 @@ + + + + GetFaceShapeAreaOptions + + + + + + + GetFaceShapeBeautyOptions + + + @@ -1219,6 +1247,27 @@ + + + + SetFaceShapeAreaOptions + + + + + + + SetFaceShapeBeautyOptions + + + + + + + SetFilterEffectOptions + + + @@ -1506,7 +1555,14 @@ - TakeSnapshotEx + TakeSnapshotEx [1/2] + + + + + + + TakeSnapshotEx [2/2] @@ -1610,6 +1666,13 @@ + + + + SetExternalMediaProjection + + + @@ -2509,6 +2572,13 @@ + + + + SetExternalRemoteEglContext + + + @@ -2568,6 +2638,29 @@ + + + + + StartLocalAudioMixer + + + + + + + StopLocalAudioMixer + + + + + + + UpdateLocalAudioMixerConfiguration + + + + @@ -3682,7 +3775,14 @@ - TakeSnapshot + TakeSnapshot [1/2] + + + + + + + TakeSnapshot [2/2] @@ -5030,6 +5130,27 @@ ExtensionContext + + + + + FaceShapeAreaOptions + + + + + + + FaceShapeBeautyOptions + + + + + + + FilterEffectOptions + + @@ -5157,6 +5278,20 @@ + + + + MixedAudioStream + + + + + + + LocalAudioMixerConfiguration + + + @@ -5362,6 +5497,13 @@ + + + + SnapshotConfig + + + @@ -6883,6 +7025,13 @@ + + + + APPLICATION_SCENARIO_LIVESHOW + + + @@ -7100,6 +7249,13 @@ + + + + PREFER_COMPRESSION_AUTO + + + @@ -7926,6 +8082,13 @@ + + + + MAINTAIN_AUTO + + + @@ -9438,6 +9601,13 @@ + + + + MEDIA_DEVICE_STATE_PLUGGED_IN + + + @@ -10880,6 +11050,27 @@ + + + + RecorderStreamType + + + + + + + RTC + + + + + + + PREVIEW + + + diff --git a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap index a152a9d65d4..7c547436aad 100644 --- a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap +++ b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap @@ -2539,7 +2539,7 @@ - +