rtmp-wip

Run: scrcpy -ra.mp4 --audio-codec=aac (the filename is ignored, but the command line parser must be happy, and opus is not supported by flv)
Fix boolean condition
2026-03-12 07:04:28 +01:00 · 2024-04-26 10:03:19 +02:00 · 2024-04-19 12:49:03 +02:00 · 2024-04-17 10:45:18 +02:00 · 2024-04-16 15:50:44 +02:00 · 2024-04-16 15:50:41 +02:00
7 changed files with 110 additions and 111 deletions
--- a/app/src/cli.c
+++ b/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,6 +2598,11 @@ 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) {
--- a/app/src/input_manager.c
+++ b/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);
                    }
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -9,6 +9,8 @@
 #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)
@@ -131,7 +133,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(format_name);
+    const AVOutputFormat *format = find_muxer("flv");
    if (!format) {
        LOGE("Could not find muxer");
        return false;
@@ -143,8 +145,11 @@ sc_recorder_open_output_file(struct sc_recorder *recorder) {
        return false;
    }

-    int ret = avio_open(&recorder->ctx->pb, recorder->filename,
-                        AVIO_FLAG_WRITE);
+    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);
    if (ret < 0) {
        LOGE("Failed to open output file: %s", recorder->filename);
        avformat_free_context(recorder->ctx);
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -127,6 +127,10 @@ 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);
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -118,12 +118,16 @@ public final class LogUtils {
                        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);

                        android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
-                        for (android.util.Size size : sizes) {
-                            builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
+                        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());
+                            }
                        }

                        android.util.Size[] highSpeedSizes = configs.getHighSpeedVideoSizes();
-                        if (highSpeedSizes.length > 0) {
+                        if (highSpeedSizes != null && highSpeedSizes.length > 0) {
                            builder.append("\n      High speed capture (--camera-high-speed):");
                            for (android.util.Size size : highSpeedSizes) {
                                Range<Integer>[] highFpsRanges = configs.getHighSpeedVideoFpsRanges();
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -38,53 +38,38 @@ public final class ClipboardManager {
        if (getPrimaryClipMethod == null) {
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
-                return getPrimaryClipMethod;
+            } else {
+                try {
+                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
+                    getMethodVersion = 0;
+                } catch (NoSuchMethodException e1) {
+                    try {
+                        getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class);
+                        getMethodVersion = 1;
+                    } catch (NoSuchMethodException e2) {
+                        try {
+                            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class, int.class);
+                            getMethodVersion = 2;
+                        } catch (NoSuchMethodException e3) {
+                            try {
+                                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class, String.class);
+                                getMethodVersion = 3;
+                            } catch (NoSuchMethodException e4) {
+                                try {
+                                    getPrimaryClipMethod = manager.getClass()
+                                            .getMethod("getPrimaryClip", String.class, String.class, int.class, int.class, boolean.class);
+                                    getMethodVersion = 4;
+                                } catch (NoSuchMethodException e5) {
+                                    getPrimaryClipMethod = manager.getClass()
+                                            .getMethod("getPrimaryClip", String.class, String.class, String.class, String.class, int.class, int.class,
+                                                    boolean.class);
+                                    getMethodVersion = 5;
+                                }
+                            }
+                        }
+                    }
+                }
            }
-            try {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
-                getMethodVersion = 0;
-                return getPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class);
-                getMethodVersion = 1;
-                return getPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class, int.class);
-                getMethodVersion = 2;
-                return getPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class, String.class);
-                getMethodVersion = 3;
-                return getPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                getPrimaryClipMethod = manager.getClass()
-                        .getMethod("getPrimaryClip", String.class, String.class, int.class, int.class, boolean.class);
-                getMethodVersion = 4;
-                return getPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                getPrimaryClipMethod = manager.getClass()
-                        .getMethod("getPrimaryClip", String.class, String.class, String.class, String.class, int.class, int.class, boolean.class);
-                getMethodVersion = 5;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class, int.class, String.class);
-            getMethodVersion = 6;
        }
        return getPrimaryClipMethod;
    }
@@ -93,33 +78,27 @@ public final class ClipboardManager {
        if (setPrimaryClipMethod == null) {
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
-                return setPrimaryClipMethod;
+            } else {
+                try {
+                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);
+                    setMethodVersion = 0;
+                } catch (NoSuchMethodException e1) {
+                    try {
+                        setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class);
+                        setMethodVersion = 1;
+                    } catch (NoSuchMethodException e2) {
+                        try {
+                            setPrimaryClipMethod = manager.getClass()
+                                    .getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class, int.class);
+                            setMethodVersion = 2;
+                        } catch (NoSuchMethodException e3) {
+                            setPrimaryClipMethod = manager.getClass()
+                                    .getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class, int.class, boolean.class);
+                            setMethodVersion = 3;
+                        }
+                    }
+                }
            }
-            try {
-                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);
-                setMethodVersion = 0;
-                return setPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class);
-                setMethodVersion = 1;
-                return setPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall through
-            }
-            try {
-                setPrimaryClipMethod = manager.getClass()
-                        .getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class, int.class);
-                setMethodVersion = 2;
-                return setPrimaryClipMethod;
-            } catch (NoSuchMethodException e) {
-                // fall though
-            }
-            setPrimaryClipMethod = manager.getClass()
-                    .getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class, int.class, boolean.class);
-            setMethodVersion = 3;
        }
        return setPrimaryClipMethod;
    }
@@ -141,10 +120,8 @@ public final class ClipboardManager {
            case 4:
                // The last boolean parameter is "userOperate"
                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0, true);
-            case 5:
-                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, null, null, FakeContext.ROOT_UID, 0, true);
            default:
-                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0, null);
+                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, null, null, FakeContext.ROOT_UID, 0, true);
        }
    }

--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -49,7 +49,9 @@ public final class WindowManager {
    private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException {
        if (freezeDisplayRotationMethod == null) {
            try {
-                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 = 0;
            } catch (NoSuchMethodException e) {
                try {
@@ -58,9 +60,7 @@ public final class WindowManager {
                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
                    freezeDisplayRotationMethodVersion = 1;
                } catch (NoSuchMethodException e1) {
-                    // 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 = 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,7 +86,9 @@ public final class WindowManager {
    private Method getThawDisplayRotationMethod() throws NoSuchMethodException {
        if (thawDisplayRotationMethod == null) {
            try {
-                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 = 0;
            } catch (NoSuchMethodException e) {
                try {
@@ -95,9 +97,7 @@ public final class WindowManager {
                    thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
                    thawDisplayRotationMethodVersion = 1;
                } catch (NoSuchMethodException e1) {
-                    // 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 = 2;
                }
            }
@@ -120,17 +120,17 @@ public final class WindowManager {
            Method method = getFreezeDisplayRotationMethod();
            switch (freezeDisplayRotationMethodVersion) {
                case 0:
-                    if (displayId != 0) {
-                        Ln.e("Secondary display rotation not supported on this device");
-                        return;
-                    }
-                    method.invoke(manager, rotation);
+                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
                    break;
                case 1:
                    method.invoke(manager, displayId, rotation);
                    break;
                default:
-                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
+                    if (displayId != 0) {
+                        Ln.e("Secondary display rotation not supported on this device");
+                        return;
+                    }
+                    method.invoke(manager, rotation);
                    break;
            }
        } catch (ReflectiveOperationException 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,17 +162,17 @@ public final class WindowManager {
            Method method = getThawDisplayRotationMethod();
            switch (thawDisplayRotationMethodVersion) {
                case 0:
-                    if (displayId != 0) {
-                        Ln.e("Secondary display rotation not supported on this device");
-                        return;
-                    }
-                    method.invoke(manager);
+                    method.invoke(manager, displayId, "scrcpy#thawRotation");
                    break;
                case 1:
                    method.invoke(manager, displayId);
                    break;
                default:
-                    method.invoke(manager, displayId, "scrcpy#thawRotation");
+                    if (displayId != 0) {
+                        Ln.e("Secondary display rotation not supported on this device");
+                        return;
+                    }
+                    method.invoke(manager);
                    break;
            }
        } catch (ReflectiveOperationException e) {
@@ -189,6 +189,10 @@ 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) {
Author	SHA1	Message	Date
Romain Vimont	84be93ce3f	rtmp-wip Run: scrcpy -ra.mp4 --audio-codec=aac (the filename is ignored, but the command line parser must be happy, and opus is not supported by flv)	2024-04-26 10:03:19 +02:00
Romain Vimont	22d78e8a82	Fix boolean condition Use the short-circuit operator && between booleans.	2024-04-19 12:49:03 +02:00
Romain Vimont	bcb8503b26	Handle reported camera sizes array is null The array of sizes may be null. Handle this case gracefully. Fixes #4852 <https://github.com/Genymobile/scrcpy/issues/4852>	2024-04-17 10:45:18 +02:00
Romain Vimont	9aa6cc71be	Forbid --no-control in OTG mode The whole purpose of OTG is to only control the device.	2024-04-16 15:50:44 +02:00
Romain Vimont	54e08b4eae	Fix code style Limit to 80 columns.	2024-04-16 15:50:41 +02:00
Romain Vimont	bd8b945bb3	Register rotation watcher only when possible Old Android versions may not be able to register a rotation watcher for a secondary display. In that case, report the error instead of registering a rotation watcher for the default display. Refs <https://github.com/Genymobile/scrcpy/pull/4740#issuecomment-2051245633> Suggested by: Kaiming Hu <huxxx1234@gmail.com>	2024-04-12 17:22:45 +02:00
Kaiming Hu	a73bf932d6	Fix could not rotate secondary display The version of the methods with the display id parameter must be tried first, otherwise they will never be used (since the old versions without the display id are still present). Regression introduced by `ee6620d123`. Refs #4740 <https://github.com/Genymobile/scrcpy/pull/4740> PR #4841 <https://github.com/Genymobile/scrcpy/pull/4841> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-04-12 17:20:15 +02:00