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

4.2.3 ld #3334

Merged
merged 11 commits into from
Sep 20, 2023
Merged

4.2.3 ld #3334

merged 11 commits into from
Sep 20, 2023

Conversation

Cilla-luodan
Copy link
Collaborator

No description provided.

@@ -90,6 +90,30 @@
<pt><ph keyref="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_FAILURE"/></pt>
<pd>21:(仅适用于 Windows)当前采集的窗口无数据。</pd>
</plentry>
<plentry props="cpp flutter unity">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

新增的这些枚举要不要+electron

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

因为 electron 这次不发,所以就不加,等到下次 electron发版的时候再做适配。
否则后面拉 bugfix 分支,上面的 electron 内容会超前,就出事了

@@ -90,6 +90,30 @@
<pt><ph keyref="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_FAILURE"/></pt>
<pd>21:(仅适用于 Windows)当前采集的窗口无数据。</pd>
</plentry>
<plentry props="cpp flutter unity">
<pt><ph keyref="LOCAL_VIDEO_STREAM_ERROR_SCREEN_CAPTURE_NO_PERMISSION"/></pt>
<pd>22:(仅适用于 Windows 和 macOS)不具备采集屏幕的权限。</pd>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果上面+electron,这里或许要+个props把elec排除掉

@@ -60,6 +60,10 @@
<pt><ph keyref="VIDEO_PIXEL_I422"/></pt>
<pd>16: I422 格式。</pd>
</plentry>
<plentry props="cpp unity flutter">
<pt><ph keyref="VIDEO_TEXTURE_ID3D11TEXTURE2D"/></pt>
<pd>17: ID3D11TEXTURE2D 格式。目前支持的类型有 <codeph>DXGI_FORMAT_B8G8R8A8_UNORM</codeph>, <codeph>DXGI_FORMAT_B8G8R8A8_TYPELESS</codeph>, <codeph>DXGI_FORMAT_NV12</codeph>。</pd>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是不是按照最新的 SG 要用顿号、(无所谓

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗯改一下好了~

<pt><ph keyref="LOCAL_AUDIO_STREAM_ERROR_INTERRUPTED"/> </pt>
<pd props="cpp unreal bp unity flutter">8:(仅适用于 Android 和 iOS)本地音频采集被系统来电、Siri、闹钟中断。如需恢复本地音频采集,请用户中止电话、Siri、闹钟。</pd>
<pd props="cpp unreal bp ios unity flutter">8:<ph props="cpp unreal bp unity flutter">(仅适用于 Android 和 iOS)</ph>本地音频采集被系统来电、Siri、闹钟中断。如需恢复本地音频采集,请用户中止电话、Siri、闹钟。</pd>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里应该还漏了一个 rn 的 props,上面那俩贴一起的应该也是漏了一个
image

@Cilla-luodan Cilla-luodan merged commit ac5d200 into release/rtc-ng/4.2.3 Sep 20, 2023
2 checks passed
@Cilla-luodan Cilla-luodan deleted the 4.2.3-ld branch June 11, 2024 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants