From 8ba650e53c095f9b323051da1126622698c7c483 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 9 Aug 2024 12:02:44 +0800 Subject: [PATCH 01/37] unity proto 1/3 --- ...musiccontentcenter_destroymusicplayer.dita | 2 +- .../API/api_imusicplayer_setplaymode.dita | 2 +- dita/RTC-NG/API/class_advanceoptions.dita | 32 +++++++++-------- dita/RTC-NG/API/class_externalvideoframe.dita | 34 ++++++++++--------- dita/RTC-NG/API/class_videoframe.dita | 6 +++- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + .../config/keys-rtc-ng-api-unity.ditamap | 28 +++++++++++++++ 7 files changed, 72 insertions(+), 33 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index 542d6c13167..e52bdefd16e 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -18,7 +18,7 @@ virtual int destroyMusicPlayer(agora_refptr<IMusicPlayer> music_player) = 0; - + public abstract int DestroyMusicPlayer(IMusicPlayer music_player);

diff --git a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita index 6c44a735040..7f54e0e4dbb 100644 --- a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita +++ b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita @@ -18,7 +18,7 @@ virtual int setPlayMode(MusicPlayMode mode) = 0; - + public abstract int SetPlayMode(MusicPlayMode mode);

diff --git a/dita/RTC-NG/API/class_advanceoptions.dita b/dita/RTC-NG/API/class_advanceoptions.dita index 967b6484454..b59378761e2 100644 --- a/dita/RTC-NG/API/class_advanceoptions.dita +++ b/dita/RTC-NG/API/class_advanceoptions.dita @@ -70,22 +70,26 @@ struct FAdvanceOptions { compressionPreference?: CompressionPreference; } public class AdvanceOptions - { - public ENCODING_PREFERENCE encodingPreference { set; get; } - public COMPRESSION_PREFERENCE compressionPreference { set; get; } + { + public ENCODING_PREFERENCE encodingPreference; + public COMPRESSION_PREFERENCE compressionPreference; + public bool encodeAlpha; - public AdvanceOptions() - { - encodingPreference = ENCODING_PREFERENCE.PREFER_AUTO; - compressionPreference = COMPRESSION_PREFERENCE.PREFER_LOW_LATENCY; - } + public AdvanceOptions() + { + this.encodingPreference = ENCODING_PREFERENCE.PREFER_AUTO; + this.compressionPreference = COMPRESSION_PREFERENCE.PREFER_LOW_LATENCY; + this.encodeAlpha = false; + } - public AdvanceOptions(ENCODING_PREFERENCE encoding_preference, COMPRESSION_PREFERENCE compression_preference) - { - encodingPreference = encoding_preference; - compressionPreference = compression_preference; - } - } + public AdvanceOptions(ENCODING_PREFERENCE encoding_preference, COMPRESSION_PREFERENCE compression_preference, bool encode_alpha) + { + this.encodingPreference = encoding_preference; + this.compressionPreference = compression_preference; + this.encodeAlpha = encode_alpha; + } + + } export class AdvanceOptions { encodingPreference?: EncodingPreference; compressionPreference?: CompressionPreference; diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 7e663e8ddb7..ffef1c2d8c4 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -20,7 +20,7 @@ public static final int BUFFER_TYPE_ARRAY = 2; public static final int BUFFER_TYPE_TEXTURE = 3; public AgoraVideoFrame() { - format = 10; + format = 10; timeStamp = 0; stride = 0; height = 0; @@ -46,7 +46,7 @@ public float[] transform; public javax.microedition.khronos.egl.EGLContext eglContext10; public android.opengl.EGLContext eglContext14; - + public byte[] buf; public int cropLeft; public int cropTop; @@ -67,20 +67,20 @@ __attribute__((visibility("default"))) @interface AgoraVideoFrame : NSObject @property(assign, nonatomic) NSInteger format; -@property(assign, nonatomic) CMTime time; +@property(assign, nonatomic) CMTime time; @property(assign, nonatomic) int stride DEPRECATED_MSG_ATTRIBUTE("use strideInPixels instead"); -@property(assign, nonatomic) int strideInPixels; -@property(assign, nonatomic) int height; +@property(assign, nonatomic) int strideInPixels; +@property(assign, nonatomic) int height; @property(assign, nonatomic) CVPixelBufferRef _Nullable textureBuf; @property(strong, nonatomic) IMAGE_CLASS * _Nullable image; -@property(strong, nonatomic) NSData *_Nullable dataBuf; +@property(strong, nonatomic) NSData *_Nullable dataBuf; @property(strong, nonatomic) NSData *_Nullable alphaBuf; @property(assign, nonatomic) AgoraAlphaStitchMode alphaStitchMode; -@property(assign, nonatomic) int cropLeft; -@property(assign, nonatomic) int cropTop; -@property(assign, nonatomic) int cropRight; -@property(assign, nonatomic) int cropBottom; -@property(assign, nonatomic) int rotation; +@property(assign, nonatomic) int cropLeft; +@property(assign, nonatomic) int cropTop; +@property(assign, nonatomic) int cropRight; +@property(assign, nonatomic) int cropBottom; +@property(assign, nonatomic) int rotation; - (void)fillAlphaData; @end struct ExternalVideoFrame { @@ -174,6 +174,8 @@ public int textureId; public byte[] metadata_buffer; public int metadata_size; + public bool fillAlphaBuffer; + public ALPHA_STITCH_MODE alphaStitchMode; public IntPtr d3d11_texture_2d; public int texture_slice_index; }; @@ -297,7 +299,7 @@ class ExternalVideoFrame { id="windows-format">像素格式。详见 。 传入的视频帧的格式，必须指定为下面的某一个值： - +
  • 1: I420。
  • 2: BGRA。
    • @@ -310,7 +312,7 @@ class ExternalVideoFrame {
  • 16: I422。
 视频数据的格式： - +
  • 10：TEXTURE_2D。
  • 11：TEXTURE_OES，通常摄像头采集的数据为这种格式。
    • @@ -335,7 +337,7 @@ class ExternalVideoFrame { stride 传入视频帧的行间距，单位为像素而不是字节。对于 Texture，该值指的是 Texture 的宽度。 - +

    @@ -350,7 +352,7 @@ class ExternalVideoFrame { strideInPixels 该帧的行跨度，即相邻两行视频帧之间的像素点数。 - +
    • 该参数单位为像素，不是字节数。
      • @@ -433,7 +435,7 @@ class ExternalVideoFrame { fillAlphaBuffer fillAlphaData - 该参数仅适用于 BGRA 或 RGBA 格式的视频数据。设置是否提取视频帧中的 Alpha 通道数据并自动填入到 alphaBuffer 中： + 该参数仅适用于 BGRA 或 RGBA 格式的视频数据。设置是否提取视频帧中的 Alpha 通道数据并自动填入到 alphaBuffer 中：
      • ：提取并填充 Alpha 通道数据。
      • ：（默认）不提取填充 Alpha 通道数据。
        • diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 329f1fbc6e2..70f01a8094e 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -135,7 +135,7 @@ Unspecified(2), BT470M(4), BT470BG(5), - kSMPTE170M(6), + kSMPTE170M(6), kSMPTE240M(7), kFILM(8), kBT2020(9), @@ -463,6 +463,10 @@ struct FVideoFrame { public int textureId; public float[] matrix; + + public byte[] alphaBuffer; + + public ALPHA_STITCH_MODE alphaStitchMode; }; export class VideoFrame { diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index fa698da4ddb..b21e619bc04 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1711,6 +1711,7 @@
        • +
        • 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 ab3978b9479..c8b49767401 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -9892,6 +9892,34 @@ + + + + MusicPlayMode + + + + + + + kMusicPlayModeOriginal + + + + + + + kMusicPlayModeAccompany + + + + + + + kMusicPlayModeLeadSing + + + From 3a4a21a383a99a868747f1fcc0ed5dbc832c1a5d Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 9 Aug 2024 15:08:43 +0800 Subject: [PATCH 02/37] unity proto 2/3 --- .../api_irtcengine_enablevoiceaituner.dita | 2 +- ...nthandler_onextensionerrorwithcontext.dita | 2 +- ...nthandler_onextensioneventwithcontext.dita | 2 +- ...handler_onextensionstartedwithcontext.dita | 2 +- ...handler_onextensionstoppedwithcontext.dita | 2 +- .../RTC-NG/API/class_channelmediaoptions.dita | 1 + dita/RTC-NG/API/class_extensioncontext.dita | 24 ++++++++++++++++++- dita/RTC-NG/API/rtc_api_data_type.dita | 2 ++ 8 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita index f33160c4292..724c2e19b2a 100644 --- a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita +++ b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita @@ -18,7 +18,7 @@ virtual int enableVoiceAITuner(bool enabled, VOICE_AI_TUNER_TYPE type) = 0; - + public abstract int EnableVoiceAITuner(bool enabled, VOICE_AI_TUNER_TYPE type);

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita index c9739273d3e..2348b2f07ac 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita @@ -30,7 +30,7 @@ error: number, message: string ): void;         - public virtual void OnExtensionError(string provider, string extension, int error, string message) { } + public virtual void OnExtensionErrorWithContext(ExtensionContext context, int error, string message){} onExtensionError?( provider: string, extension: string, diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita index 897d7ae90d9..30161229668 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita @@ -30,7 +30,7 @@ key: string, value: string ): void; - public virtual void OnExtensionEvent(string provider, string extension, string key, string value) { } + public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){} onExtensionEvent?( provider: string, extension: string, diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita index e5cbf60c764..0d4c5f0aa4e 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita @@ -21,7 +21,7 @@ } DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStarted, FString, provider, FString, extension); onExtensionStarted?(provider: string, extension: string): void; - public virtual void OnExtensionStarted(string provider, string extension) { } + public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } onExtensionStarted?(provider: string, extension: string): void; final void Function(String provider, String extName)? onExtensionStarted;

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita index d79496baa28..e33020d19a0 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita @@ -21,7 +21,7 @@ }         DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStopped, FString, provider, FString, extension); onExtensionStopped?(provider: string, extension: string): void; - public virtual void OnExtensionStopped(string provider, string extension) { } + public virtual void OnExtensionStoppedWithContext(ExtensionContext context){ } onExtensionStopped?(provider: string, extension: string): void; final void Function(String provider, String extName)? onExtensionStopped;

        diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 5940608834a..404ded38453 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -391,6 +391,7 @@ struct FChannelMediaOptions public Optional<bool> publishMediaPlayerAudioTrack = new Optional<bool>(); public Optional<bool> publishMediaPlayerVideoTrack = new Optional<bool>(); public Optional<bool> publishTranscodedVideoTrack = new Optional<bool>(); + public Optional<bool> publishLipSyncTrack = new Optional<bool>(); public Optional<bool> autoSubscribeAudio = new Optional<bool>(); public Optional<bool> autoSubscribeVideo = new Optional<bool>(); public Optional<bool> enableAudioRecordingOrPlayout = new Optional<bool>(); diff --git a/dita/RTC-NG/API/class_extensioncontext.dita b/dita/RTC-NG/API/class_extensioncontext.dita index e83098cd2d4..34fc6f763e4 100644 --- a/dita/RTC-NG/API/class_extensioncontext.dita +++ b/dita/RTC-NG/API/class_extensioncontext.dita @@ -43,7 +43,29 @@ };         - + public class ExtensionContext + { + public bool isValid; + public uint uid; + public string providerName; + public string extensionName; + + public ExtensionContext() + { + this.isValid = false; + this.uid = 0; + this.providerName = ""; + this.extensionName = ""; + } + + public ExtensionContext(bool isValid, uint uid, string providerName, string extensionName) + { + this.isValid = isValid; + this.uid = uid; + this.providerName = providerName; + this.extensionName = extensionName; + } + }

        diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index b21e619bc04..53485585366 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -596,6 +596,7 @@
        • +
        • @@ -1764,6 +1765,7 @@
        • +
        • From 21641bac51817b9be32947917e35fbbd687da505 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 9 Aug 2024 15:14:45 +0800 Subject: [PATCH 03/37] unity proto 3/3 --- dita/RTC-NG/API/class_metadata.dita | 31 ++++--- .../config/keys-rtc-ng-api-unity.ditamap | 91 +++++++++++++++++++ 2 files changed, 109 insertions(+), 13 deletions(-) diff --git a/dita/RTC-NG/API/class_metadata.dita b/dita/RTC-NG/API/class_metadata.dita index 1ac893c186b..59f53cc3413 100644 --- a/dita/RTC-NG/API/class_metadata.dita +++ b/dita/RTC-NG/API/class_metadata.dita @@ -57,25 +57,30 @@ struct FAgoraMetadata };         public class Metadata { + public string channelId; public uint uid; public uint size; + public IntPtr buffer; + public long timeStampMs; - public IntPtr buffer + public Metadata() { - set - { - _buffer = (UInt64)value; - } - get - { - return (IntPtr)_buffer; - } + this.channelId = ""; + this.uid = 0; + this.size = 0; + this.buffer = IntPtr.Zero; + this.timeStampMs = 0; } - private UInt64 _buffer; - - public long timeStampMs; - }; + public Metadata(string channelId, uint uid, uint size, IntPtr buffer, long timeStampMs) + { + this.channelId = channelId; + this.uid = uid; + this.size = size; + this.buffer = buffer; + this.timeStampMs = timeStampMs; + } + }         export class Metadata { uid?: number; 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 c8b49767401..5e4adbb4f22 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -6833,6 +6833,13 @@         + + + + APPLICATION_SCENARIO_1V1 + + + @@ -9031,6 +9038,13 @@ + + + + LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_DISPLAY_DISCONNECTED + + + @@ -12573,6 +12587,83 @@ + + + + VOICE_AI_TUNER_TYPE + + + + + + + VOICE_AI_TUNER_MATURE_MALE + + + + + + + VOICE_AI_TUNER_FRESH_MALE + + + + + + + VOICE_AI_TUNER_ELEGANT_FEMALE + + + + + + + VOICE_AI_TUNER_SWEET_FEMALE + + + + + + + VOICE_AI_TUNER_WARM_MALE_SINGING + + + + + + + VOICE_AI_TUNER_GENTLE_FEMALE_SINGING + + + + + + + VOICE_AI_TUNER_HUSKY_MALE_SINGING + + + + + + + VOICE_AI_TUNER_WARM_ELEGANT_FEMALE_SINGING + + + + + + + VOICE_AI_TUNER_POWERFUL_MALE_SINGING + + + + + + + VOICE_AI_TUNER_DREAMY_FEMALE_SINGING + + + From 8f0de3d1e3600c886692e329e04c73e0939ab3d4 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 9 Aug 2024 15:25:31 +0800 Subject: [PATCH 04/37] unity maps --- dita/RTC-NG/RTC_NG_API_Unity.ditamap | 3 ++ .../config/keys-rtc-ng-api-unity.ditamap | 29 ++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dita/RTC-NG/RTC_NG_API_Unity.ditamap b/dita/RTC-NG/RTC_NG_API_Unity.ditamap index 4261d8cddb9..e7427ab1242 100644 --- a/dita/RTC-NG/RTC_NG_API_Unity.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Unity.ditamap @@ -149,6 +149,7 @@ + @@ -522,6 +523,7 @@ + @@ -537,6 +539,7 @@ + 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 5e4adbb4f22..de6e34e38bc 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -1960,6 +1960,13 @@ + + + + EnableVoiceAITuner + + + @@ -2763,28 +2770,28 @@ - OnExtensionEvent + OnExtensionEventWithContext - OnExtensionStarted + OnExtensionStartedWithContext - OnExtensionStopped + OnExtensionStoppedWithContext - OnExtensionError + OnExtensionErrorWithContext @@ -3597,6 +3604,13 @@ + + + + DestroyMusicPlayer + + + @@ -3639,6 +3653,13 @@ + + + + SetPlayMode + + + From 1929a6bde76e56bce0fd55f88250189a24cee76b Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 9 Aug 2024 15:31:21 +0800 Subject: [PATCH 05/37] rename --- dita/RTC-NG/RTC_NG_API_Unity.ditamap | 8 ++++---- dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dita/RTC-NG/RTC_NG_API_Unity.ditamap b/dita/RTC-NG/RTC_NG_API_Unity.ditamap index e7427ab1242..72df50ef684 100644 --- a/dita/RTC-NG/RTC_NG_API_Unity.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Unity.ditamap @@ -717,10 +717,10 @@ - - - - + + + + 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 de6e34e38bc..9114762b7f2 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -2767,28 +2767,28 @@ - + OnExtensionEventWithContext - + OnExtensionStartedWithContext - + OnExtensionStoppedWithContext - + OnExtensionErrorWithContext From ddadbe4cfe2b523ca6af12ba70533d8527e8b368 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 10:35:04 +0800 Subject: [PATCH 06/37] 1 --- ...musiccontentcenter_destroymusicplayer.dita | 2 +- .../API/api_imusicplayer_setplaymode.dita | 2 +- .../api_irtcengine_enablevoiceaituner.dita | 3 +- ...nthandler_onextensionerrorwithcontext.dita | 5 +- ...nthandler_onextensioneventwithcontext.dita | 5 +- ...handler_onextensionstartedwithcontext.dita | 2 +- ...handler_onextensionstoppedwithcontext.dita | 2 +- dita/RTC-NG/API/class_advanceoptions.dita | 20 +- .../RTC-NG/API/class_channelmediaoptions.dita | 121 +++---- dita/RTC-NG/API/class_extensioncontext.dita | 17 +- dita/RTC-NG/API/class_externalvideoframe.dita | 82 +++-- dita/RTC-NG/API/class_metadata.dita | 14 +- dita/RTC-NG/API/class_videoframe.dita | 134 +++---- dita/RTC-NG/RTC_NG_API_Flutter.ditamap | 11 +- .../config/keys-rtc-ng-api-flutter.ditamap | 331 +++++++++++++----- 15 files changed, 449 insertions(+), 302 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index e52bdefd16e..57873e91c54 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -20,7 +20,7 @@ public abstract int DestroyMusicPlayer(IMusicPlayer music_player); -

        + Future<void> destroyMusicPlayer(MusicPlayer musicPlayer);

        diff --git a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita index 7f54e0e4dbb..188db1e5760 100644 --- a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita +++ b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita @@ -20,7 +20,7 @@ public abstract int SetPlayMode(MusicPlayMode mode); -

        + Future<void> setPlayMode(MusicPlayMode mode);

        diff --git a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita index 724c2e19b2a..e27a97e074b 100644 --- a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita +++ b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita @@ -20,7 +20,8 @@ public abstract int EnableVoiceAITuner(bool enabled, VOICE_AI_TUNER_TYPE type); -

        + Future<void> enableVoiceAITuner( + {required bool enabled, required VoiceAiTunerType type});

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita index 2348b2f07ac..34162981eca 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita @@ -37,9 +37,8 @@ error: number, message: string ): void; - final void Function( - String provider, String extension, int error, String message)? - onExtensionError; + final void Function(ExtensionContext context, int error, String message)? + onExtensionErrorWithContext;

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita index 30161229668..92f48f83993 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita @@ -37,9 +37,8 @@ key: string, value: string ): void; - final void Function( - String provider, String extName, String key, String value)? - onExtensionEvent; + final void Function(ExtensionContext context, String key, String value)? + onExtensionEventWithContext;

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita index 0d4c5f0aa4e..469db444f3b 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita @@ -23,7 +23,7 @@ onExtensionStarted?(provider: string, extension: string): void; public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } onExtensionStarted?(provider: string, extension: string): void; - final void Function(String provider, String extName)? onExtensionStarted; + final void Function(ExtensionContext context)? onExtensionStartedWithContext;

        diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita index e33020d19a0..02bb189565a 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita @@ -23,7 +23,7 @@ onExtensionStopped?(provider: string, extension: string): void; public virtual void OnExtensionStoppedWithContext(ExtensionContext context){ } onExtensionStopped?(provider: string, extension: string): void; - final void Function(String provider, String extName)? onExtensionStopped; + final void Function(ExtensionContext context)? onExtensionStoppedWithContext;

        diff --git a/dita/RTC-NG/API/class_advanceoptions.dita b/dita/RTC-NG/API/class_advanceoptions.dita index b59378761e2..ab8db32a525 100644 --- a/dita/RTC-NG/API/class_advanceoptions.dita +++ b/dita/RTC-NG/API/class_advanceoptions.dita @@ -94,19 +94,19 @@ struct FAdvanceOptions { encodingPreference?: EncodingPreference; compressionPreference?: CompressionPreference; } - class AdvanceOptions { - const AdvanceOptions({this.encodingPreference, this.compressionPreference}); - - @JsonKey(name: 'encodingPreference') + @JsonSerializable(explicitToJson: true, includeIfNull: false) +class AdvanceOptions { + const AdvanceOptions( + {this.encodingPreference, this.compressionPreference, this.encodeAlpha}); + @JsonKey(name: 'encodingPreference') final EncodingPreference? encodingPreference; - - @JsonKey(name: 'compressionPreference') + @JsonKey(name: 'compressionPreference') final CompressionPreference? compressionPreference; - - factory AdvanceOptions.fromJson(Map<String, dynamic> json) => + @JsonKey(name: 'encodeAlpha') + final bool? encodeAlpha; + factory AdvanceOptions.fromJson(Map<String, dynamic> json) => _$AdvanceOptionsFromJson(json); - - Map<String, dynamic> toJson() => _$AdvanceOptionsToJson(this); + Map<String, dynamic> toJson() => _$AdvanceOptionsToJson(this); }

        diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 404ded38453..8b8f579a819 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -473,7 +473,7 @@ struct FChannelMediaOptions }         @JsonSerializable(explicitToJson: true, includeIfNull: false) class ChannelMediaOptions { - const ChannelMediaOptions( + const ChannelMediaOptions( {this.publishCameraTrack, this.publishSecondaryCameraTrack, this.publishThirdCameraTrack, @@ -492,6 +492,8 @@ class ChannelMediaOptions { this.publishMediaPlayerAudioTrack, this.publishMediaPlayerVideoTrack, this.publishTranscodedVideoTrack, + this.publishMixedAudioTrack, + this.publishLipSyncTrack, this.autoSubscribeAudio, this.autoSubscribeVideo, this.enableAudioRecordingOrPlayout, @@ -507,114 +509,85 @@ class ChannelMediaOptions { this.publishRhythmPlayerTrack, this.isInteractiveAudience, this.customVideoTrackId, - this.isAudioFilterable}); - - @JsonKey(name: 'publishCameraTrack') + this.isAudioFilterable, + this.parameters}); + @JsonKey(name: 'publishCameraTrack') final bool? publishCameraTrack; - - @JsonKey(name: 'publishSecondaryCameraTrack') + @JsonKey(name: 'publishSecondaryCameraTrack') final bool? publishSecondaryCameraTrack; - - @JsonKey(name: 'publishThirdCameraTrack') + @JsonKey(name: 'publishThirdCameraTrack') final bool? publishThirdCameraTrack; - - @JsonKey(name: 'publishFourthCameraTrack') + @JsonKey(name: 'publishFourthCameraTrack') final bool? publishFourthCameraTrack; - - @JsonKey(name: 'publishMicrophoneTrack') + @JsonKey(name: 'publishMicrophoneTrack') final bool? publishMicrophoneTrack; - - @JsonKey(name: 'publishScreenCaptureVideo') + @JsonKey(name: 'publishScreenCaptureVideo') final bool? publishScreenCaptureVideo; - - @JsonKey(name: 'publishScreenCaptureAudio') + @JsonKey(name: 'publishScreenCaptureAudio') final bool? publishScreenCaptureAudio; - - @JsonKey(name: 'publishScreenTrack') + @JsonKey(name: 'publishScreenTrack') final bool? publishScreenTrack; - - @JsonKey(name: 'publishSecondaryScreenTrack') + @JsonKey(name: 'publishSecondaryScreenTrack') final bool? publishSecondaryScreenTrack; - - @JsonKey(name: 'publishThirdScreenTrack') + @JsonKey(name: 'publishThirdScreenTrack') final bool? publishThirdScreenTrack; - - @JsonKey(name: 'publishFourthScreenTrack') + @JsonKey(name: 'publishFourthScreenTrack') final bool? publishFourthScreenTrack; - - @JsonKey(name: 'publishCustomAudioTrack') + @JsonKey(name: 'publishCustomAudioTrack') final bool? publishCustomAudioTrack; - - @JsonKey(name: 'publishCustomAudioTrackId') + @JsonKey(name: 'publishCustomAudioTrackId') final int? publishCustomAudioTrackId; - - @JsonKey(name: 'publishCustomVideoTrack') + @JsonKey(name: 'publishCustomVideoTrack') final bool? publishCustomVideoTrack; - - @JsonKey(name: 'publishEncodedVideoTrack') + @JsonKey(name: 'publishEncodedVideoTrack') final bool? publishEncodedVideoTrack; - - @JsonKey(name: 'publishMediaPlayerAudioTrack') + @JsonKey(name: 'publishMediaPlayerAudioTrack') final bool? publishMediaPlayerAudioTrack; - - @JsonKey(name: 'publishMediaPlayerVideoTrack') + @JsonKey(name: 'publishMediaPlayerVideoTrack') final bool? publishMediaPlayerVideoTrack; - - @JsonKey(name: 'publishTranscodedVideoTrack') + @JsonKey(name: 'publishTranscodedVideoTrack') final bool? publishTranscodedVideoTrack; - - @JsonKey(name: 'autoSubscribeAudio') + @JsonKey(name: 'publishMixedAudioTrack') + final bool? publishMixedAudioTrack; + @JsonKey(name: 'publishLipSyncTrack') + final bool? publishLipSyncTrack; + @JsonKey(name: 'autoSubscribeAudio') final bool? autoSubscribeAudio; - - @JsonKey(name: 'autoSubscribeVideo') + @JsonKey(name: 'autoSubscribeVideo') final bool? autoSubscribeVideo; - - @JsonKey(name: 'enableAudioRecordingOrPlayout') + @JsonKey(name: 'enableAudioRecordingOrPlayout') final bool? enableAudioRecordingOrPlayout; - - @JsonKey(name: 'publishMediaPlayerId') + @JsonKey(name: 'publishMediaPlayerId') final int? publishMediaPlayerId; - - @JsonKey(name: 'clientRoleType') + @JsonKey(name: 'clientRoleType') final ClientRoleType? clientRoleType; - - @JsonKey(name: 'audienceLatencyLevel') + @JsonKey(name: 'audienceLatencyLevel') final AudienceLatencyLevelType? audienceLatencyLevel; - - @JsonKey(name: 'defaultVideoStreamType') + @JsonKey(name: 'defaultVideoStreamType') final VideoStreamType? defaultVideoStreamType; - - @JsonKey(name: 'channelProfile') + @JsonKey(name: 'channelProfile') final ChannelProfileType? channelProfile; - - @JsonKey(name: 'audioDelayMs') + @JsonKey(name: 'audioDelayMs') final int? audioDelayMs; - - @JsonKey(name: 'mediaPlayerAudioDelayMs') + @JsonKey(name: 'mediaPlayerAudioDelayMs') final int? mediaPlayerAudioDelayMs; - - @JsonKey(name: 'token') + @JsonKey(name: 'token') final String? token; - - @JsonKey(name: 'enableBuiltInMediaEncryption') + @JsonKey(name: 'enableBuiltInMediaEncryption') final bool? enableBuiltInMediaEncryption; - - @JsonKey(name: 'publishRhythmPlayerTrack') + @JsonKey(name: 'publishRhythmPlayerTrack') final bool? publishRhythmPlayerTrack; - - @JsonKey(name: 'isInteractiveAudience') + @JsonKey(name: 'isInteractiveAudience') final bool? isInteractiveAudience; - - @JsonKey(name: 'customVideoTrackId') + @JsonKey(name: 'customVideoTrackId') final int? customVideoTrackId; - - @JsonKey(name: 'isAudioFilterable') + @JsonKey(name: 'isAudioFilterable') final bool? isAudioFilterable; - - factory ChannelMediaOptions.fromJson(Map<String, dynamic> json) => + @JsonKey(name: 'parameters') + final String? parameters; + factory ChannelMediaOptions.fromJson(Map<String, dynamic> json) => _$ChannelMediaOptionsFromJson(json); - - Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); + Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); }

        diff --git a/dita/RTC-NG/API/class_extensioncontext.dita b/dita/RTC-NG/API/class_extensioncontext.dita index 34fc6f763e4..32963f50d33 100644 --- a/dita/RTC-NG/API/class_extensioncontext.dita +++ b/dita/RTC-NG/API/class_extensioncontext.dita @@ -67,7 +67,22 @@ } }         -

        + @JsonSerializable(explicitToJson: true, includeIfNull: false) +class ExtensionContext { + const ExtensionContext( + {this.isValid, this.uid, this.providerName, this.extensionName}); + @JsonKey(name: 'isValid') + final bool? isValid; + @JsonKey(name: 'uid') + final int? uid; + @JsonKey(name: 'providerName') + final String? providerName; + @JsonKey(name: 'extensionName') + final String? extensionName; + factory ExtensionContext.fromJson(Map<String, dynamic> json) => + _$ExtensionContextFromJson(json); + Map<String, dynamic> toJson() => _$ExtensionContextToJson(this); +}

        diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index ffef1c2d8c4..f3933b64775 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -199,7 +199,7 @@ } @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExternalVideoFrame { - const ExternalVideoFrame( + const ExternalVideoFrame( {this.type, this.format, this.buffer, @@ -213,70 +213,68 @@ class ExternalVideoFrame { this.timestamp, this.eglType, this.textureId, + this.fenceObject, this.matrix, this.metadataBuffer, this.metadataSize, this.alphaBuffer, - this.textureSliceIndex}); - - @JsonKey(name: 'type') + this.fillAlphaBuffer, + this.alphaStitchMode, + this.d3d11Texture2d, + this.textureSliceIndex, + this.hdr10MetadataInfo, + this.colorSpace}); + @JsonKey(name: 'type') final VideoBufferType? type; - - @JsonKey(name: 'format') + @JsonKey(name: 'format') final VideoPixelFormat? format; - - @JsonKey(name: 'buffer', ignore: true) + @JsonKey(name: 'buffer', ignore: true) final Uint8List? buffer; - - @JsonKey(name: 'stride') + @JsonKey(name: 'stride') final int? stride; - - @JsonKey(name: 'height') + @JsonKey(name: 'height') final int? height; - - @JsonKey(name: 'cropLeft') + @JsonKey(name: 'cropLeft') final int? cropLeft; - - @JsonKey(name: 'cropTop') + @JsonKey(name: 'cropTop') final int? cropTop; - - @JsonKey(name: 'cropRight') + @JsonKey(name: 'cropRight') final int? cropRight; - - @JsonKey(name: 'cropBottom') + @JsonKey(name: 'cropBottom') final int? cropBottom; - - @JsonKey(name: 'rotation') + @JsonKey(name: 'rotation') final int? rotation; - - @JsonKey(name: 'timestamp') + @JsonKey(name: 'timestamp') final int? timestamp; - - @JsonKey(name: 'eglType') + @JsonKey(name: 'eglType') final EglContextType? eglType; - - @JsonKey(name: 'textureId') + @JsonKey(name: 'textureId') final int? textureId; - - @JsonKey(name: 'matrix') + @JsonKey(name: 'fenceObject') + final int? fenceObject; + @JsonKey(name: 'matrix') final List<double>? matrix; - - @JsonKey(name: 'metadata_buffer', ignore: true) + @JsonKey(name: 'metadataBuffer', ignore: true) final Uint8List? metadataBuffer; - - @JsonKey(name: 'metadata_size') + @JsonKey(name: 'metadataSize') final int? metadataSize; - - @JsonKey(name: 'alphaBuffer', ignore: true) + @JsonKey(name: 'alphaBuffer', ignore: true) final Uint8List? alphaBuffer; - - @JsonKey(name: 'texture_slice_index') + @JsonKey(name: 'fillAlphaBuffer') + final bool? fillAlphaBuffer; + @JsonKey(name: 'alphaStitchMode') + final AlphaStitchMode? alphaStitchMode; + @JsonKey(name: 'd3d11Texture2d', readValue: readIntPtr) + final int? d3d11Texture2d; + @JsonKey(name: 'textureSliceIndex') final int? textureSliceIndex; - - factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => + @JsonKey(name: 'hdr10MetadataInfo') + final Hdr10MetadataInfo? hdr10MetadataInfo; + @JsonKey(name: 'colorSpace') + final ColorSpace? colorSpace; + factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => _$ExternalVideoFrameFromJson(json); - - Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); + Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); }

        diff --git a/dita/RTC-NG/API/class_metadata.dita b/dita/RTC-NG/API/class_metadata.dita index 59f53cc3413..a0484918ba1 100644 --- a/dita/RTC-NG/API/class_metadata.dita +++ b/dita/RTC-NG/API/class_metadata.dita @@ -101,19 +101,29 @@ struct FAgoraMetadata timeStampMs?: number; }         - class Metadata { - const Metadata({this.uid, this.size, this.buffer, this.timeStampMs}); + @JsonSerializable(explicitToJson: true, includeIfNull: false) +class Metadata { + const Metadata( + {this.channelId, this.uid, this.size, this.buffer, this.timeStampMs}); + + @JsonKey(name: 'channelId') + final String? channelId; @JsonKey(name: 'uid') final int? uid; + @JsonKey(name: 'size') final int? size; + @JsonKey(name: 'buffer', ignore: true) final Uint8List? buffer; + @JsonKey(name: 'timeStampMs') final int? timeStampMs; + factory Metadata.fromJson(Map<String, dynamic> json) => _$MetadataFromJson(json); + Map<String, dynamic> toJson() => _$MetadataToJson(this); }

        diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 70f01a8094e..3c911009ae1 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -504,81 +504,83 @@ struct FVideoFrame { }         @JsonSerializable(explicitToJson: true, includeIfNull: false) -class VideoFrame { - const VideoFrame( +class ExternalVideoFrame { + const ExternalVideoFrame( {this.type, - this.width, + this.format, + this.buffer, + this.stride, this.height, - this.yStride, - this.uStride, - this.vStride, - this.yBuffer, - this.uBuffer, - this.vBuffer, + this.cropLeft, + this.cropTop, + this.cropRight, + this.cropBottom, this.rotation, - this.renderTimeMs, - this.avsyncType, - this.metadataBuffer, - this.metadataSize, + this.timestamp, + this.eglType, this.textureId, + this.fenceObject, this.matrix, - this.pixelBuffer}); - - @JsonKey(name: 'type') - final VideoPixelFormat? type; - - @JsonKey(name: 'width') - final int? width; - - @JsonKey(name: 'height') + this.metadataBuffer, + this.metadataSize, + this.alphaBuffer, + this.fillAlphaBuffer, + this.alphaStitchMode, + this.d3d11Texture2d, + this.textureSliceIndex, + this.hdr10MetadataInfo, + this.colorSpace}); + @JsonKey(name: 'type') + final VideoBufferType? type; + @JsonKey(name: 'format') + final VideoPixelFormat? format; + @JsonKey(name: 'buffer', ignore: true) + final Uint8List? buffer; + @JsonKey(name: 'stride') + final int? stride; + @JsonKey(name: 'height') final int? height; - - @JsonKey(name: 'yStride') - final int? yStride; - - @JsonKey(name: 'uStride') - final int? uStride; - - @JsonKey(name: 'vStride') - final int? vStride; - - @JsonKey(name: 'yBuffer', ignore: true) - final Uint8List? yBuffer; - - @JsonKey(name: 'uBuffer', ignore: true) - final Uint8List? uBuffer; - - @JsonKey(name: 'vBuffer', ignore: true) - final Uint8List? vBuffer; - - @JsonKey(name: 'rotation') + @JsonKey(name: 'cropLeft') + final int? cropLeft; + @JsonKey(name: 'cropTop') + final int? cropTop; + @JsonKey(name: 'cropRight') + final int? cropRight; + @JsonKey(name: 'cropBottom') + final int? cropBottom; + @JsonKey(name: 'rotation') final int? rotation; - - @JsonKey(name: 'renderTimeMs') - final int? renderTimeMs; - - @JsonKey(name: 'avsync_type') - final int? avsyncType; - - @JsonKey(name: 'metadata_buffer', ignore: true) + @JsonKey(name: 'timestamp') + final int? timestamp; + @JsonKey(name: 'eglType') + final EglContextType? eglType; + @JsonKey(name: 'textureId') + final int? textureId; + @JsonKey(name: 'fenceObject') + final int? fenceObject; + @JsonKey(name: 'matrix') + final List<double>? matrix; + @JsonKey(name: 'metadataBuffer', ignore: true) final Uint8List? metadataBuffer; - - @JsonKey(name: 'metadata_size') + @JsonKey(name: 'metadataSize') final int? metadataSize; - - @JsonKey(name: 'textureId') - final int? textureId; - - @JsonKey(name: 'matrix') - final List<double>? matrix; - - @JsonKey(name: 'pixelBuffer', ignore: true) - final Uint8List? pixelBuffer; - - factory VideoFrame.fromJson(Map<String, dynamic> json) => - _$VideoFrameFromJson(json); - - Map<String, dynamic> toJson() => _$VideoFrameToJson(this); + @JsonKey(name: 'alphaBuffer', ignore: true) + final Uint8List? alphaBuffer; + @JsonKey(name: 'fillAlphaBuffer') + final bool? fillAlphaBuffer; + @JsonKey(name: 'alphaStitchMode') + final AlphaStitchMode? alphaStitchMode; + @JsonKey(name: 'd3d11Texture2d', readValue: readIntPtr) + final int? d3d11Texture2d; + @JsonKey(name: 'textureSliceIndex') + final int? textureSliceIndex; + @JsonKey(name: 'hdr10MetadataInfo') + final Hdr10MetadataInfo? hdr10MetadataInfo; + @JsonKey(name: 'colorSpace') + final ColorSpace? colorSpace; + factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => + _$ExternalVideoFrameFromJson(json); + Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); }

        diff --git a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap index a0112c1a085..f192bb50e5d 100644 --- a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap @@ -160,6 +160,7 @@ + @@ -522,6 +523,7 @@ + @@ -538,6 +540,7 @@ + @@ -702,10 +705,10 @@ - - - - + + + + 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 7408c54b4a8..d2c78941ce4 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -1911,6 +1911,13 @@         + + + + enableVoiceAITuner + + + @@ -2673,31 +2680,31 @@ - + - onExtensionEvent + onExtensionEventWithContext - + - onExtensionStarted + onExtensionStartedWithContext - + - onExtensionStopped + onExtensionStoppedWithContext - + - onExtensionError + onExtensionErrorWithContext @@ -3278,6 +3285,13 @@ + + + + destroyMusicPlayer + + + @@ -3390,90 +3404,6 @@ - - - - MusicCacheStatusType - - - - - - - musicCacheStatusTypeCached - - - - - - - musicCacheStatusTypeCaching - - - - - - - MusicContentCenterStateReason - - - - - - - kMusicContentCenterReasonOk - - - - - - - kMusicContentCenterReasonError - - - - - - - kMusicContentCenterReasonGateway - - - - - - - kMusicContentCenterReasonPermissionAndResource - - - - - - - kMusicContentCenterReasonInternalDataParse - - - - - - - kMusicContentCenterReasonMusicLoading - - - - - - - kMusicContentCenterReasonMusicDecryption - - - - - - - kMusicContentCenterReasonHttpInternalError - - - @@ -3593,6 +3523,13 @@ + + + + setPlayMode + + + @@ -4966,6 +4903,13 @@ + + + + ExtensionContext + + + @@ -8678,6 +8622,13 @@ + + + + localVideoStreamReasonScreenCaptureDisplayDisconnected + + + @@ -9448,6 +9399,118 @@ + + + + MusicCacheStatusType + + + + + + + musicCacheStatusTypeCached + + + + + + + musicCacheStatusTypeCaching + + + + + + + MusicContentCenterStateReason + + + + + + + kMusicContentCenterReasonOk + + + + + + + kMusicContentCenterReasonError + + + + + + + kMusicContentCenterReasonGateway + + + + + + + kMusicContentCenterReasonPermissionAndResource + + + + + + + kMusicContentCenterReasonInternalDataParse + + + + + + + kMusicContentCenterReasonMusicLoading + + + + + + + kMusicContentCenterReasonMusicDecryption + + + + + + + kMusicContentCenterReasonHttpInternalError + + + + + + + MusicPlayMode + + + + + + + kMusicPlayModeOriginal + + + + + + + kMusicPlayModeAccompany + + + + + + + kMusicPlayModeLeadSing + + + @@ -10722,6 +10785,13 @@ + + + + applicationScenario1v1 + + + @@ -11968,6 +12038,83 @@ + + + + VoiceAiTunerType + + + + + + + voiceAiTunerMatureMale + + + + + + + voiceAiTunerFreshMale + + + + + + + voiceAiTunerElegantFemale + + + + + + + voiceAiTunerSweetFemale + + + + + + + voiceAiTunerWarmMaleSinging + + + + + + + voiceAiTunerGentleFemaleSinging + + + + + + + voiceAiTunerHuskyMaleSinging + + + + + + + voiceAiTunerWarmElegantFemaleSinging + + + + + + + voiceAiTunerPowerfulMaleSinging + + + + + + + voiceAiTunerDreamyFemaleSinging + + + From 2ce2fc30fabb2d7dbfab70dea45c3d46a70afe1b Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 10:46:13 +0800 Subject: [PATCH 07/37] Update class_videoframe.dita --- dita/RTC-NG/API/class_videoframe.dita | 139 ++++++++++++++------------ 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 3c911009ae1..24a7935739b 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -504,83 +504,98 @@ struct FVideoFrame { }         @JsonSerializable(explicitToJson: true, includeIfNull: false) -class ExternalVideoFrame { - const ExternalVideoFrame( +class VideoFrame { + const VideoFrame( {this.type, - this.format, - this.buffer, - this.stride, + this.width, this.height, - this.cropLeft, - this.cropTop, - this.cropRight, - this.cropBottom, + this.yStride, + this.uStride, + this.vStride, + this.yBuffer, + this.uBuffer, + this.vBuffer, this.rotation, - this.timestamp, - this.eglType, - this.textureId, - this.fenceObject, - this.matrix, + this.renderTimeMs, + this.avsyncType, this.metadataBuffer, this.metadataSize, + this.textureId, + this.matrix, this.alphaBuffer, - this.fillAlphaBuffer, this.alphaStitchMode, - this.d3d11Texture2d, - this.textureSliceIndex, - this.hdr10MetadataInfo, + this.pixelBuffer, + this.metaInfo, this.colorSpace}); - @JsonKey(name: 'type') - final VideoBufferType? type; - @JsonKey(name: 'format') - final VideoPixelFormat? format; - @JsonKey(name: 'buffer', ignore: true) - final Uint8List? buffer; - @JsonKey(name: 'stride') - final int? stride; - @JsonKey(name: 'height') + + @JsonKey(name: 'type') + final VideoPixelFormat? type; + + @JsonKey(name: 'width') + final int? width; + + @JsonKey(name: 'height') final int? height; - @JsonKey(name: 'cropLeft') - final int? cropLeft; - @JsonKey(name: 'cropTop') - final int? cropTop; - @JsonKey(name: 'cropRight') - final int? cropRight; - @JsonKey(name: 'cropBottom') - final int? cropBottom; - @JsonKey(name: 'rotation') + + @JsonKey(name: 'yStride') + final int? yStride; + + @JsonKey(name: 'uStride') + final int? uStride; + + @JsonKey(name: 'vStride') + final int? vStride; + + @JsonKey(name: 'yBuffer', ignore: true) + final Uint8List? yBuffer; + + @JsonKey(name: 'uBuffer', ignore: true) + final Uint8List? uBuffer; + + @JsonKey(name: 'vBuffer', ignore: true) + final Uint8List? vBuffer; + + @JsonKey(name: 'rotation') final int? rotation; - @JsonKey(name: 'timestamp') - final int? timestamp; - @JsonKey(name: 'eglType') - final EglContextType? eglType; - @JsonKey(name: 'textureId') - final int? textureId; - @JsonKey(name: 'fenceObject') - final int? fenceObject; - @JsonKey(name: 'matrix') - final List<double>? matrix; - @JsonKey(name: 'metadataBuffer', ignore: true) + + @JsonKey(name: 'renderTimeMs') + final int? renderTimeMs; + + @JsonKey(name: 'avsync_type') + final int? avsyncType; + + @JsonKey(name: 'metadata_buffer', ignore: true) final Uint8List? metadataBuffer; - @JsonKey(name: 'metadataSize') + + @JsonKey(name: 'metadata_size') final int? metadataSize; - @JsonKey(name: 'alphaBuffer', ignore: true) + + @JsonKey(name: 'textureId') + final int? textureId; + + @JsonKey(name: 'matrix') + final List<double>? matrix; + + @JsonKey(name: 'alphaBuffer', ignore: true) final Uint8List? alphaBuffer; - @JsonKey(name: 'fillAlphaBuffer') - final bool? fillAlphaBuffer; - @JsonKey(name: 'alphaStitchMode') + + @JsonKey(name: 'alphaStitchMode') final AlphaStitchMode? alphaStitchMode; - @JsonKey(name: 'd3d11Texture2d', readValue: readIntPtr) - final int? d3d11Texture2d; - @JsonKey(name: 'textureSliceIndex') - final int? textureSliceIndex; - @JsonKey(name: 'hdr10MetadataInfo') - final Hdr10MetadataInfo? hdr10MetadataInfo; - @JsonKey(name: 'colorSpace') + + @JsonKey(name: 'pixelBuffer', ignore: true) + final Uint8List? pixelBuffer; + + @VideoFrameMetaInfoConverter() + @JsonKey(name: 'metaInfo') + final VideoFrameMetaInfo? metaInfo; + + @JsonKey(name: 'colorSpace') final ColorSpace? colorSpace; - factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => - _$ExternalVideoFrameFromJson(json); - Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); + + factory VideoFrame.fromJson(Map<String, dynamic> json) => + _$VideoFrameFromJson(json); + + Map<String, dynamic> toJson() => _$VideoFrameToJson(this); }

        From 8c910b71cebbb577103f5006cd03666434c74431 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 10:48:15 +0800 Subject: [PATCH 08/37] Update class_externalvideoframe.dita --- dita/RTC-NG/API/class_externalvideoframe.dita | 80 ++++++++++++------- 1 file changed, 49 insertions(+), 31 deletions(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index f3933b64775..6ee8dc5ae4b 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -199,7 +199,7 @@ } @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExternalVideoFrame { - const ExternalVideoFrame( + const ExternalVideoFrame( {this.type, this.format, this.buffer, @@ -213,7 +213,6 @@ class ExternalVideoFrame { this.timestamp, this.eglType, this.textureId, - this.fenceObject, this.matrix, this.metadataBuffer, this.metadataSize, @@ -222,59 +221,78 @@ class ExternalVideoFrame { this.alphaStitchMode, this.d3d11Texture2d, this.textureSliceIndex, - this.hdr10MetadataInfo, this.colorSpace}); - @JsonKey(name: 'type') + + @JsonKey(name: 'type') final VideoBufferType? type; - @JsonKey(name: 'format') + + @JsonKey(name: 'format') final VideoPixelFormat? format; - @JsonKey(name: 'buffer', ignore: true) + + @JsonKey(name: 'buffer', ignore: true) final Uint8List? buffer; - @JsonKey(name: 'stride') + + @JsonKey(name: 'stride') final int? stride; - @JsonKey(name: 'height') + + @JsonKey(name: 'height') final int? height; - @JsonKey(name: 'cropLeft') + + @JsonKey(name: 'cropLeft') final int? cropLeft; - @JsonKey(name: 'cropTop') + + @JsonKey(name: 'cropTop') final int? cropTop; - @JsonKey(name: 'cropRight') + + @JsonKey(name: 'cropRight') final int? cropRight; - @JsonKey(name: 'cropBottom') + + @JsonKey(name: 'cropBottom') final int? cropBottom; - @JsonKey(name: 'rotation') + + @JsonKey(name: 'rotation') final int? rotation; - @JsonKey(name: 'timestamp') + + @JsonKey(name: 'timestamp') final int? timestamp; - @JsonKey(name: 'eglType') + + @JsonKey(name: 'eglType') final EglContextType? eglType; - @JsonKey(name: 'textureId') + + @JsonKey(name: 'textureId') final int? textureId; - @JsonKey(name: 'fenceObject') - final int? fenceObject; - @JsonKey(name: 'matrix') + + @JsonKey(name: 'matrix') final List<double>? matrix; - @JsonKey(name: 'metadataBuffer', ignore: true) + + @JsonKey(name: 'metadataBuffer', ignore: true) final Uint8List? metadataBuffer; - @JsonKey(name: 'metadataSize') + + @JsonKey(name: 'metadataSize') final int? metadataSize; - @JsonKey(name: 'alphaBuffer', ignore: true) + + @JsonKey(name: 'alphaBuffer', ignore: true) final Uint8List? alphaBuffer; - @JsonKey(name: 'fillAlphaBuffer') + + @JsonKey(name: 'fillAlphaBuffer') final bool? fillAlphaBuffer; - @JsonKey(name: 'alphaStitchMode') + + @JsonKey(name: 'alphaStitchMode') final AlphaStitchMode? alphaStitchMode; - @JsonKey(name: 'd3d11Texture2d', readValue: readIntPtr) + + @JsonKey(name: 'd3d11Texture2d', readValue: readIntPtr) final int? d3d11Texture2d; - @JsonKey(name: 'textureSliceIndex') + + @JsonKey(name: 'textureSliceIndex') final int? textureSliceIndex; - @JsonKey(name: 'hdr10MetadataInfo') - final Hdr10MetadataInfo? hdr10MetadataInfo; - @JsonKey(name: 'colorSpace') + + @JsonKey(name: 'colorSpace') final ColorSpace? colorSpace; - factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => + + factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => _$ExternalVideoFrameFromJson(json); - Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); + + Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); }

        From 10ccb04a34a74dde6f3a26231696b93806e4fe17 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 10:49:35 +0800 Subject: [PATCH 09/37] Update class_advanceoptions.dita --- dita/RTC-NG/API/class_advanceoptions.dita | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dita/RTC-NG/API/class_advanceoptions.dita b/dita/RTC-NG/API/class_advanceoptions.dita index ab8db32a525..b2694081f61 100644 --- a/dita/RTC-NG/API/class_advanceoptions.dita +++ b/dita/RTC-NG/API/class_advanceoptions.dita @@ -96,17 +96,22 @@ struct FAdvanceOptions { }         @JsonSerializable(explicitToJson: true, includeIfNull: false) class AdvanceOptions { - const AdvanceOptions( + const AdvanceOptions( {this.encodingPreference, this.compressionPreference, this.encodeAlpha}); - @JsonKey(name: 'encodingPreference') + + @JsonKey(name: 'encodingPreference') final EncodingPreference? encodingPreference; - @JsonKey(name: 'compressionPreference') + + @JsonKey(name: 'compressionPreference') final CompressionPreference? compressionPreference; - @JsonKey(name: 'encodeAlpha') + + @JsonKey(name: 'encodeAlpha') final bool? encodeAlpha; - factory AdvanceOptions.fromJson(Map<String, dynamic> json) => + + factory AdvanceOptions.fromJson(Map<String, dynamic> json) => _$AdvanceOptionsFromJson(json); - Map<String, dynamic> toJson() => _$AdvanceOptionsToJson(this); + + Map<String, dynamic> toJson() => _$AdvanceOptionsToJson(this); }

        From 2a793423a1806792da1e0da4cdd297afa9fa2a9d Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 10:58:02 +0800 Subject: [PATCH 10/37] 1 --- .../RTC-NG/API/class_channelmediaoptions.dita | 119 ++++++++++++------ dita/RTC-NG/API/class_extensioncontext.dita | 20 +-- dita/RTC-NG/API/rtc_api_data_type.dita | 2 + .../config/keys-rtc-ng-api-flutter.ditamap | 2 +- 4 files changed, 95 insertions(+), 48 deletions(-) diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 8b8f579a819..f2e82efb728 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -473,7 +473,7 @@ struct FChannelMediaOptions } @JsonSerializable(explicitToJson: true, includeIfNull: false) class ChannelMediaOptions { - const ChannelMediaOptions( + const ChannelMediaOptions( {this.publishCameraTrack, this.publishSecondaryCameraTrack, this.publishThirdCameraTrack, @@ -511,83 +511,122 @@ class ChannelMediaOptions { this.customVideoTrackId, this.isAudioFilterable, this.parameters}); - @JsonKey(name: 'publishCameraTrack') + + @JsonKey(name: 'publishCameraTrack') final bool? publishCameraTrack; - @JsonKey(name: 'publishSecondaryCameraTrack') + + @JsonKey(name: 'publishSecondaryCameraTrack') final bool? publishSecondaryCameraTrack; - @JsonKey(name: 'publishThirdCameraTrack') + + @JsonKey(name: 'publishThirdCameraTrack') final bool? publishThirdCameraTrack; - @JsonKey(name: 'publishFourthCameraTrack') + + @JsonKey(name: 'publishFourthCameraTrack') final bool? publishFourthCameraTrack; - @JsonKey(name: 'publishMicrophoneTrack') + + @JsonKey(name: 'publishMicrophoneTrack') final bool? publishMicrophoneTrack; - @JsonKey(name: 'publishScreenCaptureVideo') + + @JsonKey(name: 'publishScreenCaptureVideo') final bool? publishScreenCaptureVideo; - @JsonKey(name: 'publishScreenCaptureAudio') + + @JsonKey(name: 'publishScreenCaptureAudio') final bool? publishScreenCaptureAudio; - @JsonKey(name: 'publishScreenTrack') + + @JsonKey(name: 'publishScreenTrack') final bool? publishScreenTrack; - @JsonKey(name: 'publishSecondaryScreenTrack') + + @JsonKey(name: 'publishSecondaryScreenTrack') final bool? publishSecondaryScreenTrack; - @JsonKey(name: 'publishThirdScreenTrack') + + @JsonKey(name: 'publishThirdScreenTrack') final bool? publishThirdScreenTrack; - @JsonKey(name: 'publishFourthScreenTrack') + + @JsonKey(name: 'publishFourthScreenTrack') final bool? publishFourthScreenTrack; - @JsonKey(name: 'publishCustomAudioTrack') + + @JsonKey(name: 'publishCustomAudioTrack') final bool? publishCustomAudioTrack; - @JsonKey(name: 'publishCustomAudioTrackId') + + @JsonKey(name: 'publishCustomAudioTrackId') final int? publishCustomAudioTrackId; - @JsonKey(name: 'publishCustomVideoTrack') + + @JsonKey(name: 'publishCustomVideoTrack') final bool? publishCustomVideoTrack; - @JsonKey(name: 'publishEncodedVideoTrack') + + @JsonKey(name: 'publishEncodedVideoTrack') final bool? publishEncodedVideoTrack; - @JsonKey(name: 'publishMediaPlayerAudioTrack') + + @JsonKey(name: 'publishMediaPlayerAudioTrack') final bool? publishMediaPlayerAudioTrack; - @JsonKey(name: 'publishMediaPlayerVideoTrack') + + @JsonKey(name: 'publishMediaPlayerVideoTrack') final bool? publishMediaPlayerVideoTrack; - @JsonKey(name: 'publishTranscodedVideoTrack') + + @JsonKey(name: 'publishTranscodedVideoTrack') final bool? publishTranscodedVideoTrack; - @JsonKey(name: 'publishMixedAudioTrack') + + @JsonKey(name: 'publishMixedAudioTrack') final bool? publishMixedAudioTrack; - @JsonKey(name: 'publishLipSyncTrack') + + @JsonKey(name: 'publishLipSyncTrack') final bool? publishLipSyncTrack; - @JsonKey(name: 'autoSubscribeAudio') + + @JsonKey(name: 'autoSubscribeAudio') final bool? autoSubscribeAudio; - @JsonKey(name: 'autoSubscribeVideo') + + @JsonKey(name: 'autoSubscribeVideo') final bool? autoSubscribeVideo; - @JsonKey(name: 'enableAudioRecordingOrPlayout') + + @JsonKey(name: 'enableAudioRecordingOrPlayout') final bool? enableAudioRecordingOrPlayout; - @JsonKey(name: 'publishMediaPlayerId') + + @JsonKey(name: 'publishMediaPlayerId') final int? publishMediaPlayerId; - @JsonKey(name: 'clientRoleType') + + @JsonKey(name: 'clientRoleType') final ClientRoleType? clientRoleType; - @JsonKey(name: 'audienceLatencyLevel') + + @JsonKey(name: 'audienceLatencyLevel') final AudienceLatencyLevelType? audienceLatencyLevel; - @JsonKey(name: 'defaultVideoStreamType') + + @JsonKey(name: 'defaultVideoStreamType') final VideoStreamType? defaultVideoStreamType; - @JsonKey(name: 'channelProfile') + + @JsonKey(name: 'channelProfile') final ChannelProfileType? channelProfile; - @JsonKey(name: 'audioDelayMs') + + @JsonKey(name: 'audioDelayMs') final int? audioDelayMs; - @JsonKey(name: 'mediaPlayerAudioDelayMs') + + @JsonKey(name: 'mediaPlayerAudioDelayMs') final int? mediaPlayerAudioDelayMs; - @JsonKey(name: 'token') + + @JsonKey(name: 'token') final String? token; - @JsonKey(name: 'enableBuiltInMediaEncryption') + + @JsonKey(name: 'enableBuiltInMediaEncryption') final bool? enableBuiltInMediaEncryption; - @JsonKey(name: 'publishRhythmPlayerTrack') + + @JsonKey(name: 'publishRhythmPlayerTrack') final bool? publishRhythmPlayerTrack; - @JsonKey(name: 'isInteractiveAudience') + + @JsonKey(name: 'isInteractiveAudience') final bool? isInteractiveAudience; - @JsonKey(name: 'customVideoTrackId') + + @JsonKey(name: 'customVideoTrackId') final int? customVideoTrackId; - @JsonKey(name: 'isAudioFilterable') + + @JsonKey(name: 'isAudioFilterable') final bool? isAudioFilterable; - @JsonKey(name: 'parameters') + + @JsonKey(name: 'parameters') final String? parameters; - factory ChannelMediaOptions.fromJson(Map<String, dynamic> json) => + + factory ChannelMediaOptions.fromJson(Map<String, dynamic> json) => _$ChannelMediaOptionsFromJson(json); - Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); + + Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); }

        diff --git a/dita/RTC-NG/API/class_extensioncontext.dita b/dita/RTC-NG/API/class_extensioncontext.dita index 32963f50d33..cfa4f2934bd 100644 --- a/dita/RTC-NG/API/class_extensioncontext.dita +++ b/dita/RTC-NG/API/class_extensioncontext.dita @@ -69,19 +69,25 @@ @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExtensionContext { - const ExtensionContext( + const ExtensionContext( {this.isValid, this.uid, this.providerName, this.extensionName}); - @JsonKey(name: 'isValid') + + @JsonKey(name: 'isValid') final bool? isValid; - @JsonKey(name: 'uid') + + @JsonKey(name: 'uid') final int? uid; - @JsonKey(name: 'providerName') + + @JsonKey(name: 'providerName') final String? providerName; - @JsonKey(name: 'extensionName') + + @JsonKey(name: 'extensionName') final String? extensionName; - factory ExtensionContext.fromJson(Map<String, dynamic> json) => + + factory ExtensionContext.fromJson(Map<String, dynamic> json) => _$ExtensionContextFromJson(json); - Map<String, dynamic> toJson() => _$ExtensionContextToJson(this); + + Map<String, dynamic> toJson() => _$ExtensionContextToJson(this); }

        diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 53485585366..4941ee35364 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1039,6 +1039,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 d2c78941ce4..5e21af991a0 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -12083,7 +12083,7 @@ - voiceAiTunerGentleFemaleSinging + voiceAiTunerGentleFemaleSinging From a2f1cb3769315fb569e8dff06596d2152e71542b Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 11:05:04 +0800 Subject: [PATCH 11/37] - --- dita/RTC-NG/RTC_NG_API_Flutter.ditamap | 1 - dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap | 7 ------- 2 files changed, 8 deletions(-) diff --git a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap index f192bb50e5d..cf14882b045 100644 --- a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap @@ -733,7 +733,6 @@ - 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 5e21af991a0..03476fcb3a7 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -2779,13 +2779,6 @@ - - - - setEncryptionMode - - - From 2657603b2c678d2f3c15219762632ae7f7fd14b8 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 14 Aug 2024 11:14:43 +0800 Subject: [PATCH 12/37] hh batch 1 --- ...musiccontentcenter_destroymusicplayer.dita | 4 +- .../API/api_imusicplayer_setplaymode.dita | 4 +- dita/RTC-NG/API/class_advanceoptions.dita | 2 + dita/RTC-NG/API/class_externalvideoframe.dita | 4 ++ dita/RTC-NG/API/class_videoframe.dita | 8 +++ dita/RTC-NG/API/rtc_api_data_type.dita | 2 + 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 | 70 +++++++++++++++++++ dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 14 ++++ 10 files changed, 108 insertions(+), 4 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index 57873e91c54..0e432f4d9b9 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -17,9 +17,9 @@ - (NSInteger)destroyMusicPlayer:(id<AgoraMusicPlayerProtocol>)musicPlayer; virtual int destroyMusicPlayer(agora_refptr<IMusicPlayer> music_player) = 0; - + abstract destroyMusicPlayer(musicPlayer: IMusicPlayer): number; public abstract int DestroyMusicPlayer(IMusicPlayer music_player); - + abstract destroyMusicPlayer(musicPlayer: IMusicPlayer): number; Future<void> destroyMusicPlayer(MusicPlayer musicPlayer);

        diff --git a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita index 188db1e5760..06f628009fa 100644 --- a/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita +++ b/dita/RTC-NG/API/api_imusicplayer_setplaymode.dita @@ -17,9 +17,9 @@ - (NSInteger)setPlayMode:(AgoraMusicPlayMode)mode NS_SWIFT_NAME(setPlayMode(mode:)); virtual int setPlayMode(MusicPlayMode mode) = 0; - + abstract setPlayMode(mode: MusicPlayMode): number; public abstract int SetPlayMode(MusicPlayMode mode); - + abstract setPlayMode(mode: MusicPlayMode): number; Future<void> setPlayMode(MusicPlayMode mode);

        diff --git a/dita/RTC-NG/API/class_advanceoptions.dita b/dita/RTC-NG/API/class_advanceoptions.dita index b2694081f61..82aa0a26f7d 100644 --- a/dita/RTC-NG/API/class_advanceoptions.dita +++ b/dita/RTC-NG/API/class_advanceoptions.dita @@ -68,6 +68,7 @@ struct FAdvanceOptions { export class AdvanceOptions { encodingPreference?: EncodingPreference; compressionPreference?: CompressionPreference; + encodeAlpha?: boolean; } public class AdvanceOptions { @@ -93,6 +94,7 @@ struct FAdvanceOptions { export class AdvanceOptions { encodingPreference?: EncodingPreference; compressionPreference?: CompressionPreference; + encodeAlpha?: boolean; } @JsonSerializable(explicitToJson: true, includeIfNull: false) class AdvanceOptions { diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 6ee8dc5ae4b..440496fc821 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -155,6 +155,8 @@ matrix?: number[]; metadata_buffer?: Uint8Array; metadata_size?: number; + fillAlphaBuffer?: boolean; + alphaStitchMode?: AlphaStitchMode; } public class ExternalVideoFrame { @@ -196,6 +198,8 @@ matrix?: number[]; metadata_buffer?: Uint8Array; metadata_size?: number; + fillAlphaBuffer?: boolean; + alphaStitchMode?: AlphaStitchMode; } @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExternalVideoFrame { diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 24a7935739b..938035c8a47 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -421,6 +421,10 @@ struct FVideoFrame { matrix?: number[]; + alphaBuffer?: Uint8Array; + + alphaStitchMode?: AlphaStitchMode; + } public class VideoFrame { @@ -502,6 +506,10 @@ struct FVideoFrame { matrix?: number[]; + alphaBuffer?: Uint8Array; + + alphaStitchMode?: AlphaStitchMode; + } @JsonSerializable(explicitToJson: true, includeIfNull: false) class VideoFrame { diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 53485585366..f6257d93fa6 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1990,6 +1990,7 @@
        • +
        • @@ -2128,6 +2129,7 @@
        • +
        • diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 084c9588506..5e0692f29aa 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -518,6 +518,7 @@ + @@ -534,6 +535,7 @@ + diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index f53dc13cc86..1c02ba0509b 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -514,6 +514,7 @@ + @@ -530,6 +531,7 @@ + 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 179ba56dd04..d514ab9a1ff 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -3177,6 +3177,34 @@ kMusicContentCenterReasonHttpInternalError + + + + MusicPlayMode + + + + + + + kMusicPlayModeOriginal + + + + + + + kMusicPlayModeAccompany + + + + + + + kMusicPlayModeLeadSing + + + @@ -3213,6 +3241,13 @@ + + + + onSongSimpleInfoResult + + + @@ -3297,6 +3332,13 @@ + + + + setPlayMode + + + @@ -9442,6 +9484,34 @@ + + + + MusicPlayMode + + + + + + + kMusicPlayModeOriginal + + + + + + + kMusicPlayModeAccompany + + + + + + + kMusicPlayModeLeadSing + + + 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 2e159cba455..dd78670e798 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -3183,6 +3183,20 @@ + + + + setPlayMode + + + + + + + destroyMusicPlayer + + + From a79836a67dc0b775523fc5e875cf066401240e35 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 14 Aug 2024 11:55:30 +0800 Subject: [PATCH 13/37] hh 2/3 --- .../api_irtcengine_enablevoiceaituner.dita | 4 +- .../RTC-NG/API/class_channelmediaoptions.dita | 4 + dita/RTC-NG/API/class_extensioncontext.dita | 22 +++- dita/RTC-NG/API/rtc_api_data_type.dita | 4 + dita/RTC-NG/RTC_NG_API_Electron.ditamap | 9 +- dita/RTC-NG/RTC_NG_API_RN.ditamap | 9 +- .../config/keys-rtc-ng-api-electron.ditamap | 110 +++++++++++++++++- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 110 +++++++++++++++++- 8 files changed, 248 insertions(+), 24 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita index e27a97e074b..7f6fbda3484 100644 --- a/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita +++ b/dita/RTC-NG/API/api_irtcengine_enablevoiceaituner.dita @@ -17,9 +17,9 @@ - (int)enableVoiceAITuner:(bool)enabled type:(AgoraVoiceAITunerType)type NS_SWIFT_NAME(enableVoiceAITuner(_:type:)); virtual int enableVoiceAITuner(bool enabled, VOICE_AI_TUNER_TYPE type) = 0; - + abstract enableVoiceAITuner(enabled: boolean, type: VoiceAiTunerType): number; public abstract int EnableVoiceAITuner(bool enabled, VOICE_AI_TUNER_TYPE type); - + abstract enableVoiceAITuner(enabled: boolean, type: VoiceAiTunerType): number; Future<void> enableVoiceAITuner( {required bool enabled, required VoiceAiTunerType type});

        diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 8b8f579a819..d66cff37298 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -343,6 +343,8 @@ struct FChannelMediaOptions publishTranscodedVideoTrack?: boolean; + publishLipSyncTrack?: boolean; + autoSubscribeAudio?: boolean; autoSubscribeVideo?: boolean; @@ -443,6 +445,8 @@ struct FChannelMediaOptions publishTranscodedVideoTrack?: boolean; + publishLipSyncTrack?: boolean; + autoSubscribeAudio?: boolean; autoSubscribeVideo?: boolean; diff --git a/dita/RTC-NG/API/class_extensioncontext.dita b/dita/RTC-NG/API/class_extensioncontext.dita index 32963f50d33..afc4bd79b03 100644 --- a/dita/RTC-NG/API/class_extensioncontext.dita +++ b/dita/RTC-NG/API/class_extensioncontext.dita @@ -42,7 +42,16 @@ ExtensionContext():isValid(false), uid(0), providerName(NULL), extensionName(NULL) {} };         - + export class ExtensionContext { + + isValid?: boolean; + + uid?: number; + + providerName?: string; + + extensionName?: string; +} public class ExtensionContext { public bool isValid; @@ -66,7 +75,16 @@ this.extensionName = extensionName; } } - + export class ExtensionContext { + + isValid?: boolean; + + uid?: number; + + providerName?: string; + + extensionName?: string; +} @JsonSerializable(explicitToJson: true, includeIfNull: false) class ExtensionContext { const ExtensionContext( diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index f6257d93fa6..e9352da8e7d 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -801,6 +801,7 @@
        • +
        • @@ -919,6 +920,7 @@
        • +
        • @@ -2041,6 +2043,7 @@
        • +
        • @@ -2180,6 +2183,7 @@
        • +
        • diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 5e0692f29aa..984fb22943f 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -156,6 +156,7 @@ + @@ -676,10 +677,10 @@ - - - - + + + + diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index 1c02ba0509b..0d5391dd913 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -153,6 +153,7 @@ + @@ -664,10 +665,10 @@ - - - - + + + + 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 d514ab9a1ff..9dc5c5c40e6 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -1870,6 +1870,13 @@ + + + + enableVoiceAITuner + + + @@ -2589,24 +2596,31 @@ - + + + + onExtensionEventWithContext + + + + - onExtensionStarted + onExtensionStartedWithContext - + - onExtensionStopped + onExtensionStoppedWithContext - + - onExtensionError + onExtensionErrorWithContext @@ -4820,6 +4834,13 @@ + + + + ExtensionContext + + + @@ -12053,6 +12074,83 @@ + + + + VoiceAiTunerType + + + + + + + VoiceAiTunerMatureMale + + + + + + + VoiceAiTunerFreshMale + + + + + + + VoiceAiTunerElegantFemale + + + + + + + VoiceAiTunerSweetFemale + + + + + + + VoiceAiTunerWarmMaleSinging + + + + + + + VoiceAiTunerGentleFemaleSinging + + + + + + + VoiceAiTunerHuskyMaleSinging + + + + + + + VoiceAiTunerWarmElegantFemaleSinging + + + + + + + VoiceAiTunerPowerfulMaleSinging + + + + + + + VoiceAiTunerDreamyFemaleSinging + + + 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 dd78670e798..cc4139b825b 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -1882,6 +1882,13 @@ + + + + enableVoiceAITuner + + + @@ -2643,24 +2650,31 @@ - + + + + onExtensionEventWithContext + + + + - onExtensionStarted + onExtensionStartedWithContext - + - onExtensionStopped + onExtensionStoppedWithContext - + - onExtensionError + onExtensionErrorWithContext @@ -4751,6 +4765,13 @@ EncryptionConfig + + + + + ExtensionContext + + @@ -11929,6 +11950,83 @@ + + + + VoiceAiTunerType + + + + + + + VoiceAiTunerMatureMale + + + + + + + VoiceAiTunerFreshMale + + + + + + + VoiceAiTunerElegantFemale + + + + + + + VoiceAiTunerSweetFemale + + + + + + + VoiceAiTunerWarmMaleSinging + + + + + + + VoiceAiTunerGentleFemaleSinging + + + + + + + VoiceAiTunerHuskyMaleSinging + + + + + + + VoiceAiTunerWarmElegantFemaleSinging + + + + + + + VoiceAiTunerPowerfulMaleSinging + + + + + + + VoiceAiTunerDreamyFemaleSinging + + + From 59a44a8ac2ed0d8b872b4ff39bd8befe91156ca5 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 14:07:13 +0800 Subject: [PATCH 14/37] Update rtc_api_data_type.dita --- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + 1 file changed, 1 insertion(+) diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 4941ee35364..14d3abb6537 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -2268,6 +2268,7 @@
        • +
        • From a01560eb52823e33ec0624e36af22463b46094ca Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:57:19 +0800 Subject: [PATCH 15/37] add prototypes --- dita/RTC-NG/API/class_metadata.dita | 10 ++-------- .../config/keys-rtc-ng-api-electron.ditamap | 18 ++++++++++++++++-- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 7 +++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dita/RTC-NG/API/class_metadata.dita b/dita/RTC-NG/API/class_metadata.dita index a0484918ba1..00f81d9970c 100644 --- a/dita/RTC-NG/API/class_metadata.dita +++ b/dita/RTC-NG/API/class_metadata.dita @@ -82,23 +82,17 @@ struct FAgoraMetadata } }         export class Metadata { - + channelId?: string; uid?: number; - size?: number; - buffer?: Uint8Array; - timeStampMs?: number; } export class Metadata { - + channelId?: string; uid?: number; - size?: number; - buffer?: Uint8Array; - timeStampMs?: number; } @JsonSerializable(explicitToJson: true, includeIfNull: false) 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 9dc5c5c40e6..2ba40640e69 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -1871,7 +1871,7 @@ - + enableVoiceAITuner @@ -8763,7 +8763,14 @@ - + + + + LocalVideoStreamReasonScreenCaptureDisplayDisconnected + + + + LocalVideoStreamState @@ -10800,6 +10807,13 @@ + + + + ApplicationScenario1v1 + + + 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 cc4139b825b..ee9b8432397 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -10711,6 +10711,13 @@ + + + + ApplicationScenario1v1 + + + From 69a4c951d1c26be01f154131d63a571b5553dea8 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 15:48:55 +0800 Subject: [PATCH 16/37] 1 --- .../API/enum_localvideostreamreason.dita | 4 +- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + .../config/keys-rtc-ng-api-flutter.ditamap | 42 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/enum_localvideostreamreason.dita b/dita/RTC-NG/API/enum_localvideostreamreason.dita index 211c688d266..a01bf08037b 100644 --- a/dita/RTC-NG/API/enum_localvideostreamreason.dita +++ b/dita/RTC-NG/API/enum_localvideostreamreason.dita @@ -128,9 +128,9 @@ 29：（仅适用于 Windows）屏幕采集已从暂停状态中恢复。 - + - 30：（仅适用于 Windows 和 macOS）进行屏幕采集的显示器已断开连接。 + 30：（仅适用于 Windows 和 macOS）进行屏幕采集的显示器已断开连接。 diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 8e789064c01..dd9885ddf79 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -2190,6 +2190,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 03476fcb3a7..d5cbc4b5333 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -5409,6 +5409,48 @@ + + + + AlphaStitchMode + + + + + + + noAlphaStitch + + + + + + + alphaStitchUp + + + + + + + alphaStitchBelow + + + + + + + alphaStitchLeft + + + + + + + alphaStitchRight + + + From e33842ed6fffc517d56cd9d618aa6c68b76b9dc2 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 14 Aug 2024 15:53:06 +0800 Subject: [PATCH 17/37] - --- dita/RTC-NG/RTC_NG_API_Flutter.ditamap | 1 - dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap | 7 ------- 2 files changed, 8 deletions(-) diff --git a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap index cf14882b045..45aa0e30ca7 100644 --- a/dita/RTC-NG/RTC_NG_API_Flutter.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Flutter.ditamap @@ -733,7 +733,6 @@ - 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 d5cbc4b5333..4a45150071d 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -2779,13 +2779,6 @@ - - - - setEncryptionSecret - - - From 348c761d000643c09103d72941dfc2ab428a31fc Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 16:32:20 +0800 Subject: [PATCH 18/37] update --- ...musiccontentcenter_destroymusicplayer.dita | 6 +-- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + .../config/keys-rtc-ng-api-unity.ditamap | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index 0e432f4d9b9..0608350b194 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -44,9 +44,9 @@ player - musicPlayer - music_player - 对象。 + musicPlayer + music_player + 对象。 指向 对象的指针。 diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 8e789064c01..59543ab5c04 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1628,6 +1628,7 @@
        +
        • 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 9114762b7f2..46bb5900894 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -5566,6 +5566,48 @@ + + + + ALPHA_STITCH_MODE + + + + + + + NO_ALPHA_STITCH + + + + + + + ALPHA_STITCH_UP + + + + + + + ALPHA_STITCH_BELOW + + + + + + + ALPHA_STITCH_LEFT + + + + + + + ALPHA_STITCH_RIGHT + + + From 6199ecf6137f37854d67b0fb7f709392c667a9a4 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 16:35:10 +0800 Subject: [PATCH 19/37] Update class_videoframe.dita --- dita/RTC-NG/API/class_videoframe.dita | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 938035c8a47..ff4aac33713 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -747,17 +747,17 @@ class VideoFrame { 单个像素的宽高比，即每个像素宽度与高度的比值。 - alphaBuffer + alphaBuffer alphaBuf

        采用人像分割算法输出的 Alpha 通道数据。该数据跟视频帧的尺寸一致，每个像素点的取值范围为 [0,255]，其中 0 代表背景；255 代表前景（人像）。

        你可以通过设置该参数，实现将视频背景自渲染为各种效果，例如：透明、纯色、图片、视频等。

        - 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。 + 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。//TODO         alphaStitchMode - 当视频帧中包含 Alpha 通道数据时，设置 alphaBuffer 和视频帧的相对位置。详见 。 + 当视频帧中包含 Alpha 通道数据时，设置 alphaBuffer 和视频帧的相对位置。详见 。
        • (0)：（默认）仅视频帧，即 alphaBuffer 不和视频帧拼接。
        • (1)：alphaBuffer 位于视频帧的上方。
          • From 53368aa2bfc7bdb42802296678b7ed7e7eb67048 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 16:32:20 +0800 Subject: [PATCH 20/37] update --- ...musiccontentcenter_destroymusicplayer.dita | 6 +-- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + .../config/keys-rtc-ng-api-unity.ditamap | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index 0e432f4d9b9..0608350b194 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -44,9 +44,9 @@ player - musicPlayer - music_player - 对象。 + musicPlayer + music_player + 对象。 指向 对象的指针。 diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 8e789064c01..59543ab5c04 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1628,6 +1628,7 @@
          +
          • 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 9114762b7f2..46bb5900894 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -5566,6 +5566,48 @@ + + + + ALPHA_STITCH_MODE + + + + + + + NO_ALPHA_STITCH + + + + + + + ALPHA_STITCH_UP + + + + + + + ALPHA_STITCH_BELOW + + + + + + + ALPHA_STITCH_LEFT + + + + + + + ALPHA_STITCH_RIGHT + + + From d00b6829016c4add7ced1791909bbea318c77730 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 16:36:02 +0800 Subject: [PATCH 21/37] Revert "update" This reverts commit 348c761d000643c09103d72941dfc2ab428a31fc. --- ...musiccontentcenter_destroymusicplayer.dita | 6 +-- dita/RTC-NG/API/rtc_api_data_type.dita | 1 - .../config/keys-rtc-ng-api-unity.ditamap | 42 ------------------- 3 files changed, 3 insertions(+), 46 deletions(-) diff --git a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita index 0608350b194..0e432f4d9b9 100644 --- a/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita +++ b/dita/RTC-NG/API/api_imusiccontentcenter_destroymusicplayer.dita @@ -44,9 +44,9 @@ player - musicPlayer - music_player - 对象。 + musicPlayer + music_player + 对象。 指向 对象的指针。 diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 59543ab5c04..8e789064c01 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1628,7 +1628,6 @@
          -
          • 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 46bb5900894..9114762b7f2 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -5566,48 +5566,6 @@ - - - - ALPHA_STITCH_MODE - - - - - - - NO_ALPHA_STITCH - - - - - - - ALPHA_STITCH_UP - - - - - - - ALPHA_STITCH_BELOW - - - - - - - ALPHA_STITCH_LEFT - - - - - - - ALPHA_STITCH_RIGHT - - - From a4727e6087ae45cfc91e3b865dfb9ba3d4b23111 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 17:07:13 +0800 Subject: [PATCH 22/37] delete deprecated methods --- dita/RTC-NG/RTC_NG_API_Unity.ditamap | 5 --- .../config/keys-rtc-ng-api-unity.ditamap | 38 +------------------ 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/dita/RTC-NG/RTC_NG_API_Unity.ditamap b/dita/RTC-NG/RTC_NG_API_Unity.ditamap index 72df50ef684..d49f50f0632 100644 --- a/dita/RTC-NG/RTC_NG_API_Unity.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Unity.ditamap @@ -449,7 +449,6 @@ - @@ -745,8 +744,6 @@ - - @@ -755,8 +752,6 @@ - - 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 46bb5900894..7ed9f6817e9 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -797,13 +797,7 @@ - - - - OpenWithCustomSource - - - + @@ -2464,24 +2458,10 @@ - - - - StartEchoTest [1/3] - - - - - - - StartEchoTest [2/3] - - - - StartEchoTest [3/3] + StartEchoTest @@ -2889,20 +2869,6 @@ - - - - SetEncryptionMode - - - - - - - SetEncryptionSecret - - - From 0fb944547d62359d0ab6295f6f594c5f4c867b5e Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:16:29 +0800 Subject: [PATCH 23/37] temp --- ...nthandler_onextensionerrorwithcontext.dita | 20 +- ...nthandler_onextensioneventwithcontext.dita | 19 +- ...handler_onextensionstartedwithcontext.dita | 13 +- ...handler_onextensionstoppedwithcontext.dita | 12 +- .../RTC-NG/API/class_channelmediaoptions.dita | 638 +++++++++++++++++- dita/RTC-NG/API/rtc_api_data_type.dita | 521 +++++++------- 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 | 56 +- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 56 +- 10 files changed, 994 insertions(+), 345 deletions(-) diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita index 34162981eca..4b6e6980536 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita @@ -24,16 +24,14 @@ (void)message; } DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FOnExtensionError, FString, provider, FString, extension, int, error, FString, message); - onExtensionError?( - provider: string, - extension: string, + onExtensionErrorWithContext?( + context: ExtensionContext, error: number, message: string ): void; public virtual void OnExtensionErrorWithContext(ExtensionContext context, int error, string message){} - onExtensionError?( - provider: string, - extension: string, + onExtensionErrorWithContext?( + context: ExtensionContext, error: number, message: string ): void; @@ -48,18 +46,10 @@ 参数 - context + context extContext 插件上下文信息，详见 。 - - - - - - extension - 插件的名称。 - error 错误码。详见插件服务商提供的插件文档。 diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita index 92f48f83993..e087c9404bb 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita @@ -24,16 +24,14 @@ (void)value; } DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FOnExtensionEvent, FString, provider, FString, extension, FString, key, FString, value); - onExtensionEvent?( - provider: string, - extension: string, + onExtensionEventWithContext?( + context: ExtensionContext, key: string, value: string ): void; public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){} - onExtensionEvent?( - provider: string, - extension: string, + onExtensionEventWithContext?( + context: ExtensionContext, key: string, value: string ): void; @@ -51,15 +49,6 @@ - - - - - - extension - extName - 插件名称。 - diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita index 469db444f3b..98fc6795d03 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita @@ -20,9 +20,11 @@ (void)context; } DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStarted, FString, provider, FString, extension); - onExtensionStarted?(provider: string, extension: string): void; public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } onExtensionStarted?(provider: string, extension: string): void; + onExtensionStartedWithContext?(context: ExtensionContext): void; + public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } + onExtensionStartedWithContext?(context: ExtensionContext): void; final void Function(ExtensionContext context)? onExtensionStartedWithContext;

          @@ -36,15 +38,6 @@ - - - - - - extension - extName - 插件名称。 - diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita index 02bb189565a..5010f96ece0 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita @@ -20,9 +20,9 @@ (void)context; }           DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStopped, FString, provider, FString, extension); - onExtensionStopped?(provider: string, extension: string): void; + onExtensionStoppedWithContext?(context: ExtensionContext): void; public virtual void OnExtensionStoppedWithContext(ExtensionContext context){ } - onExtensionStopped?(provider: string, extension: string): void; + onExtensionStoppedWithContext?(context: ExtensionContext): void; final void Function(ExtensionContext context)? onExtensionStoppedWithContext;

          @@ -36,14 +36,6 @@ - - - - - - - - \ No newline at end of file diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 7d44be1ee7d..4660733227d 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -5,7 +5,7 @@ 频道媒体设置选项。
          -

          +

          public class ChannelMediaOptions { public Boolean publishCameraTrack; public Boolean publishSecondaryCameraTrack; @@ -573,9 +573,6 @@ class ChannelMediaOptions { @JsonKey(name: 'publishMixedAudioTrack') final bool? publishMixedAudioTrack; - @JsonKey(name: 'publishLipSyncTrack') - final bool? publishLipSyncTrack; - @JsonKey(name: 'autoSubscribeAudio') final bool? autoSubscribeAudio; @@ -633,7 +630,638 @@ class ChannelMediaOptions { Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); }

          -
          +

          + public class ChannelMediaOptions { + public Boolean publishCameraTrack; + public Boolean publishSecondaryCameraTrack; + public Boolean publishThirdCameraTrack; + public Boolean publishFourthCameraTrack; + public Boolean publishMicrophoneTrack; + public Boolean publishScreenCaptureVideo; + public Boolean publishScreenCaptureAudio; + public Boolean publishCustomAudioTrack; + public Integer publishCustomAudioTrackId; + public Boolean publishCustomVideoTrack; + public Boolean publishEncodedVideoTrack; + public Boolean publishMediaPlayerAudioTrack; + public Boolean publishMediaPlayerVideoTrack; + public Boolean publishTranscodedVideoTrack; + public Boolean publishLipSyncTrack; + public Boolean autoSubscribeAudio; + public Boolean autoSubscribeVideo; + public Boolean enableAudioRecordingOrPlayout; + public Integer publishMediaPlayerId; + public Integer clientRoleType; + public Integer audienceLatencyLevel; + public Integer defaultVideoStreamType; + public Integer channelProfile; + public Integer mediaPlayerAudioDelayMs; + public String token; + public Boolean enableBuiltInMediaEncryption; + public Boolean publishRhythmPlayerTrack; + public Boolean isInteractiveAudience; + public Integer customVideoTrackId; + public Boolean isAudioFilterable; + } + export class ChannelMediaOptions { + + public publishCameraTrack?:boolean; + + public publishSecondaryCameraTrack?:boolean; + + public publishMicrophoneTrack?:boolean; + + public publishScreenCaptureVideo?:boolean; + + public publishScreenCaptureAudio?:boolean; + + public publishCustomAudioTrack?:boolean; + + public publishCustomAudioTrackId?:number; + + public publishCustomVideoTrack?:boolean; + + public publishEncodedVideoTrack?:boolean; + + public publishMediaPlayerAudioTrack?:boolean; + + public publishMediaPlayerVideoTrack?:boolean; + + public publishTranscodedVideoTrack?:boolean; + + public publishMixedAudioTrack?:boolean; + + public autoSubscribeAudio?:boolean; + + public autoSubscribeVideo?:boolean; + + public enableAudioRecordingOrPlayout?:boolean; + + public publishMediaPlayerId?:number; + + public clientRoleType?:number; + + public audienceLatencyLevel?:number; + + public defaultVideoStreamType?:number; + + public channelProfile?:number; + + public audioDelayMs?:number; + + public mediaPlayerAudioDelayMs?:number; + + public enableBuiltInMediaEncryption?:boolean; + + public publishRhythmPlayerTrack?:boolean; + + public isInteractiveAudience?:boolean; + + public customVideoTrackId?:number; + + public isAudioFilterable?:boolean; + + public startPreview?:boolean; + public constructor() { + } + } + __attribute__((visibility("default"))) @interface AgoraRtcChannelMediaOptions : NSObject + @property(assign, nonatomic) BOOL publishCameraTrack; + @property(assign, nonatomic) BOOL publishSecondaryCameraTrack; + @property(assign, nonatomic) BOOL publishMicrophoneTrack; + #if TARGET_OS_IPHONE + @property(assign, nonatomic) BOOL publishScreenCaptureVideo; + @property(assign, nonatomic) BOOL publishScreenCaptureAudio; + #elif TARGET_OS_MAC + @property(assign, nonatomic) BOOL publishThirdCameraTrack; + @property(assign, nonatomic) BOOL publishFourthCameraTrack; + @property(assign, nonatomic) BOOL publishScreenTrack; + @property(assign, nonatomic) BOOL publishSecondaryScreenTrack; + @property(assign, nonatomic) BOOL publishThirdScreenTrack; + @property(assign, nonatomic) BOOL publishFourthScreenTrack; + #endif + @property(assign, nonatomic) BOOL publishCustomAudioTrack; + @property(assign, nonatomic) NSInteger publishCustomAudioTrackId; + + @property(assign, nonatomic) BOOL publishCustomVideoTrack; + @property(assign, nonatomic) BOOL publishEncodedVideoTrack; + @property(assign, nonatomic) BOOL publishMediaPlayerAudioTrack; + @property(assign, nonatomic) BOOL publishMediaPlayerVideoTrack; + @property(assign, nonatomic) BOOL publishTranscodedVideoTrack; + @property(assign, nonatomic) BOOL publishLipSyncTrack; + @property(assign, nonatomic) BOOL autoSubscribeAudio; + @property(assign, nonatomic) BOOL autoSubscribeVideo; + @property(assign, nonatomic) BOOL enableAudioRecordingOrPlayout; + @property(assign, nonatomic) NSInteger publishMediaPlayerId; + @property(assign, nonatomic) AgoraClientRole clientRoleType; + @property(assign, nonatomic) AgoraAudienceLatencyLevelType audienceLatencyLevel; + @property(assign, nonatomic) AgoraVideoStreamType defaultVideoStreamType; + @property(assign, nonatomic) AgoraChannelProfile channelProfile; + @property(copy, nonatomic) NSString * _Nullable token; + @property(assign, nonatomic) BOOL enableBuiltInMediaEncryption; + + @property(assign, nonatomic) BOOL publishRhythmPlayerTrack; + @property(assign, nonatomic) BOOL isInteractiveAudience; + + @property(assign, nonatomic) NSInteger customVideoTrackId; + + @property(assign, nonatomic) BOOL isAudioFilterable; + + @end + struct ChannelMediaOptions { + Optional<bool> publishCameraTrack; + Optional<bool> publishSecondaryCameraTrack; + Optional<bool> publishThirdCameraTrack; + Optional<bool> publishFourthCameraTrack; + Optional<bool> publishMicrophoneTrack; + + #if defined(__ANDROID__) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) + Optional<bool> publishScreenCaptureVideo; + Optional<bool> publishScreenCaptureAudio; + #else + Optional<bool> publishScreenTrack; + Optional<bool> publishSecondaryScreenTrack; + Optional<bool> publishThirdScreenTrack; + Optional<bool> publishFourthScreenTrack; + #endif + + Optional<bool> publishCustomAudioTrack; + Optional<int> publishCustomAudioTrackId; + Optional<bool> publishCustomVideoTrack; + Optional<bool> publishEncodedVideoTrack; + Optional<bool> publishMediaPlayerAudioTrack; + Optional<bool> publishMediaPlayerVideoTrack; + Optional<bool> publishTranscodedVideoTrack; + Optional<bool> publishLipSyncTrack; + Optional<bool> autoSubscribeAudio; + Optional<bool> autoSubscribeVideo; + Optional<bool> enableAudioRecordingOrPlayout; + Optional<int> publishMediaPlayerId; + Optional<CLIENT_ROLE_TYPE> clientRoleType; + Optional<AUDIENCE_LATENCY_LEVEL_TYPE> audienceLatencyLevel; + Optional<VIDEO_STREAM_TYPE> defaultVideoStreamType; + Optional<CHANNEL_PROFILE_TYPE> channelProfile; + Optional<const char*> token; + Optional<bool> enableBuiltInMediaEncryption; + Optional<bool> publishRhythmPlayerTrack; + Optional<bool> isInteractiveAudience; + + Optional<video_track_id_t> customVideoTrackId; + + Optional<bool> isAudioFilterable; + + ChannelMediaOptions() {} + ~ChannelMediaOptions() {} + USTRUCT(BlueprintType) + struct FChannelMediaOptions + { + GENERATED_BODY() + + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishCameraTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishSecondaryCameraTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishMicrophoneTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishScreenCaptureVideo; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishScreenCaptureAudio; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishScreenTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishSecondaryScreenTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishCustomAudioTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool publishCustomAudioTrackId_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + int publishCustomAudioTrackId; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishCustomVideoTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishEncodedVideoTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishMediaPlayerAudioTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishMediaPlayerVideoTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishTranscodedVideoTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL autoSubscribeAudio; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL autoSubscribeVideo; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL enableAudioRecordingOrPlayout; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool publishMediaPlayerId_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + int publishMediaPlayerId; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool clientRoleType_SetValue = true; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + ECLIENT_ROLE_TYPE clientRoleType = ECLIENT_ROLE_TYPE::CLIENT_ROLE_BROADCASTER; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool audienceLatencyLevel_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + EAUDIENCE_LATENCY_LEVEL_TYPE audienceLatencyLevel; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool defaultVideoStreamType_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + EVIDEO_STREAM_TYPE defaultVideoStreamType; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool channelProfile_SetValue = true; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + ECHANNEL_PROFILE_TYPE channelProfile = ECHANNEL_PROFILE_TYPE::CHANNEL_PROFILE_LIVE_BROADCASTING; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool audioDelayMs_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + int audioDelayMs; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool mediaPlayerAudioDelayMs_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + int mediaPlayerAudioDelayMs; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool token_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + FString token; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL enableBuiltInMediaEncryption; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL publishRhythmPlayerTrack; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL isInteractiveAudience; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + bool customVideoTrackId_SetValue; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + int64 customVideoTrackId; + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Agora|ChannelMediaOptions") + AGORAOPTIONAL isAudioFilterable; + }; + struct ChannelMediaOptions { + Optional<bool> publishCameraTrack; + Optional<bool> publishSecondaryCameraTrack; + Optional<bool> publishMicrophoneTrack; + + #if defined(__ANDROID__) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) + Optional<bool> publishScreenCaptureVideo; + Optional<bool> publishScreenCaptureAudio; + #else + Optional<bool> publishScreenTrack; + Optional<bool> publishSecondaryScreenTrack; + #endif + + Optional<bool> publishCustomAudioTrack; + Optional<int> publishCustomAudioTrackId; + Optional<bool> publishCustomVideoTrack; + Optional<bool> publishEncodedVideoTrack; + Optional<bool> publishMediaPlayerAudioTrack; + Optional<bool> publishMediaPlayerVideoTrack; + Optional<bool> publishTranscodedVideoTrack; + Optional<bool> autoSubscribeAudio; + Optional<bool> autoSubscribeVideo; + Optional<bool> enableAudioRecordingOrPlayout; + Optional<int> publishMediaPlayerId; + Optional<CLIENT_ROLE_TYPE> clientRoleType; + Optional<AUDIENCE_LATENCY_LEVEL_TYPE> audienceLatencyLevel; + Optional<VIDEO_STREAM_TYPE> defaultVideoStreamType; + Optional<CHANNEL_PROFILE_TYPE> channelProfile; + Optional<const char*> token; + Optional<bool> enableBuiltInMediaEncryption; + Optional<bool> publishRhythmPlayerTrack; + Optional<bool> isInteractiveAudience; + + Optional<video_track_id_t> customVideoTrackId; + + Optional<bool> isAudioFilterable; + + ChannelMediaOptions() {} + ~ChannelMediaOptions() {} + export class ChannelMediaOptions { + + publishCameraTrack?: boolean; + + publishSecondaryCameraTrack?: boolean; + + publishThirdCameraTrack?: boolean; + + publishFourthCameraTrack?: boolean; + + publishMicrophoneTrack?: boolean; + + publishScreenTrack?: boolean; + + publishSecondaryScreenTrack?: boolean; + + publishThirdScreenTrack?: boolean; + + publishFourthScreenTrack?: boolean; + + publishCustomAudioTrack?: boolean; + + publishCustomAudioTrackId?: number; + + publishCustomVideoTrack?: boolean; + + publishEncodedVideoTrack?: boolean; + + publishMediaPlayerAudioTrack?: boolean; + + publishMediaPlayerVideoTrack?: boolean; + + publishTranscodedVideoTrack?: boolean; + + publishLipSyncTrack?: boolean; + + autoSubscribeAudio?: boolean; + + autoSubscribeVideo?: boolean; + + enableAudioRecordingOrPlayout?: boolean; + + publishMediaPlayerId?: number; + + clientRoleType?: ClientRoleType; + + audienceLatencyLevel?: AudienceLatencyLevelType; + + defaultVideoStreamType?: VideoStreamType; + + channelProfile?: ChannelProfileType; + + token?: string; + + enableBuiltInMediaEncryption?: boolean; + + publishRhythmPlayerTrack?: boolean; + + isInteractiveAudience?: boolean; + + customVideoTrackId?: number; + + isAudioFilterable?: boolean; + } + public class ChannelMediaOptions : OptionalJsonParse + { + public Optional<bool> publishCameraTrack = new Optional<bool>(); + public Optional<bool> publishSecondaryCameraTrack = new Optional<bool>(); + public Optional<bool> publishThirdCameraTrack = new Optional<bool>(); + public Optional<bool> publishFourthCameraTrack = new Optional<bool>(); + public Optional<bool> publishMicrophoneTrack = new Optional<bool>(); + public Optional<bool> publishScreenCaptureVideo = new Optional<bool>(); + public Optional<bool> publishScreenCaptureAudio = new Optional<bool>(); + public Optional<bool> publishScreenTrack = new Optional<bool>(); + public Optional<bool> publishSecondaryScreenTrack = new Optional<bool>(); + public Optional<bool> publishThirdScreenTrack = new Optional<bool>(); + public Optional<bool> publishFourthScreenTrack = new Optional<bool>(); + public Optional<bool> publishCustomAudioTrack = new Optional<bool>(); + public Optional<int> publishCustomAudioTrackId = new Optional<int>(); + public Optional<bool> publishCustomVideoTrack = new Optional<bool>(); + public Optional<bool> publishEncodedVideoTrack = new Optional<bool>(); + public Optional<bool> publishMediaPlayerAudioTrack = new Optional<bool>(); + public Optional<bool> publishMediaPlayerVideoTrack = new Optional<bool>(); + public Optional<bool> publishTranscodedVideoTrack = new Optional<bool>(); + public Optional<bool> publishLipSyncTrack = new Optional<bool>(); + public Optional<bool> autoSubscribeAudio = new Optional<bool>(); + public Optional<bool> autoSubscribeVideo = new Optional<bool>(); + public Optional<bool> enableAudioRecordingOrPlayout = new Optional<bool>(); + public Optional<int> publishMediaPlayerId = new Optional<int>(); + public Optional<CLIENT_ROLE_TYPE> clientRoleType = new Optional<CLIENT_ROLE_TYPE>(); + public Optional<AUDIENCE_LATENCY_LEVEL_TYPE> audienceLatencyLevel = new Optional<AUDIENCE_LATENCY_LEVEL_TYPE>(); + public Optional<VIDEO_STREAM_TYPE> defaultVideoStreamType = new Optional<VIDEO_STREAM_TYPE>(); + public Optional<CHANNEL_PROFILE_TYPE> channelProfile = new Optional<CHANNEL_PROFILE_TYPE>(); + public Optional<string> token = new Optional<string>(); + public Optional<bool> publishRhythmPlayerTrack = new Optional<bool>(); + public Optional<bool> isInteractiveAudience = new Optional<bool>(); + public Optional<video_track_id_t> customVideoTrackId = new Optional<video_track_id_t>(); + public Optional<bool> isAudioFilterable = new Optional<bool>(); + + } + export class ChannelMediaOptions { + + publishCameraTrack?: boolean; + + publishSecondaryCameraTrack?: boolean; + + publishThirdCameraTrack?: boolean; + + publishFourthCameraTrack?: boolean; + + publishMicrophoneTrack?: boolean; + + publishScreenCaptureVideo?: boolean; + + publishScreenCaptureAudio?: boolean; + + publishSecondaryScreenTrack?: boolean; + + publishThirdScreenTrack?: boolean; + + publishFourthScreenTrack?: boolean; + + publishCustomAudioTrack?: boolean; + + publishCustomAudioTrackId?: number; + + publishCustomVideoTrack?: boolean; + + publishEncodedVideoTrack?: boolean; + + publishMediaPlayerAudioTrack?: boolean; + + publishMediaPlayerVideoTrack?: boolean; + + publishTranscodedVideoTrack?: boolean; + + publishLipSyncTrack?: boolean; + + autoSubscribeAudio?: boolean; + + autoSubscribeVideo?: boolean; + + enableAudioRecordingOrPlayout?: boolean; + + publishMediaPlayerId?: number; + + clientRoleType?: ClientRoleType; + + audienceLatencyLevel?: AudienceLatencyLevelType; + + defaultVideoStreamType?: VideoStreamType; + + channelProfile?: ChannelProfileType; + + token?: string; + + enableBuiltInMediaEncryption?: boolean; + + publishRhythmPlayerTrack?: boolean; + + isInteractiveAudience?: boolean; + + customVideoTrackId?: number; + + isAudioFilterable?: boolean; + } + @JsonSerializable(explicitToJson: true, includeIfNull: false) + class ChannelMediaOptions { + const ChannelMediaOptions( + {this.publishCameraTrack, + this.publishSecondaryCameraTrack, + this.publishThirdCameraTrack, + this.publishFourthCameraTrack, + this.publishMicrophoneTrack, + this.publishScreenCaptureVideo, + this.publishScreenCaptureAudio, + this.publishScreenTrack, + this.publishSecondaryScreenTrack, + this.publishThirdScreenTrack, + this.publishFourthScreenTrack, + this.publishCustomAudioTrack, + this.publishCustomAudioTrackId, + this.publishCustomVideoTrack, + this.publishEncodedVideoTrack, + this.publishMediaPlayerAudioTrack, + this.publishMediaPlayerVideoTrack, + this.publishTranscodedVideoTrack, + this.publishMixedAudioTrack, + this.publishLipSyncTrack, + this.autoSubscribeAudio, + this.autoSubscribeVideo, + this.enableAudioRecordingOrPlayout, + this.publishMediaPlayerId, + this.clientRoleType, + this.audienceLatencyLevel, + this.defaultVideoStreamType, + this.channelProfile, + this.audioDelayMs, + this.mediaPlayerAudioDelayMs, + this.token, + this.enableBuiltInMediaEncryption, + this.publishRhythmPlayerTrack, + this.isInteractiveAudience, + this.customVideoTrackId, + this.isAudioFilterable, + this.parameters}); + + @JsonKey(name: 'publishCameraTrack') + final bool? publishCameraTrack; + + @JsonKey(name: 'publishSecondaryCameraTrack') + final bool? publishSecondaryCameraTrack; + + @JsonKey(name: 'publishThirdCameraTrack') + final bool? publishThirdCameraTrack; + + @JsonKey(name: 'publishFourthCameraTrack') + final bool? publishFourthCameraTrack; + + @JsonKey(name: 'publishMicrophoneTrack') + final bool? publishMicrophoneTrack; + + @JsonKey(name: 'publishScreenCaptureVideo') + final bool? publishScreenCaptureVideo; + + @JsonKey(name: 'publishScreenCaptureAudio') + final bool? publishScreenCaptureAudio; + + @JsonKey(name: 'publishScreenTrack') + final bool? publishScreenTrack; + + @JsonKey(name: 'publishSecondaryScreenTrack') + final bool? publishSecondaryScreenTrack; + + @JsonKey(name: 'publishThirdScreenTrack') + final bool? publishThirdScreenTrack; + + @JsonKey(name: 'publishFourthScreenTrack') + final bool? publishFourthScreenTrack; + + @JsonKey(name: 'publishCustomAudioTrack') + final bool? publishCustomAudioTrack; + + @JsonKey(name: 'publishCustomAudioTrackId') + final int? publishCustomAudioTrackId; + + @JsonKey(name: 'publishCustomVideoTrack') + final bool? publishCustomVideoTrack; + + @JsonKey(name: 'publishEncodedVideoTrack') + final bool? publishEncodedVideoTrack; + + @JsonKey(name: 'publishMediaPlayerAudioTrack') + final bool? publishMediaPlayerAudioTrack; + + @JsonKey(name: 'publishMediaPlayerVideoTrack') + final bool? publishMediaPlayerVideoTrack; + + @JsonKey(name: 'publishTranscodedVideoTrack') + final bool? publishTranscodedVideoTrack; + + @JsonKey(name: 'publishMixedAudioTrack') + final bool? publishMixedAudioTrack; + + @JsonKey(name: 'publishLipSyncTrack') + final bool? publishLipSyncTrack; + + @JsonKey(name: 'autoSubscribeAudio') + final bool? autoSubscribeAudio; + + @JsonKey(name: 'autoSubscribeVideo') + final bool? autoSubscribeVideo; + + @JsonKey(name: 'enableAudioRecordingOrPlayout') + final bool? enableAudioRecordingOrPlayout; + + @JsonKey(name: 'publishMediaPlayerId') + final int? publishMediaPlayerId; + + @JsonKey(name: 'clientRoleType') + final ClientRoleType? clientRoleType; + + @JsonKey(name: 'audienceLatencyLevel') + final AudienceLatencyLevelType? audienceLatencyLevel; + + @JsonKey(name: 'defaultVideoStreamType') + final VideoStreamType? defaultVideoStreamType; + + @JsonKey(name: 'channelProfile') + final ChannelProfileType? channelProfile; + + @JsonKey(name: 'audioDelayMs') + final int? audioDelayMs; + + @JsonKey(name: 'mediaPlayerAudioDelayMs') + final int? mediaPlayerAudioDelayMs; + + @JsonKey(name: 'token') + final String? token; + + @JsonKey(name: 'enableBuiltInMediaEncryption') + final bool? enableBuiltInMediaEncryption; + + @JsonKey(name: 'publishRhythmPlayerTrack') + final bool? publishRhythmPlayerTrack; + + @JsonKey(name: 'isInteractiveAudience') + final bool? isInteractiveAudience; + + @JsonKey(name: 'customVideoTrackId') + final int? customVideoTrackId; + + @JsonKey(name: 'isAudioFilterable') + final bool? isAudioFilterable; + + @JsonKey(name: 'parameters') + final String? parameters; + + factory ChannelMediaOptions.fromJson(Map<String, dynamic> json) => + _$ChannelMediaOptionsFromJson(json); + + Map<String, dynamic> toJson() => _$ChannelMediaOptionsToJson(this); + } +

          +
          SDK 支持在同一时间、同一 中发布多路音频流、一路视频流。例如，publishMicrophoneTrack、publishCustomAudioTrack 和 publishMediaPlayerAudioTrack 可以同时为 ； publishCameraTrack、publishScreenCaptureVideo、publishScreenTrack、publishCustomVideoTrack 或 publishEncodedVideoTrack 之中同一时间只能有一个为 。 建议你根据业务场景自行设置成员参数值，否则 SDK 会自动对成员参数进行赋值。
          diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 8e789064c01..7eda617c34b 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1129,6 +1129,7 @@
          Enum
            +
            • @@ -1366,266 +1367,268 @@
            • -
          -
            -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • +
          +
            +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • -
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • +
            • @@ -1911,6 +1914,7 @@
            +
            • @@ -2050,6 +2054,7 @@
            +
            • diff --git a/dita/RTC-NG/RTC_NG_API_Electron.ditamap b/dita/RTC-NG/RTC_NG_API_Electron.ditamap index 984fb22943f..715d31e56c6 100644 --- a/dita/RTC-NG/RTC_NG_API_Electron.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Electron.ditamap @@ -704,8 +704,6 @@ - - diff --git a/dita/RTC-NG/RTC_NG_API_RN.ditamap b/dita/RTC-NG/RTC_NG_API_RN.ditamap index 0d5391dd913..43b7a0febd2 100644 --- a/dita/RTC-NG/RTC_NG_API_RN.ditamap +++ b/dita/RTC-NG/RTC_NG_API_RN.ditamap @@ -692,8 +692,6 @@ - - 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 2ba40640e69..ce2caad5acc 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -2709,20 +2709,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - @@ -5347,6 +5333,48 @@ + + + + AlphaStitchMode + + + + + + + NoAlphaStitch + + + + + + + AlphaStitchUp + + + + + + + AlphaStitchBelow + + + + + + + AlphaStitchLeft + + + + + + + AlphaStitchRight + + + 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 ee9b8432397..e43525bcd87 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -2763,20 +2763,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - @@ -5258,6 +5244,48 @@ + + + + AlphaStitchMode + + + + + + + NoAlphaStitch + + + + + + + AlphaStitchUp + + + + + + + AlphaStitchBelow + + + + + + + AlphaStitchLeft + + + + + + + AlphaStitchRight + + + From 908b023a89cf3793ca63fc16472af13f089b44e4 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:55:05 +0800 Subject: [PATCH 24/37] 1 --- .../api_irtcengine_setlocalrendermode2.dita | 5 +++-- dita/RTC-NG/API/class_externalvideoframe.dita | 20 +++++++++++-------- .../config/keys-rtc-ng-api-electron.ditamap | 7 ------- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 7 ------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setlocalrendermode2.dita b/dita/RTC-NG/API/api_irtcengine_setlocalrendermode2.dita index 05b59fcca08..967ec147045 100644 --- a/dita/RTC-NG/API/api_irtcengine_setlocalrendermode2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setlocalrendermode2.dita @@ -39,8 +39,9 @@

            初始化本地用户视图后，你可以调用该方法更新本地用户视图的渲染和镜像模式。该方法只影响本地用户看到的视频画面，不影响本地视频的发布。

          - <ph props="native unreal bp electron rn flutter">调用时机</ph> -
          • 请在调用 方法初始化本地视图后，调用该方法。
            • + 调用时机 +
              +
            • 请在调用 方法初始化本地视图后，调用该方法。
            • 你可以在通话中多次调用该方法，多次更新本地用户视图的显示模式。
          diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 440496fc821..061225df842 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -153,10 +153,13 @@ eglType?: EglContextType; textureId?: number; matrix?: number[]; - metadata_buffer?: Uint8Array; - metadata_size?: number; + metadataBuffer?: Uint8Array; + metadataSize?: number; + alphaBuffer?: Uint8Array; fillAlphaBuffer?: boolean; alphaStitchMode?: AlphaStitchMode; + d3d11Texture2d?: any; + textureSliceIndex?: number; } public class ExternalVideoFrame { @@ -196,8 +199,9 @@ eglType?: EglContextType; textureId?: number; matrix?: number[]; - metadata_buffer?: Uint8Array; - metadata_size?: number; + metadataBuffer?: Uint8Array; + metadataSize?: number; + alphaBuffer?: Uint8Array; fillAlphaBuffer?: boolean; alphaStitchMode?: AlphaStitchMode; } @@ -439,10 +443,10 @@ class ExternalVideoFrame { metadataSize 该参数仅适用于 Texture 格式的视频数据。指 MetaData 的大小，默认值为 0。 - - - - + + d3d11Texture2d + 该参数仅适用于 Windows Texture 格式的视频数据。表示一个指向 ID3D11Texture2D 类型对象的指针，该类型对象被视频帧所使用。 + alphaBuffer alphaBuf 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 ce2caad5acc..8e597379db9 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -2589,13 +2589,6 @@ - - - - onExtensionEvent - - - 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 e43525bcd87..8c035447c5b 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -2643,13 +2643,6 @@ - - - - onExtensionEvent - - - From f3bfa6bc01ffe6cade3741cdcbb734551384445f Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 14 Aug 2024 18:10:11 +0800 Subject: [PATCH 25/37] fix error --- ...tcengineeventhandler_onjoinchannelsuccess.dita | 5 +++-- dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap | 15 +++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onjoinchannelsuccess.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onjoinchannelsuccess.dita index c3c361dbecc..1ec204944f9 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onjoinchannelsuccess.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onjoinchannelsuccess.dita @@ -37,7 +37,8 @@
          触发时机 -

          当你调用 、、、、 或 方法成功加入频道后，SDK 会触发该回调。

          +

          当你调用 、、、、 或 方法成功加入频道后，SDK 会触发该回调。

          +

          当你调用 、、、、 方法成功加入频道后，SDK 会触发该回调。

          当你调用 、、 或 方法成功加入频道后，SDK 会触发该回调。

          当你调用 、 或 方法成功加入频道后，SDK 会触发该回调。

          @@ -70,4 +71,4 @@           - \ No newline at end of file + 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 7ed9f6817e9..ed42ad309ba 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -2747,28 +2747,28 @@           - + OnExtensionEventWithContext - + OnExtensionStartedWithContext - + OnExtensionStoppedWithContext - + OnExtensionErrorWithContext @@ -5016,6 +5016,13 @@ ExternalVideoFrame + + + + + ExtensionContext + + From 5a5db9921298f22896cf60b55e564f446122a93b Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:42:19 +0800 Subject: [PATCH 26/37] 1 --- dita/RTC-NG/API/class_videoframe.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 938035c8a47..15824b0d967 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -717,7 +717,7 @@ class VideoFrame { textureId 该参数仅适用于 Texture 格式的视频数据。Texture ID。 - + d3d11Texture2d 该参数仅适用于 Windows Texture 格式的视频数据。表示一个指向 ID3D11Texture2D 类型对象的指针，该类型对象被视频帧所使用。 From 9f5eec9159988cb3f13f4ac9d34cdb4d07edd469 Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 15 Aug 2024 09:49:52 +0800 Subject: [PATCH 27/37] - --- dita/RTC-NG/API/class_externalvideoframe.dita | 6 +----- dita/RTC-NG/API/class_videoframe.dita | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 440496fc821..94f1aa6e60e 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -224,8 +224,7 @@ class ExternalVideoFrame { this.fillAlphaBuffer, this.alphaStitchMode, this.d3d11Texture2d, - this.textureSliceIndex, - this.colorSpace}); + this.textureSliceIndex}); @JsonKey(name: 'type') final VideoBufferType? type; @@ -290,9 +289,6 @@ class ExternalVideoFrame { @JsonKey(name: 'textureSliceIndex') final int? textureSliceIndex; - @JsonKey(name: 'colorSpace') - final ColorSpace? colorSpace; - factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) => _$ExternalVideoFrameFromJson(json); diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 938035c8a47..6d7d692fa5b 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -533,8 +533,7 @@ class VideoFrame { this.alphaBuffer, this.alphaStitchMode, this.pixelBuffer, - this.metaInfo, - this.colorSpace}); + this.metaInfo}); @JsonKey(name: 'type') final VideoPixelFormat? type; @@ -597,9 +596,6 @@ class VideoFrame { @JsonKey(name: 'metaInfo') final VideoFrameMetaInfo? metaInfo; - @JsonKey(name: 'colorSpace') - final ColorSpace? colorSpace; - factory VideoFrame.fromJson(Map<String, dynamic> json) => _$VideoFrameFromJson(json); From be233bba5ad3e6469f6b0cc87243ede36f973841 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 15 Aug 2024 11:56:09 +0800 Subject: [PATCH 28/37] Update class_videoframe.dita --- dita/RTC-NG/API/class_videoframe.dita | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index ff4aac33713..7c8821e65d4 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -466,6 +466,8 @@ struct FVideoFrame { public int textureId; + public IntPtr d3d11Texture2d; + public float[] matrix; public byte[] alphaBuffer; From c6118e198e7e88651785f32bdbe6803a1377c7cf Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 15 Aug 2024 14:27:51 +0800 Subject: [PATCH 29/37] fix props --- dita/RTC-NG/API/class_externalvideoframe.dita | 13 +++++++------ dita/RTC-NG/API/class_videoframe.dita | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 440496fc821..27ce57105d1 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -175,7 +175,8 @@ public EGL_CONTEXT_TYPE eglType; public int textureId; public byte[] metadata_buffer; - public int metadata_size; + public int metadataSize; + public byte[] alphaBuffer; public bool fillAlphaBuffer; public ALPHA_STITCH_MODE alphaStitchMode; public IntPtr d3d11_texture_2d; @@ -435,8 +436,8 @@ class ExternalVideoFrame { 该参数仅适用于 Texture 格式的视频数据。指 MetaData 的数据缓冲区，默认值为 NULL。 - metadata_size - metadataSize + metadata_size + metadataSize 该参数仅适用于 Texture 格式的视频数据。指 MetaData 的大小，默认值为 0。 @@ -444,16 +445,16 @@ class ExternalVideoFrame { - alphaBuffer + alphaBuffer alphaBuf

          采用人像分割算法输出的 Alpha 通道数据。该数据跟视频帧的尺寸一致，每个像素点的取值范围为 [0,255]，其中 0 代表背景；255 代表前景（人像）。

          你可以通过设置该参数，实现将视频背景自渲染为各种效果，例如：透明、纯色、图片、视频等。

          - 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。 + 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。           - fillAlphaBuffer + fillAlphaBuffer fillAlphaData 该参数仅适用于 BGRA 或 RGBA 格式的视频数据。设置是否提取视频帧中的 Alpha 通道数据并自动填入到 alphaBuffer 中：
            diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 7c8821e65d4..5de808e43f2 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -754,7 +754,7 @@ class VideoFrame {

            采用人像分割算法输出的 Alpha 通道数据。该数据跟视频帧的尺寸一致，每个像素点的取值范围为 [0,255]，其中 0 代表背景；255 代表前景（人像）。

            你可以通过设置该参数，实现将视频背景自渲染为各种效果，例如：透明、纯色、图片、视频等。

            - 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。//TODO + 在自定义视频渲染场景下，需确保传入的视频帧和 alphaBuffer 均为 Full Range 类型；其他类型可能导致 Alpha 数据渲染不正常。             From 8fcc8917a2fff701e4294a328b024f212b534059 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:45:21 +0800 Subject: [PATCH 30/37] review comments --- ...ck_irtcengineeventhandler_onextensionstartedwithcontext.dita | 2 -- dita/RTC-NG/API/class_videoframe.dita | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita index 98fc6795d03..89053d214a0 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita @@ -20,8 +20,6 @@ (void)context; } DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStarted, FString, provider, FString, extension); - public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } - onExtensionStarted?(provider: string, extension: string): void; onExtensionStartedWithContext?(context: ExtensionContext): void; public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ } onExtensionStartedWithContext?(context: ExtensionContext): void; diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 15824b0d967..04ea4808e84 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -717,7 +717,7 @@ class VideoFrame { textureId 该参数仅适用于 Texture 格式的视频数据。Texture ID。 - + d3d11Texture2d 该参数仅适用于 Windows Texture 格式的视频数据。表示一个指向 ID3D11Texture2D 类型对象的指针，该类型对象被视频帧所使用。 From cb56800805d5b6869a66b068e5eeb319c92affc1 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:46:54 +0800 Subject: [PATCH 31/37] 1 --- dita/RTC-NG/API/class_videoframe.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 04ea4808e84..a69ba2d28c0 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -717,7 +717,7 @@ class VideoFrame { textureId 该参数仅适用于 Texture 格式的视频数据。Texture ID。 - + d3d11Texture2d 该参数仅适用于 Windows Texture 格式的视频数据。表示一个指向 ID3D11Texture2D 类型对象的指针，该类型对象被视频帧所使用。 From d93ba3320def0cf1bcb11b0f19d0fec9230ba0d4 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 15 Aug 2024 14:53:38 +0800 Subject: [PATCH 32/37] Update class_externalvideoframe.dita --- dita/RTC-NG/API/class_externalvideoframe.dita | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 4a30316d3bd..ba637e42536 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -177,7 +177,7 @@ public byte[] eglContext; public EGL_CONTEXT_TYPE eglType; public int textureId; - public byte[] metadata_buffer; + public byte[] metadataBuffer; public int metadataSize; public byte[] alphaBuffer; public bool fillAlphaBuffer; @@ -431,19 +431,17 @@ class ExternalVideoFrame { 该参数仅适用于 Texture 格式的视频数据。为一个输入的 4x4 变换矩阵，典型值为一个单位矩阵。 - metadata_buffer - metadataBuffer + metadataBuffer 该参数仅适用于 Texture 格式的视频数据。指 MetaData 的数据缓冲区，默认值为 NULL。 - metadata_size - metadataSize + metadataSize 该参数仅适用于 Texture 格式的视频数据。指 MetaData 的大小，默认值为 0。 d3d11Texture2d 该参数仅适用于 Windows Texture 格式的视频数据。表示一个指向 ID3D11Texture2D 类型对象的指针，该类型对象被视频帧所使用。 - + alphaBuffer alphaBuf From 67f1dc4ea6719fc87dff4b1a8eef7010480f88a6 Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 15 Aug 2024 14:59:44 +0800 Subject: [PATCH 33/37] - --- dita/RTC-NG/API/rtc_api_data_type.dita | 1 - .../config/keys-rtc-ng-api-flutter.ditamap | 504 ------------------ 2 files changed, 505 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index 56a19a78fbe..aafd614aa9e 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -2328,7 +2328,6 @@
            • -
            • 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 4a45150071d..96fafab5e72 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -11478,510 +11478,6 @@ - - - - VideoProfileType - - - - - - - videoProfileLandscape120p - - - - - - - videoProfileLandscape120p3 - - - - - - - videoProfileLandscape180p - - - - - - - videoProfileLandscape180p3 - - - - - - - videoProfileLandscape180p4 - - - - - - - videoProfileLandscape240p - - - - - - - videoProfileLandscape240p3 - - - - - - - videoProfileLandscape240p4 - - - - - - - videoProfileLandscape360p - - - - - - - videoProfileLandscape360p3 - - - - - - - videoProfileLandscape360p4 - - - - - - - videoProfileLandscape360p6 - - - - - - - videoProfileLandscape360p7 - - - - - - - videoProfileLandscape360p8 - - - - - - - videoProfileLandscape360p9 - - - - - - - videoProfileLandscape360p10 - - - - - - - videoProfileLandscape360p11 - - - - - - - videoProfileLandscape480p - - - - - - - videoProfileLandscape480p3 - - - - - - - videoProfileLandscape480p4 - - - - - - - videoProfileLandscape480p6 - - - - - - - videoProfileLandscape480p8 - - - - - - - videoProfileLandscape480p9 - - - - - - - videoProfileLandscape480p10 - - - - - - - videoProfileLandscape720p - - - - - - - videoProfileLandscape720p3 - - - - - - - videoProfileLandscape720p5 - - - - - - - videoProfileLandscape720p6 - - - - - - - videoProfileLandscape1080p - - - - - - - videoProfileLandscape1080p3 - - - - - - - videoProfileLandscape1080p5 - - - - - - - videoProfileLandscape1440p - - - - - - - videoProfileLandscape1440p2 - - - - - - - videoProfileLandscape4k - - - - - - - videoProfileLandscape4k3 - - - - - - - videoProfilePortrait120p - - - - - - - videoProfilePortrait120p3 - - - - - - - videoProfilePortrait180p - - - - - - - videoProfilePortrait180p3 - - - - - - - videoProfilePortrait180p4 - - - - - - - videoProfilePortrait240p - - - - - - - videoProfilePortrait240p3 - - - - - - - videoProfilePortrait240p4 - - - - - - - videoProfilePortrait360p - - - - - - - videoProfilePortrait360p3 - - - - - - - videoProfilePortrait360p4 - - - - - - - videoProfilePortrait360p6 - - - - - - - videoProfilePortrait360p7 - - - - - - - videoProfilePortrait360p8 - - - - - - - videoProfilePortrait360p9 - - - - - - - videoProfilePortrait360p10 - - - - - - - videoProfilePortrait360p11 - - - - - - - videoProfilePortrait480p - - - - - - - videoProfilePortrait480p3 - - - - - - - videoProfilePortrait480p4 - - - - - - - videoProfilePortrait480p6 - - - - - - - videoProfilePortrait480p8 - - - - - - - videoProfilePortrait480p9 - - - - - - - videoProfilePortrait480p10 - - - - - - - videoProfilePortrait720p - - - - - - - videoProfilePortrait720p3 - - - - - - - videoProfilePortrait720p5 - - - - - - - videoProfilePortrait720p6 - - - - - - - videoProfilePortrait1080p - - - - - - - videoProfilePortrait1080p3 - - - - - - - videoProfilePortrait1080p5 - - - - - - - videoProfilePortrait1440p - - - - - - - videoProfilePortrait1440p2 - - - - - - - videoProfilePortrait4k - - - - - - - videoProfilePortrait4k3 - - - - - - - videoProfileDefault - - - From 01306d1c132770e00ee4b8d9620501846fe60caf Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 15 Aug 2024 15:08:32 +0800 Subject: [PATCH 34/37] delete --- .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 504 ------------------ .../config/keys-rtc-ng-api-unity.ditamap | 504 ------------------ 2 files changed, 1008 deletions(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index c56ea6e11c7..bf4073b8d0e 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -12500,510 +12500,6 @@ - - - - VIDEO_PROFILE_TYPE - - - - - - - VIDEO_PROFILE_LANDSCAPE_120P - - - - - - - VIDEO_PROFILE_LANDSCAPE_120P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_7 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_8 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_9 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_10 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_11 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_8 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_9 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_10 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_5 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P_5 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1440P - - - - - - - VIDEO_PROFILE_LANDSCAPE_1440P_2 - - - - - - - VIDEO_PROFILE_LANDSCAPE_4K - - - - - - - VIDEO_PROFILE_LANDSCAPE_4K_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_120P - - - - - - - VIDEO_PROFILE_PORTRAIT_120P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_180P - - - - - - - VIDEO_PROFILE_PORTRAIT_180P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_180P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_240P - - - - - - - VIDEO_PROFILE_PORTRAIT_240P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_240P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_7 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_8 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_9 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_10 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_11 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_8 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_9 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_10 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_5 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P_5 - - - - - - - VIDEO_PROFILE_PORTRAIT_1440P - - - - - - - VIDEO_PROFILE_PORTRAIT_1440P_2 - - - - - - - VIDEO_PROFILE_PORTRAIT_4K - - - - - - - VIDEO_PROFILE_PORTRAIT_4K_3 - - - - - - - VIDEO_PROFILE_DEFAULT - - - 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 ed42ad309ba..8480f2f4bbc 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -12035,510 +12035,6 @@ - - - - VIDEO_PROFILE_TYPE - - - - - - - VIDEO_PROFILE_LANDSCAPE_120P - - - - - - - VIDEO_PROFILE_LANDSCAPE_120P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_180P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_240P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_7 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_8 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_9 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_10 - - - - - - - VIDEO_PROFILE_LANDSCAPE_360P_11 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_4 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_8 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_9 - - - - - - - VIDEO_PROFILE_LANDSCAPE_480P_10 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_5 - - - - - - - VIDEO_PROFILE_LANDSCAPE_720P_6 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P_3 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1080P_5 - - - - - - - VIDEO_PROFILE_LANDSCAPE_1440P - - - - - - - VIDEO_PROFILE_LANDSCAPE_1440P_2 - - - - - - - VIDEO_PROFILE_LANDSCAPE_4K - - - - - - - VIDEO_PROFILE_LANDSCAPE_4K_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_120P - - - - - - - VIDEO_PROFILE_PORTRAIT_120P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_180P - - - - - - - VIDEO_PROFILE_PORTRAIT_180P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_180P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_240P - - - - - - - VIDEO_PROFILE_PORTRAIT_240P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_240P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_7 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_8 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_9 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_10 - - - - - - - VIDEO_PROFILE_PORTRAIT_360P_11 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_4 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_8 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_9 - - - - - - - VIDEO_PROFILE_PORTRAIT_480P_10 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_5 - - - - - - - VIDEO_PROFILE_PORTRAIT_720P_6 - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P_3 - - - - - - - VIDEO_PROFILE_PORTRAIT_1080P_5 - - - - - - - VIDEO_PROFILE_PORTRAIT_1440P - - - - - - - VIDEO_PROFILE_PORTRAIT_1440P_2 - - - - - - - VIDEO_PROFILE_PORTRAIT_4K - - - - - - - VIDEO_PROFILE_PORTRAIT_4K_3 - - - - - - - VIDEO_PROFILE_DEFAULT - - - From 723380c312f27b30171f4fa37207b894dd595977 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:28:23 +0800 Subject: [PATCH 35/37] fix publish errros --- .../config/keys-rtc-ng-api-electron.ditamap | 546 +----------------- .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 511 ---------------- .../config/keys-rtc-ng-api-macos.ditamap | 511 ---------------- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 532 +---------------- 4 files changed, 35 insertions(+), 2065 deletions(-) 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 8e597379db9..4af0e354d1b 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-electron.ditamap @@ -3052,6 +3052,13 @@ + + + + destroyMusicPlayer + + + @@ -3206,13 +3213,6 @@ - - - - onSongSimpleInfoResult - - - @@ -9533,34 +9533,6 @@ - - - - MusicPlayMode - - - - - - - kMusicPlayModeOriginal - - - - - - - kMusicPlayModeAccompany - - - - - - - kMusicPlayModeLeadSing - - - @@ -11520,510 +11492,6 @@ VideoTextureOes - - - - - VideoProfileType - - - - - - - VideoProfileLandscape120p - - - - - - - VideoProfileLandscape120p3 - - - - - - - VideoProfileLandscape180p - - - - - - - VideoProfileLandscape180p3 - - - - - - - VideoProfileLandscape180p4 - - - - - - - VideoProfileLandscape240p - - - - - - - VideoProfileLandscape240p3 - - - - - - - VideoProfileLandscape240p4 - - - - - - - VideoProfileLandscape360p - - - - - - - VideoProfileLandscape360p3 - - - - - - - VideoProfileLandscape360p4 - - - - - - - VideoProfileLandscape360p6 - - - - - - - VideoProfileLandscape360p7 - - - - - - - VideoProfileLandscape360p8 - - - - - - - VideoProfileLandscape360p9 - - - - - - - VideoProfileLandscape360p10 - - - - - - - VideoProfileLandscape360p11 - - - - - - - VideoProfileLandscape480p - - - - - - - VideoProfileLandscape480p3 - - - - - - - VideoProfileLandscape480p4 - - - - - - - VideoProfileLandscape480p6 - - - - - - - VideoProfileLandscape480p8 - - - - - - - VideoProfileLandscape480p9 - - - - - - - VideoProfileLandscape480p10 - - - - - - - VideoProfileLandscape720p - - - - - - - VideoProfileLandscape720p3 - - - - - - - VideoProfileLandscape720p5 - - - - - - - VideoProfileLandscape720p6 - - - - - - - VideoProfileLandscape1080p - - - - - - - VideoProfileLandscape1080p3 - - - - - - - VideoProfileLandscape1080p5 - - - - - - - VideoProfileLandscape1440p - - - - - - - VideoProfileLandscape1440p2 - - - - - - - VideoProfileLandscape4k - - - - - - - VideoProfileLandscape4k3 - - - - - - - VideoProfilePortrait120p - - - - - - - VideoProfilePortrait120p3 - - - - - - - VideoProfilePortrait180p - - - - - - - VideoProfilePortrait180p3 - - - - - - - VideoProfilePortrait180p4 - - - - - - - VideoProfilePortrait240p - - - - - - - VideoProfilePortrait240p3 - - - - - - - VideoProfilePortrait240p4 - - - - - - - VideoProfilePortrait360p - - - - - - - VideoProfilePortrait360p3 - - - - - - - VideoProfilePortrait360p4 - - - - - - - VideoProfilePortrait360p6 - - - - - - - VideoProfilePortrait360p7 - - - - - - - VideoProfilePortrait360p8 - - - - - - - VideoProfilePortrait360p9 - - - - - - - VideoProfilePortrait360p10 - - - - - - - VideoProfilePortrait360p11 - - - - - - - VideoProfilePortrait480p - - - - - - - VideoProfilePortrait480p3 - - - - - - - VideoProfilePortrait480p4 - - - - - - - VideoProfilePortrait480p6 - - - - - - - VideoProfilePortrait480p8 - - - - - - - VideoProfilePortrait480p9 - - - - - - - VideoProfilePortrait480p10 - - - - - - - VideoProfilePortrait720p - - - - - - - VideoProfilePortrait720p3 - - - - - - - VideoProfilePortrait720p5 - - - - - - - VideoProfilePortrait720p6 - - - - - - - VideoProfilePortrait1080p - - - - - - - VideoProfilePortrait1080p3 - - - - - - - VideoProfilePortrait1080p5 - - - - - - - VideoProfilePortrait1440p - - - - - - - VideoProfilePortrait1440p2 - - - - - - - VideoProfilePortrait4k - - - - - - - VideoProfilePortrait4k3 - - - - - - - VideoProfileDefault - - diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap index d4ef1e8b537..5461aec8b85 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -11533,517 +11533,6 @@ - - - - AgoraVideoProfile - - - - - - - AgoraVideoProfileInvalid - - - - - - - AgoraVideoProfileLandscape120P - - - - - - - AgoraVideoProfileLandscape120P_3 - - - - - - - AgoraVideoProfileLandscape180P - - - - - - - AgoraVideoProfileLandscape180P_3 - - - - - - - AgoraVideoProfileLandscape180P_4 - - - - - - - AgoraVideoProfileLandscape240P - - - - - - - AgoraVideoProfileLandscape240P_3 - - - - - - - AgoraVideoProfileLandscape240P_4 - - - - - - - AgoraVideoProfileLandscape360P - - - - - - - AgoraVideoProfileLandscape360P_3 - - - - - - - AgoraVideoProfileLandscape360P_4 - - - - - - - AgoraVideoProfileLandscape360P_6 - - - - - - - AgoraVideoProfileLandscape360P_7 - - - - - - - AgoraVideoProfileLandscape360P_8 - - - - - - - AgoraVideoProfileLandscape360P_9 - - - - - - - AgoraVideoProfileLandscape360P_10 - - - - - - - AgoraVideoProfileLandscape360P_11 - - - - - - - AgoraVideoProfileLandscape480P - - - - - - - AgoraVideoProfileLandscape480P_3 - - - - - - - AgoraVideoProfileLandscape480P_4 - - - - - - - AgoraVideoProfileLandscape480P_6 - - - - - - - AgoraVideoProfileLandscape480P_8 - - - - - - - AgoraVideoProfileLandscape480P_9 - - - - - - - AgoraVideoProfileLandscape480P_10 - - - - - - - AgoraVideoProfileLandscape720P - - - - - - - AgoraVideoProfileLandscape720P_3 - - - - - - - AgoraVideoProfileLandscape720P_5 - - - - - - - AgoraVideoProfileLandscape720P_6 - - - - - - - AgoraVideoProfileLandscape1080P - - - - - - - AgoraVideoProfileLandscape1080P_3 - - - - - - - AgoraVideoProfileLandscape1080P_5 - - - - - - - AgoraVideoProfileLandscape1440P - - - - - - - AgoraVideoProfileLandscape1440P_2 - - - - - - - AgoraVideoProfileLandscape4K - - - - - - - AgoraVideoProfileLandscape4K_3 - - - - - - - AgoraVideoProfilePortrait120P - - - - - - - AgoraVideoProfilePortrait120P_3 - - - - - - - AgoraVideoProfilePortrait180P - - - - - - - AgoraVideoProfilePortrait180P_3 - - - - - - - AgoraVideoProfilePortrait180P_4 - - - - - - - AgoraVideoProfilePortrait240P - - - - - - - AgoraVideoProfilePortrait240P_3 - - - - - - - AgoraVideoProfilePortrait240P_4 - - - - - - - AgoraVideoProfilePortrait360P - - - - - - - AgoraVideoProfilePortrait360P_3 - - - - - - - AgoraVideoProfilePortrait360P_4 - - - - - - - AgoraVideoProfilePortrait360P_6 - - - - - - - AgoraVideoProfilePortrait360P_7 - - - - - - - AgoraVideoProfilePortrait360P_8 - - - - - - - AgoraVideoProfilePortrait360P_9 - - - - - - - AgoraVideoProfilePortrait360P_10 - - - - - - - AgoraVideoProfilePortrait360P_11 - - - - - - - AgoraVideoProfilePortrait480P - - - - - - - AgoraVideoProfilePortrait480P_3 - - - - - - - AgoraVideoProfilePortrait480P_4 - - - - - - - AgoraVideoProfilePortrait480P_6 - - - - - - - AgoraVideoProfilePortrait480P_8 - - - - - - - AgoraVideoProfilePortrait480P_9 - - - - - - - AgoraVideoProfilePortrait480P_10 - - - - - - - AgoraVideoProfilePortrait720P - - - - - - - AgoraVideoProfilePortrait720P_3 - - - - - - - AgoraVideoProfilePortrait720P_5 - - - - - - - AgoraVideoProfilePortrait720P_6 - - - - - - - AgoraVideoProfilePortrait1080P - - - - - - - AgoraVideoProfilePortrait1080P_3 - - - - - - - AgoraVideoProfilePortrait1080P_5 - - - - - - - AgoraVideoProfilePortrait1440P - - - - - - - AgoraVideoProfilePortrait1440P_2 - - - - - - - AgoraVideoProfilePortrait4K - - - - - - - AgoraVideoProfilePortrait4K_3 - - - - - - - AgoraVideoProfileDEFAULT - - - diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap index 07d62e1ce77..9b505ac1afb 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -10978,517 +10978,6 @@ - - - - AgoraVideoProfile - - - - - - - AgoraVideoProfileInvalid - - - - - - - AgoraVideoProfileLandscape120P - - - - - - - AgoraVideoProfileLandscape120P_3 - - - - - - - AgoraVideoProfileLandscape180P - - - - - - - AgoraVideoProfileLandscape180P_3 - - - - - - - AgoraVideoProfileLandscape180P_4 - - - - - - - AgoraVideoProfileLandscape240P - - - - - - - AgoraVideoProfileLandscape240P_3 - - - - - - - AgoraVideoProfileLandscape240P_4 - - - - - - - AgoraVideoProfileLandscape360P - - - - - - - AgoraVideoProfileLandscape360P_3 - - - - - - - AgoraVideoProfileLandscape360P_4 - - - - - - - AgoraVideoProfileLandscape360P_6 - - - - - - - AgoraVideoProfileLandscape360P_7 - - - - - - - AgoraVideoProfileLandscape360P_8 - - - - - - - AgoraVideoProfileLandscape360P_9 - - - - - - - AgoraVideoProfileLandscape360P_10 - - - - - - - AgoraVideoProfileLandscape360P_11 - - - - - - - AgoraVideoProfileLandscape480P - - - - - - - AgoraVideoProfileLandscape480P_3 - - - - - - - AgoraVideoProfileLandscape480P_4 - - - - - - - AgoraVideoProfileLandscape480P_6 - - - - - - - AgoraVideoProfileLandscape480P_8 - - - - - - - AgoraVideoProfileLandscape480P_9 - - - - - - - AgoraVideoProfileLandscape480P_10 - - - - - - - AgoraVideoProfileLandscape720P - - - - - - - AgoraVideoProfileLandscape720P_3 - - - - - - - AgoraVideoProfileLandscape720P_5 - - - - - - - AgoraVideoProfileLandscape720P_6 - - - - - - - AgoraVideoProfileLandscape1080P - - - - - - - AgoraVideoProfileLandscape1080P_3 - - - - - - - AgoraVideoProfileLandscape1080P_5 - - - - - - - AgoraVideoProfileLandscape1440P - - - - - - - AgoraVideoProfileLandscape1440P_2 - - - - - - - AgoraVideoProfileLandscape4K - - - - - - - AgoraVideoProfileLandscape4K_3 - - - - - - - AgoraVideoProfilePortrait120P - - - - - - - AgoraVideoProfilePortrait120P_3 - - - - - - - AgoraVideoProfilePortrait180P - - - - - - - AgoraVideoProfilePortrait180P_3 - - - - - - - AgoraVideoProfilePortrait180P_4 - - - - - - - AgoraVideoProfilePortrait240P - - - - - - - AgoraVideoProfilePortrait240P_3 - - - - - - - AgoraVideoProfilePortrait240P_4 - - - - - - - AgoraVideoProfilePortrait360P - - - - - - - AgoraVideoProfilePortrait360P_3 - - - - - - - AgoraVideoProfilePortrait360P_4 - - - - - - - AgoraVideoProfilePortrait360P_6 - - - - - - - AgoraVideoProfilePortrait360P_7 - - - - - - - AgoraVideoProfilePortrait360P_8 - - - - - - - AgoraVideoProfilePortrait360P_9 - - - - - - - AgoraVideoProfilePortrait360P_10 - - - - - - - AgoraVideoProfilePortrait360P_11 - - - - - - - AgoraVideoProfilePortrait480P - - - - - - - AgoraVideoProfilePortrait480P_3 - - - - - - - AgoraVideoProfilePortrait480P_4 - - - - - - - AgoraVideoProfilePortrait480P_6 - - - - - - - AgoraVideoProfilePortrait480P_8 - - - - - - - AgoraVideoProfilePortrait480P_9 - - - - - - - AgoraVideoProfilePortrait480P_10 - - - - - - - AgoraVideoProfilePortrait720P - - - - - - - AgoraVideoProfilePortrait720P_3 - - - - - - - AgoraVideoProfilePortrait720P_5 - - - - - - - AgoraVideoProfilePortrait720P_6 - - - - - - - AgoraVideoProfilePortrait1080P - - - - - - - AgoraVideoProfilePortrait1080P_3 - - - - - - - AgoraVideoProfilePortrait1080P_5 - - - - - - - AgoraVideoProfilePortrait1440P - - - - - - - AgoraVideoProfilePortrait1440P_2 - - - - - - - AgoraVideoProfilePortrait4K - - - - - - - AgoraVideoProfilePortrait4K_3 - - - - - - - AgoraVideoProfileDEFAULT - - - 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 8c035447c5b..80eba449e27 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -3134,6 +3134,34 @@ + + + + MusicPlayMode + + + + + + + kMusicPlayModeOriginal + + + + + + + kMusicPlayModeAccompany + + + + + + + kMusicPlayModeLeadSing + + + @@ -11389,510 +11417,6 @@ VideoPixelI422 - - - - - VideoProfileType - - - - - - - VideoProfileLandscape120p - - - - - - - VideoProfileLandscape120p3 - - - - - - - VideoProfileLandscape180p - - - - - - - VideoProfileLandscape180p3 - - - - - - - VideoProfileLandscape180p4 - - - - - - - VideoProfileLandscape240p - - - - - - - VideoProfileLandscape240p3 - - - - - - - VideoProfileLandscape240p4 - - - - - - - VideoProfileLandscape360p - - - - - - - VideoProfileLandscape360p3 - - - - - - - VideoProfileLandscape360p4 - - - - - - - VideoProfileLandscape360p6 - - - - - - - VideoProfileLandscape360p7 - - - - - - - VideoProfileLandscape360p8 - - - - - - - VideoProfileLandscape360p9 - - - - - - - VideoProfileLandscape360p10 - - - - - - - VideoProfileLandscape360p11 - - - - - - - VideoProfileLandscape480p - - - - - - - VideoProfileLandscape480p3 - - - - - - - VideoProfileLandscape480p4 - - - - - - - VideoProfileLandscape480p6 - - - - - - - VideoProfileLandscape480p8 - - - - - - - VideoProfileLandscape480p9 - - - - - - - VideoProfileLandscape480p10 - - - - - - - VideoProfileLandscape720p - - - - - - - VideoProfileLandscape720p3 - - - - - - - VideoProfileLandscape720p5 - - - - - - - VideoProfileLandscape720p6 - - - - - - - VideoProfileLandscape1080p - - - - - - - VideoProfileLandscape1080p3 - - - - - - - VideoProfileLandscape1080p5 - - - - - - - VideoProfileLandscape1440p - - - - - - - VideoProfileLandscape1440p2 - - - - - - - VideoProfileLandscape4k - - - - - - - VideoProfileLandscape4k3 - - - - - - - VideoProfilePortrait120p - - - - - - - VideoProfilePortrait120p3 - - - - - - - VideoProfilePortrait180p - - - - - - - VideoProfilePortrait180p3 - - - - - - - VideoProfilePortrait180p4 - - - - - - - VideoProfilePortrait240p - - - - - - - VideoProfilePortrait240p3 - - - - - - - VideoProfilePortrait240p4 - - - - - - - VideoProfilePortrait360p - - - - - - - VideoProfilePortrait360p3 - - - - - - - VideoProfilePortrait360p4 - - - - - - - VideoProfilePortrait360p6 - - - - - - - VideoProfilePortrait360p7 - - - - - - - VideoProfilePortrait360p8 - - - - - - - VideoProfilePortrait360p9 - - - - - - - VideoProfilePortrait360p10 - - - - - - - VideoProfilePortrait360p11 - - - - - - - VideoProfilePortrait480p - - - - - - - VideoProfilePortrait480p3 - - - - - - - VideoProfilePortrait480p4 - - - - - - - VideoProfilePortrait480p6 - - - - - - - VideoProfilePortrait480p8 - - - - - - - VideoProfilePortrait480p9 - - - - - - - VideoProfilePortrait480p10 - - - - - - - VideoProfilePortrait720p - - - - - - - VideoProfilePortrait720p3 - - - - - - - VideoProfilePortrait720p5 - - - - - - - VideoProfilePortrait720p6 - - - - - - - VideoProfilePortrait1080p - - - - - - - VideoProfilePortrait1080p3 - - - - - - - VideoProfilePortrait1080p5 - - - - - - - VideoProfilePortrait1440p - - - - - - - VideoProfilePortrait1440p2 - - - - - - - VideoProfilePortrait4k - - - - - - - VideoProfilePortrait4k3 - - - - - - - VideoProfileDefault - - From 28564dfab8e4616eedb61dd8554050450c29c551 Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 15 Aug 2024 15:45:45 +0800 Subject: [PATCH 36/37] - --- dita/RTC-NG/API/rtc_api_data_type.dita | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index aafd614aa9e..d52c798d28e 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1267,7 +1267,6 @@
            • -
            • @@ -1493,7 +1492,6 @@
            • -
            • @@ -1622,7 +1620,6 @@
            • -
            • @@ -1767,7 +1764,6 @@
            • -
            • @@ -1905,7 +1901,6 @@
            • -
            • @@ -2045,7 +2040,6 @@
            • -
            • @@ -2186,7 +2180,6 @@
            • -
            • From bb37e028e6bd2303bd25e15dfc632d31ff3b256c Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 15 Aug 2024 15:47:15 +0800 Subject: [PATCH 37/37] 1 --- dita/RTC-NG/API/class_extensioncontext.dita | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dita/RTC-NG/API/class_extensioncontext.dita b/dita/RTC-NG/API/class_extensioncontext.dita index 015862cf1e4..7e79c88f30a 100644 --- a/dita/RTC-NG/API/class_extensioncontext.dita +++ b/dita/RTC-NG/API/class_extensioncontext.dita @@ -133,13 +133,13 @@ class ExtensionContext { uid 用户 ID。0 代表本地用户，大于 0 代表远端用户。             - - - + + providerName + 提供插件的服务商名称。 - - - + + extensionName + 插件的名称。