File 0001-wayland-restore-external-renderloop.patch of Package mpv

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-wayland-restore-external-renderloop.patch of Package mpv (Revision 2076b08a8071afc77e551f950d70c000)

Currently displaying revision 2076b08a8071afc77e551f950d70c000 , Show latest

From cb178cc0b7f4fcae47280ce218a6ef040a3088e5 Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public@gmail.com>
Date: Sat, 11 Mar 2023 23:04:57 +0530
Subject: [PATCH] wayland: restore external renderloop

diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c
index 0380114e95..dfd1b1de02 100644
--- a/video/out/opengl/context_wayland.c
+++ b/video/out/opengl/context_wayland.c
@@ -88,11 +88,6 @@ static void resize(struct ra_ctx *ctx)
     vo_wayland_handle_fractional_scale(wl);
 }
 
-static bool wayland_egl_check_visible(struct ra_ctx *ctx)
-{
-    return vo_wayland_check_visible(ctx->vo);
-}
-
 static void wayland_egl_swap_buffers(struct ra_ctx *ctx)
 {
     struct priv *p = ctx->priv;
@@ -100,9 +95,6 @@ static void wayland_egl_swap_buffers(struct ra_ctx *ctx)
 
     eglSwapBuffers(p->egl_display, p->egl_surface);
 
-    if (!wl->opts->disable_vsync)
-        vo_wayland_wait_frame(wl);
-
     if (wl->use_present)
         present_sync_swap(wl->present);
 }
@@ -136,7 +128,6 @@ static bool egl_create_context(struct ra_ctx *ctx)
     mpegl_load_functions(&p->gl, wl->log);
 
     struct ra_gl_ctx_params params = {
-        .check_visible      = wayland_egl_check_visible,
         .swap_buffers       = wayland_egl_swap_buffers,
         .get_vsync          = wayland_egl_get_vsync,
     };
diff --git a/video/out/vo.c b/video/out/vo.c
index 40079049f8..3a1ef4b5df 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -147,6 +147,8 @@ struct vo_internal {
 
     int64_t nominal_vsync_interval;
 
+    bool external_renderloop_drive;
+
     int64_t vsync_interval;
     int64_t *vsync_samples;
     int num_vsync_samples;
@@ -878,11 +880,12 @@ static void wait_until(struct vo *vo, int64_t target)
     pthread_mutex_unlock(&in->lock);
 }
 
-static bool render_frame(struct vo *vo)
+bool vo_render_frame_external(struct vo *vo)
 {
     struct vo_internal *in = vo->in;
     struct vo_frame *frame = NULL;
     bool more_frames = false;
+    bool flipped = false;
 
     update_display_fps(vo);
 
@@ -951,6 +954,7 @@ static bool render_frame(struct vo *vo)
         in->drop_count += 1;
         wakeup_core(vo);
     } else {
+        flipped = true;
         in->rendering = true;
         in->hasframe_rendered = true;
         int64_t prev_drop_count = vo->in->drop_count;
@@ -1033,6 +1037,8 @@ done:
         wakeup_core(vo);
     }
     pthread_mutex_unlock(&in->lock);
+    if (in->external_renderloop_drive)
+        return flipped;
 
     return more_frames;
 }
@@ -1076,6 +1082,44 @@ static void do_redraw(struct vo *vo)
         talloc_free(frame);
 }
 
+static void drop_unrendered_frame(struct vo *vo)
+{
+    struct vo_internal *in = vo->in;
+
+    pthread_mutex_lock(&in->lock);
+
+    if (!in->frame_queued)
+        goto end;
+
+    if ((in->frame_queued->pts + in->frame_queued->duration) > mp_time_us())
+        goto end;
+
+    MP_VERBOSE(vo, "Dropping unrendered frame (pts %"PRId64")\n", in->frame_queued->pts);
+
+    talloc_free(in->frame_queued);
+    in->frame_queued = NULL;
+    in->hasframe = false;
+    pthread_cond_broadcast(&in->wakeup);
+    wakeup_core(vo);
+
+end:
+    pthread_mutex_unlock(&in->lock);
+}
+
+void vo_enable_external_renderloop(struct vo *vo)
+{
+    struct vo_internal *in = vo->in;
+    MP_VERBOSE(vo, "Enabling event driven renderloop!\n");
+    in->external_renderloop_drive = true;
+}
+
+void vo_disable_external_renderloop(struct vo *vo)
+{
+    struct vo_internal *in = vo->in;
+    MP_VERBOSE(vo, "Disabling event driven renderloop!\n");
+    in->external_renderloop_drive = false;
+}
+
 static struct mp_image *get_image_vo(void *ctx, int imgfmt, int w, int h,
                                      int stride_align, int flags)
 {
@@ -1111,7 +1155,11 @@ static void *vo_thread(void *ptr)
             break;
         stats_event(in->stats, "iterations");
         vo->driver->control(vo, VOCTRL_CHECK_EVENTS, NULL);
-        bool working = render_frame(vo);
+        bool working = false;
+        if (!in->external_renderloop_drive || !in->hasframe_rendered)
+            working = vo_render_frame_external(vo);
+        else
+            drop_unrendered_frame(vo);
         int64_t now = mp_time_us();
         int64_t wait_until = now + (working ? 0 : (int64_t)1e9);
 
diff --git a/video/out/vo.h b/video/out/vo.h
index 0f01a4b056..c5daac821b 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -524,6 +524,9 @@ void vo_query_formats(struct vo *vo, uint8_t *list);
 void vo_event(struct vo *vo, int event);
 int vo_query_and_reset_events(struct vo *vo, int events);
 struct mp_image *vo_get_current_frame(struct vo *vo);
+void vo_enable_external_renderloop(struct vo *vo);
+void vo_disable_external_renderloop(struct vo *vo);
+bool vo_render_frame_external(struct vo *vo);
 void vo_set_queue_params(struct vo *vo, int64_t offset_us, int num_req_frames);
 int vo_get_num_req_frames(struct vo *vo);
 int64_t vo_get_vsync_interval(struct vo *vo);
diff --git a/video/out/vo_dmabuf_wayland.c b/video/out/vo_dmabuf_wayland.c
index 6b85bdf226..a116a897ff 100644
--- a/video/out/vo_dmabuf_wayland.c
+++ b/video/out/vo_dmabuf_wayland.c
@@ -220,9 +220,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
     struct priv *p = vo->priv;
     struct vo_wayland_state *wl = vo->wl;
     struct wlbuf_pool_entry *entry;
-    
-    if (!vo_wayland_check_visible(vo))
-        return;
 
     /* lazy initialization of buffer pool */
     if (!p->wlbuf_pool) {
@@ -259,8 +256,6 @@ static void flip_page(struct vo *vo)
 
     wl_surface_commit(wl->video_surface);
     wl_surface_commit(wl->surface);
-    if (!wl->opts->disable_vsync)
-        vo_wayland_wait_frame(wl);
     if (wl->use_present)
        present_sync_swap(wl->present);
     if (p->want_reset) {
diff --git a/video/out/vo_gpu.c b/video/out/vo_gpu.c
index b778ab08ca..4f855965b1 100644
--- a/video/out/vo_gpu.c
+++ b/video/out/vo_gpu.c
@@ -214,7 +214,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
     case VOCTRL_PAUSE:
         if (gl_video_showing_interpolated_frame(p->renderer))
             vo->want_redraw = true;
-        return true;
+        break;
     case VOCTRL_PERFORMANCE_DATA:
         gl_video_perfdata(p->renderer, (struct voctrl_performance_data *)data);
         return true;
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index 7ed01d5216..91207054da 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -1290,7 +1290,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
     case VOCTRL_PAUSE:
         if (p->is_interpolated)
             vo->want_redraw = true;
-        return VO_TRUE;
+        break;
 
     case VOCTRL_OSD_CHANGED:
         p->osd_sync++;
diff --git a/video/out/vo_wlshm.c b/video/out/vo_wlshm.c
index 2ccdd7d681..aa9e602937 100644
--- a/video/out/vo_wlshm.c
+++ b/video/out/vo_wlshm.c
@@ -236,10 +236,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
     struct mp_image *src = frame->current;
     struct buffer *buf;
 
-    bool render = vo_wayland_check_visible(vo);
-    if (!render)
-        return;
-
     buf = p->free_buffers;
     if (buf) {
         p->free_buffers = buf->next;
@@ -289,9 +285,6 @@ static void flip_page(struct vo *vo)
                              vo->dheight);
     wl_surface_commit(wl->surface);
 
-    if (!wl->opts->disable_vsync)
-        vo_wayland_wait_frame(wl);
-
     if (wl->use_present)
         present_sync_swap(wl->present);
 }
diff --git a/video/out/vulkan/context_wayland.c b/video/out/vulkan/context_wayland.c
index 5ca6265a91..ceb61a3528 100644
--- a/video/out/vulkan/context_wayland.c
+++ b/video/out/vulkan/context_wayland.c
@@ -27,18 +27,10 @@ struct priv {
     struct mpvk_ctx vk;
 };
 
-static bool wayland_vk_check_visible(struct ra_ctx *ctx)
-{
-    return vo_wayland_check_visible(ctx->vo);
-}
-
 static void wayland_vk_swap_buffers(struct ra_ctx *ctx)
 {
     struct vo_wayland_state *wl = ctx->vo->wl;
 
-    if (!wl->opts->disable_vsync)
-        vo_wayland_wait_frame(wl);
-
     if (wl->use_present)
         present_sync_swap(wl->present);
 }
@@ -78,7 +70,6 @@ static bool wayland_vk_init(struct ra_ctx *ctx)
     };
 
     struct ra_vk_ctx_params params = {
-        .check_visible = wayland_vk_check_visible,
         .swap_buffers = wayland_vk_swap_buffers,
         .get_vsync = wayland_vk_get_vsync,
     };
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index b5bfb8b917..a98e368eb8 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -1112,8 +1112,8 @@ static void frame_callback(void *data, struct wl_callback *callback, uint32_t ti
         wp_presentation_feedback_add_listener(fback, &feedback_listener, wl->fback_pool);
     }
 
-    wl->frame_wait = false;
-    wl->hidden = false;
+    if (!vo_render_frame_external(wl->vo))
+        wl_surface_commit(wl->callback_surface);
 }
 
 static const struct wl_callback_listener frame_listener = {
@@ -1888,14 +1888,6 @@ int vo_wayland_allocate_memfd(struct vo *vo, size_t size)
 #endif
 }
 
-bool vo_wayland_check_visible(struct vo *vo)
-{
-    struct vo_wayland_state *wl = vo->wl;
-    bool render = !wl->hidden || wl->vo_opts->force_render;
-    wl->frame_wait = true;
-    return render;
-}
-
 int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
 {
     struct vo_wayland_state *wl = vo->wl;
@@ -1908,7 +1900,6 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
         *events |= wl->pending_vo_events;
         if (*events & VO_EVENT_RESIZE) {
             *events |= VO_EVENT_EXPOSE;
-            wl->frame_wait = false;
             wl->timeout_count = 0;
             wl->hidden = false;
         }
@@ -1973,6 +1964,17 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
         *(char ***)arg = get_displays_spanned(wl);
         return VO_TRUE;
     }
+    case VOCTRL_PAUSE: {
+        wl_callback_destroy(wl->frame_callback);
+        wl->frame_callback = NULL;
+        vo_disable_external_renderloop(wl->vo);
+        return VO_TRUE;
+    }
+    case VOCTRL_RESUME: {
+        vo_enable_external_renderloop(wl->vo);
+        frame_callback(wl, NULL, 0);
+        return VO_TRUE;
+    }
     case VOCTRL_GET_UNFS_WINDOW_SIZE: {
         int *s = arg;
         if (wl->vo_opts->window_maximized) {
@@ -2185,6 +2187,7 @@ bool vo_wayland_init(struct vo *vo)
     update_app_id(wl);
     mp_make_wakeup_pipe(wl->wakeup_pipe);
 
+    vo_enable_external_renderloop(wl->vo);
     wl->callback_surface = wl->using_dmabuf_wayland ? wl->video_surface : wl->surface;
     wl->frame_callback = wl_surface_frame(wl->callback_surface);
     wl_callback_add_listener(wl->frame_callback, &frame_listener, wl);
@@ -2408,60 +2411,6 @@ void vo_wayland_uninit(struct vo *vo)
     vo->wl = NULL;
 }
 
-void vo_wayland_wait_frame(struct vo_wayland_state *wl)
-{
-    int64_t vblank_time = 0;
-    /* We need some vblank interval to use for the timeout in
-     * this function. The order of preference of values to use is:
-     * 1. vsync duration from presentation time
-     * 2. refresh inteval reported by presentation time
-     * 3. refresh rate of the output reported by the compositor
-     * 4. make up crap if vblank_time is still <= 0 (better than nothing) */
-
-    if (wl->use_present)
-        vblank_time = wl->present->vsync_duration;
-
-    if (vblank_time <= 0 && wl->refresh_interval > 0)
-        vblank_time = wl->refresh_interval;
-
-    if (vblank_time <= 0 && wl->current_output->refresh_rate > 0)
-        vblank_time = 1e6 / wl->current_output->refresh_rate;
-
-    // Ideally you should never reach this point.
-    if (vblank_time <= 0)
-        vblank_time = 1e6 / 60;
-
-    // Completely arbitrary amount of additional time to wait.
-    vblank_time += 0.05 * vblank_time;
-    int64_t finish_time = mp_time_us() + vblank_time;
-
-    while (wl->frame_wait && finish_time > mp_time_us()) {
-        int poll_time = ceil((double)(finish_time - mp_time_us()) / 1000);
-        if (poll_time < 0) {
-            poll_time = 0;
-        }
-        wayland_dispatch_events(wl, 1, poll_time);
-    }
-
-    /* If the compositor does not have presentation time, we cannot be sure
-     * that this wait is accurate. Do a hacky block with wl_display_roundtrip. */
-    if (!wl->use_present && !wl_display_get_error(wl->display))
-        wl_display_roundtrip(wl->display);
-
-    if (wl->frame_wait) {
-        // Only consider consecutive missed callbacks.
-        if (wl->timeout_count > 1) {
-            wl->hidden = true;
-            return;
-        } else {
-            wl->timeout_count += 1;
-            return;
-        }
-    }
-
-    wl->timeout_count = 0;
-}
-
 void vo_wayland_wait_events(struct vo *vo, int64_t until_time_us)
 {
     struct vo_wayland_state *wl = vo->wl;
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index d22e91d5e5..fc6460f72a 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -175,7 +175,6 @@ void vo_wayland_set_opaque_region(struct vo_wayland_state *wl, bool alpha);
 void vo_wayland_sync_swap(struct vo_wayland_state *wl);
 void vo_wayland_uninit(struct vo *vo);
 void vo_wayland_wait_events(struct vo *vo, int64_t until_time_us);
-void vo_wayland_wait_frame(struct vo_wayland_state *wl);
 void vo_wayland_wakeup(struct vo *vo);
 
 #endif /* MPLAYER_WAYLAND_COMMON_H */
-- 
2.39.2

Places

File 0001-wayland-restore-external-renderloop.patch of Package mpv (Revision 2076b08a8071afc77e551f950d70c000)

Places