diff --git a/en-US/dita/RTC-NG/API/callback_ivideoframeobserver_getvideoformatpreference.dita b/en-US/dita/RTC-NG/API/callback_ivideoframeobserver_getvideoformatpreference.dita index 72d15d17bca..4303635e515 100644 --- a/en-US/dita/RTC-NG/API/callback_ivideoframeobserver_getvideoformatpreference.dita +++ b/en-US/dita/RTC-NG/API/callback_ivideoframeobserver_getvideoformatpreference.dita @@ -26,13 +26,13 @@ return VIDEO_OBSERVER_FRAME_TYPE.FRAME_TYPE_RGBA; } - +

You need to register the callback when calling the method. After you successfully register the video frame observer, the SDK triggers this callback each time it receives a video frame. You need to set your preferred video data in the return value of this callback.

The default types of pixel format () for the raw video are as follows:
    -
  • On the Android platform, the default video frame type may be I420Buffer or TextureBuffer. As of v4.2.3, the texture formats of TextureBuffer type no longer include OES format, only RGB format is available. You need to add support for I420 and RGB texture formats when processing video data. The cases where the video frame type is fixed as I420Buffer include but are not limited to:
      +
    • On the Android platform, the default video frame type may be I420Buffer or TextureBuffer. The cases where the video frame type is fixed as I420Buffer include but are not limited to:
      • Specific devices, such as: LG G5 SE (H848), Google Pixel 4a, Samsung Galaxy A7, or Xiaomi Mi Max.
      • Image enhancement extension has been integrated and video noise reduction or low-light enhancement function has been enabled.
    • diff --git a/en-US/dita/RTC-NG/API/class_channelmediarelayconfiguration.dita b/en-US/dita/RTC-NG/API/class_channelmediarelayconfiguration.dita index 0d6d9b08dd3..e6956c5d78a 100644 --- a/en-US/dita/RTC-NG/API/class_channelmediarelayconfiguration.dita +++ b/en-US/dita/RTC-NG/API/class_channelmediarelayconfiguration.dita @@ -8,34 +8,31 @@

      public class ChannelMediaRelayConfiguration { private ChannelMediaInfo srcInfo = null; - private Map<String, ChannelMediaInfo> destInfos = null; - + private Map<String, ChannelMediaInfo> destInfos = null; + public ChannelMediaRelayConfiguration() { - destInfos = new HashMap<String, ChannelMediaInfo>(); + destInfos = new HashMap<String, ChannelMediaInfo>(); srcInfo = new ChannelMediaInfo(null, null, 0); } - + public void setSrcChannelInfo(ChannelMediaInfo srcInfo) { this.srcInfo = srcInfo; } - + public void setDestChannelInfo(String channelName, ChannelMediaInfo destInfo) { destInfos.put(channelName, destInfo); } - + public void removeDestChannelInfo(String channelName) { destInfos.remove(channelName); } - public ChannelMediaInfo getSrcChannelMediaInfo() { return srcInfo; } - - public Map<String, ChannelMediaInfo> getDestChannelMediaInfos() { + public Map<String, ChannelMediaInfo> getDestChannelMediaInfos() { return destInfos; } -} - +} export class ChannelMediaRelayConfiguration { public srcInfo:ChannelMediaInfo = new ChannelMediaInfo(null,null,0); public destInfos:Map<string, ChannelMediaInfo> = new Map<string, ChannelMediaInfo>(); @@ -43,25 +40,21 @@ public setSrcChannelInfo(srcInfo: ChannelMediaInfo) { this.srcInfo = srcInfo; } - __attribute__((visibility("default"))) @interface AgoraChannelMediaRelayConfiguration: NSObject - + __attribute__((visibility("default"))) @interface AgoraChannelMediaRelayConfiguration: NSObject @property (strong, nonatomic, readonly) NSDictionary<NSString *, AgoraChannelMediaRelayInfo *> *_Nullable destinationInfos; @property (strong, nonatomic) AgoraChannelMediaRelayInfo *_Nonnull sourceInfo; - -- (BOOL)setDestinationInfo:(AgoraChannelMediaRelayInfo *_Nonnull)destinationInfo forChannelName:(NSString *_Nonnull)channelName; -- (BOOL)removeDestinationInfoForChannelName:(NSString *_Nonnull)channelName; +- (BOOL)setDestinationInfo:(AgoraChannelMediaRelayInfo *_Nonnull)destinationInfo forChannelName:(NSString *_Nonnull)channelName NS_SWIFT_NAME(setDestinationInfo(_:forChannelName:)); +- (BOOL)removeDestinationInfoForChannelName:(NSString *_Nonnull)channelName NS_SWIFT_NAME(removeDestinationInfo(forChannelName:)); @end struct ChannelMediaRelayConfiguration { - ChannelMediaInfo *srcInfo; - ChannelMediaInfo *destInfos; - int destCount; - - ChannelMediaRelayConfiguration() - : srcInfo(nullptr) - , destInfos(nullptr) - , destCount(0) - {} - }; + + ChannelMediaInfo* srcInfo; + + ChannelMediaInfo* destInfos; + + int destCount; + ChannelMediaRelayConfiguration() : srcInfo(OPTIONAL_NULLPTR), destInfos(OPTIONAL_NULLPTR), destCount(0) {} +}; USTRUCT(BlueprintType) struct FChannelMediaRelayConfiguration { @@ -153,8 +146,9 @@ public: setSrcChannelInfo Sets the information of the source channel. See . - - setDestChannelInfo + + setDestChannelInfo + setDestinationInfo Sets the information of the target channel. See . diff --git a/en-US/dita/RTC-NG/API/enum_rendermodetype.dita b/en-US/dita/RTC-NG/API/enum_rendermodetype.dita index 7145a3cd845..b581bc51d32 100644 --- a/en-US/dita/RTC-NG/API/enum_rendermodetype.dita +++ b/en-US/dita/RTC-NG/API/enum_rendermodetype.dita @@ -9,13 +9,13 @@ - 1: Hidden mode. Uniformly scale the video until one of its dimension fits the boundary (zoomed to fit). One dimension of the video may have clipped contents. + 1: Hidden mode. The priority is to fill the window. Any excess video that does not match the window size will be cropped. - 2: Fit mode. Uniformly scale the video until one of its dimension fits the boundary (zoomed to fit). Areas that are not filled due to disparity in the aspect ratio are filled with black. + 2: Fit mode. The priority is to ensure that all video content is displayed. Any areas of the window that are not filled due to the mismatch between video size and window size will be filled with black. diff --git a/en-US/dita/RTC-NG/API/enum_rteplayerstate.dita b/en-US/dita/RTC-NG/API/enum_rteplayerstate.dita index 45351c3e663..663af20797b 100644 --- a/en-US/dita/RTC-NG/API/enum_rteplayerstate.dita +++ b/en-US/dita/RTC-NG/API/enum_rteplayerstate.dita @@ -17,35 +17,35 @@ - 0:空闲状态。 + 0: Idle. - 1:正在打开 URL 资源。 当调用 后会报告该状态码。 + 1: Opening URL resource. This state code is reported when is called. - 2:成功打开 URL 资源。 当调用 成功打开 URL 资源后会报告该状态码。 + 2: Successfully opened URL resource. This state code is reported when successfully opens the URL resource. - 3:播放中。 + 3: Currently playing. - 4:暂停播放。 当成功调用 后会报告该状态码。 + 4: Playback paused. This state code is reported when is successfully called. - 5:播放完成。 当主播结束推流退出房间后,会报告该状态码。 + 5: Playback completed. This state code is reported when the host ends the stream and exits the room. - 6:停止播放。 当成功调用 后会报告该状态码。 + 6: Playback stopped. This state code is reported when is successfully called. - 7:失败状态。 当内部发生错误时会报告该状态码。 如果你收到该状态,需要先调用 然后再调用 重新打开该资源。 + 7: Failed. This state code is reported when an internal error occurs. If you receive this state, you should first call and then call to reopen the resource.

diff --git a/en-US/dita/RTC-NG/API/enum_rtevideorendermode.dita b/en-US/dita/RTC-NG/API/enum_rtevideorendermode.dita index 5a0c37b2fd8..88495bc6473 100644 --- a/en-US/dita/RTC-NG/API/enum_rtevideorendermode.dita +++ b/en-US/dita/RTC-NG/API/enum_rtevideorendermode.dita @@ -17,11 +17,11 @@ - Uniformly scale the video until it fills the visible boundaries (zoomed to fit). Uniformly scale the video until one of its dimension fits the boundary (zoomed to fit). One dimension of the video may have clipped contents. + 0: Video size is scaled proportionally. The priority is to fill the window. Any excess video that does not match the window size will be cropped. - 1: Hidden mode. Uniformly scale the video until one of its dimension fits the boundary (zoomed to fit). Areas that are not filled due to disparity in the aspect ratio are filled with black. + 1: Video size is scaled proportionally. The priority is to ensure that all video content is displayed. Any areas of the window that are not filled due to the mismatch between video size and window size will be filled with black. diff --git a/en-US/dita/RTC-NG/API/rtc_api_data_type.dita b/en-US/dita/RTC-NG/API/rtc_api_data_type.dita index 4570260d851..611a27959a2 100644 --- a/en-US/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/en-US/dita/RTC-NG/API/rtc_api_data_type.dita @@ -402,7 +402,11 @@
  • -
  • +
  • +
      +
    • +
    • +
  • @@ -517,7 +521,11 @@
  • -
  • +
  • +
      +
    • +
    • +
  • diff --git a/en-US/dita/RTC-NG/API/toc_audiomixer.dita b/en-US/dita/RTC-NG/API/toc_audiomixer.dita index ee7a4fb2bc5..5dd9d365afd 100644 --- a/en-US/dita/RTC-NG/API/toc_audiomixer.dita +++ b/en-US/dita/RTC-NG/API/toc_audiomixer.dita @@ -1,7 +1,7 @@ - 本地音频合流 + Local audio mixing