Send the audio format explicitly down, not just the ID.

[bmusb] / bmusb.h

diff --git a/bmusb.h b/bmusb.h
index 6fdddedeb6e1d5781d8a9128cf67b5525fd5ef33..5b7c0f9c8e35a501c91bf40bdc81fb8d79f3770f 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -57,48 +57,94 @@ class FrameAllocator {
        virtual void release_frame(Frame frame) = 0;
 };
 
+struct VideoFormat {
+       uint16_t id = 0;  // For debugging/logging only.
+       unsigned width = 0, height = 0, second_field_start = 0;
+       unsigned extra_lines_top = 0, extra_lines_bottom = 0;
+       unsigned frame_rate_nom = 0, frame_rate_den = 0;
+       bool interlaced = false;
+       bool has_signal = false;
+};
+
+struct AudioFormat {
+       uint16_t id = 0;  // For debugging/logging only.
+       unsigned bits_per_sample = 0;
+       unsigned num_channels = 0;
+};
+
 typedef std::function<void(uint16_t timecode,
-                           FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
-                           FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format)>
+                           FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format,
+                           FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format)>
        frame_callback_t;
 
+class CaptureInterface {
+ public:
+       virtual ~CaptureInterface() {}
+
+       // Does not take ownership.
+       virtual void set_video_frame_allocator(FrameAllocator *allocator) = 0;
+
+       virtual FrameAllocator *get_video_frame_allocator() = 0;
+
+       // Does not take ownership.
+       virtual void set_audio_frame_allocator(FrameAllocator *allocator) = 0;
+
+       virtual FrameAllocator *get_audio_frame_allocator() = 0;
+
+       virtual void set_frame_callback(frame_callback_t callback) = 0;
+
+       // Needs to be run before configure_card().
+       virtual void set_dequeue_thread_callbacks(std::function<void()> init, std::function<void()> cleanup) = 0;
+
+       // Only valid after configure_card().
+       virtual std::string get_description() const = 0;
+
+       virtual void configure_card() = 0;
+
+       virtual void start_bm_capture() = 0;
+
+       virtual void stop_dequeue_thread() = 0;
+};
+
 // The actual capturing class, representing capture from a single card.
-class BMUSBCapture {
+class BMUSBCapture : public CaptureInterface {
  public:
        BMUSBCapture(int card_index)
                : card_index(card_index)
        {
        }
 
+       ~BMUSBCapture() {}
+
        // Does not take ownership.
-       void set_video_frame_allocator(FrameAllocator *allocator)
+       void set_video_frame_allocator(FrameAllocator *allocator) override
        {
                video_frame_allocator = allocator;
        }
 
-       FrameAllocator *get_video_frame_allocator()
+       FrameAllocator *get_video_frame_allocator() override
        {
                return video_frame_allocator;
        }
 
        // Does not take ownership.
-       void set_audio_frame_allocator(FrameAllocator *allocator)
+       void set_audio_frame_allocator(FrameAllocator *allocator) override
        {
                audio_frame_allocator = allocator;
        }
 
-       FrameAllocator *get_audio_frame_allocator()
+       FrameAllocator *get_audio_frame_allocator() override
        {
                return audio_frame_allocator;
        }
 
-       void set_frame_callback(frame_callback_t callback)
+       void set_frame_callback(frame_callback_t callback) override
        {
                frame_callback = callback;
        }
 
        // Needs to be run before configure_card().
-       void set_dequeue_thread_callbacks(std::function<void()> init, std::function<void()> cleanup)
+       void set_dequeue_thread_callbacks(std::function<void()> init, std::function<void()> cleanup) override
        {
                dequeue_init_callback = init;
                dequeue_cleanup_callback = cleanup;
@@ -106,14 +152,15 @@ class BMUSBCapture {
        }
 
        // Only valid after configure_card().
-       std::string get_description() const {
+       std::string get_description() const override {
                return description;
        }
 
-       void configure_card();
-       void start_bm_capture();
-       void stop_dequeue_thread();
+       void configure_card() override;
+       void start_bm_capture() override;
+       void stop_dequeue_thread() override;
 
+       // TODO: It's rather messy to have these outside the interface.
        static void start_bm_thread();
        static void stop_bm_thread();
 
@@ -168,8 +215,6 @@ class BMUSBCapture {
 // "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);
+bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format);
 
 #endif