From 821f30b44d661349773e59b71e2e06b5c3aeab49 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 21 Sep 2023 17:39:47 +0800 Subject: [PATCH] unity 4.2.3 --- .../API/class_contentinspectconfig.dita | 39 ++++---- dita/RTC-NG/API/class_externalvideoframe.dita | 84 +++++----------- dita/RTC-NG/API/rtc_api_data_type.dita | 1 + dita/RTC-NG/RTC_NG_API_Unity.ditamap | 2 + .../config/keys-rtc-ng-api-unity.ditamap | 96 +++++++++++++++++-- 5 files changed, 136 insertions(+), 86 deletions(-) diff --git a/dita/RTC-NG/API/class_contentinspectconfig.dita b/dita/RTC-NG/API/class_contentinspectconfig.dita index 6f80e628574..669324e188e 100644 --- a/dita/RTC-NG/API/class_contentinspectconfig.dita +++ b/dita/RTC-NG/API/class_contentinspectconfig.dita @@ -42,7 +42,7 @@ struct ContentInspectConfig { const char* extraInfo; const char* serverConfig; - + ContentInspectModule modules[MAX_CONTENT_INSPECT_MODULE_COUNT]; int moduleCount; ContentInspectConfig& operator=(const ContentInspectConfig& rth) @@ -56,33 +56,36 @@ ContentInspectConfig() :extraInfo(NULL), serverConfig(NULL), moduleCount(0){} }; export class ContentInspectConfig { - + extraInfo?: string; - + modules?: ContentInspectModule[]; - + moduleCount?: number; } public class ContentInspectConfig - { - public ContentInspectModule[] modules { set; get; } - - public int moduleCount { set; get; } + { + public string extraInfo; + public string serverConfig; + public ContentInspectModule[] modules; + public int moduleCount; - public ContentInspectConfig() - { - modules = null; - moduleCount = 0; - } - }; + public ContentInspectConfig() + { + extraInfo = ""; + serverConfig = ""; + modules = null; + moduleCount = 0; + } + }; export class ContentInspectConfig { - + extraInfo?: string; - + serverConfig?: string; modules?: ContentInspectModule[]; - + moduleCount?: number; } @JsonSerializable(explicitToJson: true, includeIfNull: false) @@ -128,7 +131,7 @@ class ContentInspectConfig { CONTENT_INSPECT_TYPE_IMAGE_MODERATION 3：使用云市场插件截图上传。SDK 会使用云市场视频审核插件对视频流进行截图并上传。 - + extraInfo

附加信息，最大长度为 1024 字节。

diff --git a/dita/RTC-NG/API/class_externalvideoframe.dita b/dita/RTC-NG/API/class_externalvideoframe.dita index b0933d5e60b..9e74b247475 100644 --- a/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/dita/RTC-NG/API/class_externalvideoframe.dita @@ -118,65 +118,25 @@ } public class ExternalVideoFrame { - public ExternalVideoFrame() - { - this.type = VIDEO_BUFFER_TYPE.VIDEO_BUFFER_RAW_DATA; - this.format = VIDEO_PIXEL_FORMAT.VIDEO_PIXEL_UNKNOWN; - this.buffer = null; - this.stride = 0; - this.height = 0; - this.cropLeft = 0; - this.cropTop = 0; - this.cropRight = 0; - this.cropBottom = 0; - this.rotation = 0; - this.timestamp = 0; - this.eglContext = null; - this.eglType = EGL_CONTEXT_TYPE.EGL_CONTEXT10; - this.textureId = 0; - this.metadata_buffer = null; - this.metadata_size = 0; - } - - public ExternalVideoFrame(VIDEO_BUFFER_TYPE type, VIDEO_PIXEL_FORMAT format, byte[] buffer, int stride, - int height, long timestamp, byte[] eglContext, EGL_CONTEXT_TYPE eglType, int textureId, byte[] metadata_buffer, - int metadata_size, int cropLeft = 0, int cropTop = 0, int cropRight = 0, int cropBottom = 0, - int rotation = 0) - { - this.type = type; - this.format = format; - this.buffer = buffer; - this.stride = stride; - this.height = height; - this.cropLeft = cropLeft; - this.cropTop = cropTop; - this.cropRight = cropRight; - this.cropBottom = cropBottom; - this.rotation = rotation; - this.timestamp = timestamp; - this.eglContext = eglContext; - this.eglType = eglType; - this.textureId = textureId; - this.metadata_buffer = metadata_buffer; - this.metadata_size = metadata_size; - } - public VIDEO_BUFFER_TYPE type { set; get; } - public VIDEO_PIXEL_FORMAT format { set; get; } - public byte[] buffer { set; get; } - public int stride { set; get; } - public int height { set; get; } - public int cropLeft { set; get; } - public int cropTop { set; get; } - public int cropRight { set; get; } - public int cropBottom { set; get; } - public int rotation { set; get; } - public long timestamp { set; get; } - public byte[] eglContext { set; get; } - public EGL_CONTEXT_TYPE eglType { set; get; } - public int textureId { set; get; } - public byte[] metadata_buffer { set; get; } - public int metadata_size { set; get; } - } + public VIDEO_BUFFER_TYPE type; + public VIDEO_PIXEL_FORMAT format; + public byte[] buffer; + public int stride; + public int height; + public int cropLeft; + public int cropTop; + public int cropRight; + public int cropBottom; + public int rotation; + public long timestamp; + public byte[] eglContext; + public EGL_CONTEXT_TYPE eglType; + public int textureId; + public byte[] metadata_buffer; + public int metadata_size; + public IntPtr d3d11_texture_2d; + public int texture_slice_index; + }; export class ExternalVideoFrame { type?: VideoBufferType; format?: VideoPixelFormat; @@ -275,7 +235,7 @@ class ExternalVideoFrame { _$ExternalVideoFrameFromJson(json); Map<String, dynamic> toJson() => _$ExternalVideoFrameToJson(this); -} +}

@@ -392,7 +352,7 @@ class ExternalVideoFrame {
  • 当使用 Android 定义的 OpenGL 接口 (android.opengl.*)时，需要将 eglContext 设置给这个字段。
    • - + eglType 该参数仅适用于 Texture 格式的视频数据。指该视频帧的 Texture ID。 @@ -458,4 +418,4 @@ class ExternalVideoFrame {
    - \ No newline at end of file + diff --git a/dita/RTC-NG/API/rtc_api_data_type.dita b/dita/RTC-NG/API/rtc_api_data_type.dita index e84a289a309..bce57be50b5 100644 --- a/dita/RTC-NG/API/rtc_api_data_type.dita +++ b/dita/RTC-NG/API/rtc_api_data_type.dita @@ -1539,6 +1539,7 @@
    • +
    • diff --git a/dita/RTC-NG/RTC_NG_API_Unity.ditamap b/dita/RTC-NG/RTC_NG_API_Unity.ditamap index 7a4fc7f56a1..0e87e1a9c57 100644 --- a/dita/RTC-NG/RTC_NG_API_Unity.ditamap +++ b/dita/RTC-NG/RTC_NG_API_Unity.ditamap @@ -283,6 +283,7 @@ + @@ -714,6 +715,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 61bf93f8538..abe1fdc3902 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -3603,6 +3603,13 @@ + + + + EnableContentInspectEx + + + @@ -3754,6 +3761,13 @@ + + + + IsFeatureAvailableOnDevice + + + @@ -6933,17 +6947,17 @@ - + - CONTENT_INSPECT_MODERATION + CONTENT_INSPECT_SUPERVISE - + - CONTENT_INSPECT_SUPERVISION + CONTENT_INSPECT_IMAGE_MODERATION @@ -8326,6 +8340,27 @@ + + + + FeatureType + + + + + + + VIDEO_VIRTUAL_BACKGROUND + + + + + + + VIDEO_BEAUTY_EFFECT + + + @@ -8753,6 +8788,13 @@ + + + + LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE + + + @@ -8760,10 +8802,45 @@ - + - LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN + + + + + + + LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED @@ -11637,6 +11714,13 @@ + + + + VIDEO_TEXTURE_ID3D11TEXTURE2D + + +