Display and control your Android device
Add RESIZE_DISPLAY control message
Romain Vimont1495dae0dc4c
diff --git a/app/src/control_msg.c b/app/src/control_msg.cindex 146fbed7..fa8ce480 100644--- a/app/src/control_msg.c+++ b/app/src/control_msg.c@@ -185,6 +185,10 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {case SC_CONTROL_MSG_TYPE_CAMERA_SET_TORCH:buf[1] = msg->camera_set_torch.on ? 1 : 0;return 2;+ case SC_CONTROL_MSG_TYPE_RESIZE_DISPLAY:+ sc_write16be(&buf[1], msg->resize_display.width);+ sc_write16be(&buf[3], msg->resize_display.height);+ return 5;case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:@@ -273,6 +277,10 @@ sc_control_msg_log(const struct sc_control_msg *msg) {LOG_CMSG("display power %s",msg->set_display_power.on ? "on" : "off");break;+ case SC_CONTROL_MSG_TYPE_RESIZE_DISPLAY:+ LOG_CMSG("resize display %" PRIu16 "x%" PRIu16,+ msg->resize_display.width, msg->resize_display.height);+ break;case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:LOG_CMSG("expand notification panel");break;diff --git a/app/src/control_msg.h b/app/src/control_msg.hindex 36e9a4b6..2f69e1f0 100644--- a/app/src/control_msg.h+++ b/app/src/control_msg.h@@ -46,6 +46,7 @@ enum sc_control_msg_type {SC_CONTROL_MSG_TYPE_CAMERA_SET_TORCH,SC_CONTROL_MSG_TYPE_CAMERA_ZOOM_IN,SC_CONTROL_MSG_TYPE_CAMERA_ZOOM_OUT,+ SC_CONTROL_MSG_TYPE_RESIZE_DISPLAY,};enum sc_copy_key {@@ -117,6 +118,10 @@ struct sc_control_msg {struct {bool on;} camera_set_torch;+ struct {+ uint16_t width;+ uint16_t height;+ } resize_display;};};diff --git a/app/tests/test_control_msg_serialize.c b/app/tests/test_control_msg_serialize.cindex bd445a1d..f674b704 100644--- a/app/tests/test_control_msg_serialize.c+++ b/app/tests/test_control_msg_serialize.c@@ -495,6 +495,27 @@ static void test_serialize_camera_zoom_out(void) {assert(!memcmp(buf, expected, sizeof(expected)));}+static void test_serialize_resize_display(void) {+ struct sc_control_msg msg = {+ .type = SC_CONTROL_MSG_TYPE_RESIZE_DISPLAY,+ .resize_display = {+ .width = 1920,+ .height = 1080,+ },+ };++ uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];+ size_t size = sc_control_msg_serialize(&msg, buf);+ assert(size == 5);++ const uint8_t expected[] = {+ SC_CONTROL_MSG_TYPE_RESIZE_DISPLAY,+ 1920 >> 8, 1920 & 0xff,+ 1080 >> 8, 1080 & 0xff,+ };+ assert(!memcmp(buf, expected, sizeof(expected)));+}+int main(int argc, char *argv[]) {(void) argc;(void) argv;@@ -522,5 +543,6 @@ int main(int argc, char *argv[]) {test_serialize_camera_set_torch();test_serialize_camera_zoom_in();test_serialize_camera_zoom_out();+ test_serialize_resize_display();return 0;}diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.javaindex 098046ed..d7a5c78e 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java@@ -28,6 +28,7 @@ public final class ControlMessage {public static final int TYPE_CAMERA_SET_TORCH = 18;public static final int TYPE_CAMERA_ZOOM_IN = 19;public static final int TYPE_CAMERA_ZOOM_OUT = 20;+ public static final int TYPE_RESIZE_DISPLAY = 21;public static final long SEQUENCE_INVALID = 0;@@ -56,6 +57,8 @@ public final class ControlMessage {private boolean on;private int vendorId;private int productId;+ private int width;+ private int height;private ControlMessage() {}@@ -176,6 +179,14 @@ public final class ControlMessage {return msg;}+ public static ControlMessage createResizeDisplay(int width, int height) {+ ControlMessage msg = new ControlMessage();+ msg.type = TYPE_RESIZE_DISPLAY;+ msg.width = width;+ msg.height = height;+ return msg;+ }+public int getType() {return type;}@@ -259,4 +270,12 @@ public final class ControlMessage {public int getProductId() {return productId;}++ public int getWidth() {+ return width;+ }++ public int getHeight() {+ return height;+ }}diff --git a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.javaindex 13a853df..a2e3a4a7 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java@@ -60,6 +60,8 @@ public class ControlMessageReader {return parseStartApp();case ControlMessage.TYPE_CAMERA_SET_TORCH:return parseCameraSetTorch();+ case ControlMessage.TYPE_RESIZE_DISPLAY:+ return parseResizeDisplay();default:throw new ControlProtocolException("Unknown event type: " + type);}@@ -175,6 +177,12 @@ public class ControlMessageReader {return ControlMessage.createCameraSetTorch(on);}+ private ControlMessage parseResizeDisplay() throws IOException {+ int width = dis.readUnsignedShort();+ int height = dis.readUnsignedShort();+ return ControlMessage.createResizeDisplay(width, height);+ }+private Position parsePosition() throws IOException {int x = dis.readInt();int y = dis.readInt();diff --git a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.javaindex 4fcf66c9..57ff063d 100644--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java@@ -472,6 +472,26 @@ public class ControlMessageReaderTest {Assert.assertEquals(-1, bis.read()); // EOS}+ @Test+ public void testParseResizeDisplay() throws IOException {+ ByteArrayOutputStream bos = new ByteArrayOutputStream();+ DataOutputStream dos = new DataOutputStream(bos);+ dos.writeByte(ControlMessage.TYPE_RESIZE_DISPLAY);+ dos.writeShort(1920);+ dos.writeShort(1080);+ byte[] packet = bos.toByteArray();++ ByteArrayInputStream bis = new ByteArrayInputStream(packet);+ ControlMessageReader reader = new ControlMessageReader(bis);++ ControlMessage event = reader.read();+ Assert.assertEquals(ControlMessage.TYPE_RESIZE_DISPLAY, event.getType());+ Assert.assertEquals(1920, event.getWidth());+ Assert.assertEquals(1080, event.getHeight());++ Assert.assertEquals(-1, bis.read()); // EOS+ }+@Testpublic void testMultiEvents() throws IOException {ByteArrayOutputStream bos = new ByteArrayOutputStream();