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.

Sign up for GitHub

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

4.2.3 unity #3344

Merged
merged 3 commits into from
Sep 22, 2023
Merged

4.2.3 unity #3344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
821f30b
unity 4.2.3
Suri539 Sep 21, 2023
2c16400
Sync cn prototype to en prototype
Suri539 Sep 21, 2023
3b2f428
Merge pull request #3343 from AgoraIO/auto/sync-cn-proto-to-en-patch-…
github-actions[bot] Sep 21, 2023
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
39 changes: 21 additions & 18 deletions dita/RTC-NG/API/class_contentinspectconfig.dita
View file
Open in desktop
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 int moduleCount { set; get; }
{
public string extraInfo;
public string serverConfig;
public ContentInspectModule[] modules;
public int moduleCount;

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 Expand Up @@ -128,7 +131,7 @@ class ContentInspectConfig {
<pt>CONTENT_INSPECT_TYPE_IMAGE_MODERATION</pt>
<pd>3：使用云市场插件截图上传。SDK 会使用云市场视频审核插件对视频流进行截图并上传。</pd>
</plentry>
<plentry props="native unreal bp electron rn flutter">
<plentry>
<pt>extraInfo</pt>
<pd>
<p>附加信息，最大长度为 1024 字节。</p>
Expand Down
84 changes: 22 additions & 62 deletions dita/RTC-NG/API/class_externalvideoframe.dita
View file
Open in desktop
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"></codeblock></p>
</section>
<section id="detailed_desc" props="android">
Expand Down Expand Up @@ -392,7 +352,7 @@ class ExternalVideoFrame {
<li>当使用 Android 定义的 OpenGL 接口 (android.opengl.*)时，需要将 eglContext 设置给这个字段。</li>
</ul></pd>
</plentry>
<plentry props="cpp unreal bp unity c'selectron rn flutter cs">
<plentry props="cpp unreal bp unity electron rn flutter cs">
<pt>eglType</pt>
<pd>该参数仅适用于 Texture 格式的视频数据。指该视频帧的 Texture ID。</pd>
</plentry>
Expand Down Expand Up @@ -458,4 +418,4 @@ class ExternalVideoFrame {
</plentry>
</parml>
</section></refbody>
</reference>
</reference>
1 change: 1 addition & 0 deletions dita/RTC-NG/API/rtc_api_data_type.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,7 @@
<li><xref keyref="EXPERIENCE_POOR_REASON"/></li>
<li><xref keyref="EXPERIENCE_QUALITY_TYPE"/></li>
<li><xref keyref="EXTERNAL_VIDEO_SOURCE_TYPE"/></li>
<li><xref keyref="FeatureType"/></li>
<li><xref keyref="FRAME_RATE"/></li>
<li><xref keyref="HEADPHONE_EQUALIZER_PRESET"/></li>
<li props="hide"><xref keyref="INTERFACE_ID_TYPE"/></li>
Expand Down
2 changes: 2 additions & 0 deletions dita/RTC-NG/RTC_NG_API_Unity.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
<topicref href="API/toc_video_prenpro.dita" chunk="to-content">
<topicref href="API/toc_snapshot.dita" chunk="to-content">
<topicref keyref="enableContentInspect" toc="no"/>
<topicref keyref="enableContentInspectEx" toc="no"/>
<topicref keyref="takeSnapshot" toc="no"/>
<topicref keyref="takeSnapshotEx" toc="no"/>
<topicref keyref="onContentInspectResult" toc="no" props="hide"/>
Expand Down Expand Up @@ -714,6 +715,7 @@
<topicref keyref="getNetworkType" toc="no"/>
<topicref keyref="getNtpWallTimeInMs" toc="no"/>
<topicref keyref="getVersion" toc="no"/>
<topicref keyref="isFeatureAvailableOnDevice" toc="no"/>
<topicref keyref="onRemoteSubscribeFallbackToAudioOnly" toc="no" props="hide"/>
<topicref keyref="rate" toc="no"/>
<topicref keyref="sendCustomReportMessage" toc="no"/>
Expand Down
96 changes: 90 additions & 6 deletions dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3603,6 +3603,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="enableContentInspectEx" href="../API/api_irtcengineex_enablecontentinspectex.dita">
<topicmeta>
<keywords>
<keyword>EnableContentInspectEx</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
<topichead navtitle="Unity 原生方法">
<keydef keys="setEnable" href="../API/api_videosurface_setenable.dita">
Expand Down Expand Up @@ -3754,6 +3761,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="isFeatureAvailableOnDevice" href="../API/api_irtcengine_isfeatureavailableondevice.dita">
<topicmeta>
<keywords>
<keyword>IsFeatureAvailableOnDevice</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
</topichead>
<topichead navtitle="Callbacks">
Expand Down Expand Up @@ -6933,17 +6947,17 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="CONTENT_INSPECT_MODERATION">
<keydef keys="CONTENT_INSPECT_SUPERVISE">
<topicmeta>
<keywords>
<keyword>CONTENT_INSPECT_MODERATION</keyword>
<keyword>CONTENT_INSPECT_SUPERVISE</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="CONTENT_INSPECT_SUPERVISE">
<keydef keys="CONTENT_INSPECT_IMAGE_MODERATION">
<topicmeta>
<keywords>
<keyword>CONTENT_INSPECT_SUPERVISION</keyword>
<keyword>CONTENT_INSPECT_IMAGE_MODERATION</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -8326,6 +8340,27 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="FeatureType" href="../API/enum_featuretype.dita">
<topicmeta>
<keywords>
<keyword>FeatureType</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="VIDEO_VIRTUAL_BACKGROUND">
<topicmeta>
<keywords>
<keyword>VIDEO_VIRTUAL_BACKGROUND</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="VIDEO_BEAUTY_EFFECT">
<topicmeta>
<keywords>
<keyword>VIDEO_BEAUTY_EFFECT</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="FRAME_RATE" href="../API/enum_framerate.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -8753,17 +8788,59 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_NOT_SUPPORTED">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_NOT_SUPPORTED</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE">
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_DEVICE_SYSTEM_PRESSURE</keyword>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_PAUSED</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_RESUMED</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_HIDDEN</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_HIDDEN</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED">
<topicmeta>
<keywords>
<keyword>LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_WINDOW_RECOVER_FROM_MINIMIZED</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -11637,6 +11714,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="VIDEO_TEXTURE_ID3D11TEXTURE2D">
<topicmeta>
<keywords>
<keyword>VIDEO_TEXTURE_ID3D11TEXTURE2D</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="VIDEO_TEXTURE_OES">
<topicmeta>
<keywords>
Expand Down
Loading
Loading