mirror
/
RGBtoHDMI
kopia lustrzana https://github.com/hoglet67/RGBtoHDMI
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix incorrect sync polarity detection during hot plugging

pull/360/head
IanSB 2023-11-13 22:14:50 +00:00
rodzic bef858322f
commit 33f738e11b
3 zmienionych plików z 11 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/cpld_rgb.c
Wyświetl plik

@ -1392,7 +1392,6 @@ static int cpld_analyse(int selected_sync_state, int analyse) {
} else {
log_info("Analyze Csync: polarity changed to non-inverted");
}
write_config(config, DAC_UPDATE);
} else {
if (invert) {
log_info("Analyze Csync: polarity unchanged (inverted)");
@ -1400,6 +1399,7 @@ static int cpld_analyse(int selected_sync_state, int analyse) {
log_info("Analyze Csync: polarity unchanged (non-inverted)");
}
}
write_config(config, DAC_UPDATE);
int polarity = selected_sync_state;
if (analyse) {
polarity = analyse_sync();

2
src/cpld_yuv.c
Wyświetl plik

@ -1032,7 +1032,6 @@ static int cpld_analyse(int selected_sync_state, int analyse) {
} else {
log_info("Analyze Csync: polarity changed to non-inverted");
}
write_config(config, DAC_UPDATE);
} else {
if (invert) {
log_info("Analyze Csync: polarity unchanged (inverted)");
@ -1040,6 +1039,7 @@ static int cpld_analyse(int selected_sync_state, int analyse) {
log_info("Analyze Csync: polarity unchanged (non-inverted)");
}
}
write_config(config, DAC_UPDATE);
int polarity = selected_sync_state;
if (analyse) {
polarity = analyse_sync();

10
src/rgb_to_hdmi.c
Wyświetl plik

@ -1075,7 +1075,8 @@ int calibrate_sampling_clock(int profile_changed) {
vsync_width_lines = 1;
}
if (vsync_width_lines > (lines_per_vsync >> 2)) { // if large value then likely measuring inverted sync so set limit on that
vsync_width_lines = 4; //vsync_width_lines = lines_per_vsync >> 2;
vsync_width_lines = 4;
//vsync_width_lines = lines_per_vsync >> 2;
}
log_info("Vsync width = %dns, (%d lines)", vsync_width, vsync_width_lines);
@ -3178,6 +3179,13 @@ void setup_profile(int profile_changed) {
vsync_comparison_hi = frame_timeout;
}
}
if ((capinfo->detected_sync_type & SYNC_BIT_MASK) != (capinfo->sync_type & SYNC_BIT_MASK) || vsync_retry_count == VSYNC_RETRY_MAX) { //if detected sync type doesn't match profile sync type then set windows to 0 so capture will be aborted to try again
hsync_comparison_lo = 1;
hsync_comparison_hi = 0;
vsync_comparison_lo = 1;
vsync_comparison_hi = 0;
}
log_info("Window: H=%d to %d, V=%d to %d", hsync_comparison_lo * 1000 / cpuspeed, hsync_comparison_hi * 1000 / cpuspeed, (int)((double)vsync_comparison_lo * 1000 / cpuspeed)
, (int)((double)vsync_comparison_hi * 1000 / cpuspeed));
hsync_comparison_lo *= (capinfo->nlines - 1); //actually measure nlines-1 hsyncs to average out jitter