Newer drivers can seemingly send completions out-of-order on shutdown, so adjust...

[nageru] / nageru / decklink_output.h

diff --git a/nageru/decklink_output.h b/nageru/decklink_output.h
index 90b89a22a18f1f6e0de7a9352d94d437415f79f3..f008dc3b32bec8f0c1aba542c4d3de3a8167b047 100644 (file)
--- 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,8 +39,13 @@ class QSurface;
 class DeckLinkOutput : public IDeckLinkVideoOutputCallback {
 public:
        DeckLinkOutput(movit::ResourcePool *resource_pool, QSurface *surface, unsigned width, unsigned height, unsigned card_index);
+       ~DeckLinkOutput();
 
-       bool set_device(IDeckLink *output);
+       // 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);  // Mode comes from get_available_video_modes().
        void end_output();
 
@@ -133,7 +140,8 @@ 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;
        int64_t base_pts, frame_duration;
@@ -141,6 +149,7 @@ private:
        bool last_frame_had_mode_mismatch = false;
 
        movit::ResourcePool *resource_pool;
+       IDeckLinkInput *input = nullptr;
        IDeckLinkOutput *output = nullptr;
        BMDVideoConnection video_connection;
        QSurface *surface;