Fix DeckLink capture using the 11.7 or newer drivers.

[nageru] / nageru / mixer.cpp

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 2fdbf645e876d89cc39022a411d75f2e92016ba3..3a137d68a9b0d39b2a52388f699be0b9fa004c4b 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -234,6 +234,16 @@ void JitterHistory::unregister_metrics(const vector<pair<string, string>> &label
 
 void JitterHistory::frame_arrived(steady_clock::time_point now, int64_t frame_duration, size_t dropped_frames)
 {
+       if (frame_duration != last_duration) {
+               // If the frame rate changed, the input clock is also going to change,
+               // so our historical data doesn't make much sense anymore.
+               // Also, format changes typically introduce blips that are not representative
+               // of the typical frame stream. (We make the assumption that format changes
+               // don't happen all the time in regular use; if they did, we should probably
+               // rather keep the history so that we take jitter they may introduce into account.)
+               clear();
+               last_duration = frame_duration;
+       }
        if (expected_timestamp > steady_clock::time_point::min()) {
                expected_timestamp += dropped_frames * nanoseconds(frame_duration * 1000000000 / TIMEBASE);
                double jitter_seconds = fabs(duration<double>(expected_timestamp - now).count());
@@ -419,7 +429,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 
                                DeckLinkCapture *capture = new DeckLinkCapture(decklink, card_index);
                                DeckLinkOutput *output = new DeckLinkOutput(resource_pool.get(), decklink_output_surface, global_flags.width, global_flags.height, card_index);
-                               if (!output->set_device(decklink)) {
+                               if (!output->set_device(decklink, capture->get_input())) {
                                        delete output;
                                        output = nullptr;
                                }