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

wayland: correctly report display refresh rate 

This commit will cause the wayland backend and vo to correctly report
the display frame rate. This didn't work as VOCTRL_GET_DISPLAY_FPS was
received way too early, before the window was created (and thus
current_output set).

The VO will now signal VO_EVENT_WIN_STATE after window initialization
and upon a resize.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2016-05-31 00:38:55 +01:00 committed by wm4
parent 68c77d955f
commit 29ea6e5e4a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/out/wayland_common.c
View File

@ -224,6 +224,8 @@ static void surface_handle_enter(void *data,
break; break;
} }
} }
wl->window.events |= VO_EVENT_WIN_STATE;
} }
static void surface_handle_leave(void *data, static void surface_handle_leave(void *data,
@ -805,7 +807,7 @@ static void schedule_resize(struct vo_wayland_state *wl,
wl->window.sh_height = height; wl->window.sh_height = height;
wl->window.sh_x = x; wl->window.sh_x = x;
wl->window.sh_y = y; wl->window.sh_y = y;
wl->window.events |= VO_EVENT_RESIZE; wl->window.events |= VO_EVENT_WIN_STATE | VO_EVENT_RESIZE;
wl->vo->dwidth = width; wl->vo->dwidth = width;
wl->vo->dheight = height; wl->vo->dheight = height;
} }
@ -1037,10 +1039,10 @@ int vo_wayland_init (struct vo *vo)
"\tmodel: %s\n" "\tmodel: %s\n"
"\tw: %d, h: %d\n" "\tw: %d, h: %d\n"
"\tscale: %d\n" "\tscale: %d\n"
"\tHz: %d\n", "\tHz: %f\n",
o->make, o->model, o->make, o->model,
o->width, o->height, o->scale, o->width, o->height, o->scale,
o->refresh_rate / 1000); o->refresh_rate / 1000.0f);
} }
vo->event_fd = wl->display.display_fd; vo->event_fd = wl->display.display_fd;
@ -1290,7 +1292,7 @@ int vo_wayland_control (struct vo *vo, int *events, int request, void *arg)
break; break;
// refresh rate is stored in milli-Hertz (mHz) // refresh rate is stored in milli-Hertz (mHz)
double fps = wl->display.current_output->refresh_rate / 1000; double fps = wl->display.current_output->refresh_rate / 1000.0f;
*(double*) arg = fps; *(double*) arg = fps;
return VO_TRUE; return VO_TRUE;
} }