From c167cfcf0078ab6d5a1f0a1402c83a6f79249f88 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Mon, 23 Oct 2023 07:34:03 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taoyao-client-web/src/components/Taoyao.js | 37 +++++++++++-------- .../protocol/client/ClientConfigProtocol.java | 4 +- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js index f129095..58cb4ef 100644 --- a/taoyao-client-web/src/components/Taoyao.js +++ b/taoyao-client-web/src/components/Taoyao.js @@ -1182,48 +1182,53 @@ class Taoyao extends RemoteClient { * @param {*} body 消息主体 */ defaultClientConfig(message, body) { - const me = this; - const { media, webrtc } = body; - const { audio, video } = media; - me.audioConfig.sampleSize = { + const { + media, + webrtc + } = body; + const { + audio, + video + } = media; + this.audioConfig.sampleSize = { min : media.minSampleSize, ideal: audio.sampleSize, max : media.maxSampleSize, }; - me.audioConfig.sampleRate = { + this.audioConfig.sampleRate = { min : media.minSampleRate, ideal: audio.sampleRate, max : media.maxSampleRate, }; - me.videoConfig.width = { + this.videoConfig.width = { min : media.minWidth, ideal: video.width, max : media.maxWidth, }; - me.videoConfig.height = { + this.videoConfig.height = { min : media.minHeight, ideal: video.height, max : media.maxHeight, }; - me.videoConfig.frameRate = { + this.videoConfig.frameRate = { min : media.minFrameRate, ideal: video.frameRate, max : media.maxFrameRate, }; - me.options = Object.keys(media.videos).map(key => ({ + this.options = Object.keys(media.videos).map(key => ({ ...media.videos[key], label: key, value: media.videos[key].resolution, })); - me.mediaConfig = media; - me.webrtcConfig = webrtc; + this.mediaConfig = media; + this.webrtcConfig = webrtc; console.debug( "终端媒体配置", - me.options, - me.audioConfig, - me.videoConfig, - me.mediaConfig, - me.webrtcConfig + this.options, + this.audioConfig, + this.videoConfig, + this.mediaConfig, + this.webrtcConfig ); } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientConfigProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientConfigProtocol.java index 2bb4aba..331a0f1 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientConfigProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/client/ClientConfigProtocol.java @@ -53,7 +53,7 @@ public class ClientConfigProtocol extends ProtocolClientAdapter implements Appli @Async @Override public void onApplicationEvent(ClientConfigEvent event) { - final Client client = event.getClient(); + final Client client = event.getClient(); final ClientType clientType = client.getClientType(); client.push(this.build(clientType)); } @@ -69,7 +69,7 @@ public class ClientConfigProtocol extends ProtocolClientAdapter implements Appli * @return 消息 */ public Message build(ClientType clientType) { - final Message message = super.build(); + final Message message = super.build(); final Map config = new HashMap<>(); // 日期时间 config.put(Constant.DATETIME, DateUtils.format(LocalDateTime.now(), DateTimeStyle.YYYYMMDDHH24MMSS));