Add rescaling variants to all the chains in the theme.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index f28ea378f8f48410ad890f24df1c144da07a6162..74d2bf6f19b79466f1e8d7858563e0f7d64fdd77 100644 (file)
--- 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)
@@ -146,8 +145,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
                cards[card_index].usb->start_bm_capture();
        }
 
-       //chain->enable_phase_timing(true);
-
        // Set up stuff for NV12 conversion.
 
        // Cb/Cr shader.
@@ -345,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);
@@ -355,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.
@@ -560,6 +557,7 @@ void Mixer::thread_func()
                Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state);
                EffectChain *chain = theme_main_chain.chain;
                theme_main_chain.setup_chain();
+               //theme_main_chain.chain->enable_phase_timing(true);
 
                GLuint y_tex, cbcr_tex;
                bool got_frame = h264_encoder->begin_frame(&y_tex, &cbcr_tex);