Add some extra height information to decode_video_format().

diff --git a/bmusb.cpp b/bmusb.cpp
index c2c49abb476a2057eaa491d6181ef9cb16398be5..b1c8fdc7225b00432f1e8610e451d0fd609e2882 100644 (file)
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -256,9 +256,10 @@ void BMUSBCapture::start_new_frame(const uint8_t *start)
 
                // Update the assumed frame width. We might be one frame too late on format changes,
                // but it's much better than asking the user to choose manually.
-               int width, height, frame_rate_nom, frame_rate_den;
+               int width, height, extra_lines_top, extra_lines_bottom, frame_rate_nom, frame_rate_den;
                bool interlaced;
-               if (decode_video_format(format, &width, &height, &frame_rate_nom, &frame_rate_den, &interlaced)) {
+               if (decode_video_format(format, &width, &height, &extra_lines_top, &extra_lines_bottom,
+                                       &frame_rate_nom, &frame_rate_den, &interlaced)) {
                        assumed_frame_width = width;
                }
        }
@@ -1106,19 +1107,26 @@ void BMUSBCapture::stop_bm_thread()
 struct VideoFormatEntry {
        uint16_t normalized_video_format;
        int width, height;
+       int extra_lines_top, extra_lines_bottom;
        int frame_rate_nom, frame_rate_den;
        bool interlaced;
 };
 
-bool decode_video_format(uint16_t video_format, int *width, int *height, int *frame_rate_nom, int *frame_rate_den, bool *interlaced)
+bool decode_video_format(uint16_t video_format, int *width, int *height, int *extra_lines_top, int *extra_lines_bottom,
+                         int *frame_rate_nom, int *frame_rate_den, bool *interlaced)
 {
        *interlaced = false;
 
+       // TODO: Add these for all formats as we find them.
+       *extra_lines_top = *extra_lines_bottom = 0;
+
        if (video_format == 0x0800) {
                // No video signal. These green pseudo-frames seem to come at about 30.13 Hz.
                // It's a strange thing, but what can you do.
                *width = 720;
                *height = 525;
+               *extra_lines_top = 0;
+               *extra_lines_bottom = 0;
                *frame_rate_nom = 3013;
                *frame_rate_den = 100;
                return true;
@@ -1128,6 +1136,8 @@ bool decode_video_format(uint16_t video_format, int *width, int *height, int *fr
                        video_format);
                *width = 0;
                *height = 0;
+               *extra_lines_top = 0;
+               *extra_lines_bottom = 0;
                *frame_rate_nom = 60;
                *frame_rate_den = 1;
                return false;
@@ -1159,22 +1169,24 @@ bool decode_video_format(uint16_t video_format, int *width, int *height, int *fr
        // usually it doesn't mean anything.
        uint16_t normalized_video_format = video_format & ~0xe808;
        constexpr VideoFormatEntry entries[] = {
-               { 0x0143, 1280,  720,    50,    1, false },  // 720p50.
-               { 0x0103, 1280,  720,    60,    1, false },  // 720p60.
-               { 0x0121, 1280,  720, 60000, 1001, false },  // 720p59.94.
-               { 0x01c3, 1920, 1080,    30,    1, false },  // 1080p30.
-               { 0x0003, 1920, 1080,    30,    1,  true },  // 1080i60.
-               { 0x01e1, 1920, 1080, 30000, 1001, false },  // 1080p29.97.
-               { 0x0021, 1920, 1080, 30000, 1001,  true },  // 1080i59.94.
-               { 0x0063, 1920, 1080,    25,    1, false },  // 1080p25.
-               { 0x0043, 1920, 1080,    25,    1,  true },  // 1080p50.
-               { 0x008e, 1920, 1080,    24,    1, false },  // 1080p24.
-               { 0x00a1, 1920, 1080, 24000, 1001, false },  // 1080p23.98.
+               { 0x0143, 1280,  720, 25, 5,    50,    1, false },  // 720p50.
+               { 0x0103, 1280,  720, 25, 5,    60,    1, false },  // 720p60.
+               { 0x0121, 1280,  720, 25, 5, 60000, 1001, false },  // 720p59.94.
+               { 0x01c3, 1920, 1080,  0, 0,    30,    1, false },  // 1080p30.
+               { 0x0003, 1920, 1080,  0, 0,    30,    1,  true },  // 1080i60.
+               { 0x01e1, 1920, 1080,  0, 0, 30000, 1001, false },  // 1080p29.97.
+               { 0x0021, 1920, 1080,  0, 0, 30000, 1001,  true },  // 1080i59.94.
+               { 0x0063, 1920, 1080,  0, 0,    25,    1, false },  // 1080p25.
+               { 0x0043, 1920, 1080,  0, 0,    25,    1,  true },  // 1080p50.
+               { 0x008e, 1920, 1080,  0, 0,    24,    1, false },  // 1080p24.
+               { 0x00a1, 1920, 1080,  0, 0, 24000, 1001, false },  // 1080p23.98.
        };
        for (const VideoFormatEntry &entry : entries) {
                if (normalized_video_format == entry.normalized_video_format) {
                        *width = entry.width;
                        *height = entry.height;
+                       *extra_lines_top = entry.extra_lines_top;
+                       *extra_lines_bottom = entry.extra_lines_bottom;
                        *frame_rate_nom = entry.frame_rate_nom;
                        *frame_rate_den = entry.frame_rate_den;
                        *interlaced = entry.interlaced;

diff --git a/bmusb.h b/bmusb.h
index 5ce73ccc7e744d84f11ea31dcaab2fccc28195fa..58ad9e7f3d86b0c60fd742921a7a279708ea07f7 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -157,6 +157,7 @@ class BMUSBCapture {
 
 // Get details for the given video format; returns false if detection was incomplete.
 // Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1.
-bool decode_video_format(uint16_t video_format, int *width, int *height, int *frame_rate_nom, int *frame_rate_den, bool *interlaced);
+bool decode_video_format(uint16_t video_format, int *width, int *height, int *extra_lines_top, int *extra_lines_bottom,
+                         int *frame_rate_nom, int *frame_rate_den, bool *interlaced);
 
 #endif