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

Video: Automatic Direct Video dv_dac.txt Parsing Fix (#1036)

Browse Source 
* Simple Auto Direct Video

direct_video=2
Checks for 1024x768 HDMI resolution and sets direct_video=1
No hot plug detect
No EDID parsing
No device whitelist
No hdmi_limited set based on EDID whitelist

* Add EDID detection and set hdmi_limited for common DACs

- AG6200 sets hdmi_limited=2
- CS5213 sets hdmi_limited=0

* Fix logic to pass normal EDID resolution if not 1024x768

* Update MiSTer.ini

* Remove 1024x768 resolution check

- Only use mfg_id from EDID to identify known compatible DACs

* Add DAC id and settings to dv_dac.txt and dv_dac_user.txt

- mfg_id
- rgb range
- hdmi_audio_96khz
- composite_sync: 0, 1, or "" (default is "")
- dv_dac_user.txt for HDMI video upscalers that support direct video
  - device commented out by default

* Fix parsing of dv_dac.txt

DAC model name wasn't being displayed due to empty composite_sync field
This commit is contained in:
misteraddons
2025-09-14 04:13:51 -06:00
committed by GitHub
parent 5f2ccf6ab7
commit 0f667a8442
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dv_dac.txt
View File

@@ -16,9 +16,9 @@
# Combined as: (byte_08 << 8) | byte_09
#
# Examples:
# 0x48F4,0,0,,Full-range CS5213 DAC
# 0x04EF,2,0,1,Limited-range AG6200 DAC
# 0x48F4,0,0,,CS5213 DAC
# 0x04EF,2,0,1,AG6200 DAC
# Known DACs
0x48F4,0,0,,Full-range CS5213 DAC
0x04EF,2,0,,Limited-range AG6200 DAC
0x48F4,0,0,,CS5213 DAC
0x04EF,2,0,,AG6200 DAC

33
video.cpp
View File

@@ -2456,16 +2456,35 @@ static void load_dac_file(const char *filename)
// Example: 0x48F4,0,0,,Full-range CS5213 DAC
unsigned int mfg, limited, audio_96k = 0;
char name[64] = {0};
char csync_str[16] = {0};
int8_t csync = -1; // Default to use MiSTer.ini setting
// Parse with optional composite_sync field
int fields = sscanf(line, "%x,%u,%u,%15[^,],%63[^\n]", &mfg, &limited, &audio_96k, csync_str, name);
if (fields >= 2) {
// Parse composite sync field if present
if (fields >= 4 && strlen(csync_str) > 0) {
csync = (csync_str[0] == '1') ? 1 : 0;
// Find commas to parse fields manually (to handle empty fields)
const char *comma1 = strchr(line, ',');
if (!comma1) continue;
const char *comma2 = strchr(comma1 + 1, ',');
if (!comma2) continue;
const char *comma3 = strchr(comma2 + 1, ',');
if (!comma3) continue;
const char *comma4 = strchr(comma3 + 1, ',');
if (!comma4) continue;
// Parse mfg_id, hdmi_limited, hdmi_audio_96k
if (sscanf(line, "%x,%u,%u", &mfg, &limited, &audio_96k) >= 2) {
// Parse composite_sync field (between comma3 and comma4)
if (comma4 - comma3 > 1) {
char csync_char = comma3[1];
if (csync_char == '0' || csync_char == '1') {
csync = (csync_char == '1') ? 1 : 0;
}
}
// Parse name (after comma4)
strncpy(name, comma4 + 1, 63);
// Remove newline if present
char *newline = strchr(name, '\n');
if (newline) *newline = '\0';
char *carriage = strchr(name, '\r');
if (carriage) *carriage = '\0';
// Check if this mfg_id already exists and update it
bool found = false;
for (int i = 0; i < dac_config_count; i++) {