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.4.0 jjj #3737

Merged
merged 3 commits into from
Aug 15, 2024
Merged

4.4.0 jjj #3737

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
69a4c95
1
jinyuagora Aug 14, 2024
e33842e
-
jinyuagora Aug 14, 2024
9f5eec9
-
jinyuagora Aug 15, 2024
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
6 changes: 1 addition & 5 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 @@ -224,8 +224,7 @@ class ExternalVideoFrame {
this.fillAlphaBuffer,
this.alphaStitchMode,
this.d3d11Texture2d,
this.textureSliceIndex,
this.colorSpace});
this.textureSliceIndex});

@JsonKey(name: 'type')
final VideoBufferType? type;
Expand Down Expand Up @@ -290,9 +289,6 @@ class ExternalVideoFrame {
@JsonKey(name: 'textureSliceIndex')
final int? textureSliceIndex;

@JsonKey(name: 'colorSpace')
final ColorSpace? colorSpace;

factory ExternalVideoFrame.fromJson(Map<String, dynamic> json) =>
_$ExternalVideoFrameFromJson(json);

Expand Down
6 changes: 1 addition & 5 deletions dita/RTC-NG/API/class_videoframe.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,7 @@ class VideoFrame {
this.alphaBuffer,
this.alphaStitchMode,
this.pixelBuffer,
this.metaInfo,
this.colorSpace});
this.metaInfo});

@JsonKey(name: 'type')
final VideoPixelFormat? type;
Expand Down Expand Up @@ -597,9 +596,6 @@ class VideoFrame {
@JsonKey(name: 'metaInfo')
final VideoFrameMetaInfo? metaInfo;

@JsonKey(name: 'colorSpace')
final ColorSpace? colorSpace;

factory VideoFrame.fromJson(Map<String, dynamic> json) =>
_$VideoFrameFromJson(json);

Expand Down
4 changes: 2 additions & 2 deletions dita/RTC-NG/API/enum_localvideostreamreason.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
<pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_RESUMED"/></pt>
<pd>29：（仅适用于 Windows）屏幕采集已从暂停状态中恢复。</pd>
</plentry>
<plentry props="cpp mac">
<plentry props="cpp mac flutter unreal bp unity electron">
<pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_DISPLAY_DISCONNECTED"/></pt>
<pd>30：<ph props="cpp">（仅适用于 Windows 和 macOS）</ph>进行屏幕采集的显示器已断开连接。</pd>
<pd>30：<ph props="cpp flutter unreal bp unity">（仅适用于 Windows 和 macOS）</ph>进行屏幕采集的显示器已断开连接。</pd>
</plentry>
<plentry props="cpp unreal bp unity electron flutter cs">
<pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_DEVICE_SYSTEM_PRESSURE"/></pt>
Expand Down
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 @@ -2190,6 +2190,7 @@
<li><xref keyref="WATERMARK_FIT_MODE"/></li>
</ul>
<ul props="flutter">
<li><xref keyref="ALPHA_STITCH_MODE"/></li>
<li><xref keyref="AREA_CODE"/></li>
<li><xref keyref="AUDIENCE_LATENCY_LEVEL_TYPE"/></li>
<li><xref keyref="AUDIO_AINS_MODE"/></li>
Expand Down
1 change: 0 additions & 1 deletion dita/RTC-NG/RTC_NG_API_Flutter.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@
<topicref keyref="sendCustomReportMessageEx" toc="no"/>
<topicref keyref="setAVSyncSource" toc="no" props="cn"/>
<topicref keyref="setCloudProxy" toc="no"/>
<topicref keyref="setEncryptionSecret" toc="no"/>
<topicref keyref="setLocalAccessPoint" toc="no" props="cn"/>
<topicref keyref="setLocalPublishFallbackOption" toc="no" props="hide"/>
<topicref keyref="setLogFile" toc="no"/>
Expand Down
49 changes: 42 additions & 7 deletions dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2779,13 +2779,6 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="setEncryptionSecret" href="../API/api_irtcengine_setencryptionsecret.dita">
<topicmeta>
<keywords>
<keyword>setEncryptionSecret</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
<topichead navtitle="音频采集">
<keydef keys="startAudioRecording3" href="../API/api_irtcengine_startaudiorecording3.dita">
Expand Down Expand Up @@ -5409,6 +5402,48 @@
</keydef>
</topichead>
<topichead navtitle="Enums">
<keydef keys="ALPHA_STITCH_MODE" href="../API/enum_alphastitchmode.dita">
<topicmeta>
<keywords>
<keyword>AlphaStitchMode</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="NO_ALPHA_STITCH">
<topicmeta>
<keywords>
<keyword>noAlphaStitch</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="ALPHA_STITCH_UP">
<topicmeta>
<keywords>
<keyword>alphaStitchUp</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="ALPHA_STITCH_BELOW">
<topicmeta>
<keywords>
<keyword>alphaStitchBelow</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="ALPHA_STITCH_LEFT">
<topicmeta>
<keywords>
<keyword>alphaStitchLeft</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="ALPHA_STITCH_RIGHT">
<topicmeta>
<keywords>
<keyword>alphaStitchRight</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="AREA_CODE" href="../API/enum_areacode.dita">
<topicmeta>
<keywords>
Expand Down
Loading