dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2026-01-16 17:00:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

clapper-app: Fix auto resize dimensions calculation

Browse Source 
Improved logic that uses GCD to calculate correct window size to be scaled.

Fixes #521
This commit is contained in:
Rafał Dzięgiel
2025-12-19 16:08:34 +01:00
parent 5f7cf0c4c8
commit 55d75b0c74
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/bin/clapper-app/clapper-app-window.c
View File

@@ -335,37 +335,36 @@ _resize_tick (GtkWidget *widget, GdkFrameClock *frame_clock,
return G_SOURCE_CONTINUE;
}
static gint
_get_gcd (gint width, gint height)
{
return (height > 0)
? _get_gcd (height, width % height)
: width;
}
static void
_calculate_win_resize (gint win_w, gint win_h,
gint vid_w, gint vid_h, gint *dest_w, gint *dest_h)
{
gdouble win_aspect = (gdouble) win_w / win_h;
gdouble vid_aspect = (gdouble) vid_w / vid_h;
/* Get the smallest integer ratio (e.g. 1920x1080 becomes 16x9) */
gint gcd = _get_gcd (vid_w, vid_h);
gint min_w = vid_w / gcd;
gint min_h = vid_h / gcd;
if (win_aspect < vid_aspect) {
while (!G_APPROX_VALUE (fmod (win_w, vid_aspect), 0, FLT_EPSILON))
win_w++;
/* Find the scale multiplier that best fits video */
gint scale_fit = MIN (win_w / min_w, win_h / min_h);
win_h = round ((gdouble) win_w / vid_aspect);
/* Calculate minimal allowed scale for video (-1 for ceil) */
gint scale_min = MAX (
(MIN_WINDOW_WIDTH + min_w - 1) / min_w,
(MIN_WINDOW_HEIGHT + min_h - 1) / min_h);
if (win_h < MIN_WINDOW_HEIGHT) {
_calculate_win_resize (G_MAXINT, MIN_WINDOW_HEIGHT, vid_w, vid_h, dest_w, dest_h);
return;
}
} else {
while (!G_APPROX_VALUE (fmod (win_h * vid_aspect, 1.0), 0, FLT_EPSILON))
win_h++;
/* Select best allowed scale multiplier */
gint scale = MAX (scale_fit, scale_min);
win_w = round ((gdouble) win_h * vid_aspect);
if (win_w < MIN_WINDOW_WIDTH) {
_calculate_win_resize (MIN_WINDOW_WIDTH, G_MAXINT, vid_w, vid_h, dest_w, dest_h);
return;
}
}
*dest_w = win_w;
*dest_h = win_h;
*dest_w = min_w * scale;
*dest_h = min_h * scale;
}
static void