aboutsummaryrefslogtreecommitdiffstats
path: root/edid-decode.cpp
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-07-08 18:20:27 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-07-08 18:20:27 +0200
commitbecb0efd507149b9771803eef91f4b1273cbe941 (patch)
tree32007f65ca4a56b79b6af27464ff2f6983d9d360 /edid-decode.cpp
parentb47e44e0fcda64938ef5314e22da7d310d672210 (diff)
edid-decode: introduce timings_ext struct
This simplifies storing timings together with the type and flags strings. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'edid-decode.cpp')
-rw-r--r--edid-decode.cpp31
1 files changed, 13 insertions, 18 deletions
diff --git a/edid-decode.cpp b/edid-decode.cpp
index 440f590..4b9ba5a 100644
--- a/edid-decode.cpp
+++ b/edid-decode.cpp
@@ -1125,38 +1125,33 @@ int edid_state::parse_edid()
msg(!fail || edid_minor >= 4, "%s", err.c_str());
}
- if (native_interlaced_timing.vact && !native_timing.vact)
+ if (native_interlaced_timing.t.vact && !native_timing.t.vact)
fail("A native interlaced timing is present, but not a native progressive timing.\n");
- if (native_interlaced_timing.vact && native_timing.vact &&
- native_interlaced_timing.vact != native_timing.vact)
+ if (native_interlaced_timing.t.vact && native_timing.t.vact &&
+ native_interlaced_timing.t.vact != native_timing.t.vact)
warn("The native interlaced frame height differs from the native progressive frame height.\n");
- if (native_timing.vact && preferred_timings.vact > native_timing.vact) {
+ if (native_timing.t.vact && preferred_timings.t.vact > native_timing.t.vact) {
warn("Native resolution of %ux%u is smaller than the preferred resolution %ux%u.\n",
- native_timing.hact, native_timing.vact,
- preferred_timings.hact, preferred_timings.vact);
+ native_timing.t.hact, native_timing.t.vact,
+ preferred_timings.t.hact, preferred_timings.t.vact);
}
if (options[OptPreferredTimings]) {
printf("\n----------------\n");
printf("\nPreferred Video Timing:\n");
- print_timings(" ", &preferred_timings,
- preferred_type.c_str(),
- preferred_flags.c_str(), true);
+ print_timings(" ", preferred_timings, true);
}
- if (options[OptNativeTimings] && (native_timing.vact || native_interlaced_timing.vact)) {
+ if (options[OptNativeTimings] &&
+ (native_timing.t.vact || native_interlaced_timing.t.vact)) {
printf("\n----------------\n");
- if (native_timing.vact) {
+ if (native_timing.t.vact) {
printf("\nNative Progressive Video Timing:\n");
- print_timings(" ", &native_timing,
- native_type.c_str(),
- native_flags.c_str(), true);
+ print_timings(" ", native_timing, true);
}
- if (native_interlaced_timing.vact) {
+ if (native_interlaced_timing.t.vact) {
printf("\nNative Interlaced Video Timing:\n");
- print_timings(" ", &native_interlaced_timing,
- native_interlaced_type.c_str(),
- native_interlaced_flags.c_str(), true);
+ print_timings(" ", native_interlaced_timing, true);
}
}

Privacy Policy