eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: support for direct_video=2 mode (experimental).

Browse Source
This commit is contained in:
Sorgelig
2023-12-20 21:37:55 +08:00
parent 4483501011
commit 0419387578
5 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg.cpp
View File

@@ -62,7 +62,7 @@ static const ini_var_t ini_vars[] =
{ "FB_SIZE", (void*)(&(cfg.fb_size)), UINT8, 0, 4 },
{ "FB_TERMINAL", (void*)(&(cfg.fb_terminal)), UINT8, 0, 1 },
{ "OSD_TIMEOUT", (void*)(&(cfg.osd_timeout)), INT16, 0, 3600 },
{ "DIRECT_VIDEO", (void*)(&(cfg.direct_video)), UINT8, 0, 1 },
{ "DIRECT_VIDEO", (void*)(&(cfg.direct_video)), UINT8, 0, 2 },
{ "OSD_ROTATE", (void*)(&(cfg.osd_rotate)), UINT8, 0, 2 },
{ "DEADZONE", (void*)(&(cfg.controller_deadzone)), STRINGARR, sizeof(cfg.controller_deadzone) / sizeof(*cfg.controller_deadzone), sizeof(*cfg.controller_deadzone) },
{ "GAMEPAD_DEFAULTS", (void*)(&(cfg.gamepad_defaults)), UINT8, 0, 1 },

1
user_io.cpp
View File

@@ -2812,6 +2812,7 @@ void user_io_send_buttons(char force)
if (cfg.hdmi_limited & 1) map |= CONF_HDMI_LIMITED1;
if (cfg.hdmi_limited & 2) map |= CONF_HDMI_LIMITED2;
if (cfg.direct_video) map |= CONF_DIRECT_VIDEO;
if (cfg.direct_video == 2) map |= CONF_DIRECT_VIDEO2;
if (vga_fb) map |= CONF_VGA_FB;
if ((map != key_map) || force)

1
user_io.h
View File

@@ -148,6 +148,7 @@
#define CONF_DIRECT_VIDEO 0b0000010000000000
#define CONF_HDMI_LIMITED2 0b0000100000000000
#define CONF_VGA_FB 0b0001000000000000
#define CONF_DIRECT_VIDEO2 0b0010000000000000
// core type value should be unlikely to be returned by broken cores
#define CORE_TYPE_UNKNOWN 0x55

31
video.cpp
View File

@@ -1165,7 +1165,7 @@ static void hdmi_config_set_csc()
const float pi = float(M_PI);
int ypbpr = (cfg.vga_mode_int == 1) && cfg.direct_video;
int ypbpr = (cfg.vga_mode_int == 1) && (cfg.direct_video == 1);
// out-of-scope defines, not used with ypbpr
int16_t csc_int16[12];
@@ -1364,7 +1364,7 @@ static void hdmi_config_set_csc()
static void hdmi_config_init()
{
int ypbpr = (cfg.vga_mode_int == 1) && cfg.direct_video;
int ypbpr = (cfg.vga_mode_int == 1) && (cfg.direct_video == 1);
// address, value
uint8_t init_data[] = {
@@ -1403,8 +1403,8 @@ static void hdmi_config_init()
0x17, 0b01100010, // Aspect ratio 16:9 [1]=1, 4:3 [1]=0, invert sync polarity
0x3B, 0x0, // Automatic pixel repetition and VIC detection
0x3B, 0x80, // Automatic pixel repetition and VIC detection
0x3C, 0x00,
0x48, 0b00001000, // [6]=0 Normal bus order!
// [5] DDR Alignment.
@@ -1521,6 +1521,21 @@ static void hdmi_config_init()
hdmi_config_set_csc();
}
static void hdmi_config_dv2(VideoInfo *vi)
{
int fd = i2c_open(0x39, 0);
if (fd >= 0)
{
i2c_smbus_write_byte_data(fd, 0x3B, 0xC0); //manual mode
i2c_smbus_write_byte_data(fd, 0x3C, vi->pixrep & 0x3F);
i2c_close(fd);
}
else
{
printf("*** ADV7513 not found on i2c bus! HDMI won't be available!\n");
}
}
static void hdmi_config_set_hdr()
{
// Grab desired nits values
@@ -2444,6 +2459,7 @@ static bool get_video_info(bool force, VideoInfo *video_info)
video_info->ptime = spi_w(0) | (spi_w(0) << 16);
video_info->vtimeh = spi_w(0) | (spi_w(0) << 16);
video_info->ctime = spi_w(0) | (spi_w(0) << 16);
video_info->pixrep = spi_w(0);
video_info->interlaced = ( res & 0x100 ) != 0;
video_info->rotated = ( res & 0x200 ) != 0;
}
@@ -2539,8 +2555,8 @@ static void show_video_info(const VideoInfo *vi, const vmode_custom_t *vm)
float crate = vi->ctime * 100;
crate /= vi->ptime;
printf("\033[1;33mINFO: Video resolution: %u x %u%s, fHorz = %.1fKHz, fVert = %.1fHz, fPix = %.2fMHz, fVid = %.2fMHz\033[0m\n",
vi->width, vi->height, vi->interlaced ? "i" : "", hrate, vrate, prate, crate);
printf("\033[1;33mINFO: Video resolution: %u x %u%s, fHorz = %.1fKHz, fVert = %.1fHz, fPix = %.2fMHz, fVid = %.2fMHz, pr = %d\033[0m\n",
vi->width, vi->height, vi->interlaced ? "i" : "", hrate, vrate, prate, crate, vi->pixrep);
printf("\033[1;33mINFO: Frame time (100MHz counter): VGA = %d, HDMI = %d\033[0m\n", vi->vtime, vi->vtimeh);
printf("\033[1;33mINFO: AR = %d:%d, fb_en = %d, fb_width = %d, fb_height = %d\033[0m\n", vi->arx, vi->ary, vi->fb_en, vi->fb_width, vi->fb_height);
if (vi->vtimeh) api1_5 = 1;
@@ -2741,7 +2757,7 @@ static void set_yc_mode()
int pal = fps < 55.f;
double CLK_REF = (pal || (cfg.ntsc_mode == 1)) ? 4.43361875f : (cfg.ntsc_mode == 2) ? 3.575611f : 3.579545f;
double CLK_VIDEO = current_video_info.ctime * 100.f / current_video_info.ptime;
float prate = current_video_info.width * 100.f;
prate /= current_video_info.ptime;
@@ -2794,6 +2810,7 @@ void video_mode_adjust()
{
current_video_info = video_info;
show_video_info(&video_info, &v_cur);
if(cfg.direct_video == 2) hdmi_config_dv2(&video_info);
set_yc_mode();
}
force = false;

1
video.h
View File

@@ -21,6 +21,7 @@ struct VideoInfo
uint32_t fb_fmt;
uint32_t fb_width;
uint32_t fb_height;
uint32_t pixrep;
bool interlaced;
bool rotated;