Display and control your Android device
Move log message helpers to LogUtils
Romain Vimont2596ca02f0d9
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.javaindex 66950004..1ce4107f 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java@@ -338,7 +338,7 @@ public final class AudioEncoder {try {return MediaCodec.createByCodecName(encoderName);} catch (IllegalArgumentException e) {- Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + CodecUtils.buildAudioEncoderListMessage());+ Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildAudioEncoderListMessage());throw new ConfigurationException("Unknown encoder: " + encoderName);}}diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java b/server/src/main/java/com/genymobile/scrcpy/CodecUtils.javaindex aca54d20..afb6f904 100644--- a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java+++ b/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java@@ -44,34 +44,6 @@ public final class CodecUtils {}}- public static String buildVideoEncoderListMessage() {- StringBuilder builder = new StringBuilder("List of video encoders:");- List<CodecUtils.DeviceEncoder> videoEncoders = CodecUtils.listVideoEncoders();- if (videoEncoders.isEmpty()) {- builder.append("\n (none)");- } else {- for (CodecUtils.DeviceEncoder encoder : videoEncoders) {- builder.append("\n --video-codec=").append(encoder.getCodec().getName());- builder.append(" --video-encoder='").append(encoder.getInfo().getName()).append("'");- }- }- return builder.toString();- }-- public static String buildAudioEncoderListMessage() {- StringBuilder builder = new StringBuilder("List of audio encoders:");- List<CodecUtils.DeviceEncoder> audioEncoders = CodecUtils.listAudioEncoders();- if (audioEncoders.isEmpty()) {- builder.append("\n (none)");- } else {- for (CodecUtils.DeviceEncoder encoder : audioEncoders) {- builder.append("\n --audio-codec=").append(encoder.getCodec().getName());- builder.append(" --audio-encoder='").append(encoder.getInfo().getName()).append("'");- }- }- return builder.toString();- }-private static MediaCodecInfo[] getEncoders(MediaCodecList codecs, String mimeType) {List<MediaCodecInfo> result = new ArrayList<>();for (MediaCodecInfo codecInfo : codecs.getCodecInfos()) {diff --git a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java b/server/src/main/java/com/genymobile/scrcpy/LogUtils.javanew file mode 100644index 00000000..e74b7e97--- /dev/null+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java@@ -0,0 +1,38 @@+package com.genymobile.scrcpy;++import java.util.List;++public final class LogUtils {++ private LogUtils() {+ // not instantiable+ }++ public static String buildVideoEncoderListMessage() {+ StringBuilder builder = new StringBuilder("List of video encoders:");+ List<CodecUtils.DeviceEncoder> videoEncoders = CodecUtils.listVideoEncoders();+ if (videoEncoders.isEmpty()) {+ builder.append("\n (none)");+ } else {+ for (CodecUtils.DeviceEncoder encoder : videoEncoders) {+ builder.append("\n --video-codec=").append(encoder.getCodec().getName());+ builder.append(" --video-encoder='").append(encoder.getInfo().getName()).append("'");+ }+ }+ return builder.toString();+ }++ public static String buildAudioEncoderListMessage() {+ StringBuilder builder = new StringBuilder("List of audio encoders:");+ List<CodecUtils.DeviceEncoder> audioEncoders = CodecUtils.listAudioEncoders();+ if (audioEncoders.isEmpty()) {+ builder.append("\n (none)");+ } else {+ for (CodecUtils.DeviceEncoder encoder : audioEncoders) {+ builder.append("\n --audio-codec=").append(encoder.getCodec().getName());+ builder.append(" --audio-encoder='").append(encoder.getInfo().getName()).append("'");+ }+ }+ return builder.toString();+ }+}diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.javaindex 668a4ed0..f5f996ba 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java@@ -202,7 +202,7 @@ public class ScreenEncoder implements Device.RotationListener {try {return MediaCodec.createByCodecName(encoderName);} catch (IllegalArgumentException e) {- Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + CodecUtils.buildVideoEncoderListMessage());+ Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildVideoEncoderListMessage());throw new ConfigurationException("Unknown encoder: " + encoderName);}}diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex adfbef2a..f46cf308 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -359,8 +359,8 @@ public final class Server {CleanUp.unlinkSelf();}- Ln.i(CodecUtils.buildVideoEncoderListMessage());- Ln.i(CodecUtils.buildAudioEncoderListMessage());+ Ln.i(LogUtils.buildVideoEncoderListMessage());+ Ln.i(LogUtils.buildAudioEncoderListMessage());// Just print the available encoders, do not mirrorreturn;}