X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.cpp;h=ddecb049b5a918229505b8bcb4c9bd8bc424a86a;hb=ba6d58ee308949b96975c3081bd1c5411dd6966c;hp=990a8ee280dcb7db944d0e023836fbaeb3e1a7b0;hpb=ec10aedf720f2356035255999827beb4158aa4a2;p=bmusb diff --git a/bmusb.cpp b/bmusb.cpp index 990a8ee..ddecb04 100644 --- 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; + 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, &frame_rate_nom, &frame_rate_den, &interlaced)) { + 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; } } @@ -805,6 +806,8 @@ void BMUSBCapture::configure_card() fprintf(stderr, "Error getting configuration: %s\n", libusb_error_name(rc)); exit(1); } + +#if 0 printf("%d interface\n", config->bNumInterfaces); for (int interface_number = 0; interface_number < config->bNumInterfaces; ++interface_number) { printf(" interface %d\n", interface_number); @@ -818,6 +821,7 @@ void BMUSBCapture::configure_card() } } } +#endif rc = libusb_set_configuration(devh, /*configuration=*/1); if (rc < 0) { @@ -946,12 +950,18 @@ void BMUSBCapture::configure_card() fprintf(stderr, "Error on control %d: %s\n", ctrls[req].index, libusb_error_name(rc)); exit(1); } - + + if (ctrls[req].index == 16 && rc == 4) { + printf("Card firmware version: 0x%02x%02x\n", value[2], value[3]); + } + +#if 0 printf("rc=%d: ep=%d@%d %d -> 0x", rc, ctrls[req].endpoint, ctrls[req].request, ctrls[req].index); for (int i = 0; i < rc; ++i) { printf("%02x", value[i]); } printf("\n"); +#endif } #if 0 @@ -1059,10 +1069,8 @@ void BMUSBCapture::configure_card() void BMUSBCapture::start_bm_capture() { - printf("starting capture\n"); int i = 0; for (libusb_transfer *xfr : iso_xfrs) { - printf("submitting transfer...\n"); int rc = libusb_submit_transfer(xfr); ++i; if (rc < 0) { @@ -1105,20 +1113,28 @@ void BMUSBCapture::stop_bm_thread() struct VideoFormatEntry { uint16_t normalized_video_format; - int width, height; - int frame_rate_den, frame_rate_nom; + 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 *frame_rate_den, int *frame_rate_nom, 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 = *second_field_start = 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 +1144,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; @@ -1135,20 +1153,26 @@ bool decode_video_format(uint16_t video_format, int *width, int *height, int *fr // 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; } @@ -1159,22 +1183,25 @@ 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, 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; *frame_rate_den = entry.frame_rate_den; *interlaced = entry.interlaced;