RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_gpu_next: fix OOM on wayland 

Similar to ff0864d5f0

Fixes #9484
This commit is contained in:
Niklas Haas 2021-11-20 19:20:52 +01:00
parent d2c2bf5a13
commit 970061efdc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/out/vo_gpu_next.c
View File

@ -627,12 +627,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
p->last_id = id;
}
// Doesn't draw anything. Only checks for visibility.
struct ra_swapchain *sw = p->ra_ctx->swapchain;
bool should_draw = sw->fns->start_frame(sw, NULL);
if (!should_draw)
return;
if (p->target_hint && frame->current) {
struct pl_swapchain_colors hint = get_csp_hint(vo, frame->current);
pl_swapchain_colorspace_hint(p->sw, &hint);
@ -641,7 +635,9 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
}
struct pl_swapchain_frame swframe;
if (!pl_swapchain_start_frame(p->sw, &swframe)) {
struct ra_swapchain *sw = p->ra_ctx->swapchain;
bool should_draw = sw->fns->start_frame(sw, NULL); // for wayland logic
if (!should_draw || !pl_swapchain_start_frame(p->sw, &swframe)) {
// Advance the queue state to the current PTS to discard unused frames
pl_queue_update(p->queue, NULL, &(struct pl_queue_params) {
.pts = frame->current->pts + frame->vsync_offset,