Fix freeze and thaw rotation for Android 15

Refs <670fb7f5c0%5E%21/>
PR #4740 <https://github.com/Genymobile/scrcpy/pull/4740>

Signed-off-by: Romain Vimont <rom@rom1v.com>

app/src/cli.c

@@ -2556,9 +2556,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
 
     if (opts->audio_playback && opts->audio_buffer == -1) {
         if (opts->audio_codec == SC_CODEC_FLAC) {
-            // Use 50 ms audio buffer by default, but use a higher value for
-            // FLAC, which is not low latency (the default encoder produces
-            // blocks of 4096 samples, which represent ~85.333ms).
+            // Use 50 ms audio buffer by default, but use a higher value for FLAC,
+            // which is not low latency (the default encoder produces blocks of
+            // 4096 samples, which represent ~85.333ms).
             LOGI("FLAC audio: audio buffer increased to 120 ms (use "
                  "--audio-buffer to set a custom value)");
             opts->audio_buffer = SC_TICK_FROM_MS(120);
@@ -2598,11 +2598,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
     }
 
     if (otg) {
-        if (!opts->control) {
-            LOGE("--no-control is not allowed in OTG mode");
-            return false;
-        }
-
         enum sc_keyboard_input_mode kmode = opts->keyboard_input_mode;
         if (kmode != SC_KEYBOARD_INPUT_MODE_AOA
                 && kmode != SC_KEYBOARD_INPUT_MODE_DISABLED) {

app/src/input_manager.c

@@ -468,7 +468,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 return;
             case SDLK_DOWN:
                 if (shift) {
-                    if (!repeat && down) {
+                    if (!repeat & down) {
                         apply_orientation_transform(im,
                                                     SC_ORIENTATION_FLIP_180);
                     }
@@ -479,7 +479,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 return;
             case SDLK_UP:
                 if (shift) {
-                    if (!repeat && down) {
+                    if (!repeat & down) {
                         apply_orientation_transform(im,
                                                     SC_ORIENTATION_FLIP_180);
                     }

app/src/recorder.c

@@ -9,8 +9,6 @@
 #include "util/log.h"
 #include "util/str.h"
 
-#define RTMP_URL "rtmp://localhost/live/stream"
-
 /** Downcast packet sinks to recorder */
 #define DOWNCAST_VIDEO(SINK) \
     container_of(SINK, struct sc_recorder, video_packet_sink)
@@ -133,7 +131,7 @@ static bool
 sc_recorder_open_output_file(struct sc_recorder *recorder) {
     const char *format_name = sc_recorder_get_format_name(recorder->format);
     assert(format_name);
-    const AVOutputFormat *format = find_muxer("flv");
+    const AVOutputFormat *format = find_muxer(format_name);
     if (!format) {
         LOGE("Could not find muxer");
         return false;
@@ -145,11 +143,8 @@ sc_recorder_open_output_file(struct sc_recorder *recorder) {
         return false;
     }
 
-    AVDictionary *options = NULL;
-    av_dict_set(&options, "listen", "1", 0); // Enable listening
-
-    int ret = avio_open2(&recorder->ctx->pb, RTMP_URL,
-                        AVIO_FLAG_WRITE, NULL, &options);
+    int ret = avio_open(&recorder->ctx->pb, recorder->filename,
+                        AVIO_FLAG_WRITE);
     if (ret < 0) {
         LOGE("Failed to open output file: %s", recorder->filename);
         avformat_free_context(recorder->ctx);

app/src/scrcpy.c

@@ -805,12 +805,9 @@ scrcpy(struct scrcpy_options *options) {
     ret = event_loop(s);
     LOGD("quit...");
 
-    if (options->video_playback) {
-        // Close the window immediately on closing, because screen_destroy()
-        // may only be called once the video demuxer thread is joined (it may
-        // take time)
-        sc_screen_hide_window(&s->screen);
-    }
+    // Close the window immediately on closing, because screen_destroy() may
+    // only be called once the video demuxer thread is joined (it may take time)
+    sc_screen_hide_window(&s->screen);
 
 end:
     if (timeout_started) {

server/src/main/java/com/genymobile/scrcpy/CameraCapture.java

@@ -127,10 +127,6 @@ public class CameraCapture extends SurfaceCapture {
 
         StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
         android.util.Size[] sizes = highSpeed ? configs.getHighSpeedVideoSizes() : configs.getOutputSizes(MediaCodec.class);
-        if (sizes == null) {
-            return null;
-        }
-
         Stream<android.util.Size> stream = Arrays.stream(sizes);
         if (maxSize > 0) {
             stream = stream.filter(it -> it.getWidth() <= maxSize && it.getHeight() <= maxSize);

server/src/main/java/com/genymobile/scrcpy/LogUtils.java

@@ -118,16 +118,12 @@ public final class LogUtils {
                         StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
 
                         android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
-                        if (sizes == null || sizes.length == 0) {
-                            builder.append("\n        (none)");
-                        } else {
-                            for (android.util.Size size : sizes) {
-                                builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
-                            }
+                        for (android.util.Size size : sizes) {
+                            builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
                         }
 
                         android.util.Size[] highSpeedSizes = configs.getHighSpeedVideoSizes();
-                        if (highSpeedSizes != null && highSpeedSizes.length > 0) {
+                        if (highSpeedSizes.length > 0) {
                             builder.append("\n      High speed capture (--camera-high-speed):");
                             for (android.util.Size size : highSpeedSizes) {
                                 Range<Integer>[] highFpsRanges = configs.getHighSpeedVideoFpsRanges();

server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java

@@ -49,9 +49,7 @@ public final class WindowManager {
     private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException {
         if (freezeDisplayRotationMethod == null) {
             try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
+                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
                 freezeDisplayRotationMethodVersion = 0;
             } catch (NoSuchMethodException e) {
                 try {
@@ -60,7 +58,9 @@ public final class WindowManager {
                     freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
                     freezeDisplayRotationMethodVersion = 1;
                 } catch (NoSuchMethodException e1) {
-                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
+                    // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
                     freezeDisplayRotationMethodVersion = 2;
                 }
             }
@@ -71,12 +71,12 @@ public final class WindowManager {
     private Method getIsDisplayRotationFrozenMethod() throws NoSuchMethodException {
         if (isDisplayRotationFrozenMethod == null) {
             try {
+                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
+                isDisplayRotationFrozenMethodVersion = 0;
+            } catch (NoSuchMethodException e) {
                 // New method added by this commit:
                 // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
                 isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
-                isDisplayRotationFrozenMethodVersion = 0;
-            } catch (NoSuchMethodException e) {
-                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
                 isDisplayRotationFrozenMethodVersion = 1;
             }
         }
@@ -86,9 +86,7 @@ public final class WindowManager {
     private Method getThawDisplayRotationMethod() throws NoSuchMethodException {
         if (thawDisplayRotationMethod == null) {
             try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
+                thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
                 thawDisplayRotationMethodVersion = 0;
             } catch (NoSuchMethodException e) {
                 try {
@@ -97,7 +95,9 @@ public final class WindowManager {
                     thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
                     thawDisplayRotationMethodVersion = 1;
                 } catch (NoSuchMethodException e1) {
-                    thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
+                    // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                    thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
                     thawDisplayRotationMethodVersion = 2;
                 }
             }
@@ -120,18 +120,18 @@ public final class WindowManager {
             Method method = getFreezeDisplayRotationMethod();
             switch (freezeDisplayRotationMethodVersion) {
                 case 0:
-                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId, rotation);
-                    break;
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return;
                     }
                     method.invoke(manager, rotation);
                     break;
+                case 1:
+                    method.invoke(manager, displayId, rotation);
+                    break;
+                default:
+                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
+                    break;
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -143,13 +143,13 @@ public final class WindowManager {
             Method method = getIsDisplayRotationFrozenMethod();
             switch (isDisplayRotationFrozenMethodVersion) {
                 case 0:
-                    return (boolean) method.invoke(manager, displayId);
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return false;
                     }
                     return (boolean) method.invoke(manager);
+                default:
+                    return (boolean) method.invoke(manager, displayId);
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -162,18 +162,18 @@ public final class WindowManager {
             Method method = getThawDisplayRotationMethod();
             switch (thawDisplayRotationMethodVersion) {
                 case 0:
-                    method.invoke(manager, displayId, "scrcpy#thawRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId);
-                    break;
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return;
                     }
                     method.invoke(manager);
                     break;
+                case 1:
+                    method.invoke(manager, displayId);
+                    break;
+                default:
+                    method.invoke(manager, displayId, "scrcpy#thawRotation");
+                    break;
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -189,10 +189,6 @@ public final class WindowManager {
                 cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, displayId);
             } catch (NoSuchMethodException e) {
                 // old version
-                if (displayId != 0) {
-                    Ln.e("Secondary display rotation not supported on this device");
-                    return;
-                }
                 cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
             }
         } catch (Exception e) {