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

wayland_common: remove questionable gcd impl and global state

This commit is contained in:
sfan5 2023-07-17 12:18:21 +02:00
parent e399266400
commit d46a31317f
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
video/out/wayland_common.c
View File

@ -189,7 +189,7 @@ static int spawn_cursor(struct vo_wayland_state *wl);
static void add_feedback(struct vo_wayland_feedback_pool *fback_pool, static void add_feedback(struct vo_wayland_feedback_pool *fback_pool,
struct wp_presentation_feedback *fback); struct wp_presentation_feedback *fback);
static void get_shape_device(struct vo_wayland_state *wl); static void get_shape_device(struct vo_wayland_state *wl);
static void greatest_common_divisor(struct vo_wayland_state *wl, int a, int b); static int greatest_common_divisor(int a, int b);
static void guess_focus(struct vo_wayland_state *wl); static void guess_focus(struct vo_wayland_state *wl);
static void prepare_resize(struct vo_wayland_state *wl, int width, int height); static void prepare_resize(struct vo_wayland_state *wl, int width, int height);
static void remove_feedback(struct vo_wayland_feedback_pool *fback_pool, static void remove_feedback(struct vo_wayland_feedback_pool *fback_pool,
@ -1584,24 +1584,12 @@ static void get_shape_device(struct vo_wayland_state *wl)
#endif #endif
} }
static void greatest_common_divisor(struct vo_wayland_state *wl, int a, int b) static int greatest_common_divisor(int a, int b)
{ {
// euclidean algorithm int rem = a % b;
int larger; if (rem == 0)
int smaller; return b;
if (a > b) { return greatest_common_divisor(b, rem);
larger = a;
smaller = b;
} else {
larger = b;
smaller = a;
}
int remainder = larger - smaller * floor(larger/smaller);
if (remainder == 0) {
wl->gcd = smaller;
} else {
greatest_common_divisor(wl, smaller, remainder);
}
} }
static void guess_focus(struct vo_wayland_state *wl) static void guess_focus(struct vo_wayland_state *wl)
@ -1784,9 +1772,9 @@ static void set_geometry(struct vo_wayland_state *wl, bool resize)
vo_calc_window_geometry2(vo, &screenrc, wl->scaling, &geo); vo_calc_window_geometry2(vo, &screenrc, wl->scaling, &geo);
vo_apply_window_geometry(vo, &geo); vo_apply_window_geometry(vo, &geo);
greatest_common_divisor(wl, vo->dwidth, vo->dheight); int gcd = greatest_common_divisor(vo->dwidth, vo->dheight);
wl->reduced_width = vo->dwidth / wl->gcd; wl->reduced_width = vo->dwidth / gcd;
wl->reduced_height = vo->dheight / wl->gcd; wl->reduced_height = vo->dheight / gcd;
wl->window_size = (struct mp_rect){0, 0, vo->dwidth, vo->dheight}; wl->window_size = (struct mp_rect){0, 0, vo->dwidth, vo->dheight};

1
video/out/wayland_common.h
View File

@ -62,7 +62,6 @@ struct vo_wayland_state {
struct vo_wayland_output *current_output; struct vo_wayland_output *current_output;
int bounded_height; int bounded_height;
int bounded_width; int bounded_width;
int gcd;
int reduced_height; int reduced_height;
int reduced_width; int reduced_width;
int toplevel_width; int toplevel_width;