X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.cpp;h=ddecb049b5a918229505b8bcb4c9bd8bc424a86a;hb=ba6d58ee308949b96975c3081bd1c5411dd6966c;hp=62376db795743a93079a745f32f70458ea092ed1;hpb=8eb0e99394c2ffa361c9dd7eb22bc176e6e4c899;p=bmusb

diff --git a/bmusb.cpp b/bmusb.cpp
index 62376db..ddecb04 100644
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -256,9 +256,9 @@ 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, extra_lines_top, extra_lines_bottom, frame_rate_nom, frame_rate_den;
+		unsigned width, height, second_field_start, extra_lines_top, extra_lines_bottom, frame_rate_nom, frame_rate_den;
 		bool interlaced;
-		if (decode_video_format(format, &width, &height, &extra_lines_top, &extra_lines_bottom,
+		if (decode_video_format(format, &width, &height, &second_field_start, &extra_lines_top, &extra_lines_bottom,
 		                        &frame_rate_nom, &frame_rate_den, &interlaced)) {
 			assumed_frame_width = width;
 		}
@@ -1113,19 +1113,20 @@ 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;
+	unsigned width, height, second_field_start;
+	unsigned extra_lines_top, extra_lines_bottom;
+	unsigned frame_rate_nom, 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)
+bool decode_video_format(uint16_t video_format, unsigned *width, unsigned *height, unsigned *second_field_start,
+                         unsigned *extra_lines_top, unsigned *extra_lines_bottom,
+                         unsigned *frame_rate_nom, unsigned *frame_rate_den, bool *interlaced)
 {
 	*interlaced = false;
 
 	// TODO: Add these for all formats as we find them.
-	*extra_lines_top = *extra_lines_bottom = 0;
+	*extra_lines_top = *extra_lines_bottom = *second_field_start = 0;
 
 	if (video_format == 0x0800) {
 		// No video signal. These green pseudo-frames seem to come at about 30.13 Hz.
@@ -1152,20 +1153,26 @@ bool decode_video_format(uint16_t video_format, int *width, int *height, int *ex
 
 	// NTSC (480i59.94, I suppose). A special case, see below.
 	if (video_format == 0xe901 || video_format == 0xe9c1 || video_format == 0xe801) {
-		*width = 640;
+		*width = 720;
 		*height = 480;
-		*frame_rate_nom = 60000;
+		*extra_lines_top = 17;
+		*extra_lines_bottom = 28;
+		*frame_rate_nom = 30000;
 		*frame_rate_den = 1001;
+		*second_field_start = 280;
 		*interlaced = true;
 		return true;
 	}
 
 	// PAL (576i50, I suppose). A special case, see below.
-	if (video_format == 0xe909) {
+	if (video_format == 0xe909 || video_format == 0xe9c9 || video_format == 0xe809 || video_format == 0xebe9) {
 		*width = 720;
 		*height = 576;
-		*frame_rate_nom = 50;
+		*extra_lines_top = 22;
+		*extra_lines_bottom = 27;
+		*frame_rate_nom = 25;
 		*frame_rate_den = 1;
+		*second_field_start = 335;
 		*interlaced = true;
 		return true;
 	}
@@ -1176,22 +1183,23 @@ bool decode_video_format(uint16_t video_format, int *width, int *height, int *ex
 	// usually it doesn't mean anything.
 	uint16_t normalized_video_format = video_format & ~0xe808;
 	constexpr VideoFormatEntry entries[] = {
-		{ 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, 20, 25,    30,    1,  true },  // 1080i60.
-		{ 0x01e1, 1920, 1080,  0,  0, 30000, 1001, false },  // 1080p29.97.
-		{ 0x0021, 1920, 1080, 20, 25, 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.
+		{ 0x0143, 1280,  720,   0, 25,  5,    50,    1, false },  // 720p50.
+		{ 0x0103, 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, 582, 20, 25,    30,    1,  true },  // 1080i60.
+		{ 0x01e1, 1920, 1080,   0,  0,  0, 30000, 1001, false },  // 1080p29.97.
+		{ 0x0021, 1920, 1080, 582, 20, 25, 30000, 1001,  true },  // 1080i59.94.
+		{ 0x0063, 1920, 1080,   0,  0,  0,    25,    1, false },  // 1080p25.
+		{ 0x0043, 1920, 1080,   0,  0,  0,    25,    1,  true },  // 1080p50.
+		{ 0x008e, 1920, 1080,   0,  0,  0,    24,    1, false },  // 1080p24.
+		{ 0x00a1, 1920, 1080,   0,  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;
+			*second_field_start = entry.second_field_start;
 			*extra_lines_top = entry.extra_lines_top;
 			*extra_lines_bottom = entry.extra_lines_bottom;
 			*frame_rate_nom = entry.frame_rate_nom;