Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO: DELETE THIS BRANCH ONCE YOU MERGE!!!] Sync cn prototype to en prototype in a flash #3343

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions en-US/dita/RTC-NG/API/class_contentinspectconfig.dita
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<codeblock props="cpp unreal bp" outputclass="language-cpp">struct ContentInspectConfig {
const char* extraInfo;
const char* serverConfig;

ContentInspectModule modules[MAX_CONTENT_INSPECT_MODULE_COUNT];
int moduleCount;
ContentInspectConfig&amp; operator=(const ContentInspectConfig&amp; rth)
Expand All @@ -56,33 +56,36 @@
ContentInspectConfig() :extraInfo(NULL), serverConfig(NULL), moduleCount(0){}
};</codeblock>
<codeblock props="electron" outputclass="language-typescript">export class ContentInspectConfig {

extraInfo?: string;

modules?: ContentInspectModule[];

moduleCount?: number;
}</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">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;
}
};</codeblock>
public ContentInspectConfig()
{
extraInfo = "";
serverConfig = "";
modules = null;
moduleCount = 0;
}
};</codeblock>
<codeblock props="rn" outputclass="language-typescript">export class ContentInspectConfig {

extraInfo?: string;

serverConfig?: string;

modules?: ContentInspectModule[];

moduleCount?: number;
}</codeblock>
<codeblock props="flutter" outputclass="language-dart">@JsonSerializable(explicitToJson: true, includeIfNull: false)
Expand Down
80 changes: 20 additions & 60 deletions en-US/dita/RTC-NG/API/class_externalvideoframe.dita
Original file line number Diff line number Diff line change
Expand Up @@ -118,65 +118,25 @@
}</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">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; }
}</codeblock>
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;
};</codeblock>
<codeblock props="rn" outputclass="language-typescript">export class ExternalVideoFrame {
type?: VideoBufferType;
format?: VideoPixelFormat;
Expand Down Expand Up @@ -275,7 +235,7 @@ class ExternalVideoFrame {
_$ExternalVideoFrameFromJson(json);

Map&lt;String, dynamic&gt; toJson() =&gt; _$ExternalVideoFrameToJson(this);
}</codeblock>
}</codeblock>
<codeblock props="reserve" outputclass="language-cpp" /></p>
</section>
<section id="detailed_desc" props="android">
Expand Down