From 4a275155fbd23690652c0478b12363d254f84e16 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 10 Jan 2016 15:18:47 +0100 Subject: [PATCH] More video modes, from the D4. --- bmusb.cpp | 11 ++++++++--- formats.txt | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bmusb.cpp b/bmusb.cpp index 8787f8b..2ea6407 100644 --- a/bmusb.cpp +++ b/bmusb.cpp @@ -1181,11 +1181,16 @@ bool decode_video_format(uint16_t video_format, unsigned *width, unsigned *heigh // except when it's not (e.g. it's the only difference between NTSC // and PAL). Rather confusing. But we clear it here nevertheless, because // usually it doesn't mean anything. - uint16_t normalized_video_format = video_format & ~0xe808; + // + // 0x4 is a flag I've only seen from the D4. I don't know what it is. + uint16_t normalized_video_format = video_format & ~0xe80c; constexpr VideoFormatEntry entries[] = { - { 0x0011, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50 (5:4) + { 0x01f1, 720, 480, 0, 40, 5, 60000, 1001, false }, // 480p59.94 (believed). + { 0x0131, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50. + { 0x0011, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50 (5:4). { 0x0143, 1280, 720, 0, 25, 5, 50, 1, false }, // 720p50. { 0x0103, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. + { 0x0125, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. { 0x0121, 1280, 720, 0, 25, 5, 60000, 1001, false }, // 720p59.94. { 0x01c3, 1920, 1080, 0, 0, 0, 30, 1, false }, // 1080p30. { 0x0003, 1920, 1080, 583, 20, 25, 30, 1, true }, // 1080i60. @@ -1210,7 +1215,7 @@ bool decode_video_format(uint16_t video_format, unsigned *width, unsigned *heigh } } - printf("Unknown video format 0x%04x. Assuming 720p60.\n", video_format); + printf("Unknown video format 0x%04x (normalized 0x%04x). Assuming 720p60.\n", video_format, normalized_video_format); *width = 1280; *height = 720; *frame_rate_nom = 60; diff --git a/formats.txt b/formats.txt index 8842cfe..3b3abd3 100644 --- a/formats.txt +++ b/formats.txt @@ -7,6 +7,7 @@ 0xe90e - 720p59.94?? from the scaler (deep color?) +480p60 - 0xe9f1 (unsure if this is 60 or 59.94) NTSC - 0xe901 (also seen 0xe9c1, 0xe801) NTSC 23.98 - 0xe901 PAL - 0xe909 (also seen 0xe9c9 and 0xebe9) @@ -22,6 +23,13 @@ PAL - 0xe909 (also seen 0xe9c9 and 0xebe9) 720p 59.94 - 0xe92d (also seen 0xe925) 720p 60 - 0xe90b (also seen 0xe903) + +unknown video modes from the D4: + +640x424 30 fps - 0xe931 +640x424 25 fps - 0xe939 + + theories: video - 0xe800 -- 2.39.2