X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=f3d975c6d7757a1e049b6eac88377f5362bd34fb;hb=b52fb85a67eefa93ad976d3881a9491dfdbd615d;hp=b7e720d2feb6dbaffb3ead7ac17689620bee4e42;hpb=86f32b5a80b232e6d824776a87ecc1b5f8fbfa96;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index b7e720d..f3d975c 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -10,12 +10,12 @@
 #include <movit/flat_input.h>
 #include <movit/image_format.h>
 #include <movit/resource_pool.h>
+#include <movit/util.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <time.h>
-#include <util.h>
 #include <algorithm>
 #include <cmath>
 #include <condition_variable>
@@ -316,6 +316,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 			card->new_data_ready = true;
 			card->new_frame = RefCountedFrame(FrameAllocator::Frame());
 			card->new_frame_length = frame_length;
+			card->new_frame_interlaced = false;
 			card->new_data_ready_fence = nullptr;
 			card->dropped_frames = dropped_frames;
 			card->new_data_ready_changed.notify_all();
@@ -415,6 +416,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 			card->new_frame = new_frame;
 			card->new_frame_length = frame_length;
 			card->new_frame_field = field;
+			card->new_frame_interlaced = interlaced;
 			card->new_data_ready_fence = fence;
 			card->dropped_frames = dropped_frames;
 			card->new_data_ready_changed.notify_all();
@@ -461,6 +463,7 @@ void Mixer::thread_func()
 				card_copy[card_index].new_frame = card->new_frame;
 				card_copy[card_index].new_frame_length = card->new_frame_length;
 				card_copy[card_index].new_frame_field = card->new_frame_field;
+				card_copy[card_index].new_frame_interlaced = card->new_frame_interlaced;
 				card_copy[card_index].new_data_ready_fence = card->new_data_ready_fence;
 				card_copy[card_index].dropped_frames = card->dropped_frames;
 				card->new_data_ready = false;