Small format update.

[bmusb] / bmusb.h

diff --git a/bmusb.h b/bmusb.h
index e0531c2c3f552543b81b48a225b396e4b7974c67..b2725ab76dc5154e04a3b57797ed21c5182231f6 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -8,6 +8,9 @@
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <vector>
+
+struct libusb_transfer;
 
 // An interface for frame allocators; if you do not specify one
 // (using set_video_frame_allocator), a default one that pre-allocates
@@ -22,6 +25,7 @@ class FrameAllocator {
                uint8_t *data2 = nullptr;  // Only if interleaved == true.
                size_t len = 0;  // Number of bytes we actually have.
                size_t size = 0;  // Number of bytes we have room for.
+               size_t overflow = 0;
                void *userdata = nullptr;
                FrameAllocator *owner = nullptr;
 
@@ -60,6 +64,11 @@ typedef std::function<void(uint16_t timecode,
 // The actual capturing class, representing capture from a single card.
 class BMUSBCapture {
  public:
+       BMUSBCapture(int vid = 0x1edb, int pid = 0xbd3b)
+               : vid(vid), pid(pid)
+       {
+       }
+
        // Does not take ownership.
        void set_video_frame_allocator(FrameAllocator *allocator)
        {
@@ -87,8 +96,20 @@ class BMUSBCapture {
                frame_callback = callback;
        }
 
+       // Needs to be run before configure_card().
+       void set_dequeue_thread_callbacks(std::function<void()> init, std::function<void()> cleanup)
+       {
+               dequeue_init_callback = init;
+               dequeue_cleanup_callback = cleanup;
+               has_dequeue_callbacks = true;
+       }
+
+       void configure_card();
        void start_bm_capture();
-       void stop_bm_capture();
+       void stop_dequeue_thread();
+
+       static void start_bm_thread();
+       static void stop_bm_thread();
 
  private:
        struct QueuedFrame {
@@ -101,9 +122,9 @@ class BMUSBCapture {
        void start_new_frame(const uint8_t *start);
 
        void queue_frame(uint16_t format, uint16_t timecode, FrameAllocator::Frame frame, std::deque<QueuedFrame> *q);
-       void dequeue_thread();
+       void dequeue_thread_func();
 
-       void usb_thread_func();
+       static void usb_thread_func();
        static void cb_xfr(struct libusb_transfer *xfr);
 
        FrameAllocator::Frame current_video_frame;
@@ -114,17 +135,23 @@ class BMUSBCapture {
        std::deque<QueuedFrame> pending_video_frames;
        std::deque<QueuedFrame> pending_audio_frames;
 
-       std::thread usb_thread;
-       std::atomic<bool> should_quit;
-
        FrameAllocator *video_frame_allocator = nullptr;
        FrameAllocator *audio_frame_allocator = nullptr;
        frame_callback_t frame_callback = nullptr;
 
+       std::thread dequeue_thread;
+       std::atomic<bool> dequeue_thread_should_quit;
+       bool has_dequeue_callbacks = false;
+       std::function<void()> dequeue_init_callback = nullptr;
+       std::function<void()> dequeue_cleanup_callback = nullptr;
+
        int current_register = 0;
 
        static constexpr int NUM_BMUSB_REGISTERS = 60;
        uint8_t register_file[NUM_BMUSB_REGISTERS];
+
+       int vid, pid;
+       std::vector<libusb_transfer *> iso_xfrs;
 };
 
 #endif