Display and control your Android device
Reorganize server packages
Romain Vimonte84db2914dfa
diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.shindex 845b0104..6dc547d9 100755--- a/server/build_without_gradle.sh+++ b/server/build_without_gradle.sh@@ -52,6 +52,11 @@ cd "$SERVER_DIR/src/main/aidl"SRC=( \com/genymobile/scrcpy/*.java \+ com/genymobile/scrcpy/audio/*.java \+ com/genymobile/scrcpy/control/*.java \+ com/genymobile/scrcpy/device/*.java \+ com/genymobile/scrcpy/util/*.java \+ com/genymobile/scrcpy/video/*.java \com/genymobile/scrcpy/wrappers/*.java \)diff --git a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java b/server/src/main/java/com/genymobile/scrcpy/CleanUp.javaindex f9b1efd6..1b8d4248 100644--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java@@ -1,5 +1,10 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.device.Device;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.Settings;+import com.genymobile.scrcpy.util.SettingsException;+import java.io.File;import java.io.IOException;import java.io.OutputStream;diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.javaindex 9b1d8d8d..143fbb9a 100644--- a/server/src/main/java/com/genymobile/scrcpy/Options.java+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java@@ -1,5 +1,15 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.audio.AudioCodec;+import com.genymobile.scrcpy.audio.AudioSource;+import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.util.CodecOption;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.video.CameraAspectRatio;+import com.genymobile.scrcpy.video.CameraFacing;+import com.genymobile.scrcpy.video.VideoCodec;+import com.genymobile.scrcpy.video.VideoSource;+import android.graphics.Rect;import java.util.List;diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex 587a46df..263c784d 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -1,5 +1,26 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.audio.AudioCapture;+import com.genymobile.scrcpy.audio.AudioCodec;+import com.genymobile.scrcpy.audio.AudioEncoder;+import com.genymobile.scrcpy.audio.AudioRawRecorder;+import com.genymobile.scrcpy.control.ControlChannel;+import com.genymobile.scrcpy.control.Controller;+import com.genymobile.scrcpy.control.DeviceMessage;+import com.genymobile.scrcpy.device.ConfigurationException;+import com.genymobile.scrcpy.device.DesktopConnection;+import com.genymobile.scrcpy.device.Device;+import com.genymobile.scrcpy.device.Streamer;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.LogUtils;+import com.genymobile.scrcpy.util.Settings;+import com.genymobile.scrcpy.util.SettingsException;+import com.genymobile.scrcpy.video.CameraCapture;+import com.genymobile.scrcpy.video.ScreenCapture;+import com.genymobile.scrcpy.video.SurfaceCapture;+import com.genymobile.scrcpy.video.SurfaceEncoder;+import com.genymobile.scrcpy.video.VideoSource;+import android.os.BatteryManager;import android.os.Build;diff --git a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java b/server/src/main/java/com/genymobile/scrcpy/Workarounds.javaindex c9a26d78..8b8b4233 100644--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java@@ -1,5 +1,7 @@package com.genymobile.scrcpy;+import com.genymobile.scrcpy.util.Ln;+import android.annotation.SuppressLint;import android.annotation.TargetApi;import android.app.Application;diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/AudioCapture.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.javaindex 3934ad49..414bfa5d 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCapture.java@@ -1,5 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;+import com.genymobile.scrcpy.FakeContext;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.Workarounds;import com.genymobile.scrcpy.wrappers.ServiceManager;import android.annotation.SuppressLint;diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.javasimilarity index 84%rename from server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.javaindex baa7d846..49cfe70f 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioCaptureForegroundException.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCaptureForegroundException.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;/*** Exception thrown if audio capture failed on Android 11 specifically because the running App (shell) was not in foreground.diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.javasimilarity index 93%rename from server/src/main/java/com/genymobile/scrcpy/AudioCodec.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.javaindex b4ea3680..8f9e59b3 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;++import com.genymobile.scrcpy.util.Codec;import android.media.MediaFormat;diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/AudioEncoder.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.javaindex 0b59369b..78b6de55 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java@@ -1,4 +1,14 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;++import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.util.Codec;+import com.genymobile.scrcpy.util.CodecOption;+import com.genymobile.scrcpy.util.CodecUtils;+import com.genymobile.scrcpy.device.ConfigurationException;+import com.genymobile.scrcpy.util.IO;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.LogUtils;+import com.genymobile.scrcpy.device.Streamer;import android.annotation.TargetApi;import android.media.MediaCodec;diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.javasimilarity index 93%rename from server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.javaindex 7e052f32..72527600 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java@@ -1,4 +1,9 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;++import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.util.IO;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Streamer;import android.media.MediaCodec;import android.os.Build;diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioSource.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.javasimilarity index 86%rename from server/src/main/java/com/genymobile/scrcpy/AudioSource.javarename to server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.javaindex 466ea297..2324f1a4 100644--- a/server/src/main/java/com/genymobile/scrcpy/AudioSource.java+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.audio;import android.media.MediaRecorder;@@ -18,7 +18,7 @@ public enum AudioSource {return value;}- static AudioSource findByName(String name) {+ public static AudioSource findByName(String name) {for (AudioSource audioSource : AudioSource.values()) {if (name.equals(audioSource.name)) {return audioSource;diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlChannel.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/ControlChannel.javarename to server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.javaindex 4677cfda..f24ca117 100644--- a/server/src/main/java/com/genymobile/scrcpy/ControlChannel.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlChannel.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;import android.net.LocalSocket;diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/ControlMessage.javarename to server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.javaindex bcbacb4b..c414f2a5 100644--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.device.Position;/*** Union of all supported event types, identified by their {@code type}.diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.javarename to server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.javaindex 1761d228..f5cfee75 100644--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java@@ -1,4 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.util.Binary;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Position;import java.io.EOFException;import java.io.IOException;diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/Controller.javarename to server/src/main/java/com/genymobile/scrcpy/control/Controller.javaindex b7d2f93e..85425113 100644--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java@@ -1,5 +1,11 @@-package com.genymobile.scrcpy;-+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.CleanUp;+import com.genymobile.scrcpy.device.Device;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Point;+import com.genymobile.scrcpy.device.Position;import com.genymobile.scrcpy.wrappers.InputManager;import com.genymobile.scrcpy.wrappers.ServiceManager;diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessage.javarename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.javaindex a8987eb6..079a7a04 100644--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessage.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;public final class DeviceMessage {diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.javasimilarity index 94%rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.javarename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.javaindex af14bb4e..dc5e6be0 100644--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageSender.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.util.Ln;import java.io.IOException;import java.util.concurrent.ArrayBlockingQueue;diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.javasimilarity index 93%rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.javarename to server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.javaindex f5d57c98..6bf53bed 100644--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/DeviceMessageWriter.java@@ -1,4 +1,7 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.StringUtils;import java.io.IOException;import java.io.OutputStream;diff --git a/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java b/server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.javasimilarity index 99%rename from server/src/main/java/com/genymobile/scrcpy/KeyComposition.javarename to server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.javaindex 2f2835c9..5b988f53 100644--- a/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/KeyComposition.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;import java.util.HashMap;import java.util.Map;diff --git a/server/src/main/java/com/genymobile/scrcpy/Pointer.java b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.javasimilarity index 92%rename from server/src/main/java/com/genymobile/scrcpy/Pointer.javarename to server/src/main/java/com/genymobile/scrcpy/control/Pointer.javaindex b89cc256..02e33e10 100644--- a/server/src/main/java/com/genymobile/scrcpy/Pointer.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/Pointer.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.device.Point;public class Pointer {diff --git a/server/src/main/java/com/genymobile/scrcpy/PointersState.java b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/PointersState.javarename to server/src/main/java/com/genymobile/scrcpy/control/PointersState.javaindex d8daaff2..a12da71d 100644--- a/server/src/main/java/com/genymobile/scrcpy/PointersState.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/PointersState.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.device.Point;import android.view.MotionEvent;diff --git a/server/src/main/java/com/genymobile/scrcpy/UhidManager.java b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/UhidManager.javarename to server/src/main/java/com/genymobile/scrcpy/control/UhidManager.javaindex a39288a5..b1e6a9b9 100644--- a/server/src/main/java/com/genymobile/scrcpy/UhidManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.util.Ln;import android.os.Build;import android.os.HandlerThread;diff --git a/server/src/main/java/com/genymobile/scrcpy/ConfigurationException.java b/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.javasimilarity index 78%rename from server/src/main/java/com/genymobile/scrcpy/ConfigurationException.javarename to server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.javaindex 76c8f52e..17729342 100644--- a/server/src/main/java/com/genymobile/scrcpy/ConfigurationException.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;public class ConfigurationException extends Exception {public ConfigurationException(String message) {diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/DesktopConnection.javarename to server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.javaindex d693ad61..db75aec6 100644--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/DesktopConnection.java@@ -1,4 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;++import com.genymobile.scrcpy.control.ControlChannel;+import com.genymobile.scrcpy.util.IO;+import com.genymobile.scrcpy.util.StringUtils;import android.net.LocalServerSocket;import android.net.LocalSocket;diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/device/Device.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/Device.javarename to server/src/main/java/com/genymobile/scrcpy/device/Device.javaindex 8d0ee231..ae4f50e5 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java@@ -1,5 +1,9 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;+import com.genymobile.scrcpy.Options;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.LogUtils;+import com.genymobile.scrcpy.video.ScreenInfo;import com.genymobile.scrcpy.wrappers.ClipboardManager;import com.genymobile.scrcpy.wrappers.DisplayControl;import com.genymobile.scrcpy.wrappers.InputManager;diff --git a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.javasimilarity index 95%rename from server/src/main/java/com/genymobile/scrcpy/DisplayInfo.javarename to server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.javaindex 4b8036f8..2973710d 100644--- a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;public final class DisplayInfo {private final int displayId;diff --git a/server/src/main/java/com/genymobile/scrcpy/Point.java b/server/src/main/java/com/genymobile/scrcpy/device/Point.javasimilarity index 95%rename from server/src/main/java/com/genymobile/scrcpy/Point.javarename to server/src/main/java/com/genymobile/scrcpy/device/Point.javaindex c2a30fa8..361b9958 100644--- a/server/src/main/java/com/genymobile/scrcpy/Point.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Point.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;import java.util.Objects;diff --git a/server/src/main/java/com/genymobile/scrcpy/Position.java b/server/src/main/java/com/genymobile/scrcpy/device/Position.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/Position.javarename to server/src/main/java/com/genymobile/scrcpy/device/Position.javaindex 2d298645..7ce4e256 100644--- a/server/src/main/java/com/genymobile/scrcpy/Position.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Position.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;import java.util.Objects;diff --git a/server/src/main/java/com/genymobile/scrcpy/Size.java b/server/src/main/java/com/genymobile/scrcpy/device/Size.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/Size.javarename to server/src/main/java/com/genymobile/scrcpy/device/Size.javaindex fd4b6971..bc9dce1c 100644--- a/server/src/main/java/com/genymobile/scrcpy/Size.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Size.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;import android.graphics.Rect;diff --git a/server/src/main/java/com/genymobile/scrcpy/Streamer.java b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/Streamer.javarename to server/src/main/java/com/genymobile/scrcpy/device/Streamer.javaindex 8b6c9dcc..f54d0567 100644--- a/server/src/main/java/com/genymobile/scrcpy/Streamer.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java@@ -1,4 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.device;++import com.genymobile.scrcpy.audio.AudioCodec;+import com.genymobile.scrcpy.util.Codec;+import com.genymobile.scrcpy.util.IO;import android.media.MediaCodec;diff --git a/server/src/main/java/com/genymobile/scrcpy/Binary.java b/server/src/main/java/com/genymobile/scrcpy/util/Binary.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/Binary.javarename to server/src/main/java/com/genymobile/scrcpy/util/Binary.javaindex 29534f59..f46ba695 100644--- a/server/src/main/java/com/genymobile/scrcpy/Binary.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/Binary.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;public final class Binary {private Binary() {diff --git a/server/src/main/java/com/genymobile/scrcpy/Codec.java b/server/src/main/java/com/genymobile/scrcpy/util/Codec.javasimilarity index 82%rename from server/src/main/java/com/genymobile/scrcpy/Codec.javarename to server/src/main/java/com/genymobile/scrcpy/util/Codec.javaindex 7e905af3..a363bd8b 100644--- a/server/src/main/java/com/genymobile/scrcpy/Codec.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/Codec.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;public interface Codec {diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java b/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/CodecOption.javarename to server/src/main/java/com/genymobile/scrcpy/util/CodecOption.javaindex 22c45a90..bed2be9a 100644--- a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import java.util.ArrayList;import java.util.List;diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.javasimilarity index 95%rename from server/src/main/java/com/genymobile/scrcpy/CodecUtils.javarename to server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.javaindex afb6f904..5b0c95e8 100644--- a/server/src/main/java/com/genymobile/scrcpy/CodecUtils.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java@@ -1,4 +1,7 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;++import com.genymobile.scrcpy.audio.AudioCodec;+import com.genymobile.scrcpy.video.VideoCodec;import android.media.MediaCodecInfo;import android.media.MediaCodecList;diff --git a/server/src/main/java/com/genymobile/scrcpy/Command.java b/server/src/main/java/com/genymobile/scrcpy/util/Command.javasimilarity index 97%rename from server/src/main/java/com/genymobile/scrcpy/Command.javarename to server/src/main/java/com/genymobile/scrcpy/util/Command.javaindex 362504ff..b26158e6 100644--- a/server/src/main/java/com/genymobile/scrcpy/Command.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/Command.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import java.io.IOException;import java.util.Arrays;diff --git a/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java b/server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.javasimilarity index 93%rename from server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.javarename to server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.javaindex 1f5f0a4f..03309989 100644--- a/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/HandlerExecutor.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import android.os.Handler;diff --git a/server/src/main/java/com/genymobile/scrcpy/IO.java b/server/src/main/java/com/genymobile/scrcpy/util/IO.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/IO.javarename to server/src/main/java/com/genymobile/scrcpy/util/IO.javaindex 4a55c152..ab3fa59f 100644--- a/server/src/main/java/com/genymobile/scrcpy/IO.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/IO.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;++import com.genymobile.scrcpy.BuildConfig;import android.system.ErrnoException;import android.system.Os;diff --git a/server/src/main/java/com/genymobile/scrcpy/Ln.java b/server/src/main/java/com/genymobile/scrcpy/util/Ln.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/Ln.javarename to server/src/main/java/com/genymobile/scrcpy/util/Ln.javaindex cdd57b9f..c0700125 100644--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/Ln.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import android.util.Log;@@ -19,7 +19,7 @@ public final class Ln {private static final PrintStream CONSOLE_OUT = new PrintStream(new FileOutputStream(FileDescriptor.out));private static final PrintStream CONSOLE_ERR = new PrintStream(new FileOutputStream(FileDescriptor.err));- enum Level {+ public enum Level {VERBOSE, DEBUG, INFO, WARN, ERROR}diff --git a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/LogUtils.javarename to server/src/main/java/com/genymobile/scrcpy/util/LogUtils.javaindex 1ffb19d3..aee1594a 100644--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java@@ -1,5 +1,7 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;+import com.genymobile.scrcpy.device.DisplayInfo;+import com.genymobile.scrcpy.device.Size;import com.genymobile.scrcpy.wrappers.DisplayManager;import com.genymobile.scrcpy.wrappers.ServiceManager;diff --git a/server/src/main/java/com/genymobile/scrcpy/Settings.java b/server/src/main/java/com/genymobile/scrcpy/util/Settings.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/Settings.javarename to server/src/main/java/com/genymobile/scrcpy/util/Settings.javaindex 1b5e5f98..d9e82d62 100644--- a/server/src/main/java/com/genymobile/scrcpy/Settings.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/Settings.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import com.genymobile.scrcpy.wrappers.ContentProvider;import com.genymobile.scrcpy.wrappers.ServiceManager;diff --git a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java b/server/src/main/java/com/genymobile/scrcpy/util/SettingsException.javasimilarity index 92%rename from server/src/main/java/com/genymobile/scrcpy/SettingsException.javarename to server/src/main/java/com/genymobile/scrcpy/util/SettingsException.javaindex 36ef63ee..87fa3884 100644--- a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/SettingsException.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;public class SettingsException extends Exception {private static String createMessage(String method, String table, String key, String value) {diff --git a/server/src/main/java/com/genymobile/scrcpy/StringUtils.java b/server/src/main/java/com/genymobile/scrcpy/util/StringUtils.javasimilarity index 94%rename from server/src/main/java/com/genymobile/scrcpy/StringUtils.javarename to server/src/main/java/com/genymobile/scrcpy/util/StringUtils.javaindex dac05466..8b19ca3d 100644--- a/server/src/main/java/com/genymobile/scrcpy/StringUtils.java+++ b/server/src/main/java/com/genymobile/scrcpy/util/StringUtils.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;public final class StringUtils {private StringUtils() {diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.javarename to server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.javaindex 4fdf4c74..bf1cba5d 100644--- a/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraAspectRatio.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;public final class CameraAspectRatio {private static final float SENSOR = -1;diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.javasimilarity index 98%rename from server/src/main/java/com/genymobile/scrcpy/CameraCapture.javarename to server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.javaindex df3cf7c4..7d2e2055 100644--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java@@ -1,5 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;+import com.genymobile.scrcpy.util.HandlerExecutor;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Size;import com.genymobile.scrcpy.wrappers.ServiceManager;import android.annotation.SuppressLint;diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.javasimilarity index 89%rename from server/src/main/java/com/genymobile/scrcpy/CameraFacing.javarename to server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.javaindex b7e8daa5..f818e665 100644--- a/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraFacing.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;import android.annotation.SuppressLint;import android.hardware.camera2.CameraCharacteristics;@@ -21,7 +21,7 @@ public enum CameraFacing {return value;}- static CameraFacing findByName(String name) {+ public static CameraFacing findByName(String name) {for (CameraFacing facing : CameraFacing.values()) {if (name.equals(facing.name)) {return facing;diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/ScreenCapture.javarename to server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.javaindex 090c96f0..fbeca2af 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java@@ -1,5 +1,8 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;+import com.genymobile.scrcpy.device.Device;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Size;import com.genymobile.scrcpy.wrappers.ServiceManager;import com.genymobile.scrcpy.wrappers.SurfaceControl;diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.javasimilarity index 96%rename from server/src/main/java/com/genymobile/scrcpy/ScreenInfo.javarename to server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.javaindex 8e5b401f..ba537b17 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java@@ -1,4 +1,9 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;++import com.genymobile.scrcpy.BuildConfig;+import com.genymobile.scrcpy.device.Device;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Size;import android.graphics.Rect;diff --git a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.javasimilarity index 95%rename from server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.javarename to server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.javaindex e300e4d6..3118ddc8 100644--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;++import com.genymobile.scrcpy.device.Size;import android.view.Surface;diff --git a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.javasimilarity index 95%rename from server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.javarename to server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.javaindex 4a0fdf4e..8fe0b227 100644--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java@@ -1,4 +1,15 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;++import com.genymobile.scrcpy.AsyncProcessor;+import com.genymobile.scrcpy.util.Codec;+import com.genymobile.scrcpy.util.CodecOption;+import com.genymobile.scrcpy.util.CodecUtils;+import com.genymobile.scrcpy.device.ConfigurationException;+import com.genymobile.scrcpy.util.IO;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.LogUtils;+import com.genymobile.scrcpy.device.Size;+import com.genymobile.scrcpy.device.Streamer;import android.media.MediaCodec;import android.media.MediaCodecInfo;diff --git a/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.javasimilarity index 93%rename from server/src/main/java/com/genymobile/scrcpy/VideoCodec.javarename to server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.javaindex fa787a99..5d528da1 100644--- a/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;++import com.genymobile.scrcpy.util.Codec;import android.annotation.SuppressLint;import android.media.MediaFormat;diff --git a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoSource.javasimilarity index 80%rename from server/src/main/java/com/genymobile/scrcpy/VideoSource.javarename to server/src/main/java/com/genymobile/scrcpy/video/VideoSource.javaindex b5a74fbe..53b54a52 100644--- a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoSource.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.video;public enum VideoSource {DISPLAY("display"),@@ -10,7 +10,7 @@ public enum VideoSource {this.name = name;}- static VideoSource findByName(String name) {+ public static VideoSource findByName(String name) {for (VideoSource videoSource : VideoSource.values()) {if (name.equals(videoSource.name)) {return videoSource;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.javaindex d4bee165..bb1ca0d4 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java@@ -1,7 +1,7 @@package com.genymobile.scrcpy.wrappers;import com.genymobile.scrcpy.FakeContext;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.annotation.TargetApi;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.javaindex a0e3a7e1..c5f007fe 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java@@ -1,7 +1,7 @@package com.genymobile.scrcpy.wrappers;import com.genymobile.scrcpy.FakeContext;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.content.ClipData;import android.content.IOnPrimaryClipChangedListener;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.javaindex a03f824e..7e92ac50 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java@@ -1,8 +1,8 @@package com.genymobile.scrcpy.wrappers;import com.genymobile.scrcpy.FakeContext;-import com.genymobile.scrcpy.Ln;-import com.genymobile.scrcpy.SettingsException;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.util.SettingsException;import android.annotation.SuppressLint;import android.content.AttributionSource;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.javaindex ba3e9ee0..cc9d5526 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.annotation.TargetApi;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.javaindex 2ff82d04..dd92330c 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java@@ -1,9 +1,9 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Command;-import com.genymobile.scrcpy.DisplayInfo;-import com.genymobile.scrcpy.Ln;-import com.genymobile.scrcpy.Size;+import com.genymobile.scrcpy.util.Command;+import com.genymobile.scrcpy.device.DisplayInfo;+import com.genymobile.scrcpy.util.Ln;+import com.genymobile.scrcpy.device.Size;import android.annotation.SuppressLint;import android.hardware.display.VirtualDisplay;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.javaindex 16ecb09f..5c5ba56c 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.view.InputEvent;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.javaindex 36d5f1ac..0a56f347 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.os.Build;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.javaindex af217da2..ca80dde2 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.os.IInterface;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.javaindex f0e351a2..fc18a8e2 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.SuppressLint;import android.graphics.Rect;diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.javaindex 44394ba9..4c769e85 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java@@ -1,6 +1,6 @@package com.genymobile.scrcpy.wrappers;-import com.genymobile.scrcpy.Ln;+import com.genymobile.scrcpy.util.Ln;import android.annotation.TargetApi;import android.os.IInterface;diff --git a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.javasimilarity index 99%rename from server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.javarename to server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.javaindex 0c8086f7..1737730f 100644--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java@@ -1,4 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;++import com.genymobile.scrcpy.device.Device;import android.view.KeyEvent;import android.view.MotionEvent;diff --git a/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.javasimilarity index 98%rename from server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.javarename to server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.javaindex d7f926ba..ff1a2fbc 100644--- a/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/control/DeviceMessageWriterTest.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.control;import org.junit.Assert;import org.junit.Test;diff --git a/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java b/server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.javasimilarity index 98%rename from server/src/test/java/com/genymobile/scrcpy/BinaryTest.javarename to server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.javaindex 569a2f2c..7ee95ac5 100644--- a/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/util/BinaryTest.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import org.junit.Assert;import org.junit.Test;diff --git a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java b/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.javasimilarity index 99%rename from server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.javarename to server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.javaindex ad802258..ffd8e32e 100644--- a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import org.junit.Assert;import org.junit.Test;diff --git a/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.javasimilarity index 99%rename from server/src/test/java/com/genymobile/scrcpy/CommandParserTest.javarename to server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.javaindex de996a07..7e1d55b5 100644--- a/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java@@ -1,5 +1,6 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;+import com.genymobile.scrcpy.device.DisplayInfo;import com.genymobile.scrcpy.wrappers.DisplayManager;import android.view.Display;diff --git a/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java b/server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.javasimilarity index 97%rename from server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.javarename to server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.javaindex 89799c5e..c72b112a 100644--- a/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/util/StringUtilsTest.java@@ -1,4 +1,4 @@-package com.genymobile.scrcpy;+package com.genymobile.scrcpy.util;import org.junit.Assert;import org.junit.Test;