[*] 日常优化

This commit is contained in:
acgist
2023-10-23 07:34:03 +08:00
parent 5e6f1b608d
commit c167cfcf00
2 changed files with 23 additions and 18 deletions

View File

@@ -1182,48 +1182,53 @@ class Taoyao extends RemoteClient {
* @param {*} body 消息主体 * @param {*} body 消息主体
*/ */
defaultClientConfig(message, body) { defaultClientConfig(message, body) {
const me = this; const {
const { media, webrtc } = body; media,
const { audio, video } = media; webrtc
me.audioConfig.sampleSize = { } = body;
const {
audio,
video
} = media;
this.audioConfig.sampleSize = {
min : media.minSampleSize, min : media.minSampleSize,
ideal: audio.sampleSize, ideal: audio.sampleSize,
max : media.maxSampleSize, max : media.maxSampleSize,
}; };
me.audioConfig.sampleRate = { this.audioConfig.sampleRate = {
min : media.minSampleRate, min : media.minSampleRate,
ideal: audio.sampleRate, ideal: audio.sampleRate,
max : media.maxSampleRate, max : media.maxSampleRate,
}; };
me.videoConfig.width = { this.videoConfig.width = {
min : media.minWidth, min : media.minWidth,
ideal: video.width, ideal: video.width,
max : media.maxWidth, max : media.maxWidth,
}; };
me.videoConfig.height = { this.videoConfig.height = {
min : media.minHeight, min : media.minHeight,
ideal: video.height, ideal: video.height,
max : media.maxHeight, max : media.maxHeight,
}; };
me.videoConfig.frameRate = { this.videoConfig.frameRate = {
min : media.minFrameRate, min : media.minFrameRate,
ideal: video.frameRate, ideal: video.frameRate,
max : media.maxFrameRate, max : media.maxFrameRate,
}; };
me.options = Object.keys(media.videos).map(key => ({ this.options = Object.keys(media.videos).map(key => ({
...media.videos[key], ...media.videos[key],
label: key, label: key,
value: media.videos[key].resolution, value: media.videos[key].resolution,
})); }));
me.mediaConfig = media; this.mediaConfig = media;
me.webrtcConfig = webrtc; this.webrtcConfig = webrtc;
console.debug( console.debug(
"终端媒体配置", "终端媒体配置",
me.options, this.options,
me.audioConfig, this.audioConfig,
me.videoConfig, this.videoConfig,
me.mediaConfig, this.mediaConfig,
me.webrtcConfig this.webrtcConfig
); );
} }

View File

@@ -53,7 +53,7 @@ public class ClientConfigProtocol extends ProtocolClientAdapter implements Appli
@Async @Async
@Override @Override
public void onApplicationEvent(ClientConfigEvent event) { public void onApplicationEvent(ClientConfigEvent event) {
final Client client = event.getClient(); final Client client = event.getClient();
final ClientType clientType = client.getClientType(); final ClientType clientType = client.getClientType();
client.push(this.build(clientType)); client.push(this.build(clientType));
} }
@@ -69,7 +69,7 @@ public class ClientConfigProtocol extends ProtocolClientAdapter implements Appli
* @return 消息 * @return 消息
*/ */
public Message build(ClientType clientType) { public Message build(ClientType clientType) {
final Message message = super.build(); final Message message = super.build();
final Map<String, Object> config = new HashMap<>(); final Map<String, Object> config = new HashMap<>();
// 日期时间 // 日期时间
config.put(Constant.DATETIME, DateUtils.format(LocalDateTime.now(), DateTimeStyle.YYYYMMDDHH24MMSS)); config.put(Constant.DATETIME, DateUtils.format(LocalDateTime.now(), DateTimeStyle.YYYYMMDDHH24MMSS));