Skip to content

4.5.0 ld #3788

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

Merged
merged 12 commits into from
Oct 30, 2024
Merged

4.5.0 ld #3788

merged 12 commits into from
Oct 30, 2024

Conversation

Cilla-luodan
Copy link
Collaborator

No description provided.

</dlentry>
</dl>
<p>该方法支持在本地将多路音频流合并为一路音频流。例如:将本地麦克风采集的音频流、媒体播放器中的音频流、声卡采集的音频流、远端音频流、通过网络获取的远端音频流等合并为一路音频流,然后将合流后的音频流发布到频道中。<ul>
<li>如果你要对本地采集的音频流进行合流,可以将 <xref keyref="ChannelMediaOptions"/> 中的 publishMixedAudioTrack 设置为 true,则可将合流后的音频流发布到频道中。</li>
Copy link
Collaborator

Choose a reason for hiding this comment

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

true -> <codeph><ph keyref="true"/></codeph>

</plentry>
<plentry id="targetfps">
<pt>targetFps</pt>
<pd>最大渲染帧率。支持的参数值为:1、7、10、15、24、30、60。
Copy link
Collaborator

Choose a reason for hiding this comment

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

渲染帧率。-> 渲染帧率 (fps)。

</section>
<section id="timing" deliveryTarget="details">
<title>调用时机</title>
<p>该方法需要在 <apiname keyref="startLocalAudioMixer"/> 之后调用。</p>
Copy link
Collaborator

Choose a reason for hiding this comment

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

startLocalAudioMixer 前有冗余空格

@@ -104,6 +104,7 @@
<li>当前 App 已被切换到后台。可以使用前台服务通知操作系统,确保 App 在切换到后台时仍可采集视频。<ph props="cn">详见<xref keyref="android-background"/>。</ph></li>
</ul></li>
<li><ph keyref="LOCAL_VIDEO_STREAM_REASON_DEVICE_FATAL_ERROR"/> (15):视频采集设备出错。请提示用户关闭并重新启动摄像头以恢复功能,如果该操作不能解决问题,请检查摄像头是否出现硬件故障。</li>
<li><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE"/> (21):当前采集的窗口无数据。</li>
Copy link
Collaborator

@jinyuagora jinyuagora Oct 29, 2024

Choose a reason for hiding this comment

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

想问下这个是只有cpp有么?我看java头文件中没有,如果是这样的话这里是不是不写出来

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

研发的 PR 早提出来了,但拖的时间长、又有冲突一直没合入,已催。

@@ -53,7 +53,7 @@
</plentry>
<plentry props="cpp unreal bp mac unity electron flutter cs">
<pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_DEVICE_DISCONNECTED"/></pt>
<pd props="mac cpp unreal bp electron unity flutter"><ph>9:</ph><ph props="cpp unreal bp unity electron flutter">(仅适用于 macOS)</ph><ph>当前正在使用的视频采集设备已经断开连接(例如,被拔出)。</ph></pd>
<pd props="mac cpp unreal bp electron unity flutter"><ph>9:</ph><ph props="cpp unreal bp unity electron flutter">(仅适用于 macOS 和 Winodws)</ph><ph>当前正在使用的视频采集设备已经断开连接(例如,被拔出)。</ph></pd>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Winodws -> Windows

Copy link
Collaborator

Choose a reason for hiding this comment

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

仅适用于 macOS 和 Windows 把 electron 的 props 去掉吧

@@ -98,7 +98,7 @@
</plentry>
<plentry props="cpp unreal bp flutter unity electron">
<pt><ph keyref="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE"/></pt>
<pd>21:(仅适用于 Windows)当前采集的窗口无数据。</pd>
<pd>21:(仅适用于 Windows 和 Android)当前采集的窗口无数据。</pd>
Copy link
Collaborator

Choose a reason for hiding this comment

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

这个为什么支持 Android 但是 java 头文件里没有

@@ -105,5 +105,12 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="mediaprojection-link" href="https://developer.android.com/reference/android/media/projection/MediaProjection" scope="external" format="html">
Copy link
Collaborator

@jinyuagora jinyuagora Oct 29, 2024

Choose a reason for hiding this comment

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

这个link看起来除了cpp,android和框架也是需要的?是否移到共用的linksmap

@@ -8774,6 +8774,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_FAILURE">
Copy link
Collaborator

Choose a reason for hiding this comment

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

没搜到 java 头文件里有这个,有合到arsenal么

<pd>在本地进行合流的音频源。详见 <xref keyref="MixedAudioStream"/>。</pd>
</plentry>
<plentry props="cpp">
<pt>syncWithLocalMic</pt>
Copy link
Collaborator

Choose a reason for hiding this comment

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

这个参数我看android/ios/mac的原型里也有,cpp的props是确定需要的么

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

抄错了,已删

@Cilla-luodan Cilla-luodan merged commit 9344de5 into release/rtc-ng/4.5.0 Oct 30, 2024
2 checks passed
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.

2 participants