X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=74d2bf6f19b79466f1e8d7858563e0f7d64fdd77;hb=f65089f8f99aa42e2dec6396a13e797aaafde903;hp=e928ed9945319b38eec6585e3b8b11fb3deb8a8d;hpb=3585603bd8c584eabf5b4b001f43cbf2c61f1b98;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index e928ed9..74d2bf6 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -74,7 +74,6 @@ void insert_new_frame(RefCountedFrame frame, unsigned field_num, bool interlaced
 	}
 }
 
-
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
@@ -343,9 +342,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	unsigned num_fields = interlaced ? 2 : 1;
 	timespec frame_upload_start;
 	if (interlaced) {
-		// NOTE: This isn't deinterlacing. This is just sending the two fields along
-		// as separate frames without considering anything like the half-field offset.
-		// We'll need to add a proper deinterlacer on the receiving side to get this right.
+		// Send the two fields along as separate frames; the other side will need to add
+		// a deinterlacer to actually get this right.
 		assert(height % 2 == 0);
 		height /= 2;
 		assert(frame_length % 2 == 0);
@@ -353,6 +351,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		num_fields = 2;
 		clock_gettime(CLOCK_MONOTONIC, &frame_upload_start);
 	}
+	userdata->last_interlaced = interlaced;
 	RefCountedFrame new_frame(video_frame);
 
 	// Upload the textures.