Return second field offset for interlaced modes (1080i only for now).

[bmusb] / bmusb.h

diff --git a/bmusb.h b/bmusb.h
index c7a5224d4ad31a41f5846123dc363a8be4c3fd46..d47ce8e85c4541be65dcd89c7b10ed727781b153 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -25,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;
 
@@ -63,8 +64,8 @@ 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)
+       BMUSBCapture(int card_index)
+               : card_index(card_index)
        {
        }
 
@@ -105,6 +106,7 @@ class BMUSBCapture {
 
        void configure_card();
        void start_bm_capture();
+       void stop_dequeue_thread();
 
        static void start_bm_thread();
        static void stop_bm_thread();
@@ -120,7 +122,7 @@ 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();
 
        static void usb_thread_func();
        static void cb_xfr(struct libusb_transfer *xfr);
@@ -137,6 +139,8 @@ class BMUSBCapture {
        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;
@@ -146,8 +150,18 @@ class BMUSBCapture {
        static constexpr int NUM_BMUSB_REGISTERS = 60;
        uint8_t register_file[NUM_BMUSB_REGISTERS];
 
-       int vid, pid;
+       int card_index;
        std::vector<libusb_transfer *> iso_xfrs;
+       int assumed_frame_width = 1280;
 };
 
+// Get details for the given video format; returns false if detection was incomplete.
+// Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1.
+// "second_field_start" is only valid for interlaced modes; it signifies
+// how many lines from the very top of the frame there are before the second field
+// starts (so it will always be >= height/2 + extra_lines_top).
+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);
+
 #endif