X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fdecklink_output.h;h=4aa76beca45df780d86d758401319cdeb7063005;hb=d35a697e031264d9102a52b5f41d9f4c057e9f11;hp=90b89a22a18f1f6e0de7a9352d94d437415f79f3;hpb=4a38970b4e8cd4bce1dd9eabd56a45635501bbc3;p=nageru

diff --git a/nageru/decklink_output.h b/nageru/decklink_output.h
index 90b89a2..4aa76be 100644
--- a/nageru/decklink_output.h
+++ b/nageru/decklink_output.h
@@ -7,10 +7,12 @@
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
+#include <deque>
 #include <memory>
 #include <mutex>
 #include <queue>
 #include <thread>
+#include <unordered_set>
 #include <vector>
 
 #include "DeckLinkAPI.h"
@@ -37,9 +39,14 @@ class QSurface;
 class DeckLinkOutput : public IDeckLinkVideoOutputCallback {
 public:
 	DeckLinkOutput(movit::ResourcePool *resource_pool, QSurface *surface, unsigned width, unsigned height, unsigned card_index);
-
-	bool set_device(IDeckLink *output);
-	void start_output(uint32_t mode, int64_t base_pts);  // Mode comes from get_available_video_modes().
+	~DeckLinkOutput();
+
+	// The IDecklinkInput argument is to work around a bug
+	// in the 11.7 and newer drivers against older SDKs,
+	// where you get a freeze if querying an IDeckLinkInput interface
+	// on an already-started card.
+	bool set_device(IDeckLink *decklink, IDeckLinkInput *input_arg);
+	void start_output(uint32_t mode, int64_t base_pts, bool is_master_card);  // Mode comes from get_available_video_modes().
 	void end_output();
 
 	void send_frame(GLuint y_tex, GLuint cbcr_tex, movit::YCbCrLumaCoefficients ycbcr_coefficients, const std::vector<RefCountedFrame> &input_frames, int64_t pts, int64_t duration);
@@ -133,14 +140,16 @@ private:
 	std::mutex frame_queue_mutex;
 	std::queue<std::unique_ptr<Frame>> pending_video_frames;  // Under <frame_queue_mutex>.
 	std::queue<std::unique_ptr<Frame>> frame_freelist;  // Under <frame_queue_mutex>.
-	int num_frames_in_flight = 0;  // Number of frames allocated but not on the freelist. Under <frame_queue_mutex>.
+	std::unordered_set<Frame *> scheduled_frames;  // Owned by the driver, so no unique_ptr. Under <frame_queue_mutex>.
+
 	std::condition_variable frame_queues_changed;
-	bool playback_initiated = false, playback_started = false;
+	bool playback_initiated = false, playback_started = false, is_master_card = false;
 	int64_t base_pts, frame_duration;
 	BMDDisplayModeFlags current_mode_flags = 0;
 	bool last_frame_had_mode_mismatch = false;
 
 	movit::ResourcePool *resource_pool;
+	IDeckLinkInput *input = nullptr;
 	IDeckLinkOutput *output = nullptr;
 	BMDVideoConnection video_connection;
 	QSurface *surface;