Skip to content

Commit

Permalink
Merge pull request #896 from sonninnos/crop-aspect
Browse files Browse the repository at this point in the history 
Fix dynamic crop aspect ratio
  • Loading branch information
@LibretroAdmin
LibretroAdmin authored Feb 27, 2024
2 parents 17a27f8 + dbd26c3 commit 4a006dc
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 60 deletions.
52 changes: 32 additions & 20 deletions libretro.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ int64 cd_slow_timeout = 8000; // microseconds

// If true, PAL games will run at 60fps
bool fast_pal = false;
unsigned image_height = 0;

#ifdef HAVE_LIGHTREC
enum DYNAREC psx_dynarec;
Expand Down Expand Up @@ -4476,6 +4477,22 @@ void retro_unload_game(void)
static uint64_t video_frames, audio_frames;
#define SOUND_CHANNELS 2

static bool retro_set_geometry(void)
{
struct retro_system_av_info new_av_info;

retro_get_system_av_info(&new_av_info);
return environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &new_av_info);
}

static bool retro_set_system_av_info(void)
{
struct retro_system_av_info new_av_info;

retro_get_system_av_info(&new_av_info);
return environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &new_av_info);
}

void retro_run(void)
{
bool updated = false;
Expand All @@ -4502,13 +4519,11 @@ void retro_run(void)
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
{
check_variables(false);
struct retro_system_av_info new_av_info;

/* Max width/height changed, need to call SET_SYSTEM_AV_INFO */
if (GPU_get_upscale_shift() != psx_gpu_upscale_shift)
{
retro_get_system_av_info(&new_av_info);
if (environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &new_av_info))
if (retro_set_system_av_info())
{
// We successfully changed the frontend's resolution, we can
// apply the change immediately
Expand All @@ -4532,20 +4547,16 @@ void retro_run(void)
*/
if (has_new_timing)
{
retro_get_system_av_info(&new_av_info);
if (environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &new_av_info))
if (retro_set_system_av_info())
has_new_timing = false;
}

/* Widescreen hack, scanlines, overscan cropping, or aspect ratio setting
changed, need to call SET_GEOMETRY to change aspect ratio */
if (has_new_geometry)
{
retro_get_system_av_info(&new_av_info);
if (environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &new_av_info))
{
if (retro_set_geometry())
has_new_geometry = false;
}
}

switch (psx_gpu_dither_mode)
Expand Down Expand Up @@ -4768,10 +4779,7 @@ void retro_run(void)
// Check if aspect ratio needs to be changed due to display mode change on this frame
if (MDFN_UNLIKELY((aspect_ratio_setting == 1) && aspect_ratio_dirty))
{
struct retro_system_av_info new_av_info;
retro_get_system_av_info(&new_av_info);

if (environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &new_av_info.geometry))
if (retro_set_geometry())
aspect_ratio_dirty = false;

// If unable to change geometry here, defer to next frame and leave aspect_ratio_dirty flagged
Expand All @@ -4783,10 +4791,7 @@ void retro_run(void)
{
// This may cause video and audio reinit on the frontend, so it may be preferable to
// set the core option to force progressive or interlaced timings
struct retro_system_av_info new_av_info;
retro_get_system_av_info(&new_av_info);

if (environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &new_av_info))
if (retro_set_system_av_info())
interlace_setting_dirty = false;

// If unable to change AV info here, defer to next frame and leave interlace_setting_dirty flagged
Expand Down Expand Up @@ -4816,10 +4821,8 @@ void retro_run(void)
PrevInterlaced = false;
#endif
// PSX is rather special, and needs specific handling ...

width = rects[0]; // spec.DisplayRect.w is 0. Only rects[0].w seems to return something sane.
height = spec.DisplayRect.h;
//fprintf(stderr, "(%u x %u)\n", width, height);

// PSX core inserts padding on left and right (overscan). Optionally crop this.
const uint32_t *pix = surf->pixels;
Expand Down Expand Up @@ -4866,8 +4869,17 @@ void retro_run(void)
// This shouldn't happen.
break;
}
}

/* Smart/dynamic height geometry trigger */
if (crop_overscan == 2)
{
if (image_height != height)
{
image_height = height;
retro_set_geometry();
}
}
}

width <<= upscale_shift;
height <<= upscale_shift;
Expand Down
74 changes: 37 additions & 37 deletions libretro_core_options.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,24 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"100%(native)"
},
{
BEETLE_OPT(gpu_overclock),
"GPU Rasterizer Overclock",
NULL,
"Enable overclocking of the 2D rasterizer contained within the emulated PSX's GPU. Does not improve 3D rendering, and in general has little effect.",
NULL,
"hacks",
{
{ "1x(native)", "1x (Native)" },
{ "2x", NULL },
{ "4x", NULL },
{ "8x", NULL },
{ "16x", NULL },
{ "32x", NULL },
{ NULL, NULL },
},
"1x(native)"
},
{
BEETLE_OPT(gte_overclock),
"GTE Overclock",
Expand Down Expand Up @@ -1212,6 +1230,21 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"disabled"
},
{
BEETLE_OPT(aspect_ratio),
"Core Aspect Ratio",
NULL,
"Choose core provided aspect ratio. This setting is ignored when the Widescreen Mode Hack or Display Full VRAM options are enabled.",
NULL,
"video",
{
{ "corrected", "Corrected" },
{ "uncorrected", "Uncorrected" },
{ "4:3", "Force 4:3" },
{ "ntsc", "Force NTSC" },
},
"corrected"
},
{
BEETLE_OPT(crop_overscan),
"Crop Overscan",
Expand Down Expand Up @@ -1280,7 +1313,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
{ "-3px", NULL },
{ "-2px", NULL },
{ "-1px", NULL },
{ "disabled", "0 (Default)" },
{ "disabled", "0" },
{ "+1px", NULL },
{ "+2px", NULL },
{ "+3px", NULL },
Expand Down Expand Up @@ -1346,7 +1379,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
{ "-3", NULL },
{ "-2", NULL },
{ "-1", NULL },
{ "0", "0 (Default)" },
{ "0", "0" },
{ "+1", NULL },
{ "+2", NULL },
{ "+3", NULL },
Expand Down Expand Up @@ -1392,39 +1425,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
"0"
},
#endif
{
BEETLE_OPT(gpu_overclock),
"GPU Rasterizer Overclock",
NULL,
"Enable overclocking of the 2D rasterizer contained within the emulated PSX's GPU. Does not improve 3D rendering, and in general has little effect.",
NULL,
"video",
{
{ "1x(native)", "1x (Native)" },
{ "2x", NULL },
{ "4x", NULL },
{ "8x", NULL },
{ "16x", NULL },
{ "32x", NULL },
{ NULL, NULL },
},
"1x(native)"
},
{
BEETLE_OPT(aspect_ratio),
"Core Aspect Ratio",
NULL,
"Choose core provided aspect ratio. This setting is ignored when the Widescreen Mode Hack or Display Full VRAM options are enabled.",
NULL,
"video",
{
{ "corrected", "Corrected" },
{ "uncorrected", "Uncorrected" },
{ "4:3", "Force 4:3" },
{ "ntsc", "Force NTSC" },
},
"corrected"
},
{
BEETLE_OPT(initial_scanline),
"Initial Scan Line - NTSC",
Expand All @@ -1433,7 +1433,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
NULL,
"video",
{
{ "0", NULL },
{ "0", "0 (Default)" },
{ "1", NULL },
{ "2", NULL },
{ "3", NULL },
Expand Down Expand Up @@ -1528,7 +1528,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
NULL,
"video",
{
{ "0", NULL },
{ "0", "0 (Default)" },
{ "1", NULL },
{ "2", NULL },
{ "3", NULL },
Expand Down
18 changes: 15 additions & 3 deletions rsx/rsx_intf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#endif

extern bool fast_pal;
extern unsigned int image_height;

static enum rsx_renderer_type rsx_type = RSX_SOFTWARE;

Expand Down Expand Up @@ -81,6 +82,18 @@ void rsx_intf_get_system_av_info(struct retro_system_av_info *info)
switch (rsx_type)
{
case RSX_SOFTWARE:
{
int first_visible_scanline = MDFN_GetSettingI(content_is_pal ? "psx.slstartp" : "psx.slstart");
int last_visible_scanline = MDFN_GetSettingI(content_is_pal ? "psx.slendp" : "psx.slend");
int manual_height = last_visible_scanline - first_visible_scanline + 1;

/* Compensate height in smart/dynamic crop mode to keep proper aspect ratio */
if (crop_overscan == 2 && image_height && manual_height > image_height)
{
first_visible_scanline = 0;
last_visible_scanline = first_visible_scanline + image_height - 1;
}

memset(info, 0, sizeof(*info));
info->timing.fps = rsx_common_get_timing_fps();
info->timing.sample_rate = SOUND_FREQUENCY;
Expand All @@ -89,10 +102,10 @@ void rsx_intf_get_system_av_info(struct retro_system_av_info *info)
info->geometry.max_width = MEDNAFEN_CORE_GEOMETRY_MAX_W << psx_gpu_upscale_shift;
info->geometry.max_height = MEDNAFEN_CORE_GEOMETRY_MAX_H << psx_gpu_upscale_shift;
info->geometry.aspect_ratio = rsx_common_get_aspect_ratio(content_is_pal, crop_overscan,
MDFN_GetSettingI(content_is_pal ? "psx.slstartp" : "psx.slstart"),
MDFN_GetSettingI(content_is_pal ? "psx.slendp" : "psx.slend"),
first_visible_scanline, last_visible_scanline,
aspect_ratio_setting, false, widescreen_hack, widescreen_hack_aspect_ratio_setting);
break;
}
case RSX_OPENGL:
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
rsx_gl_get_system_av_info(info);
Expand Down Expand Up @@ -873,7 +886,6 @@ double rsx_common_get_timing_fps(void)
(currently_interlaced ? FPS_NTSC_INTERLACED : FPS_NTSC_NONINTERLACED));
}


float rsx_common_get_aspect_ratio(bool pal_content, int crop_overscan,
int first_visible_scanline, int last_visible_scanline,
int aspect_ratio_setting, bool vram_override, bool widescreen_override,
Expand Down

0 comments on commit 4a006dc

Please sign in to comment.