In the MJPEG export, include white balance information.

[nageru] / nageru / mixer.cpp

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 91c82d4ca6378ffe20054429610ca0429f5070f0..1457aa92316e56400563feeea8a0185b5c76fb4e 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #include <epoxy/egl.h>
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
 #include <movit/flat_input.h>
@@ -1117,7 +1118,8 @@ void Mixer::thread_func()
                        if (new_frame->frame->data_copy != nullptr) {
                                int mjpeg_card_index = mjpeg_encoder->get_mjpeg_stream_for_card(card_index);
                                if (mjpeg_card_index != -1) {
-                                       mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]));
+                                       RGBTriplet white_balance = theme->get_white_balance_for_signal(card_index);
+                                       mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]), white_balance);
                                }
                        }
                }
@@ -1270,7 +1272,7 @@ start:
                                // we dropped. (may_have_dropped_last_frame is set whenever we
                                // trim the queue completely away, and cleared when we actually
                                // get a new frame.)
-                               ((CEFCapture *)card->capture.get())->request_new_frame();
+                               ((CEFCapture *)card->capture.get())->request_new_frame(/*ignore_if_locked=*/true);
                        }
 #endif
                } else {