From bce9b0d058843cab8f5b41509be12b3db44b1935 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 4 Jul 2024 15:03:19 +0800 Subject: [PATCH 01/17] Update callback_irtcengineeventhandler_onclientrolechangefailed.dita --- ...ngineeventhandler_onclientrolechangefailed.dita | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/callback_irtcengineeventhandler_onclientrolechangefailed.dita b/dita/RTC-NG/API/callback_irtcengineeventhandler_onclientrolechangefailed.dita index 6d6523d7632..ee27c3d349b 100644 --- a/dita/RTC-NG/API/callback_irtcengineeventhandler_onclientrolechangefailed.dita +++ b/dita/RTC-NG/API/callback_irtcengineeventhandler_onclientrolechangefailed.dita @@ -61,8 +61,18 @@
  • (1): 频道内主播人数达到上限。 该枚举仅在开启 128 人功能后报告。主播人数的上限根据开启 128 人功能时实际配置的人数而定。
  • (2): 请求被服务端拒绝。建议提示用户重新尝试切换用户角色。
    • -
  • (3): （已废弃）请求超时。建议提示用户检查网络连接状况后重新尝试切换用户角色。
    • -
  • (4): （已废弃）网络连接断开。可根据 报告的 reason，排查网络连接失败的具体原因。
    • +
  • (3): 请求超时。建议提示用户检查网络连接状况后重新尝试切换用户角色。 +
    + +
    废弃：
    +
    该枚举值自 v4.4.0 起废弃，不建议使用。
    +
    • +
  • (4): 网络连接断开。可根据 报告的 reason，排查网络连接失败的具体原因。 +
    + +
    废弃：
    +
    该枚举值自 v4.4.0 起废弃，不建议使用。
    +
    • From 07963f5d133733109ef3e8104a0ca2ce013a9fef Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 4 Jul 2024 17:37:36 +0800 Subject: [PATCH 02/17] update --- dita/RTC-NG/API/rtc_lite_api.dita | 14 ++++++++++---- dita/RTC-NG/release/release_notes.dita | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dita/RTC-NG/API/rtc_lite_api.dita b/dita/RTC-NG/API/rtc_lite_api.dita index c25820a0ce3..0c07c103229 100644 --- a/dita/RTC-NG/API/rtc_lite_api.dita +++ b/dita/RTC-NG/API/rtc_lite_api.dita @@ -111,9 +111,17 @@
    • -
    • +
  • 中，以下跟屏幕采集相关的参数设置无效： +
      +
    • publishScreenCaptureVideo
      • +
    • publishScreenCaptureAudio
      • +
    • -
    • +
  • 中，以下跟屏幕采集相关的参数设置无效： +
      +
    • publishScreenCaptureVideo
      • +
    • publishScreenCaptureAudio
      • +
    • @@ -327,7 +335,6 @@
    • -
    • @@ -535,7 +542,6 @@
    • -
    • diff --git a/dita/RTC-NG/release/release_notes.dita b/dita/RTC-NG/release/release_notes.dita index 48c1390fae9..9e17c13e2d5 100644 --- a/dita/RTC-NG/release/release_notes.dita +++ b/dita/RTC-NG/release/release_notes.dita @@ -50,7 +50,7 @@
  • Lite SDK

    自该版本起，声网推出 Lite 版 SDK，该 SDK 中仅包含音视频基础能力、对高阶音视频处理的功能进行部分裁剪，可有效减少集成 SDK 后的 App 体积。

      -
    • Lite SDK 支持手动集成或三方仓库集成，详见 和 。
      • +
    • Lite SDK 支持手动集成或三方仓库集成，详见和。
    • Lite SDK 包含的动态库信息详见。
    • Lite SDK 支持的 API 清单详见 Lite SDK API 列表Lite SDK API 列表。
    • From 54f0ab6a10d0480796e4eb33fed8bbf4f6f236ad Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 4 Jul 2024 18:36:17 +0800 Subject: [PATCH 03/17] add ALPHA_STITCH_MODE --- dita/RTC-NG/API/class_externalvideoframe.dita | 2 +- dita/RTC-NG/API/class_videoframe.dita | 20 ++++----- dita/RTC-NG/API/enum_alphastitchmode.dita | 40 ++++++++++++++++++ .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 42 +++++++++++++++++++ .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 42 +++++++++++++++++++ .../config/keys-rtc-ng-api-macos.ditamap | 42 +++++++++++++++++++ 6 files changed, 176 insertions(+), 12 deletions(-) create mode 100644 dita/RTC-NG/API/enum_alphastitchmode.dita diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 472a78ae077..9cf108d1bee 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -75,7 +75,7 @@ @property(strong, nonatomic) IMAGE_CLASS * _Nullable image; @property(strong, nonatomic) NSData *_Nullable dataBuf; @property(strong, nonatomic) NSData *_Nullable alphaBuf; -@property(assign, nonatomic) int alphaStitchMode; +@property(assign, nonatomic) AgoraAlphaStitchMode alphaStitchMode; @property(assign, nonatomic) int cropLeft; @property(assign, nonatomic) int cropTop; @property(assign, nonatomic) int cropRight; diff --git a/dita/RTC-NG/API/class_videoframe.dita b/dita/RTC-NG/API/class_videoframe.dita index 827dc09ae50..329f1fbc6e2 100644 --- a/dita/RTC-NG/API/class_videoframe.dita +++ b/dita/RTC-NG/API/class_videoframe.dita @@ -39,9 +39,7 @@ @CalledByNative("I422Buffer") int getStrideU(); @CalledByNative("I422Buffer") int getStrideV(); } - public interface RgbaBuffer extends Buffer { - @CalledByNative("RgbaBuffer") ByteBuffer getData(); - } + public interface RgbaBuffer extends Buffer { @CalledByNative("RgbaBuffer") ByteBuffer getData(); } public interface TextureBuffer extends Buffer { enum Type { OES(GLES11Ext.GL_TEXTURE_EXTERNAL_OES), @@ -295,7 +293,7 @@ @property (nonatomic, assign) int avSyncType; @property(assign, nonatomic) CVPixelBufferRef _Nullable pixelBuffer; @property (nonatomic, assign) uint8_t* _Nullable alphaBuffer; -@property (nonatomic, assign) int alphaStitchMode; +@property (nonatomic, assign) AgoraAlphaStitchMode alphaStitchMode; @property(nonatomic, strong) NSDictionary *_Nonnull metaInfo; @end struct VideoFrame { @@ -730,13 +728,13 @@ class VideoFrame {     alphaStitchMode - 当视频帧中包含 Alpha 通道数据时，设置 alphaBuffer 和视频帧的相对位置： -
      -
    • 0：（默认）仅视频帧，即 alphaBuffer 不和视频帧拼接。
      • -
    • 1：alphaBuffer 位于视频帧的上方。
      • -
    • 2：alphaBuffer 位于视频帧的下方。
      • -
    • 3：alphaBuffer 位于视频帧的左侧。
      • -
    • 4：alphaBuffer 位于视频帧的右侧。
      • + 当视频帧中包含 Alpha 通道数据时，设置 alphaBuffer 和视频帧的相对位置。详见 。 +
        +
      • (0)：（默认）仅视频帧，即 alphaBuffer 不和视频帧拼接。
        • +
      • (1)：alphaBuffer 位于视频帧的上方。
        • +
      • (2)：alphaBuffer 位于视频帧的下方。
        • +
      • (3)：alphaBuffer 位于视频帧的左侧。
        • +
      • (4)：alphaBuffer 位于视频帧的右侧。
       diff --git a/dita/RTC-NG/API/enum_alphastitchmode.dita b/dita/RTC-NG/API/enum_alphastitchmode.dita new file mode 100644 index 00000000000..80e9845abf7 --- /dev/null +++ b/dita/RTC-NG/API/enum_alphastitchmode.dita @@ -0,0 +1,40 @@ + + + + <ph keyref="ALPHA_STITCH_MODE"/> + alphaBuffer 和视频帧的相对位置。 + +
      +
      + +
      自从
      +
      v4.4.0
      +       +
      +
      +
      + 枚举值 + + + + 0：（默认）仅视频帧，即 alphaBuffer 不和视频帧拼接。 + + + + 1：alphaBuffer 位于视频帧的上方。 + + + + 2：alphaBuffer 位于视频帧的下方。 + + + + 3：alphaBuffer 位于视频帧的左侧。 + + + + 4：alphaBuffer 位于视频帧的右侧。 + + +
      +       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 d958b478e3a..b6484767572 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -5913,6 +5913,48 @@ + + + + ALPHA_STITCH_MODE + + + + + + + NO_ALPHA_STITCH + + + + + + + ALPHA_STITCH_UP + + + + + + + ALPHA_STITCH_BELOW + + + + + + + ALPHA_STITCH_LEFT + + + + + + + ALPHA_STITCH_RIGHT + + + 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 b7d717a85c0..7556c577280 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -5464,6 +5464,48 @@ + + + + AgoraAlphaStitchMode + + + + + + + AgoraNoAlphaStitch + + + + + + + AgoraAlphaStitchUp + + + + + + + AgoraAlphaStitchBelow + + + + + + + AgoraAlphaStitchLeft + + + + + + + AgoraAlphaStitchRight + + + 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 87f2e3b1e1a..bf84399751e 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -5036,6 +5036,48 @@ + + + + AgoraAlphaStitchMode + + + + + + + AgoraNoAlphaStitch + + + + + + + AgoraAlphaStitchUp + + + + + + + AgoraAlphaStitchBelow + + + + + + + AgoraAlphaStitchLeft + + + + + + + AgoraAlphaStitchRight + + + From da83ae75f4bb72297b8d4759c18d1a14a4417be1 Mon Sep 17 00:00:00 2001 From: Cilla-luodan Date: Thu, 4 Jul 2024 10:36:51 +0000 Subject: [PATCH 04/17] Sync cn prototype to en prototype --- .../RTC-NG/API/class_externalvideoframe.dita | 2 +- en-US/dita/RTC-NG/API/class_videoframe.dita | 6 +-- .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 42 +++++++++++++++++++ .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 42 +++++++++++++++++++ .../config/keys-rtc-ng-api-macos.ditamap | 42 +++++++++++++++++++ 5 files changed, 129 insertions(+), 5 deletions(-) diff --git a/en-US/dita/RTC-NG/API/class_externalvideoframe.dita b/en-US/dita/RTC-NG/API/class_externalvideoframe.dita index 931f6d3d447..6c15172e256 100644 --- a/en-US/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/en-US/dita/RTC-NG/API/class_externalvideoframe.dita @@ -75,7 +75,7 @@ @property(strong, nonatomic) IMAGE_CLASS * _Nullable image; @property(strong, nonatomic) NSData *_Nullable dataBuf; @property(strong, nonatomic) NSData *_Nullable alphaBuf; -@property(assign, nonatomic) int alphaStitchMode; +@property(assign, nonatomic) AgoraAlphaStitchMode alphaStitchMode; @property(assign, nonatomic) int cropLeft; @property(assign, nonatomic) int cropTop; @property(assign, nonatomic) int cropRight; diff --git a/en-US/dita/RTC-NG/API/class_videoframe.dita b/en-US/dita/RTC-NG/API/class_videoframe.dita index d6540955825..759f0db91d7 100644 --- a/en-US/dita/RTC-NG/API/class_videoframe.dita +++ b/en-US/dita/RTC-NG/API/class_videoframe.dita @@ -39,9 +39,7 @@ @CalledByNative("I422Buffer") int getStrideU(); @CalledByNative("I422Buffer") int getStrideV(); } - public interface RgbaBuffer extends Buffer { - @CalledByNative("RgbaBuffer") ByteBuffer getData(); - } + public interface RgbaBuffer extends Buffer { @CalledByNative("RgbaBuffer") ByteBuffer getData(); } public interface TextureBuffer extends Buffer { enum Type { OES(GLES11Ext.GL_TEXTURE_EXTERNAL_OES), @@ -295,7 +293,7 @@ @property (nonatomic, assign) int avSyncType; @property(assign, nonatomic) CVPixelBufferRef _Nullable pixelBuffer; @property (nonatomic, assign) uint8_t* _Nullable alphaBuffer; -@property (nonatomic, assign) int alphaStitchMode; +@property (nonatomic, assign) AgoraAlphaStitchMode alphaStitchMode; @property(nonatomic, strong) NSDictionary *_Nonnull metaInfo; @end struct VideoFrame { diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index d958b478e3a..b6484767572 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -5913,6 +5913,48 @@ + + + + ALPHA_STITCH_MODE + + + + + + + NO_ALPHA_STITCH + + + + + + + ALPHA_STITCH_UP + + + + + + + ALPHA_STITCH_BELOW + + + + + + + ALPHA_STITCH_LEFT + + + + + + + ALPHA_STITCH_RIGHT + + + diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap index b7d717a85c0..7556c577280 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -5464,6 +5464,48 @@ + + + + AgoraAlphaStitchMode + + + + + + + AgoraNoAlphaStitch + + + + + + + AgoraAlphaStitchUp + + + + + + + AgoraAlphaStitchBelow + + + + + + + AgoraAlphaStitchLeft + + + + + + + AgoraAlphaStitchRight + + + diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap index 87f2e3b1e1a..bf84399751e 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -5036,6 +5036,48 @@ + + + + AgoraAlphaStitchMode + + + + + + + AgoraNoAlphaStitch + + + + + + + AgoraAlphaStitchUp + + + + + + + AgoraAlphaStitchBelow + + + + + + + AgoraAlphaStitchLeft + + + + + + + AgoraAlphaStitchRight + + + From b3fbd599c9262d3a72fd6d22f58bb76fc198d8e0 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Thu, 4 Jul 2024 18:38:46 +0800 Subject: [PATCH 05/17] 1 --- dita/RTC-NG/release/release_notes.dita | 3 --- 1 file changed, 3 deletions(-) diff --git a/dita/RTC-NG/release/release_notes.dita b/dita/RTC-NG/release/release_notes.dita index 9e17c13e2d5..d3a703dab8c 100644 --- a/dita/RTC-NG/release/release_notes.dita +++ b/dita/RTC-NG/release/release_notes.dita @@ -92,11 +92,8 @@
    • 其他改进

      该版本还进行了如下改进：

        -
      • 优化了传输策略，调用 不再对传输链路的安全性产生影响。
        • -
      • 回调中新增 枚举，表示进行屏幕采集的显示器已断开连接。(Windows, macOS)
        • -
      • 优化了共享窗口的视频链路，降低了 CPU 占用率。(macOS)
      • 优化了屏幕共享场景下的回声消除。
      • 该版本在 中新增 channelId 参数，用于获取发送 Metadata 的源频道名称。
        • From bff4f5c1958933df0202f3c174e55a738e69b722 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Fri, 5 Jul 2024 10:54:41 +0800 Subject: [PATCH 06/17] update release note --- dita/RTC-NG/release/release_notes.dita | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dita/RTC-NG/release/release_notes.dita b/dita/RTC-NG/release/release_notes.dita index 9e17c13e2d5..7460746fbd7 100644 --- a/dita/RTC-NG/release/release_notes.dita +++ b/dita/RTC-NG/release/release_notes.dita @@ -10,10 +10,10 @@ 升级必看 -

        该版本对部分功能的实现方式进行了优化，包括 SDK 的行为变更、API 的改名或删除，为确保项目的正常运行，你需要在升级到该版本后更新 App 中的代码。 +

        该版本对部分功能的实现方式进行了优化，包括 SDK 的行为变更、API 的改名或删除，为确保项目的正常运行，你需要在升级到该版本后更新 App 中的代码。 自 v4.4.0 起，RTC SDK 提供 API 下架说明，包含各版本废弃及删除的 API 信息。详见 API 下架说明API 下架说明API 下架说明API 下架说明。

          -
        1. 为区分不同插件回调中的上下文信息，该版本将原有的插件相关回调删除并新增可标识插件上下文信息的对应回调（见下表），你可以通过各回调中的 了解插件的名称、使用该插件的用户 ID、和提供插件的服务商名等信息。 +
        2. 为区分不同插件回调中的上下文信息，该版本将原有的插件相关回调删除并新增可标识插件上下文信息的对应回调（见下表），你可以通过各回调中的 了解插件的名称、使用该插件的用户 ID、和提供插件的服务商名等信息。 原有回调 @@ -38,8 +38,8 @@
        3. 在 v4.4.0 之前，当你的用户角色为观众时，调用 将音频场景设为聊天室场景（）会收到申请麦克风权限的弹窗提示。自 v4.4.0 起，SDK 通过 iOS 原生的 API 控制麦克风开关，因此观众角色在聊天室场景下不会再收到申请麦克风权限的弹窗。
          4. -
        4. 改版本将 receiveMetadata 回调改名为 ，并删除了回调中的 data、timeStamp 参数，你可以通过新增的 metadata 参数来获取 Metadata 的相关信息，包括 timeStamp（发送数据的时间戳）、uid（用户 ID）、channelId（源频道名称）等。
          5. -
        5. 改版本删除了 回调中的 buffer、uid、timeStampMs 参数，你可以通过新增的 metadata 参数来获取 Metadata 的相关信息，包括 timeStampMs（发送数据的时间戳）、uid（用户 ID）、channelId（源频道名称）等。
          6. +
        6. 改版本将 receiveMetadata 回调改名为 ，并删除了回调中的 data、timeStamp 参数，你可以通过新增的 metadata 参数来获取 Metadata 的相关信息，包括 timeStamp（发送数据的时间戳）、uid（用户 ID）、channelId（源频道名称）等。
          7. +
        7. 改版本删除了 回调中的 buffer、uid、timeStampMs 参数，你可以通过新增的 metadata 参数来获取 Metadata 的相关信息，包括 timeStampMs（发送数据的时间戳）、uid（用户 ID）、channelId（源频道名称）等。
         @@ -92,14 +92,12 @@
      • 其他改进

        该版本还进行了如下改进：

          -
        • 优化了传输策略，调用 不再对传输链路的安全性产生影响。
          • -
        • 回调中新增 枚举，表示进行屏幕采集的显示器已断开连接。(Windows, macOS)
          • -
        • 优化了共享窗口的视频链路，降低了 CPU 占用率。(macOS)
        • 优化了屏幕共享场景下的回声消除。
          • -
        • 该版本在 中新增 channelId 参数，用于获取发送 Metadata 的源频道名称。
          • +
        • 该版本在 中新增 channelId 参数，用于获取发送 Metadata 的源频道名称。
          • +
        • 废弃了 中的冗余枚举值 、。
        • 优化了以下 API 的参数类型。此改进有助于提升代码的可读性，减少潜在的错误，并便于后续维护。
          • 废弃了 option 参数为 int 类型的 ，新增了 option 参数为 类型的重载函数 。
          • 废弃了 streamType 参数为 int 类型的 、、，新增了 streamType 参数为 类型的重载函数 、、。
          • From 1ab22d545a9d463e4241d455e3f165fbaf36b114 Mon Sep 17 00:00:00 2001 From: jinyu Date: Fri, 5 Jul 2024 16:18:54 +0800 Subject: [PATCH 07/17] =?UTF-8?q?alpha=E5=8F=B2=E8=92=82=E5=A5=87mode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/keys-rtc-ng-api-java.ditamap | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 2a322f05dfe..63255f775f9 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -5743,6 +5743,41 @@ + + + + VIDEO_NO_ALPHA_STITCH + + + + + + + VIDEO_ALPHA_STITCH_UP + + + + + + + VIDEO_ALPHA_STITCH_BELOW + + + + + + + VIDEO_ALPHA_STITCH_LEFT + + + + + + + VIDEO_ALPHA_STITCH_RIGHT + + + From 5163222adec66a0231a3d45d3a1911d5f03a1fca Mon Sep 17 00:00:00 2001 From: jinyuagora Date: Fri, 5 Jul 2024 08:19:29 +0000 Subject: [PATCH 08/17] Sync cn prototype to en prototype --- .../config/keys-rtc-ng-api-java.ditamap | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 2a322f05dfe..63255f775f9 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -5743,6 +5743,41 @@ + + + + VIDEO_NO_ALPHA_STITCH + + + + + + + VIDEO_ALPHA_STITCH_UP + + + + + + + VIDEO_ALPHA_STITCH_BELOW + + + + + + + VIDEO_ALPHA_STITCH_LEFT + + + + + + + VIDEO_ALPHA_STITCH_RIGHT + + + From b70c7185f6df0cf34e8051a48ac459997043636e Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:33:10 +0800 Subject: [PATCH 09/17] for yicat --- dita/RTC-NG/API/rtc_lite_api.dita | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dita/RTC-NG/API/rtc_lite_api.dita b/dita/RTC-NG/API/rtc_lite_api.dita index 0c07c103229..00c4d9c1eb4 100644 --- a/dita/RTC-NG/API/rtc_lite_api.dita +++ b/dita/RTC-NG/API/rtc_lite_api.dita @@ -111,13 +111,13 @@
          • -
        • 中，以下跟屏幕采集相关的参数设置无效： +
        • 在 中，以下跟屏幕采集相关的参数设置无效：
          • publishScreenCaptureVideo
          • publishScreenCaptureAudio
          • -
        • 中，以下跟屏幕采集相关的参数设置无效： +
        • 在 中，以下跟屏幕采集相关的参数设置无效：
          • publishScreenCaptureVideo
          • publishScreenCaptureAudio
            • @@ -328,7 +328,7 @@
            • -
          • 中，以下跟屏幕采集相关的参数设置无效： +
          • 在 中，以下跟屏幕采集相关的参数设置无效：
            • publishScreenCaptureVideo
            • publishScreenCaptureAudio
              • @@ -385,7 +385,7 @@
              • -
            • 中，以下跟屏幕采集相关的参数设置无效： +
            • 在 中，以下跟屏幕采集相关的参数设置无效：
              • publishScreenCaptureVideo
              • publishScreenCaptureAudio
                • From e7ea2f25583a11ec10f95de34b4694a7635800b0 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:39:11 +0800 Subject: [PATCH 10/17] add thead --- dita/RTC-NG/API/rtc_api_sunset.dita | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_sunset.dita b/dita/RTC-NG/API/rtc_api_sunset.dita index b66c1b5a890..d21e0c53fb6 100644 --- a/dita/RTC-NG/API/rtc_api_sunset.dita +++ b/dita/RTC-NG/API/rtc_api_sunset.dita @@ -190,13 +190,15 @@ - + API 描述 替代 API 删除版本 + + setVideoProfile 设置视频编码配置。 @@ -335,15 +337,10 @@ v4.4.0 - - - - - - + - \ No newline at end of file + From 5e153f46cf3152abfadc0d69f282f386148cd2ea Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 11:41:00 +0800 Subject: [PATCH 11/17] remove sunset api --- .../API/api_irtcengine_setvideoprofile2.dita | 2 +- dita/RTC-NG/API/rtc_api_overview.dita | 8 -- dita/RTC-NG/API/rtc_api_sunset.dita | 88 ++++--------------- dita/RTC-NG/API/rtc_lite_api.dita | 7 -- dita/RTC-NG/RTC_NG_API_Android.ditamap | 9 -- dita/RTC-NG/RTC_NG_API_CPP.ditamap | 5 -- dita/RTC-NG/RTC_NG_API_iOS.ditamap | 8 -- dita/RTC-NG/RTC_NG_API_macOS.ditamap | 8 -- .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 35 -------- .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 56 ------------ .../config/keys-rtc-ng-api-java.ditamap | 63 ------------- .../config/keys-rtc-ng-api-macos.ditamap | 56 ------------ .../config/relations-rtc-ng-api.ditamap | 10 --- 13 files changed, 17 insertions(+), 338 deletions(-) diff --git a/dita/RTC-NG/API/api_irtcengine_setvideoprofile2.dita b/dita/RTC-NG/API/api_irtcengine_setvideoprofile2.dita index 89f5b0d7a07..03db553c3fa 100644 --- a/dita/RTC-NG/API/api_irtcengine_setvideoprofile2.dita +++ b/dita/RTC-NG/API/api_irtcengine_setvideoprofile2.dita @@ -6,7 +6,7 @@ - + diff --git a/dita/RTC-NG/API/rtc_api_overview.dita b/dita/RTC-NG/API/rtc_api_overview.dita index ec7666152cd..6075fd3c6cb 100644 --- a/dita/RTC-NG/API/rtc_api_overview.dita +++ b/dita/RTC-NG/API/rtc_api_overview.dita @@ -2649,14 +2649,6 @@ 方法/回调 描述 - - - - - - - - diff --git a/dita/RTC-NG/API/rtc_api_sunset.dita b/dita/RTC-NG/API/rtc_api_sunset.dita index d21e0c53fb6..f2383532801 100644 --- a/dita/RTC-NG/API/rtc_api_sunset.dita +++ b/dita/RTC-NG/API/rtc_api_sunset.dita @@ -197,26 +197,12 @@ 替代 API 删除版本 - - - - setVideoProfile - 设置视频编码配置。 - - v4.4.0 - - - setVideoProfile [1/2] + + setVideoProfilesetVideoProfile [1/2] 设置视频编码配置。 v4.4.0 - - setVideoProfile [2/2] - 手动设置视频编码配置。 - - v4.4.0 - setRemoteRenderMode [1/2] 设置远端视图显示模式。 @@ -235,14 +221,8 @@ Android 原生的 。 v4.4.0 - - openWithCustomSource - 打开自定义媒体资源文件。 - - v4.4.0 - - - openWithCustomSourceAtStartPos + + openWithCustomSourceopenWithCustomSourceAtStartPos 打开自定义媒体资源文件。 v4.4.0 @@ -253,26 +233,14 @@ 建议使用 类中的 degradationPreference 参数设置视频质量偏好。 v4.4.0 - - startEchoTest [1/3] - 开始语音通话回路测试。 - - v4.4.0 - - - startEchoTest - 开始语音通话回路测试。 - - v4.4.0 - - - startEchoTest [2/3] + + startEchoTest [1/3]startEchoTest 开始语音通话回路测试。 v4.4.0 - - startEchoTestWithInterval + + startEchoTest [2/3]startEchoTestWithInterval 开始语音通话回路测试。 v4.4.0 @@ -289,50 +257,26 @@ v4.4.0 - - onExtensionEvent - 插件事件回调。 - - v4.4.0 - - - onEvent + + onExtensionEventonEvent 插件事件回调。 v4.4.0 - - onExtensionStarted - 插件启用回调。 - - v4.4.0 - - - onStarted + + onExtensionStartedonStarted 插件启用回调。 v4.4.0 - - onExtensionStopped - 插件禁用回调。 - - v4.4.0 - - - onStopped + + onExtensionStoppedonStopped 插件禁用回调。 v4.4.0 - - onExtensionError - 插件出错回调。 - - v4.4.0 - - - onError + + onExtensionErroronError 插件出错回调。 v4.4.0 diff --git a/dita/RTC-NG/API/rtc_lite_api.dita b/dita/RTC-NG/API/rtc_lite_api.dita index 00c4d9c1eb4..4f98a9b05b6 100644 --- a/dita/RTC-NG/API/rtc_lite_api.dita +++ b/dita/RTC-NG/API/rtc_lite_api.dita @@ -28,8 +28,6 @@
                • -
                • -
                • @@ -226,8 +224,6 @@
                • -
                • -
                • @@ -263,7 +259,6 @@
                • -
                • @@ -284,7 +279,6 @@
                • -
                • @@ -519,7 +513,6 @@
                • -
                • diff --git a/dita/RTC-NG/RTC_NG_API_Android.ditamap b/dita/RTC-NG/RTC_NG_API_Android.ditamap index 18f38397800..828d4a19a6e 100644 --- a/dita/RTC-NG/RTC_NG_API_Android.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Android.ditamap @@ -251,7 +251,6 @@ - @@ -351,13 +350,10 @@ - - - @@ -460,7 +456,6 @@ - @@ -718,8 +713,6 @@ - - @@ -728,8 +721,6 @@ - - diff --git a/dita/RTC-NG/RTC_NG_API_CPP.ditamap b/dita/RTC-NG/RTC_NG_API_CPP.ditamap index 950d45c10fb..e7f27c551b8 100644 --- a/dita/RTC-NG/RTC_NG_API_CPP.ditamap +++ b/dita/RTC-NG/RTC_NG_API_CPP.ditamap @@ -464,7 +464,6 @@ - @@ -786,8 +785,6 @@ - - @@ -796,8 +793,6 @@ - - diff --git a/dita/RTC-NG/RTC_NG_API_iOS.ditamap b/dita/RTC-NG/RTC_NG_API_iOS.ditamap index b6de10ba006..47fe0be1f55 100644 --- a/dita/RTC-NG/RTC_NG_API_iOS.ditamap +++ b/dita/RTC-NG/RTC_NG_API_iOS.ditamap @@ -256,9 +256,7 @@ - - @@ -364,7 +362,6 @@ - @@ -463,7 +460,6 @@ - @@ -713,8 +709,6 @@ - - @@ -722,8 +716,6 @@ - - diff --git a/dita/RTC-NG/RTC_NG_API_macOS.ditamap b/dita/RTC-NG/RTC_NG_API_macOS.ditamap index 639dbed2d14..29f437107bb 100644 --- a/dita/RTC-NG/RTC_NG_API_macOS.ditamap +++ b/dita/RTC-NG/RTC_NG_API_macOS.ditamap @@ -250,10 +250,8 @@ - - @@ -357,7 +355,6 @@ - @@ -449,7 +446,6 @@ - @@ -657,8 +653,6 @@ - - @@ -666,8 +660,6 @@ - - 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 b6484767572..4f57910d937 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -873,13 +873,6 @@ - - - - openWithCustomSource - - - @@ -2574,20 +2567,6 @@ - - - - startEchoTest [1/3] - - - - - - - startEchoTest [2/3] - - - @@ -3004,20 +2983,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - 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 7556c577280..deaa239de6f 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -775,13 +775,6 @@ - - - - openWithCustomSourceAtStartPos - - - @@ -1038,13 +1031,6 @@ - - - - setVideoQualityParameters - - - @@ -1087,13 +1073,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1157,13 +1136,6 @@ - - - - setVideoProfile [1/2] - - - @@ -2453,20 +2425,6 @@ - - - - startEchoTest - - - - - - - startEchoTestWithInterval - - - @@ -2909,13 +2867,6 @@ - - - - setEncryptionMode - - - @@ -2923,13 +2874,6 @@ - - - - setEncryptionSecret - - - diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 63255f775f9..5a42715db6d 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -774,13 +774,6 @@ - - - - openWithCustomSource - - - @@ -1058,13 +1051,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1079,20 +1065,6 @@ - - - - CreateRendererView - - - - - - - CreateTextureView - - - @@ -1149,13 +1121,6 @@ - - - - setVideoProfile - - - @@ -2706,20 +2671,6 @@ - - - - startEchoTest [1/3] - - - - - - - startEchoTest [2/3] - - - @@ -3159,20 +3110,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - 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 bf84399751e..6b44bb7acb3 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -732,13 +732,6 @@ - - - - openWithCustomSourceAtStartPos - - - @@ -995,13 +988,6 @@ - - - - setVideoQualityParameters - - - @@ -1044,13 +1030,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1114,13 +1093,6 @@ - - - - setVideoProfile [1/2] - - - @@ -2420,20 +2392,6 @@ - - - - startEchoTest - - - - - - - startEchoTestWithInterval - - - @@ -2855,13 +2813,6 @@ - - - - setEncryptionMode - - - @@ -2869,13 +2820,6 @@ - - - - setEncryptionSecret - - - diff --git a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap index ac4c31f9bb3..6a70cb45ff8 100644 --- a/dita/RTC-NG/config/relations-rtc-ng-api.ditamap +++ b/dita/RTC-NG/config/relations-rtc-ng-api.ditamap @@ -2219,8 +2219,6 @@ - - @@ -2420,8 +2418,6 @@ - - @@ -2459,7 +2455,6 @@ - @@ -2481,10 +2476,8 @@ - - @@ -2495,8 +2488,6 @@ - - @@ -2760,7 +2751,6 @@ - From 1e469ac03b6f19939d92d16b3d21747cff7af143 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 03:42:07 +0000 Subject: [PATCH 12/17] Sync cn prototype to en prototype --- .../RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 35 ----------- .../RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 56 ----------------- .../config/keys-rtc-ng-api-java.ditamap | 63 ------------------- .../config/keys-rtc-ng-api-macos.ditamap | 56 ----------------- 4 files changed, 210 deletions(-) diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index b6484767572..4f57910d937 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -873,13 +873,6 @@ - - - - openWithCustomSource - - - @@ -2574,20 +2567,6 @@ - - - - startEchoTest [1/3] - - - - - - - startEchoTest [2/3] - - - @@ -3004,20 +2983,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap index 7556c577280..deaa239de6f 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -775,13 +775,6 @@ - - - - openWithCustomSourceAtStartPos - - - @@ -1038,13 +1031,6 @@ - - - - setVideoQualityParameters - - - @@ -1087,13 +1073,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1157,13 +1136,6 @@ - - - - setVideoProfile [1/2] - - - @@ -2453,20 +2425,6 @@ - - - - startEchoTest - - - - - - - startEchoTestWithInterval - - - @@ -2909,13 +2867,6 @@ - - - - setEncryptionMode - - - @@ -2923,13 +2874,6 @@ - - - - setEncryptionSecret - - - diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 63255f775f9..5a42715db6d 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -774,13 +774,6 @@ - - - - openWithCustomSource - - - @@ -1058,13 +1051,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1079,20 +1065,6 @@ - - - - CreateRendererView - - - - - - - CreateTextureView - - - @@ -1149,13 +1121,6 @@ - - - - setVideoProfile - - - @@ -2706,20 +2671,6 @@ - - - - startEchoTest [1/3] - - - - - - - startEchoTest [2/3] - - - @@ -3159,20 +3110,6 @@ - - - - setEncryptionMode - - - - - - - setEncryptionSecret - - - diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap index bf84399751e..6b44bb7acb3 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -732,13 +732,6 @@ - - - - openWithCustomSourceAtStartPos - - - @@ -995,13 +988,6 @@ - - - - setVideoQualityParameters - - - @@ -1044,13 +1030,6 @@ - - - - setRemoteRenderMode [1/2] - - - @@ -1114,13 +1093,6 @@ - - - - setVideoProfile [1/2] - - - @@ -2420,20 +2392,6 @@ - - - - startEchoTest - - - - - - - startEchoTestWithInterval - - - @@ -2855,13 +2813,6 @@ - - - - setEncryptionMode - - - @@ -2869,13 +2820,6 @@ - - - - setEncryptionSecret - - - From 04a75e838d2096eed88f6fc487b71a1366711de3 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 11:58:47 +0800 Subject: [PATCH 13/17] update overload sunset api --- dita/RTC-NG/API/rtc_api_sunset.dita | 8 ++++---- dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 2 +- dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 4 ++-- dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap | 4 ++-- dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_sunset.dita b/dita/RTC-NG/API/rtc_api_sunset.dita index f2383532801..c98afff1320 100644 --- a/dita/RTC-NG/API/rtc_api_sunset.dita +++ b/dita/RTC-NG/API/rtc_api_sunset.dita @@ -198,13 +198,13 @@ 删除版本                 - setVideoProfilesetVideoProfile [1/2] + setVideoProfilesetVideoProfile:profile:swapWidthAndHeight 设置视频编码配置。 v4.4.0 - setRemoteRenderMode [1/2] + setRemoteRenderMode(userId, renderMode);setRemoteRenderMode:uid:mode 设置远端视图显示模式。 v4.4.0 @@ -234,13 +234,13 @@ v4.4.0 - startEchoTest [1/3]startEchoTest + startEchoTest()startEchoTest: 开始语音通话回路测试。 v4.4.0 - startEchoTest [2/3]startEchoTestWithInterval + startEchoTest(intervalInSeconds)startEchoTestWithInterval:interval 开始语音通话回路测试。 v4.4.0 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 4f57910d937..9590b0026eb 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -2570,7 +2570,7 @@ - startEchoTest [3/3] + startEchoTest 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 deaa239de6f..cd725f593a0 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -1076,7 +1076,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -1139,7 +1139,7 @@ - setVideoProfile [2/2] + setVideoProfile diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 5a42715db6d..bdb5cc17bf3 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -1054,7 +1054,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -2674,7 +2674,7 @@ - startEchoTest [3/3] + startEchoTest 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 6b44bb7acb3..9a13b510c1d 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -1033,7 +1033,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -1096,7 +1096,7 @@ - setVideoProfile [2/2] + setVideoProfile From 7cf6dc967377fa0df92c3e15aa17093bd5c66d3d Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 03:59:18 +0000 Subject: [PATCH 14/17] Sync cn prototype to en prototype --- en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 2 +- en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 4 ++-- en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap | 4 ++-- en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index 4f57910d937..9590b0026eb 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -2570,7 +2570,7 @@ - startEchoTest [3/3] + startEchoTest diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap index deaa239de6f..cd725f593a0 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -1076,7 +1076,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -1139,7 +1139,7 @@ - setVideoProfile [2/2] + setVideoProfile diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap index 5a42715db6d..bdb5cc17bf3 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap @@ -1054,7 +1054,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -2674,7 +2674,7 @@ - startEchoTest [3/3] + startEchoTest diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap index 6b44bb7acb3..9a13b510c1d 100644 --- a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -1033,7 +1033,7 @@ - setRemoteRenderMode [2/2] + setRemoteRenderMode @@ -1096,7 +1096,7 @@ - setVideoProfile [2/2] + setVideoProfile From a74439a0a206ef03da6866afccdd0a297e90c404 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 14:23:52 +0800 Subject: [PATCH 15/17] move sunset api to archive --- dita/RTC-NG/API/rtc_api_sunset.dita | 11 ++++++----- .../api_imediaplayer_openwithcustomsource.dita | 0 .../api_irtcengine_createrendererview.dita | 0 .../api_irtcengine_createtextureview.dita | 0 .../api_irtcengine_setencryptionmode.dita | 0 .../api_irtcengine_setencryptionsecret.dita | 0 .../api_irtcengine_setremoterendermode.dita | 0 .../api_irtcengine_setvideoprofile.dita | 0 .../api_irtcengine_setvideoqualityparameters.dita | 0 .../api_irtcengine_startechotest.dita | 0 .../api_irtcengine_startechotest2.dita | 0 11 files changed, 6 insertions(+), 5 deletions(-) rename dita/RTC-NG/{API => archive}/api_imediaplayer_openwithcustomsource.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_createrendererview.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_createtextureview.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_setencryptionmode.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_setencryptionsecret.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_setremoterendermode.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_setvideoprofile.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_setvideoqualityparameters.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_startechotest.dita (100%) rename dita/RTC-NG/{API => archive}/api_irtcengine_startechotest2.dita (100%) diff --git a/dita/RTC-NG/API/rtc_api_sunset.dita b/dita/RTC-NG/API/rtc_api_sunset.dita index c98afff1320..abf51a7812a 100644 --- a/dita/RTC-NG/API/rtc_api_sunset.dita +++ b/dita/RTC-NG/API/rtc_api_sunset.dita @@ -197,14 +197,16 @@ 替代 API 删除版本 + + - setVideoProfilesetVideoProfile:profile:swapWidthAndHeight + setVideoProfilesetVideoProfile:profile:swapWidthAndHeight: 设置视频编码配置。 v4.4.0 - setRemoteRenderMode(userId, renderMode);setRemoteRenderMode:uid:mode + setRemoteRenderMode(userId, renderMode)setRemoteRenderMode:uid:mode: 设置远端视图显示模式。 v4.4.0 @@ -240,7 +242,7 @@ v4.4.0 - startEchoTest(intervalInSeconds)startEchoTestWithInterval:interval + startEchoTest(intervalInSeconds)startEchoTestWithInterval:interval: 开始语音通话回路测试。 v4.4.0 @@ -281,8 +283,7 @@ v4.4.0 - - + diff --git a/dita/RTC-NG/API/api_imediaplayer_openwithcustomsource.dita b/dita/RTC-NG/archive/api_imediaplayer_openwithcustomsource.dita similarity index 100% rename from dita/RTC-NG/API/api_imediaplayer_openwithcustomsource.dita rename to dita/RTC-NG/archive/api_imediaplayer_openwithcustomsource.dita diff --git a/dita/RTC-NG/API/api_irtcengine_createrendererview.dita b/dita/RTC-NG/archive/api_irtcengine_createrendererview.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_createrendererview.dita rename to dita/RTC-NG/archive/api_irtcengine_createrendererview.dita diff --git a/dita/RTC-NG/API/api_irtcengine_createtextureview.dita b/dita/RTC-NG/archive/api_irtcengine_createtextureview.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_createtextureview.dita rename to dita/RTC-NG/archive/api_irtcengine_createtextureview.dita diff --git a/dita/RTC-NG/API/api_irtcengine_setencryptionmode.dita b/dita/RTC-NG/archive/api_irtcengine_setencryptionmode.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_setencryptionmode.dita rename to dita/RTC-NG/archive/api_irtcengine_setencryptionmode.dita diff --git a/dita/RTC-NG/API/api_irtcengine_setencryptionsecret.dita b/dita/RTC-NG/archive/api_irtcengine_setencryptionsecret.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_setencryptionsecret.dita rename to dita/RTC-NG/archive/api_irtcengine_setencryptionsecret.dita diff --git a/dita/RTC-NG/API/api_irtcengine_setremoterendermode.dita b/dita/RTC-NG/archive/api_irtcengine_setremoterendermode.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_setremoterendermode.dita rename to dita/RTC-NG/archive/api_irtcengine_setremoterendermode.dita diff --git a/dita/RTC-NG/API/api_irtcengine_setvideoprofile.dita b/dita/RTC-NG/archive/api_irtcengine_setvideoprofile.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_setvideoprofile.dita rename to dita/RTC-NG/archive/api_irtcengine_setvideoprofile.dita diff --git a/dita/RTC-NG/API/api_irtcengine_setvideoqualityparameters.dita b/dita/RTC-NG/archive/api_irtcengine_setvideoqualityparameters.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_setvideoqualityparameters.dita rename to dita/RTC-NG/archive/api_irtcengine_setvideoqualityparameters.dita diff --git a/dita/RTC-NG/API/api_irtcengine_startechotest.dita b/dita/RTC-NG/archive/api_irtcengine_startechotest.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_startechotest.dita rename to dita/RTC-NG/archive/api_irtcengine_startechotest.dita diff --git a/dita/RTC-NG/API/api_irtcengine_startechotest2.dita b/dita/RTC-NG/archive/api_irtcengine_startechotest2.dita similarity index 100% rename from dita/RTC-NG/API/api_irtcengine_startechotest2.dita rename to dita/RTC-NG/archive/api_irtcengine_startechotest2.dita From 254ecd1547e81fb2139d5ca68f8b2d43b3b28a31 Mon Sep 17 00:00:00 2001 From: Cilla-luodan <85477033+Cilla-luodan@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:49:34 +0800 Subject: [PATCH 16/17] 1 --- dita/RTC-NG/API/class_externalvideoframe.dita | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index 9cf108d1bee..b6a7e96bd6c 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -435,8 +435,8 @@ class ExternalVideoFrame { fillAlphaData 该参数仅适用于 BGRA 或 RGBA 格式的视频数据。设置是否提取视频帧中的 Alpha 通道数据并自动填入到 alphaBuffer 中：
                  -
                • ：提取 Alpha 通道数据。
                  • -
                • ：（默认）不提取 Alpha 通道数据。
                  • +
                • ：提取并填充 Alpha 通道数据。
                  • +
                • ：（默认）不提取填充 Alpha 通道数据。
                对于 BGRA 或 RGBA 格式的视频数据，你可以任选一种方式设置 Alpha 通道数据：
                  From a0242d740a7128b0436fb6d616060f9053880af5 Mon Sep 17 00:00:00 2001 From: Nero-Hu Date: Wed, 10 Jul 2024 14:59:56 +0800 Subject: [PATCH 17/17] update sunset --- dita/RTC-NG/API/rtc_api_sunset.dita | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dita/RTC-NG/API/rtc_api_sunset.dita b/dita/RTC-NG/API/rtc_api_sunset.dita index abf51a7812a..dfe6b9b31d3 100644 --- a/dita/RTC-NG/API/rtc_api_sunset.dita +++ b/dita/RTC-NG/API/rtc_api_sunset.dita @@ -232,17 +232,17 @@ setVideoQualityParameters 设置视频优化选项（仅适用于直播）。 - 建议使用 类中的 degradationPreference 参数设置视频质量偏好。 + 使用 类中的 degradationPreference 参数 v4.4.0 - startEchoTest()startEchoTest: + startEchoTest()startEchoTest 开始语音通话回路测试。 v4.4.0 - startEchoTest(intervalInSeconds)startEchoTestWithInterval:interval: + startEchoTest(intervalInSeconds)startEchoTestWithInterval 开始语音通话回路测试。 v4.4.0