aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-03 07:40:13 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-03 07:40:13 +0000
commitfa54b1366d911acec7c889a6f38617ab92d0a8b5 (patch)
treef1995c3c8c1dd203a7728914e283bdeb739d5b91
parentd268164386a23a56d8916af172337946df7a28a2 (diff)
downloadmonitor-edid-fa54b1366d911acec7c889a6f38617ab92d0a8b5.tar
monitor-edid-fa54b1366d911acec7c889a6f38617ab92d0a8b5.tar.gz
monitor-edid-fa54b1366d911acec7c889a6f38617ab92d0a8b5.tar.bz2
monitor-edid-fa54b1366d911acec7c889a6f38617ab92d0a8b5.tar.xz
monitor-edid-fa54b1366d911acec7c889a6f38617ab92d0a8b5.zip
Fix modeline comment for interlaced modes.
-rw-r--r--NEWS2
-rwxr-xr-xmonitor-parse-edid5
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index da2aa69..d7ebb3c 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@
o add support for Short Video Descriptor formats 1-64 (as defined by
EIA/CEA-861) in Video Data Blocks of CEA EDID Timing Extension
o set Interlace flag for ModeLines created for interlaced Detailed
- Timings
+ Timings (and note it in the ModeLine comment)
o correctly parse some interlaced video timings if the Detailed Timing
Descriptor specifies field vertical parameters instead of the frame
parameters (at least Fujitsu-Siemens Myrica VQ32-1T testcase)
diff --git a/monitor-parse-edid b/monitor-parse-edid
index 7405230..72978c3 100755
--- a/monitor-parse-edid
+++ b/monitor-parse-edid
@@ -516,10 +516,11 @@ sub parse_edid {
my $horizontal_total = $h->{horizontal_active} + $h->{horizontal_blanking};
my $vertical_total = $h->{vertical_active} + $h->{vertical_blanking};
- $h->{ModeLine_comment} = sprintf qq(# Monitor %s modeline (%.1f Hz vsync, %.1f kHz hsync, ratio %s%s)),
+ $h->{ModeLine_comment} = sprintf qq(# Monitor %s modeline (%.1f Hz vsync, %.1f kHz hsync, %sratio %s%s)),
$h->{source} eq 'cea_vdb' ? "supported CEA" : "preferred",
- $h->{pixel_clock} / $horizontal_total / $vertical_total * 1000 * 1000,
+ $h->{pixel_clock} / $horizontal_total / $vertical_total * 1000 * 1000 * ($h->{interlaced} ? 2 : 1),
$h->{pixel_clock} / $horizontal_total * 1000,
+ $h->{interlaced} ? "interlaced, " : '',
nearest_ratio($h->{horizontal_active} / $h->{vertical_active}, 0.01) || sprintf("%.2f", $h->{horizontal_active} / $h->{vertical_active}),
$dpi_string ? ", $dpi_string" : '';