Fix SDL colorspace matching AVCOL_SPC_RGB

Use BT.709 color space for AVCOL_SPC_RGB. Refs #1868 comment <https://github.com/Genymobile/scrcpy/issues/1868#issuecomment-3293917796> Signed-off-by: Romain Vimont <rom@rom1v.com>
Build SDL3 for test step on Github Actions
2026-03-11 06:34:39 +01:00 · 2025-12-30 20:03:46 +01:00 · 2025-12-30 20:03:46 +01:00 · 2025-12-30 20:03:46 +01:00 · 2025-12-30 20:03:46 +01:00 · 2025-12-30 20:03:46 +01:00
10 changed files with 36 additions and 149 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -72,19 +72,13 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v4

-        # Same as build-linux-x86_64
      - name: Install dependencies
        run: |
          sudo apt update
-          sudo apt install -y meson ninja-build nasm ffmpeg libavcodec-dev \
-             libavdevice-dev libavformat-dev libavutil-dev libswresample-dev \
-             libusb-1.0-0 libusb-1.0-0-dev libv4l-dev \
-             libasound2-dev libpulse-dev \
-             libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-             libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
-             libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-             libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
-             libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
+             libv4l-dev

        # SDL3 is not available in Ubuntu yet
      - name: Install SDL3
@@ -112,19 +106,13 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v4

-        # https://wiki.libsdl.org/SDL3/README-linux#build-dependencies
      - name: Install dependencies
        run: |
          sudo apt update
-          sudo apt install -y meson ninja-build nasm ffmpeg libavcodec-dev \
-             libavdevice-dev libavformat-dev libavutil-dev libswresample-dev \
-             libusb-1.0-0 libusb-1.0-0-dev libv4l-dev \
-             libasound2-dev libpulse-dev \
-             libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-             libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
-             libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-             libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
-             libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
+             libv4l-dev

      - name: Build
        run: release/build_linux.sh x86_64
@@ -152,7 +140,9 @@ jobs:
      - name: Install dependencies
        run: |
          sudo apt update
-          sudo apt install -y meson ninja-build nasm \
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             mingw-w64 mingw-w64-tools libz-mingw-w64-dev

      - name: Build
@@ -181,7 +171,9 @@ jobs:
      - name: Install dependencies
        run: |
          sudo apt update
-          sudo apt install -y meson ninja-build nasm \
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             mingw-w64 mingw-w64-tools libz-mingw-w64-dev

      - name: Build
--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@@ -3,9 +3,9 @@ set -ex
 . $(dirname ${BASH_SOURCE[0]})/_init
 process_args "$@"

-VERSION=3.4.0
+VERSION=3.2.28
 URL="https://github.com/libsdl-org/SDL/archive/refs/tags/release-$VERSION.tar.gz"
-SHA256SUM=9614b9696abc4597ffce6b888829dc6537ae500423474c342ac4a67222c5654c
+SHA256SUM=5c908f07a93087037d3319bc5d820ba8df14ac98bdbdf24af9084ef460ce01b1

 PROJECT_DIR="sdl-$VERSION"
 FILENAME="$PROJECT_DIR.tar.gz"
@@ -37,7 +37,6 @@ else

    conf=(
        -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/$DIRNAME"
-        -DSDL_TESTS=OFF
    )

    if [[ "$HOST" == linux ]]
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -788,19 +788,15 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
        case SDL_EVENT_WINDOW_RESTORED:
            if (screen->has_video_window && is_windowed(screen)) {
                apply_pending_resize(screen);
-                sc_screen_render(screen, true);
            }
            return true;
        case SDL_EVENT_WINDOW_ENTER_FULLSCREEN:
            LOGD("Switched to fullscreen mode");
-            assert(screen->has_video_window);
            return true;
        case SDL_EVENT_WINDOW_LEAVE_FULLSCREEN:
            LOGD("Switched to windowed mode");
-            assert(screen->has_video_window);
            if (is_windowed(screen)) {
                apply_pending_resize(screen);
-                sc_screen_render(screen, true);
            }
            return true;
    }
--- a/app/src/util/sdl.c
+++ b/app/src/util/sdl.c
@@ -130,6 +130,15 @@ sc_sdl_hide_window(SDL_Window *window) {
    }
 }

+void
+sc_sdl_restore_window(SDL_Window *window) {
+    bool ok = SDL_RestoreWindow(window);
+    if (!ok) {
+        LOGE("Could not restore window: %s", SDL_GetError());
+        assert(!"unexpected");
+    }
+}
+
 bool
 sc_sdl_render_clear(SDL_Renderer *renderer) {
    bool ok = SDL_RenderClear(renderer);
--- a/app/src/util/sdl.h
+++ b/app/src/util/sdl.h
@@ -34,6 +34,9 @@ sc_sdl_show_window(SDL_Window *window);
 void
 sc_sdl_hide_window(SDL_Window *window);

+void
+sc_sdl_restore_window(SDL_Window *window);
+
 bool
 sc_sdl_render_clear(SDL_Renderer *renderer);

--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -1,73 +0,0 @@
-# Build with:
-#     podman build -t scrcpy-builder .
-#
-# Run with:
-#     podman run \
-#       -v PATH_TO_SCRCPY:/home/debian/scrcpy \
-#       --userns=keep-id \
-#       -it scrcpy-builder \
-#       bash
-
-FROM debian:trixie
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    sudo wget unzip gcc git pkg-config meson ninja-build cmake \
-    libsdl3-dev libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev \
-    libswresample-dev libusb-1.0-0-dev openjdk-21-jdk \
-    mingw-w64 mingw-w64-tools libz-mingw-w64-dev
-
-RUN groupadd -g 1000 debian \
- && useradd -m -u 1000 -g 1000 -s /bin/bash debian
-RUN echo "debian ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
-ENV ANDROID_HOME=/opt/android/sdk
-RUN mkdir -p "$ANDROID_HOME" \
- && chown debian:debian "$ANDROID_HOME"
-
-USER debian
-WORKDIR /home/debian
-
-ENV CMDLINETOOLS_URL=https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip
-ENV CMDLINETOOLS_SHA256=7ec965280a073311c339e571cd5de778b9975026cfcbe79f2b1cdcb1e15317ee
-
-RUN wget -q "$CMDLINETOOLS_URL" -O cmdlinetools.zip \
- && echo "$CMDLINETOOLS_SHA256  cmdlinetools.zip" | sha256sum -c
-
-RUN mkdir tmp \
- && unzip -q cmdlinetools.zip -d tmp \
- && mkdir -p "$ANDROID_HOME/cmdline-tools" \
- && mv tmp/cmdline-tools "$ANDROID_HOME/cmdline-tools/latest" \
- && rmdir tmp \
- && rm cmdlinetools.zip
-# To get the licence hash, run manually: "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses
-# Build-tools 35 is still needed for the current AGP version
-RUN mkdir -p "$ANDROID_HOME/licenses" \
- && echo 24333f8a63b6825ea9c5514f83c2829b004d1fee > "$ANDROID_HOME/licenses/android-sdk-license" \
- && $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-36" "build-tools;35.0.0" "build-tools;36.0.0"
-
-# For scrcpy build scripts
-ENV GRADLE_VERSION=8.14.3
-ENV GRADLE_HOME=/opt/gradle-$GRADLE_VERSION
-ENV GRADLE_URL=https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip
-ENV GRADLE_SHA256=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-ENV GRADLE=gradle
-ENV PATH=$GRADLE_HOME/bin:$PATH
-
-USER root
-RUN wget -q "$GRADLE_URL" -O gradle.zip \
- && echo "$GRADLE_SHA256  gradle.zip" | sha256sum -c
-RUN unzip -q gradle.zip -d /opt \
- && rm gradle.zip
-
-USER debian
-
-# Pre-download gradle dependencies for scrcpy
-RUN mkdir -p /home/debian/fake-scrcpy/app
-COPY fake.gradle /home/debian/fake-scrcpy/build.gradle
-COPY fake_app.gradle /home/debian/fake-scrcpy/app/build.gradle
-RUN echo "include ':app'" > /home/debian/fake-scrcpy/settings.gradle \
- && gradle -p /home/debian/fake-scrcpy dependencies androidDependencies --no-daemon \
- && rm -rf /home/debian/fake-scrcpy
--- a/container/fake.gradle
+++ b/container/fake.gradle
@@ -1,17 +0,0 @@
-// Fake build.gradle to pre-download gradle dependencies
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
--- a/container/fake_app.gradle
+++ b/container/fake_app.gradle
@@ -1,21 +0,0 @@
-// Fake app/build.gradle to pre-download gradle dependencies
-apply plugin: 'com.android.application'
-apply plugin: 'checkstyle'
-
-android {
-    buildToolsVersion = "36.0.0"
-    namespace = "com.genymobile.scrcpy"
-    compileSdk 36
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 36
-    }
-}
-
-checkstyle {
-    toolVersion = '10.12.5'
-}
-
-dependencies {
-    testImplementation 'junit:junit:4.13.2'
-}
--- a/doc/build.md
+++ b/doc/build.md
@@ -30,13 +30,13 @@ the following files to a directory accessible from your `PATH`:

 It is also available in scrcpy releases.

-The client requires [FFmpeg] and [SDL]. Just follow the instructions.
+The client requires [FFmpeg] and [LibSDL2]. Just follow the instructions.

 [adb]: https://developer.android.com/studio/command-line/adb.html
 [platform-tools]: https://developer.android.com/studio/releases/platform-tools.html
 [platform-tools-windows]: https://dl.google.com/android/repository/platform-tools-latest-windows.zip
 [ffmpeg]: https://en.wikipedia.org/wiki/FFmpeg
-[SDL]: https://en.wikipedia.org/wiki/Simple_DirectMedia_Layer
+[LibSDL2]: https://en.wikipedia.org/wiki/Simple_DirectMedia_Layer



@@ -50,10 +50,10 @@ Install the required packages from your package manager.

 ```bash
 # runtime dependencies
-sudo apt install ffmpeg libsdl3-0 adb libusb-1.0-0
+sudo apt install ffmpeg libsdl2-2.0-0 adb libusb-1.0-0

 # client build dependencies
-sudo apt install gcc git pkg-config meson ninja-build libsdl3-dev \
+sudo apt install gcc git pkg-config meson ninja-build libsdl2-dev \
                 libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev \
                 libswresample-dev libusb-1.0-0-dev

@@ -77,7 +77,7 @@ pip3 install meson
 sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm

 # client build dependencies
-sudo dnf install SDL3-devel ffms2-devel libusb1-devel libavdevice-free-devel meson gcc make
+sudo dnf install SDL2-devel ffms2-devel libusb1-devel libavdevice-free-devel meson gcc make

 # server build dependencies
 sudo dnf install java-devel
@@ -121,7 +121,7 @@ install the required packages:

 ```bash
 # runtime dependencies
-pacman -S mingw-w64-x86_64-sdl3 \
+pacman -S mingw-w64-x86_64-SDL2 \
          mingw-w64-x86_64-ffmpeg \
          mingw-w64-x86_64-libusb

@@ -136,7 +136,7 @@ For a 32 bits version, replace `x86_64` by `i686`:

 ```bash
 # runtime dependencies
-pacman -S mingw-w64-i686-sdl3 \
+pacman -S mingw-w64-i686-SDL2 \
          mingw-w64-i686-ffmpeg \
          mingw-w64-i686-libusb

@@ -162,7 +162,7 @@ Install the packages with [Homebrew]:

 ```bash
 # runtime dependencies
-brew install sdl3 ffmpeg libusb
+brew install sdl2 ffmpeg libusb

 # client build dependencies
 brew install pkg-config meson
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -414,7 +414,6 @@ public class Options {
                    if (!value.isEmpty()) {
                        options.audioEncoder = value;
                    }
-                    break;
                case "power_off_on_close":
                    options.powerOffScreenOnClose = Boolean.parseBoolean(value);
                    break;
Author	SHA1	Message	Date
dddddjent	47f9453cdd	Fix SDL colorspace matching AVCOL_SPC_RGB Use BT.709 color space for AVCOL_SPC_RGB. Refs #1868 comment <https://github.com/Genymobile/scrcpy/issues/1868#issuecomment-3293917796> Signed-off-by: Romain Vimont <rom@rom1v.com>	2025-12-30 20:03:46 +01:00
Romain Vimont	6116e09802	Build SDL3 for test step on Github Actions The latest Ubuntu does not provide the SDL3 package yet.	2025-12-30 20:03:46 +01:00
Romain Vimont	2b060218b4	Upgrade SDL build script for SDL3	2025-12-30 20:03:46 +01:00
Romain Vimont	22ae8cfb80	Check programming errors reported by SDL3 TODO ref SDL issue 14223	2025-12-30 20:03:46 +01:00
Romain Vimont	ee640f376b	Remove obsolete workaround for macOS TODO refs 3031 TODO refs SDL 5340 5976	2025-12-30 20:03:46 +01:00
Romain Vimont	e24018b4b7	Fix asynchronous SDL window state handling The SDL3 migration guide [1] says: > The following window operations are now considered to be asynchronous requests and should not be assumed to succeed unless a corresponding event has been received […] Remove the boolean fields used to track the window state, as they were fundamentally inconsistent with SDL's internal state. Use SDL_GetWindowFlags() explicitly instead. For simplicity and consistency, this commit disables the "resize to pixel-perfect" feature when the window is maximized. [1]: <https://wiki.libsdl.org/SDL3/README-migration> Refs #6216 comment <https://github.com/Genymobile/scrcpy/pull/6216#discussion_r2651810005>	2025-12-30 19:55:51 +01:00
Romain Vimont	05cbb860b0	Migrate from SDL2 to SDL3 Refs <https://wiki.libsdl.org/SDL3/README-migration>	2025-12-30 14:51:26 +01:00
Romain Vimont	c8720ead8e	Improve color space conversion Use both the color space and color range from FFmpeg to determine the appropriate SDL YUV conversion mode.	2025-12-30 14:42:12 +01:00
Romain Vimont	60df1134a0	Set color range during texture creation This prepares for the migration to SDL3, where the color range can only be specified at the time of texture creation.	2025-12-30 14:42:12 +01:00
Romain Vimont	b607b4be37	Create texture on first frame The texture was created as soon as the initial video size was known, even before the first frame arrived. However, texture creation will require other data, such as the color range, which is only available once the first frame is received. Therefore, delay texture creation until the first frame.	2025-12-30 14:42:12 +01:00
Romain Vimont	4c0c5949d9	Remove prepare_for_frame() Inline the function body in its only caller. This will simplify further refactors.	2025-12-30 14:42:12 +01:00
Romain Vimont	940f4593fb	Handle mouse integer scrolling locally Do not rely on SDL to expose integer scroll values, as they are not available in all versions. It was reimplemented in SDL 3.2.12 by this commit: <`0447c2f3c3`> Refs #6156 <https://github.com/Genymobile/scrcpy/issues/6156>	2025-12-30 14:42:12 +01:00
Romain Vimont	0e71a858e4	Fix documentation of input_events.h Add missing reference to sc_gamepad_processor. Refs <https://github.com/Genymobile/scrcpy/pull/6216#pullrequestreview-3616928335>	2025-12-30 14:42:12 +01:00
Romain Vimont	42f2f6ef35	Include USB header only if HAVE_USB	2025-12-30 14:42:12 +01:00