fix2

PR #4868 <https://github.com/Genymobile/scrcpy/pull/4868>

app/src/display.c

@@ -23,6 +23,12 @@ sc_display_init_novideo_icon(struct sc_display *display,
         return false;
     }
 
+    SDL_RenderClear(display->renderer);
+    if (display->texture) {
+        SDL_RenderCopy(display->renderer, display->texture, NULL, NULL);
+    }
+    SDL_RenderPresent(display->renderer);
+
     return true;
 }
 

app/src/scrcpy.c

@@ -408,7 +408,7 @@ scrcpy(struct scrcpy_options *options) {
         return SCRCPY_EXIT_FAILURE;
     }
 
-    if (options->window) {
+    if (options->video_playback) {
         // Set hints before starting the server thread to avoid race conditions
         // in SDL
         sdl_set_hints(options->render_driver);

app/src/screen.c

@@ -259,13 +259,6 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
     (void) res; // any error already logged
 }
 
-static void
-sc_screen_render_novideo(struct sc_screen *screen) {
-    enum sc_display_result res =
-        sc_display_render(&screen->display, NULL, SC_ORIENTATION_0);
-    (void) res; // any error already logged
-}
-
 #if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
@@ -378,7 +371,6 @@ sc_screen_init(struct sc_screen *screen,
     screen->mouse_capture_key_pressed = 0;
     screen->paused = false;
     screen->resume_frame = NULL;
-    screen->orientation = SC_ORIENTATION_0;
 
     screen->video = params->video;
 
@@ -398,12 +390,10 @@ sc_screen_init(struct sc_screen *screen,
         goto error_destroy_frame_buffer;
     }
 
-    if (screen->video) {
-        screen->orientation = params->orientation;
-        if (screen->orientation != SC_ORIENTATION_0) {
-            LOGI("Initial display orientation set to %s",
-                 sc_orientation_get_name(screen->orientation));
-        }
+    screen->orientation = params->orientation;
+    if (screen->orientation != SC_ORIENTATION_0) {
+        LOGI("Initial display orientation set to %s",
+             sc_orientation_get_name(screen->orientation));
     }
 
     uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
@@ -413,11 +403,6 @@ sc_screen_init(struct sc_screen *screen,
     if (params->window_borderless) {
         window_flags |= SDL_WINDOW_BORDERLESS;
     }
-    if (params->video) {
-        // The window will be shown on first frame
-        window_flags |= SDL_WINDOW_HIDDEN
-                      | SDL_WINDOW_RESIZABLE;
-    }
 
     const char *title = params->window_title;
     assert(title);
@@ -426,17 +411,22 @@ sc_screen_init(struct sc_screen *screen,
     int y = SDL_WINDOWPOS_UNDEFINED;
     int width = 256;
     int height = 256;
-    if (params->window_x != SC_WINDOW_POSITION_UNDEFINED) {
-        x = params->window_x;
-    }
-    if (params->window_y != SC_WINDOW_POSITION_UNDEFINED) {
-        y = params->window_y;
-    }
-    if (params->window_width) {
-        width = params->window_width;
-    }
-    if (params->window_height) {
-        height = params->window_height;
+    if (params->video) {
+        // The window will be shown on first frame
+        window_flags |= SDL_WINDOW_HIDDEN
+                      | SDL_WINDOW_RESIZABLE;
+        if (params->window_x != SC_WINDOW_POSITION_UNDEFINED) {
+            x = params->window_x;
+        }
+        if (params->window_y != SC_WINDOW_POSITION_UNDEFINED) {
+            y = params->window_y;
+        }
+        if (params->window_width) {
+            width = params->window_width;
+        }
+        if (params->window_height) {
+            height = params->window_height;
+        }
     }
 
     // The window will be positioned and sized on first video frame
@@ -459,9 +449,8 @@ sc_screen_init(struct sc_screen *screen,
     }
 
     SDL_Surface *icon_novideo = params->video ? NULL : icon;
-    bool mipmaps = params->video && params->mipmaps;
     ok = sc_display_init(&screen->display, screen->window, icon_novideo,
-                         mipmaps);
+                         params->mipmaps);
     if (icon) {
         scrcpy_icon_destroy(icon);
     }
@@ -868,11 +857,6 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
             return true;
         }
         case SDL_WINDOWEVENT:
-            if (!screen->video
-                    && event->window.event == SDL_WINDOWEVENT_EXPOSED) {
-                sc_screen_render_novideo(screen);
-            }
-
             // !video implies !has_frame
             assert(screen->video || !screen->has_frame);
             if (!screen->has_frame) {