Make for clean shutdown of the output cards.

diff --git a/decklink_output.cpp b/decklink_output.cpp
index 7fa689e547610c0fb14696349a87f3e445e42422..c5bf96b3a0c404f0f448535d5da3fd3a286641c1 100644 (file)
--- a/decklink_output.cpp
+++ b/decklink_output.cpp
@@ -63,8 +63,10 @@ void DeckLinkOutput::set_device(IDeckLink *decklink)
 void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 {
        assert(output);
+       assert(!playback_initiated);
 
        should_quit = false;
+       playback_initiated = true;
        playback_started = false;
        this->base_pts = base_pts;
 
@@ -153,9 +155,14 @@ void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 
 void DeckLinkOutput::end_output()
 {
+       if (!playback_initiated) {
+               return;
+       }
+
        should_quit = true;
        frame_queues_changed.notify_all();
        present_thread.join();
+       playback_initiated = false;
 
        output->StopScheduledPlayback(0, nullptr, 0);
        output->DisableVideoOutput();

diff --git a/decklink_output.h b/decklink_output.h
index 0545bb7d697971dc5a408297b5ed57ff310b7779..122c8fe702445804088a2aaf71d81e3053f57b18 100644 (file)
--- a/decklink_output.h
+++ b/decklink_output.h
@@ -117,7 +117,7 @@ private:
        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::condition_variable frame_queues_changed;
-       bool playback_started = false;
+       bool playback_initiated = false, playback_started = false;
        int64_t base_pts, frame_duration;
 
        movit::ResourcePool *resource_pool;

diff --git a/mixer.cpp b/mixer.cpp
index d55363fa1d367d12aba0cbfd564d327a9c2bfa51..0d32612776f67422a7dffe53d33382f40b407787 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -217,6 +217,10 @@ Mixer::~Mixer()
                        cards[card_index].new_frames_changed.notify_all();
                }
                cards[card_index].capture->stop_dequeue_thread();
+               if (cards[card_index].output) {
+                       cards[card_index].output->end_output();
+                       delete cards[card_index].output;
+               }
        }
 
        video_encoder.reset(nullptr);