]> git.sesse.net Git - bmusb/blobdiff - bmusb.cpp
projects / bmusb / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a (commented-out) useful AVX2 debugging function.
[bmusb] / bmusb.cpp
diff --git a/bmusb.cpp b/bmusb.cpp
index 1b4628e378c18796e192db4cd260ab92584e0b8f..78e6b412d1438cdd41354c671ca3c117aa371c57 100644 (file)
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -45,6 +45,9 @@ using namespace std::placeholders;
 
 FILE *audiofp;
 
+thread usb_thread;
+atomic<bool> should_quit;
+
 FrameAllocator::~FrameAllocator() {}
 
 #define NUM_QUEUED_FRAMES 8
@@ -280,6 +283,49 @@ void add_to_frame(FrameAllocator::Frame *current_frame, const char *frame_type_n
 
 #ifdef __SSE2__
 
+#if 0
+void avx2_dump(const char *name, __m256i n)
+{
+       printf("%-10s:", name);
+       printf(" %02x", _mm256_extract_epi8(n, 0));
+       printf(" %02x", _mm256_extract_epi8(n, 1));
+       printf(" %02x", _mm256_extract_epi8(n, 2));
+       printf(" %02x", _mm256_extract_epi8(n, 3));
+       printf(" %02x", _mm256_extract_epi8(n, 4));
+       printf(" %02x", _mm256_extract_epi8(n, 5));
+       printf(" %02x", _mm256_extract_epi8(n, 6));
+       printf(" %02x", _mm256_extract_epi8(n, 7));
+       printf(" ");
+       printf(" %02x", _mm256_extract_epi8(n, 8));
+       printf(" %02x", _mm256_extract_epi8(n, 9));
+       printf(" %02x", _mm256_extract_epi8(n, 10));
+       printf(" %02x", _mm256_extract_epi8(n, 11));
+       printf(" %02x", _mm256_extract_epi8(n, 12));
+       printf(" %02x", _mm256_extract_epi8(n, 13));
+       printf(" %02x", _mm256_extract_epi8(n, 14));
+       printf(" %02x", _mm256_extract_epi8(n, 15));
+       printf(" ");
+       printf(" %02x", _mm256_extract_epi8(n, 16));
+       printf(" %02x", _mm256_extract_epi8(n, 17));
+       printf(" %02x", _mm256_extract_epi8(n, 18));
+       printf(" %02x", _mm256_extract_epi8(n, 19));
+       printf(" %02x", _mm256_extract_epi8(n, 20));
+       printf(" %02x", _mm256_extract_epi8(n, 21));
+       printf(" %02x", _mm256_extract_epi8(n, 22));
+       printf(" %02x", _mm256_extract_epi8(n, 23));
+       printf(" ");
+       printf(" %02x", _mm256_extract_epi8(n, 24));
+       printf(" %02x", _mm256_extract_epi8(n, 25));
+       printf(" %02x", _mm256_extract_epi8(n, 26));
+       printf(" %02x", _mm256_extract_epi8(n, 27));
+       printf(" %02x", _mm256_extract_epi8(n, 28));
+       printf(" %02x", _mm256_extract_epi8(n, 29));
+       printf(" %02x", _mm256_extract_epi8(n, 30));
+       printf(" %02x", _mm256_extract_epi8(n, 31));
+       printf("\n");
+}
+#endif
+
 // Does a memcpy and memchr in one to reduce processing time.
 // Note that the benefit is somewhat limited if your L3 cache is small,
 // as you'll (unfortunately) spend most of the time loading the data
@@ -574,7 +620,7 @@ void BMUSBCapture::usb_thread_func()
        }
 }
 
-void BMUSBCapture::start_bm_capture()
+void BMUSBCapture::configure_card()
 {
        if (video_frame_allocator == nullptr) {
                set_video_frame_allocator(new MallocFrameAllocator(FRAME_SIZE));  // FIXME: leak.
@@ -586,7 +632,6 @@ void BMUSBCapture::start_bm_capture()
 
        int rc;
        struct libusb_transfer *xfr;
-       vector<libusb_transfer *> iso_xfrs;
 
        rc = libusb_init(nullptr);
        if (rc < 0) {
@@ -594,7 +639,9 @@ void BMUSBCapture::start_bm_capture()
                exit(1);
        }
 
-       struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, 0x1edb, 0xbd3b);
+       //struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, 0x1edb, 0xbd3b);
+       //struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, 0x1edb, 0xbd4f);
+       struct libusb_device_handle *devh = libusb_open_device_with_vid_pid(nullptr, vid, pid);
        if (!devh) {
                fprintf(stderr, "Error finding USB device\n");
                exit(1);
@@ -717,59 +764,6 @@ void BMUSBCapture::start_bm_capture()
        static const ctrl ctrls[] = {
                { LIBUSB_ENDPOINT_IN,  214, 16, 0 },
                { LIBUSB_ENDPOINT_IN,  214,  0, 0 },
-               { LIBUSB_ENDPOINT_IN,  214,  0, 0 },
-               { LIBUSB_ENDPOINT_IN,  214,  4, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 16, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 20, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 24, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 28, 0 },
-               { LIBUSB_ENDPOINT_IN,  215, 32, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 36, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  216, 44, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 48, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 52, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 24, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 24, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },  // packet 354
-               { LIBUSB_ENDPOINT_IN,  214, 24, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 12, 0 },
-               { LIBUSB_ENDPOINT_IN,  214, 40, 0 },
-               // more...
-               //{ LIBUSB_ENDPOINT_OUT, 215,  0, 0x80000100 },
-               //{ LIBUSB_ENDPOINT_OUT, 215,  0, 0x09000000 },  // wow, some kind of mode
 
                // seems to capture on HDMI, clearing the 0x20000000 bit seems to activate 10-bit
                // capture (v210).
@@ -779,46 +773,10 @@ void BMUSBCapture::start_bm_capture()
                // 0x3c000000 = composite video? (analog audio)
                // 0x3e000000 = s-video? (analog audio)
                { LIBUSB_ENDPOINT_OUT, 215,  0, 0x29000000 },
+               //{ LIBUSB_ENDPOINT_OUT, 215,  0, 0x80000100 },
                //{ LIBUSB_ENDPOINT_OUT, 215,  0, 0x09000000 },
-
-               //{ LIBUSB_ENDPOINT_OUT, 215, 28, 0xffffffff },
-               //{ LIBUSB_ENDPOINT_OUT, 215, 32, 0xffffffff },
-               //{ LIBUSB_ENDPOINT_OUT, 215, 28, 0x40404040 },
-               //{ LIBUSB_ENDPOINT_OUT, 215, 32, 0x40404040 },
-               //{ LIBUSB_ENDPOINT_OUT, 215, 36, 0x8036802a },
                { LIBUSB_ENDPOINT_OUT, 215, 24, 0x73c60001 },  // latch for frame start?
-               //{ LIBUSB_ENDPOINT_OUT, 215, 24, 0x13370001 },  // latch for frame start?
                { LIBUSB_ENDPOINT_IN,  214, 24, 0 },  // 
-               //{ LIBUSB_ENDPOINT_OUT, 215,  4, 0x00000000 },  // appears to have no e fect
-               //{ LIBUSB_ENDPOINT_OUT, 215,  8, 0x00000000 },  // appears to have no effect
-               //{ LIBUSB_ENDPOINT_OUT, 215, 20, 0x00000000 },  // appears to have no effect
-               //{ LIBUSB_ENDPOINT_OUT, 215, 28, 0x00000000 },  // appears to have no effect
-               //{ LIBUSB_ENDPOINT_OUT, 215, 32, 0x00000000 },  // appears to have no effect
-               //{ LIBUSB_ENDPOINT_OUT, 215, 36, 0x00000000 },  // appears to have no effect
-#if 0
-               { LIBUSB_ENDPOINT_OUT, 215,  0 },
-               { LIBUSB_ENDPOINT_OUT, 215,  0 },
-               { LIBUSB_ENDPOINT_OUT, 215, 28 },
-               { LIBUSB_ENDPOINT_OUT, 215, 32 },
-               { LIBUSB_ENDPOINT_OUT, 215, 36 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215,  0 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-               { LIBUSB_ENDPOINT_OUT, 215, 24 },
-#endif
        };
 
        for (unsigned req = 0; req < sizeof(ctrls) / sizeof(ctrls[0]); ++req) {
@@ -918,7 +876,7 @@ void BMUSBCapture::start_bm_capture()
                                        size &= ~1023;
                                        size += 1024;
                                }
-                               num_iso_pack = (2 << 20) / size;  // 2 MB.
+                               num_iso_pack = (2 << 18) / size;  // 512 kB.
                                printf("Picking %d packets of 0x%x bytes each\n", num_iso_pack, size);
                        } else {
                                size = 0xc0;
@@ -941,24 +899,24 @@ void BMUSBCapture::start_bm_capture()
                        iso_xfrs.push_back(xfr);
                }
        }
+}
 
-       {
-               int i = 0;
-               for (libusb_transfer *xfr : iso_xfrs) {
-                       rc = libusb_submit_transfer(xfr);
-                       ++i;
-                       if (rc < 0) {
-                               //printf("num_bytes=%d\n", num_bytes);
-                               fprintf(stderr, "Error submitting iso to endpoint 0x%02x, number %d: %s\n",
-                                       xfr->endpoint, i, libusb_error_name(rc));
-                               exit(1);
-                       }
+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) {
+                       //printf("num_bytes=%d\n", num_bytes);
+                       fprintf(stderr, "Error submitting iso to endpoint 0x%02x, number %d: %s\n",
+                               xfr->endpoint, i, libusb_error_name(rc));
+                       exit(1);
                }
        }
 
-       should_quit = false;
-       usb_thread = thread(&BMUSBCapture::usb_thread_func, this);
-
 
 #if 0
        libusb_release_interface(devh, 0);
@@ -970,7 +928,13 @@ out:
 #endif
 }
 
-void BMUSBCapture::stop_bm_capture()
+void BMUSBCapture::start_bm_thread()
+{
+       should_quit = false;
+       usb_thread = thread(&BMUSBCapture::usb_thread_func);
+}
+
+void BMUSBCapture::stop_bm_thread()
 {
        should_quit = true;
        usb_thread.join();
Unnamed repository; edit this file 'description' to name the repository.