Genymobile/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-04-21 01:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reorganize server packages

Browse source 
Move existing classes into newly created `display` and `model` packages.
This commit is contained in:
Romain Vimont 2026-04-14 23:05:19 +02:00
parent 69578f1200
commit b38ba2f687
38 changed files with 75 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/src/main/java/com/genymobile/scrcpy/Options.java
View file

@ -3,10 +3,10 @@ package com.genymobile.scrcpy;
import com.genymobile.scrcpy.audio.AudioCodec;
import com.genymobile.scrcpy.audio.AudioSource;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.NewDisplay;
import com.genymobile.scrcpy.device.Orientation;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.util.CodecOption;
import com.genymobile.scrcpy.model.CodecOption;
import com.genymobile.scrcpy.model.NewDisplay;
import com.genymobile.scrcpy.model.Orientation;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.video.CameraAspectRatio;
import com.genymobile.scrcpy.video.CameraFacing;

4
server/src/main/java/com/genymobile/scrcpy/Server.java
View file

@ -9,11 +9,11 @@ import com.genymobile.scrcpy.audio.AudioRawRecorder;
import com.genymobile.scrcpy.audio.AudioSource;
import com.genymobile.scrcpy.control.ControlChannel;
import com.genymobile.scrcpy.control.Controller;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.DesktopConnection;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.NewDisplay;
import com.genymobile.scrcpy.device.Streamer;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.model.NewDisplay;
import com.genymobile.scrcpy.opengl.OpenGLRunner;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.util.LogUtils;

2
server/src/main/java/com/genymobile/scrcpy/audio/AudioCodec.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.audio;
import com.genymobile.scrcpy.util.Codec;
import com.genymobile.scrcpy.model.Codec;
import android.media.MediaFormat;

6
server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
View file

@ -3,10 +3,10 @@ package com.genymobile.scrcpy.audio;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Streamer;
import com.genymobile.scrcpy.util.Codec;
import com.genymobile.scrcpy.util.CodecOption;
import com.genymobile.scrcpy.model.Codec;
import com.genymobile.scrcpy.model.CodecOption;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.util.CodecUtils;
import com.genymobile.scrcpy.util.IO;
import com.genymobile.scrcpy.util.Ln;

2
server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.device.Position;
import com.genymobile.scrcpy.model.Position;
/**
* Union of all supported event types, identified by their {@code type}.

2
server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.device.Position;
import com.genymobile.scrcpy.model.Position;
import com.genymobile.scrcpy.util.Binary;
import java.io.BufferedInputStream;

10
server/src/main/java/com/genymobile/scrcpy/control/Controller.java
View file

@ -5,11 +5,11 @@ import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.CleanUp;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.DeviceApp;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.Point;
import com.genymobile.scrcpy.device.Position;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.model.DeviceApp;
import com.genymobile.scrcpy.model.Point;
import com.genymobile.scrcpy.model.Position;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.util.LogUtils;
import com.genymobile.scrcpy.video.CameraCapture;

2
server/src/main/java/com/genymobile/scrcpy/control/Pointer.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.device.Point;
import com.genymobile.scrcpy.model.Point;
public class Pointer {

2
server/src/main/java/com/genymobile/scrcpy/control/PointersState.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.device.Point;
import com.genymobile.scrcpy.model.Point;
import android.view.MotionEvent;

6
server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
View file

@ -1,8 +1,8 @@
package com.genymobile.scrcpy.control;
import com.genymobile.scrcpy.device.Point;
import com.genymobile.scrcpy.device.Position;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Point;
import com.genymobile.scrcpy.model.Position;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.AffineMatrix;
public final class PositionMapper {

4
server/src/main/java/com/genymobile/scrcpy/device/Device.java
View file

@ -2,6 +2,8 @@ package com.genymobile.scrcpy.device;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.FakeContext;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.model.DeviceApp;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.wrappers.ActivityManager;
import com.genymobile.scrcpy.wrappers.ClipboardManager;
@ -12,8 +14,8 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
import com.genymobile.scrcpy.wrappers.WindowManager;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.app.ActivityOptions;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Build;

2
server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
View file

@ -1,7 +1,7 @@
package com.genymobile.scrcpy.device;
import com.genymobile.scrcpy.audio.AudioCodec;
import com.genymobile.scrcpy.util.Codec;
import com.genymobile.scrcpy.model.Codec;
import com.genymobile.scrcpy.util.IO;
import android.media.MediaCodec;

4
server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java → server/src/main/java/com/genymobile/scrcpy/display/DisplayInfo.java
View file

@ -1,4 +1,6 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.display;
import com.genymobile.scrcpy.model.Size;
public final class DisplayInfo {
private final int displayId;

5
server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java → server/src/main/java/com/genymobile/scrcpy/display/DisplaySizeMonitor.java
View file

@ -1,9 +1,8 @@
package com.genymobile.scrcpy.video;
package com.genymobile.scrcpy.display;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Ln;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import com.genymobile.scrcpy.wrappers.DisplayWindowListener;

2
server/src/main/java/com/genymobile/scrcpy/util/Codec.java → server/src/main/java/com/genymobile/scrcpy/model/Codec.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.util;
package com.genymobile.scrcpy.model;
import android.media.MediaCodec;

2
server/src/main/java/com/genymobile/scrcpy/util/CodecOption.java → server/src/main/java/com/genymobile/scrcpy/model/CodecOption.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.util;
package com.genymobile.scrcpy.model;
import java.util.ArrayList;
import java.util.List;

2
server/src/main/java/com/genymobile/scrcpy/device/ConfigurationException.java → server/src/main/java/com/genymobile/scrcpy/model/ConfigurationException.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
public class ConfigurationException extends Exception {
public ConfigurationException(String message) {

2
server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java → server/src/main/java/com/genymobile/scrcpy/model/DeviceApp.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
public final class DeviceApp {

2
server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java → server/src/main/java/com/genymobile/scrcpy/model/NewDisplay.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
public final class NewDisplay {
private Size size;

2
server/src/main/java/com/genymobile/scrcpy/device/Orientation.java → server/src/main/java/com/genymobile/scrcpy/model/Orientation.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
public enum Orientation {

2
server/src/main/java/com/genymobile/scrcpy/device/Point.java → server/src/main/java/com/genymobile/scrcpy/model/Point.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
import java.util.Objects;

2
server/src/main/java/com/genymobile/scrcpy/device/Position.java → server/src/main/java/com/genymobile/scrcpy/model/Position.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
import java.util.Objects;

2
server/src/main/java/com/genymobile/scrcpy/device/Size.java → server/src/main/java/com/genymobile/scrcpy/model/Size.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
import com.genymobile.scrcpy.video.VideoConstraints;

2
server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.opengl;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Threads;
import android.graphics.SurfaceTexture;

4
server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java
View file

@ -1,7 +1,7 @@
package com.genymobile.scrcpy.util;
import com.genymobile.scrcpy.device.Point;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Point;
import com.genymobile.scrcpy.model.Size;
/**
* Represents a 2D affine transform (a 3x3 matrix):

7
server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
View file

@ -3,9 +3,10 @@ package com.genymobile.scrcpy.util;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.audio.AudioCodec;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.DeviceApp;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.model.Codec;
import com.genymobile.scrcpy.model.DeviceApp;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.video.VideoCodec;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import com.genymobile.scrcpy.wrappers.ServiceManager;

6
server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
View file

@ -2,9 +2,9 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Orientation;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.model.Orientation;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;

9
server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
View file

@ -3,10 +3,11 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.control.PositionMapper;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.NewDisplay;
import com.genymobile.scrcpy.device.Orientation;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.display.DisplaySizeMonitor;
import com.genymobile.scrcpy.model.NewDisplay;
import com.genymobile.scrcpy.model.Orientation;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;

9
server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
View file

@ -3,11 +3,12 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.control.PositionMapper;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Device;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.Orientation;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.display.DisplaySizeMonitor;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.model.Orientation;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.opengl.AffineOpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLFilter;
import com.genymobile.scrcpy.opengl.OpenGLRunner;

4
server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
View file

@ -1,7 +1,7 @@
package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.model.Size;
import android.view.Surface;

8
server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
View file

@ -3,11 +3,11 @@ package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.AsyncProcessor;
import com.genymobile.scrcpy.Options;
import com.genymobile.scrcpy.device.ConfigurationException;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.device.Streamer;
import com.genymobile.scrcpy.util.Codec;
import com.genymobile.scrcpy.util.CodecOption;
import com.genymobile.scrcpy.model.Codec;
import com.genymobile.scrcpy.model.CodecOption;
import com.genymobile.scrcpy.model.ConfigurationException;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.CodecUtils;
import com.genymobile.scrcpy.util.IO;
import com.genymobile.scrcpy.util.Ln;

2
server/src/main/java/com/genymobile/scrcpy/video/VideoCodec.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.util.Codec;
import com.genymobile.scrcpy.model.Codec;
import android.annotation.SuppressLint;
import android.media.MediaFormat;

2
server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Size;
public class VideoConstraints {
private final int maxSize;

4
server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java
View file

@ -1,7 +1,7 @@
package com.genymobile.scrcpy.video;
import com.genymobile.scrcpy.device.Orientation;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.model.Orientation;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.AffineMatrix;
import android.graphics.Rect;

4
server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
View file

@ -2,8 +2,8 @@ package com.genymobile.scrcpy.wrappers;
import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.FakeContext;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.device.Size;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.model.Size;
import com.genymobile.scrcpy.util.Command;
import com.genymobile.scrcpy.util.Ln;

2
server/src/test/java/com/genymobile/scrcpy/util/CodecOptionsTest.java → server/src/test/java/com/genymobile/scrcpy/model/CodecOptionsTest.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.util;
package com.genymobile.scrcpy.model;
import org.junit.Assert;
import org.junit.Test;

2
server/src/test/java/com/genymobile/scrcpy/device/SizeTest.java → server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
View file

@ -1,4 +1,4 @@
package com.genymobile.scrcpy.device;
package com.genymobile.scrcpy.model;
import com.genymobile.scrcpy.video.VideoConstraints;

2
server/src/test/java/com/genymobile/scrcpy/util/CommandParserTest.java
View file

@ -1,6 +1,6 @@
package com.genymobile.scrcpy.util;
import com.genymobile.scrcpy.device.DisplayInfo;
import com.genymobile.scrcpy.display.DisplayInfo;
import com.genymobile.scrcpy.wrappers.DisplayManager;
import android.view.Display;