X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.h;h=4c7254bcb5dea6bb773381c510565cea37035839;hb=653fb04b1f7fd18a3361524aeb4877efca032cdb;hp=8178ac0ba3e992fd1a6cb350143c9b9cb57ca12f;hpb=753cbaf5cec7411bdfe5171404c8586b8015faec;p=bmusb

diff --git a/bmusb.h b/bmusb.h
index 8178ac0..4c7254b 100644
--- a/bmusb.h
+++ b/bmusb.h
@@ -6,12 +6,14 @@
 #include <condition_variable>
 #include <deque>
 #include <functional>
+#include <map>
 #include <mutex>
 #include <stack>
 #include <string>
 #include <thread>
 #include <vector>
 
+struct libusb_device_handle;
 struct libusb_transfer;
 
 // An interface for frame allocators; if you do not specify one
@@ -80,7 +82,6 @@ private:
 
 // Represents an input mode you can tune a card to.
 struct VideoMode {
-	uint32_t id = 0;
 	std::string name;
 	bool autodetect = false;  // If true, all the remaining fields are irrelevant.
 	unsigned width = 0, height = 0;
@@ -113,10 +114,18 @@ class CaptureInterface {
  public:
 	virtual ~CaptureInterface() {}
 
-	virtual std::vector<VideoMode> get_available_video_modes() const = 0;
-
+	virtual std::map<uint32_t, VideoMode> get_available_video_modes() const = 0;
+	virtual uint32_t get_current_video_mode() const = 0;
 	virtual void set_video_mode(uint32_t video_mode_id) = 0;
 
+	virtual std::map<uint32_t, std::string> get_available_video_inputs() const = 0;
+	virtual void set_video_input(uint32_t video_input_id) = 0;
+	virtual uint32_t get_current_video_input() const = 0;
+
+	virtual std::map<uint32_t, std::string> get_available_audio_inputs() const = 0;
+	virtual void set_audio_input(uint32_t audio_input_id) = 0;
+	virtual uint32_t get_current_audio_input() const = 0;
+
 	// Does not take ownership.
 	virtual void set_video_frame_allocator(FrameAllocator *allocator) = 0;
 
@@ -152,14 +161,25 @@ class BMUSBCapture : public CaptureInterface {
 
 	~BMUSBCapture() {}
 
-	std::vector<VideoMode> get_available_video_modes() const override;
-
+	std::map<uint32_t, VideoMode> get_available_video_modes() const override;
+	uint32_t get_current_video_mode() const override;
 	void set_video_mode(uint32_t video_mode_id) override;
 
+	virtual std::map<uint32_t, std::string> get_available_video_inputs() const override;
+	virtual void set_video_input(uint32_t video_input_id) override;
+	virtual uint32_t get_current_video_input() const override { return current_video_input; }
+
+	virtual std::map<uint32_t, std::string> get_available_audio_inputs() const override;
+	virtual void set_audio_input(uint32_t audio_input_id) override;
+	virtual uint32_t get_current_audio_input() const override { return current_audio_input; }
+
 	// Does not take ownership.
 	void set_video_frame_allocator(FrameAllocator *allocator) override
 	{
 		video_frame_allocator = allocator;
+		if (owned_video_frame_allocator.get() != allocator) {
+			owned_video_frame_allocator.reset();
+		}
 	}
 
 	FrameAllocator *get_video_frame_allocator() override
@@ -171,6 +191,9 @@ class BMUSBCapture : public CaptureInterface {
 	void set_audio_frame_allocator(FrameAllocator *allocator) override
 	{
 		audio_frame_allocator = allocator;
+		if (owned_audio_frame_allocator.get() != allocator) {
+			owned_audio_frame_allocator.reset();
+		}
 	}
 
 	FrameAllocator *get_audio_frame_allocator() override
@@ -220,6 +243,8 @@ class BMUSBCapture : public CaptureInterface {
 	static void usb_thread_func();
 	static void cb_xfr(struct libusb_transfer *xfr);
 
+	void update_capture_mode();
+
 	std::string description;
 
 	FrameAllocator::Frame current_video_frame;
@@ -232,6 +257,8 @@ class BMUSBCapture : public CaptureInterface {
 
 	FrameAllocator *video_frame_allocator = nullptr;
 	FrameAllocator *audio_frame_allocator = nullptr;
+	std::unique_ptr<FrameAllocator> owned_video_frame_allocator;
+	std::unique_ptr<FrameAllocator> owned_audio_frame_allocator;
 	frame_callback_t frame_callback = nullptr;
 
 	std::thread dequeue_thread;
@@ -248,6 +275,10 @@ class BMUSBCapture : public CaptureInterface {
 	int card_index;
 	std::vector<libusb_transfer *> iso_xfrs;
 	int assumed_frame_width = 1280;
+
+	libusb_device_handle *devh = nullptr;
+	uint32_t current_video_input = 0x00000000;  // HDMI/SDI.
+	uint32_t current_audio_input = 0x00000000;  // Embedded.
 };
 
 // Get details for the given video format; returns false if detection was incomplete.