Use a callback to notify a new decoded frame

Make the decoder independant of the SDL event mechanism.

app/src/decoder.c

@@ -2,7 +2,6 @@
 
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
-#include <SDL2/SDL_events.h>
 #include <unistd.h>
 
 #include "events.h"
@@ -18,18 +17,22 @@ push_frame(struct decoder *decoder) {
     video_buffer_offer_decoded_frame(decoder->video_buffer,
                                      &previous_frame_skipped);
     if (previous_frame_skipped) {
-        // the previous EVENT_NEW_FRAME will consume this frame
+        // the previous callback will consume this frame
         return;
     }
-    static SDL_Event new_frame_event = {
-        .type = EVENT_NEW_FRAME,
-    };
-    SDL_PushEvent(&new_frame_event);
+
+    decoder->cbs->on_new_frame(decoder, decoder->cbs_userdata);
 }
 
 void
-decoder_init(struct decoder *decoder, struct video_buffer *vb) {
+decoder_init(struct decoder *decoder, struct video_buffer *vb,
+             const struct decoder_callbacks *cbs, void *cbs_userdata) {
     decoder->video_buffer = vb;
+
+    assert(cbs);
+    assert(cbs->on_new_frame);
+    decoder->cbs = cbs;
+    decoder->cbs_userdata = cbs_userdata;
 }
 
 bool

app/src/decoder.h

@@ -11,10 +11,20 @@ struct video_buffer;
 struct decoder {
     struct video_buffer *video_buffer;
     AVCodecContext *codec_ctx;
+
+    const struct decoder_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct decoder_callbacks {
+     // Called when a new frame can be consumed by
+     // video_buffer_take_rendering_frame(decoder->video_buffer).
+    void (*on_new_frame)(struct decoder *decoder, void *userdata);
 };
 
 void
-decoder_init(struct decoder *decoder, struct video_buffer *vb);
+decoder_init(struct decoder *decoder, struct video_buffer *vb,
+             const struct decoder_callbacks *cbs, void *cbs_userdata);
 
 bool
 decoder_open(struct decoder *decoder, const AVCodec *codec);

app/src/events.h

@@ -1,3 +1,2 @@
-#define EVENT_NEW_SESSION SDL_USEREVENT
-#define EVENT_NEW_FRAME (SDL_USEREVENT + 1)
-#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 2)
+#define EVENT_NEW_FRAME       SDL_USEREVENT
+#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 1)

app/src/scrcpy.c

@@ -184,7 +184,9 @@ handle_event(SDL_Event *event, const struct scrcpy_options *options) {
             }
             break;
         case SDL_WINDOWEVENT:
-            screen_handle_window_event(&screen, &event->window);
+            if (screen.has_frame) {
+                screen_handle_window_event(&screen, &event->window);
+            }
             break;
         case SDL_TEXTINPUT:
             if (!options->control) {
@@ -304,6 +306,17 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
     free(local_fmt);
 }
 
+static void
+decoder_on_new_frame(struct decoder *decoder, void *userdata) {
+    (void) decoder;
+    (void) userdata;
+
+    static SDL_Event new_frame_event = {
+        .type = EVENT_NEW_FRAME,
+    };
+    SDL_PushEvent(&new_frame_event);
+}
+
 bool
 scrcpy(const struct scrcpy_options *options) {
     if (!server_init(&server)) {
@@ -384,7 +397,11 @@ scrcpy(const struct scrcpy_options *options) {
             file_handler_initialized = true;
         }
 
-        decoder_init(&decoder, &video_buffer);
+        static const struct decoder_callbacks decoder_cbs = {
+            .on_new_frame = decoder_on_new_frame,
+        };
+
+        decoder_init(&decoder, &video_buffer, &decoder_cbs, NULL);
         dec = &decoder;
     }
 

app/src/screen.c

@@ -270,7 +270,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
                                           SDL_RENDERER_ACCELERATED);
     if (!screen->renderer) {
         LOGC("Could not create renderer: %s", SDL_GetError());
-        screen_destroy(screen);
+        SDL_DestroyWindow(screen->window);
         return false;
     }
 
@@ -280,8 +280,8 @@ screen_init_rendering(struct screen *screen, const char *window_title,
     LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");
 
     // starts with "opengl"
-    screen->use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
-    if (screen->use_opengl) {
+    bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
+    if (use_opengl) {
         struct sc_opengl *gl = &screen->gl;
         sc_opengl_init(gl);
 
@@ -301,7 +301,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
         } else {
             LOGI("Trilinear filtering disabled");
         }
-    } else {
+    } else if (mipmaps) {
         LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
     }
 
@@ -318,6 +318,8 @@ screen_init_rendering(struct screen *screen, const char *window_title,
     screen->texture = create_texture(screen);
     if (!screen->texture) {
         LOGC("Could not create texture: %s", SDL_GetError());
+        SDL_DestroyRenderer(screen->renderer);
+        SDL_DestroyWindow(screen->window);
         screen_destroy(screen);
         return false;
     }
@@ -342,12 +344,8 @@ screen_destroy(struct screen *screen) {
     if (screen->texture) {
         SDL_DestroyTexture(screen->texture);
     }
-    if (screen->renderer) {
-        SDL_DestroyRenderer(screen->renderer);
-    }
-    if (screen->window) {
-        SDL_DestroyWindow(screen->window);
-    }
+    SDL_DestroyRenderer(screen->renderer);
+    SDL_DestroyWindow(screen->window);
 }
 
 static void
@@ -444,7 +442,6 @@ update_texture(struct screen *screen, const AVFrame *frame) {
             frame->data[2], frame->linesize[2]);
 
     if (screen->mipmaps) {
-        assert(screen->use_opengl);
         SDL_GL_BindTexture(screen->texture, NULL, NULL);
         screen->gl.GenerateMipmap(GL_TEXTURE_2D);
         SDL_GL_UnbindTexture(screen->texture);
@@ -456,7 +453,6 @@ screen_update_frame(struct screen *screen, struct video_buffer *vb) {
     const AVFrame *frame = video_buffer_take_rendering_frame(vb);
     struct size new_frame_size = {frame->width, frame->height};
     if (!prepare_for_frame(screen, new_frame_size)) {
-        sc_mutex_unlock(&vb->mutex);
         return false;
     }
     update_texture(screen, frame);

app/src/screen.h

@@ -16,7 +16,6 @@ struct screen {
     SDL_Window *window;
     SDL_Renderer *renderer;
     SDL_Texture *texture;
-    bool use_opengl;
     struct sc_opengl gl;
     struct size frame_size;
     struct size content_size; // rotated frame_size
@@ -41,7 +40,6 @@ struct screen {
     .window = NULL, \
     .renderer = NULL, \
     .texture = NULL, \
-    .use_opengl = false, \
     .gl = {0}, \
     .frame_size = { \
         .width = 0, \

app/src/server.c

@@ -375,8 +375,6 @@ server_init(struct server *server) {
     server->video_socket = INVALID_SOCKET;
     server->control_socket = INVALID_SOCKET;
 
-    server->port_range.first = 0;
-    server->port_range.last = 0;
     server->local_port = 0;
 
     server->tunnel_enabled = false;
@@ -410,8 +408,6 @@ run_wait_server(void *data) {
 bool
 server_start(struct server *server, const char *serial,
              const struct server_params *params) {
-    server->port_range = params->port_range;
-
     if (serial) {
         server->serial = strdup(serial);
         if (!server->serial) {

app/src/server.h

@@ -26,7 +26,6 @@ struct server {
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
-    struct sc_port_range port_range;
     uint16_t local_port; // selected from port_range
     bool tunnel_enabled;
     bool tunnel_forward; // use "adb forward" instead of "adb reverse"

app/src/util/thread.c

@@ -61,6 +61,7 @@ sc_mutex_lock(sc_mutex *mutex) {
 void
 sc_mutex_unlock(sc_mutex *mutex) {
 #ifndef NDEBUG
+    assert(sc_mutex_held(mutex));
     mutex->locker = 0;
 #endif
     int r = SDL_UnlockMutex(mutex->mutex);