diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..26c69b23
Binary files /dev/null and b/.DS_Store differ
diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
index 4bd2e96b..f549d4bd 100644
--- a/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
@@ -60,10 +60,12 @@ public final class Streamer {
             buffer.put((byte) 0xff);
             buffer.putInt(videoSize.getWidth());
             buffer.putInt(videoSize.getHeight());
-            rotation = rotation * 90;
             buffer.put((byte) (isFlip ? 1 : 0));
-            buffer.put((byte) (rotation >= 180 ? 1 : 0));
-            buffer.put((byte) (rotation >= 90 ? 1 : 0));
+
+            int[] vertical = {0, 0, 1, 1};
+            int[] horizontal = {0, 1, 0, 1};
+            buffer.put((byte) vertical[rotation]);
+            buffer.put((byte) horizontal[rotation]);
             buffer.flip();
             IO.writeFully(fd, buffer);
         }
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java b/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
index a8abbd9f..bb7582bf 100644
--- a/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
@@ -130,6 +130,7 @@ public class DisplaySizeMonitor {
     }
 
     private synchronized void setSessionInfo(SessionInfo sessionInfo) {
+        Ln.e("@@@@@@@@@@@@@@@@@@@@@@"+sessionInfo.rotation);
         this.sessionInfo = sessionInfo;
     }