From 08e1c9cb4393b21ac0744410b7b4e34cd49a9ed6 Mon Sep 17 00:00:00 2001
From: gz0119 <liyong2@4399.com>
Date: Thu, 10 Apr 2025 22:04:12 +0800
Subject: [PATCH] Handle rotation value errors and reduce judgment
 implementation

---
 .DS_Store                                       | Bin 0 -> 10244 bytes
 .../com/genymobile/scrcpy/device/Streamer.java  |   8 +++++---
 .../scrcpy/video/DisplaySizeMonitor.java        |   1 +
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..26c69b23486de5cabc689ef3323aaecf2192a645
GIT binary patch
literal 10244
zcmZQzU|@7AO)+F(P+(wS;9!8z0z3>@0Z1N%F(jFwB8njM7#IW?Jah7slXCKt7(g7T
z<R~>70;3@?8UmvsFd71*Auy;yfDz&v4sHlNN{)uWXb6mk06YXh<pZdL0HPfrZG46X
z2n`ZqU}RtbcL5j~7+7GM7@<vnMo6Cmqz0rFM1!<4FoIZMGr(FI7@=Aj!QBuB21W(}
zuu+WQt_g?_*3Q5PwwZx}5o|L910zH`10&RCMraR(5u%-e5#(@?JrM0+Ge?Qh5Eu;s
z)DQsm-B}p)7}6Os8A{Ol?~V)%40`{;0IZ1}rj8+lp_CyBP4#*-)m(7ZnGER+c?|gs
zMGUE^dKhKV^gwJVVn}32VaUNy-HoQ2nIVy(fS~}*%%5ng*ccKSiW!O-QW;7Zic!@v
zrK73kVMt;qWyoa6VMqbH9*0X9Kp`^^95DaEAp_Bu%TT}&&rrsY%232m%#g{D&ya^|
z9|I_ikoB=KB!g5jq%mYNq@$_@hYhk?euiX*B8GghU*Z|c88R927>pT=81xuQ7%I@?
zju8}AgmjxRnBdS23PWVw%nT_E`3%XZE(C`jvMM$PHwH(BKn6XAT!s`>wV)7V<U<NE
zHimQtT%o(3fdNIWAhKEpJ%$2sI23@xxr8B;Ar(DdL1Bkt0y~Nc<*050g%yfwZdBC_
zdJIVni5MaL6U~)E;20@pC}Bus$YID~hzF&2P$~wezf=Z2hGK>cRGUE|h+;E4gAaoz
zgENCGgC9dMgDa|Pa2VDhg&{XXF39iT6a;c3H07e|0*3{%E<q$+@eKJ41q`4t%xB1B
zD8`-|K&h4y*#u68AO=?kM+O%LUj|ofu?-GUWF73NVS(mCP)OoYom5_203B7_kyMbA
zSzKaZaE+0PnT3^&or9f&n<F+jBfmVjB(bEl*eS6n8pI39&(BGMu@jTRGE>Xr1w@?l
z^GXsk^HPgIN`f;}Qj-#kV!|`?Qu524@=NnliotrJ5*(Zyobdt@)zwB8mO2WC<|ef|
z3e}cI#ySe77RI%;oE)Oc`qn}5**Up+`CZ^r0NyxZ;DzwvBq%qcg+W<xQC?1d9;gHY
zHEEa`iWo}K%L{P&Kn@u;a5+{4DPvGW5u7^SA*Bu!wZkL~QT&7!g8bmHDFLVEJce{|
zYQ|s2AcqzsLj`Jhg7XcUih&MALo*8<1w#u+N;EguQ7|<zAtNO+GE|_29Xz3qGDbsS
zGz3ONU^E0qLtr!nhIt4uL;R-z8vl1?V8Av14^cHrj)uT!2n@>*U}SL#c5wm?mgDdq
zXsjJHo}K`e2X$CMqxp=W@p*_okP^_)K6p5u39_h21Eidhfx!SogD@il19&)|kpVKA
VKVXvqqy7J(IfgRY|EF629{?mO{Nexr

literal 0
HcmV?d00001

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;
     }