From 2c164008fd1a9111821124643f72a23707c317c3 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 21 Sep 2023 09:40:42 +0000 Subject: [PATCH] Sync cn prototype to en prototype --- .../API/class_contentinspectconfig.dita | 37 +++++---- .../RTC-NG/API/class_externalvideoframe.dita | 80 +++++-------------- 2 files changed, 40 insertions(+), 77 deletions(-) diff --git a/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita b/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita index 6f6011c7d65..c0c449f5288 100644 --- a/en-US/dita/RTC-NG/API/class_contentinspectconfig.dita +++ b/en-US/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 string extraInfo; + public string serverConfig; + public ContentInspectModule[] modules; + public int moduleCount; - public int moduleCount { set; get; } - - 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) diff --git a/en-US/dita/RTC-NG/API/class_externalvideoframe.dita b/en-US/dita/RTC-NG/API/class_externalvideoframe.dita index 9794047f03d..c98556d3e9b 100644 --- a/en-US/dita/RTC-NG/API/class_externalvideoframe.dita +++ b/en-US/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); -} +}