eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video: improve border handling.

Browse Source
This commit is contained in:
sorgelig
2020-03-25 18:56:03 +08:00
parent 19fd1035d5
commit 4ce5bed723
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
user_io.h
View File

@@ -59,7 +59,7 @@
#define UIO_TIMESTAMP 0x24 // transmit seconds since Unix epoch
#define UIO_LEDS 0x25 // control on-board LEDs
#define UIO_AUDVOL 0x26 // Digital volume as a number of bits to shift to the right
#define UIO_SETHEIGHT 0x27 // Set scaled vertical resolution (to reduce scaling artefacts)
#define UIO_SETHEIGHT 0x27 // Set max scaled vertical resolution
#define UIO_GETUARTFLG 0x28 // Get UART_FLG_*
#define UIO_GET_STATUS 0x29 // Update status from the core
#define UIO_SET_FLTCOEF 0x2A // Set Scaler polyphase coefficients
@@ -75,6 +75,7 @@
#define UIO_CD_GET 0x34
#define UIO_CD_SET 0x35
#define UIO_INFO_GET 0x36
#define UIO_SETWIDTH 0x37 // Set max scaled horizontal resolution
// codes as used by 8bit for file loading from OSD
#define UIO_FILE_TX 0x53

40
video.cpp
View File

@@ -646,33 +646,47 @@ static uint32_t show_video_info(int force)
}
uint32_t scrh = v_cur.item[5];
if (height && scrh)
if (scrh)
{
if (cfg.vscale_border)
{
uint32_t border = cfg.vscale_border * 2;
if ((border + 100) > scrh) border = scrh - 100;
scrh -= border;
}
if (cfg.vscale_mode)
if (cfg.vscale_mode && height)
{
uint32_t div = 1 << (cfg.vscale_mode - 1);
uint32_t mag = (scrh*div) / height;
scrh = (height * mag) / div;
}
if(cfg.vscale_border || cfg.vscale_mode)
{
printf("Set vertical scaling to : %d\n", scrh);
spi_uio_cmd16(UIO_SETHEIGHT, scrh);
}
else if(cfg.vscale_border)
{
uint32_t border = cfg.vscale_border * 2;
if ((border + 100) > scrh) border = scrh - 100;
scrh -= border;
printf("Set max vertical resolution to : %d\n", scrh);
spi_uio_cmd16(UIO_SETHEIGHT, scrh);
}
else
{
spi_uio_cmd16(UIO_SETHEIGHT, 0);
}
}
uint32_t scrw = v_cur.item[1];
if (scrw)
{
if (cfg.vscale_border && !(cfg.vscale_mode && height))
{
uint32_t border = cfg.vscale_border * 2;
if ((border + 100) > scrw) border = scrw - 100;
scrw -= border;
printf("Set max horizontal resolution to : %d\n", scrw);
spi_uio_cmd16(UIO_SETWIDTH, scrw);
}
else
{
spi_uio_cmd16(UIO_SETWIDTH, 0);
}
}
if (vtime && vtimeh) ret = vtime;
minimig_set_adjust(2);
}