Release Nageru 1.7.2.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index c3e82dacc07b5e9827ea66e218c5023628dbfcfd..bf537de2dbdb0806d2c41fec0b8ebf3fcd74d8e7 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -33,11 +33,23 @@ class QMouseEvent;
 #include <movit/util.h>
 #include <string>
 
-
 using namespace movit;
 using namespace std;
 using namespace std::placeholders;
 
+namespace {
+
+double srgb_to_linear(double x)
+{
+       if (x < 0.04045) {
+               return x / 12.92;
+       } else {
+               return pow((x + 0.055) / 1.055, 2.4);
+       }
+}
+
+}  // namespace
+
 GLWidget::GLWidget(QWidget *parent)
     : QGLWidget(parent, global_share_widget)
 {
@@ -56,6 +68,22 @@ void GLWidget::shutdown()
        global_mixer->remove_frame_ready_callback(output, this);
 }
 
+void GLWidget::grab_white_balance(unsigned channel, unsigned x, unsigned y)
+{
+       // Set the white balance to neutral for the grab. It's probably going to
+       // flicker a bit, but hopefully this display is not live anyway.
+       global_mixer->set_wb(output, 0.5, 0.5, 0.5);
+       global_mixer->wait_for_next_frame();
+
+       // Mark that the next paintGL() should grab the given pixel.
+       grab_x = x;
+       grab_y = y;
+       grab_output = Mixer::Output(Mixer::OUTPUT_INPUT0 + channel);
+       should_grab = true;
+
+       updateGL();
+}
+
 void GLWidget::initializeGL()
 {
        static once_flag flag;
@@ -122,6 +150,17 @@ void GLWidget::paintGL()
        } else {
                assert(resource_pool == frame.chain->get_resource_pool());
        }
+
+       if (should_grab) {
+               GLfloat reference_color[4];
+               glReadPixels(grab_x, current_height - grab_y - 1, 1, 1, GL_BGRA, GL_FLOAT, reference_color);
+
+               double r = srgb_to_linear(reference_color[2]);
+               double g = srgb_to_linear(reference_color[1]);
+               double b = srgb_to_linear(reference_color[0]);
+               global_mixer->set_wb(grab_output, r, g, b);
+               should_grab = false;
+       }
 }
 
 void GLWidget::mousePressEvent(QMouseEvent *event)
@@ -176,6 +215,18 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
        QMenu card_submenu;
        QActionGroup card_group(&card_submenu);
 
+       QMenu interpretation_submenu;
+       QActionGroup interpretation_group(&interpretation_submenu);
+
+       QMenu video_input_submenu;
+       QActionGroup video_input_group(&video_input_submenu);
+
+       QMenu audio_input_submenu;
+       QActionGroup audio_input_group(&audio_input_submenu);
+
+       QMenu mode_submenu;
+       QActionGroup mode_group(&mode_submenu);
+
        unsigned num_cards = global_mixer->get_num_cards();
        unsigned current_card = global_mixer->map_signal(signal_num);
        bool is_ffmpeg = global_mixer->card_is_ffmpeg(current_card);
@@ -197,9 +248,6 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
 
                // Note that this setting depends on which card is active.
 
-               QMenu interpretation_submenu;
-               QActionGroup interpretation_group(&interpretation_submenu);
-
                YCbCrInterpretation current_interpretation = global_mixer->get_input_ycbcr_interpretation(current_card);
                {
                        QAction *action = new QAction("Auto", &interpretation_group);
@@ -250,8 +298,6 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
                }
        } else {
                // Add a submenu for selecting video input, with an action for each input.
-               QMenu video_input_submenu;
-               QActionGroup video_input_group(&video_input_submenu);
                std::map<uint32_t, string> video_inputs = global_mixer->get_available_video_inputs(current_card);
                uint32_t current_video_input = global_mixer->get_current_video_input(current_card);
                for (const auto &mode : video_inputs) {
@@ -269,8 +315,6 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
                menu.addMenu(&video_input_submenu);
 
                // The same for audio input.
-               QMenu audio_input_submenu;
-               QActionGroup audio_input_group(&audio_input_submenu);
                std::map<uint32_t, string> audio_inputs = global_mixer->get_available_audio_inputs(current_card);
                uint32_t current_audio_input = global_mixer->get_current_audio_input(current_card);
                for (const auto &mode : audio_inputs) {
@@ -288,8 +332,6 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
                menu.addMenu(&audio_input_submenu);
 
                // The same for resolution.
-               QMenu mode_submenu;
-               QActionGroup mode_group(&mode_submenu);
                std::map<uint32_t, bmusb::VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
                uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card);
                for (const auto &mode : video_modes) {