From 7fd9ae886021479f885ed3c9f51ba22fe13ded09 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Wed, 1 Nov 2023 07:58:04 +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 --- docs/TODO.md | 2 -- .../src/main/java/com/acgist/taoyao/media/MediaManager.java | 6 ++++++ .../main/java/com/acgist/taoyao/signal/party/room/Room.java | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/TODO.md b/docs/TODO.md index 467c0d5..dc3cd88 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1,7 +1,5 @@ # 计划任务 -如果优化代码影响已经优化过的代码需要对旧代码重新优化 - ## 日常任务 * 过时方法 diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java index cfaf7d7..197da2e 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.webrtc.AudioSource; import org.webrtc.AudioTrack; import org.webrtc.Camera2Enumerator; +import org.webrtc.CameraEnumerationAndroid; import org.webrtc.CameraEnumerator; import org.webrtc.CameraVideoCapturer; import org.webrtc.CapturerObserver; @@ -46,6 +47,7 @@ import org.webrtc.audio.JavaAudioDeviceModule; import java.io.IOException; import java.util.Arrays; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -512,6 +514,10 @@ public final class MediaManager { final CameraEnumerator cameraEnumerator = new Camera2Enumerator(this.context); final String[] names = cameraEnumerator.getDeviceNames(); for (String name : names) { + final List list = cameraEnumerator.getSupportedFormats(name); + list.forEach(value -> { + Log.d(MediaManager.class.getSimpleName(), "支持的分辨率:" + name + " = " + value.width + "*" + value.height); + }); if (this.videoSourceType == VideoSourceType.BACK && cameraEnumerator.isBackFacing(name)) { this.videoCapturer = cameraEnumerator.createCapturer(name, new MediaCameraEventsHandler()); } else if (this.videoSourceType == VideoSourceType.FRONT && cameraEnumerator.isFrontFacing(name)) { diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java index 1b17be3..3900091 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Room.java @@ -109,9 +109,7 @@ public class Room extends OperatorAdapter { * @return 是否认证 */ public boolean authenticate(Client client) { - return - this.mediaClient == client || - this.clients.containsKey(client); + return this.mediaClient == client || this.clients.containsKey(client); } /**