Transparently send signals through a deinterlacer as needed.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 02f4dd29c33e3afbf1b09fb8f75cfa528d195fb1..74d2bf6f19b79466f1e8d7858563e0f7d64fdd77 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -342,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);
@@ -352,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.