From 75e73e4218daaea79d84018d05364eace4da411c Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Tue, 9 Dec 2025 20:33:27 +0100 Subject: [PATCH] Display fps set with '{}' Replace "fps=[15, 30, 60]" with "fps={15, 30, 60}". The default toString() implementation for a SortedSet uses '[]', but it is more correct to use '{}' to denote a set. --- .../com/genymobile/scrcpy/util/LogUtils.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java index 4f8927ec..61e708bc 100644 --- a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java +++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java @@ -164,7 +164,7 @@ public final class LogUtils { // Capture frame rates for low-FPS mode are the same for every resolution Range[] lowFpsRanges = characteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES); if (lowFpsRanges != null) { - SortedSet uniqueLowFps = getUniqueSet(lowFpsRanges); + String uniqueLowFps = getFormattedUniqueSet(lowFpsRanges); builder.append(", fps=").append(uniqueLowFps); } } catch (Exception e) { @@ -191,7 +191,7 @@ public final class LogUtils { builder.append("\n High speed capture (--camera-high-speed):"); for (android.util.Size size : highSpeedSizes) { Range[] highFpsRanges = configs.getHighSpeedVideoFpsRanges(); - SortedSet uniqueHighFps = getUniqueSet(highFpsRanges); + String uniqueHighFps = getFormattedUniqueSet(highFpsRanges); builder.append("\n - ").append(size.getWidth()).append("x").append(size.getHeight()); builder.append(" (fps=").append(uniqueHighFps).append(')'); } @@ -205,14 +205,26 @@ public final class LogUtils { return builder.toString(); } - private static SortedSet getUniqueSet(Range[] ranges) { + private static String getFormattedUniqueSet(Range[] ranges) { SortedSet set = new TreeSet<>(); for (Range range : ranges) { set.add(range.getUpper()); } - return set; - } + StringBuilder builder = new StringBuilder("{"); + boolean first = true; + for (Integer i : set) { + if (!first) { + builder.append(", "); + } else { + first = false; + } + builder.append(i); + } + builder.append("}"); + + return builder.toString(); + } public static String buildAppListMessage() { List apps = Device.listApps();