Update email address.

[bmusb] / bmusb.cpp

diff --git a/bmusb.cpp b/bmusb.cpp
index ddecb049b5a918229505b8bcb4c9bd8bc424a86a..3132c42f2718ae80d19f4ec175b7ecf2feb48d98 100644 (file)
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -28,6 +28,7 @@
 #include <memory>
 #include <mutex>
 #include <stack>
+#include <string>
 #include <thread>
 
 using namespace std;
@@ -706,7 +707,7 @@ struct USBCardDevice {
        libusb_device *device;
 };
 
-libusb_device_handle *open_card(int card_index)
+libusb_device_handle *open_card(int card_index, string *description)
 {      
        libusb_device **devices;
        ssize_t num_devices = libusb_get_device_list(nullptr, &devices);
@@ -745,14 +746,22 @@ libusb_device_handle *open_card(int card_index)
        });
 
        for (size_t i = 0; i < found_cards.size(); ++i) {
-               fprintf(stderr, "Card %d: Bus %03u Device %03u ", int(i), found_cards[i].bus, found_cards[i].port);
+               const char *product_name = nullptr;
                if (found_cards[i].product == 0xbd3b) {
-                       fprintf(stderr, "Intensity Shuttle\n");
+                       product_name = "Intensity Shuttle";
                } else if (found_cards[i].product == 0xbd4f) {
-                       fprintf(stderr, "UltraStudio SDI\n");
+                       product_name = "UltraStudio SDI";
                } else {
                        assert(false);
                }
+
+               char buf[256];
+               snprintf(buf, sizeof(buf), "Card %d: Bus %03u Device %03u  %s",
+                       int(i), found_cards[i].bus, found_cards[i].port, product_name);
+               if (i == size_t(card_index)) {
+                       *description = buf;
+               }
+               fprintf(stderr, "%s\n", buf);
        }
 
        if (size_t(card_index) >= found_cards.size()) {
@@ -794,7 +803,7 @@ void BMUSBCapture::configure_card()
                exit(1);
        }
 
-       libusb_device_handle *devh = open_card(card_index);
+       libusb_device_handle *devh = open_card(card_index, &description);
        if (!devh) {
                fprintf(stderr, "Error finding USB device\n");
                exit(1);
@@ -1181,15 +1190,21 @@ 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[] = {
+               { 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, 582, 20, 25,    30,    1,  true },  // 1080i60.
+               { 0x0003, 1920, 1080, 583, 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.
+               { 0x0021, 1920, 1080, 583, 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.
@@ -1209,7 +1224,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;