X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=cccfa3af631b6d869255cf8f3b06addc2019c1dc;hb=327534a3031a332423411c9599c741f2f81657df;hp=0dd4a569aea3c458a14771bba3ff953d8afe538a;hpb=e5ea0b2dca8a04baeccd52b8a3c327b3a234c8ef;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index 0dd4a56..cccfa3a 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -32,6 +32,8 @@ class QMouseEvent;
 #include <movit/util.h>
 #include <string>
 
+
+using namespace movit;
 using namespace std;
 using namespace std::placeholders;
 
@@ -40,12 +42,17 @@ GLWidget::GLWidget(QWidget *parent)
 {
 }
 
-void GLWidget::clean_context()
+GLWidget::~GLWidget()
+{
+}
+
+void GLWidget::shutdown()
 {
 	if (resource_pool != nullptr) {
 		makeCurrent();
 		resource_pool->clean_context();
 	}
+	global_mixer->remove_frame_ready_callback(output, this);
 }
 
 void GLWidget::initializeGL()
@@ -57,16 +64,13 @@ void GLWidget::initializeGL()
 		global_mainwindow->mixer_created(global_mixer);
 		global_mixer->start();
 	});
-	global_mixer->set_frame_ready_callback(output, [this]{
+	global_mixer->add_frame_ready_callback(output, this, [this]{
 		QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
 	});
 	if (output == Mixer::OUTPUT_LIVE) {
 		global_mixer->set_transition_names_updated_callback(output, [this](const vector<string> &names){
 			emit transition_names_updated(names);
 		});
-		setContextMenuPolicy(Qt::CustomContextMenu);
-		connect(this, &QWidget::customContextMenuRequested,
-			bind(&GLWidget::show_live_context_menu, this, _1));
 	}
 	if (output >= Mixer::OUTPUT_INPUT0) {
 		global_mixer->set_name_updated_callback(output, [this](const string &name){
@@ -75,14 +79,9 @@ void GLWidget::initializeGL()
 		global_mixer->set_color_updated_callback(output, [this](const string &color){
 			emit color_updated(output, color);
 		});
-
-		int signal_num = global_mixer->get_channel_signal(output);
-		if (signal_num != -1) {
-			setContextMenuPolicy(Qt::CustomContextMenu);
-			connect(this, &QWidget::customContextMenuRequested,
-			        bind(&GLWidget::show_preview_context_menu, this, signal_num, _1));
-		}
 	}
+	setContextMenuPolicy(Qt::CustomContextMenu);
+	connect(this, &QWidget::customContextMenuRequested, bind(&GLWidget::show_context_menu, this, _1));
 
 	glDisable(GL_BLEND);
 	glDisable(GL_DEPTH_TEST);
@@ -91,6 +90,8 @@ void GLWidget::initializeGL()
 
 void GLWidget::resizeGL(int width, int height)
 {
+	current_width = width;
+	current_height = height;
 	glViewport(0, 0, width, height);
 }
 
@@ -110,7 +111,9 @@ void GLWidget::paintGL()
 	check_error();
 	frame.setup_chain();
 	check_error();
-	frame.chain->render_to_screen();
+	glDisable(GL_FRAMEBUFFER_SRGB);
+	check_error();
+	frame.chain->render_to_fbo(0, current_width, current_height);
 	check_error();
 
 	if (resource_pool == nullptr) {
@@ -125,6 +128,19 @@ void GLWidget::mousePressEvent(QMouseEvent *event)
 	emit clicked();
 }
 
+void GLWidget::show_context_menu(const QPoint &pos)
+{
+	if (output == Mixer::OUTPUT_LIVE) {
+		show_live_context_menu(pos);
+	}
+	if (output >= Mixer::OUTPUT_INPUT0) {
+		int signal_num = global_mixer->get_channel_signal(output);
+		if (signal_num != -1) {
+			show_preview_context_menu(signal_num, pos);
+		}
+	}
+}
+
 void GLWidget::show_live_context_menu(const QPoint &pos)
 {
 	QPoint global_pos = mapToGlobal(pos);
@@ -175,6 +191,48 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
 	card_submenu.setTitle("Input source");
 	menu.addMenu(&card_submenu);
 
+	// Note that this setting depends on which card is active.
+	// TODO: Consider hiding this for BGRA sources.
+
+	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);
+		action->setCheckable(true);
+		if (current_interpretation.ycbcr_coefficients_auto) {
+			action->setChecked(true);
+		}
+		action->setData(QList<QVariant>{"interpretation", true, YCBCR_REC_709, false});
+		interpretation_submenu.addAction(action);
+	}
+	for (YCbCrLumaCoefficients ycbcr_coefficients : { YCBCR_REC_709, YCBCR_REC_601 }) {
+		for (bool full_range : { false, true }) {
+			std::string description;
+			if (ycbcr_coefficients == YCBCR_REC_709) {
+				description = "Rec. 709 (HD)";
+			} else {
+				description = "Rec. 601 (SD)";
+			}
+			if (full_range) {
+				description += ", full range (nonstandard)";
+			}
+			QAction *action = new QAction(QString::fromStdString(description), &interpretation_group);
+			action->setCheckable(true);
+			if (!current_interpretation.ycbcr_coefficients_auto &&
+			    ycbcr_coefficients == current_interpretation.ycbcr_coefficients &&
+			    full_range == current_interpretation.full_range) {
+				action->setChecked(true);
+			}
+			action->setData(QList<QVariant>{"interpretation", false, ycbcr_coefficients, full_range});
+			interpretation_submenu.addAction(action);
+		}
+	}
+
+	interpretation_submenu.setTitle("Input interpretation");
+	menu.addMenu(&interpretation_submenu);
+
 	// --- The choices in the next few options depend a lot on which card is active ---
 
 	// Add a submenu for selecting video input, with an action for each input.
@@ -298,6 +356,12 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
 		} else if (selected[0].toString() == "card") {
 			unsigned card_index = selected[1].toUInt(nullptr);
 			global_mixer->set_signal_mapping(signal_num, card_index);
+		} else if (selected[0].toString() == "interpretation") {
+			YCbCrInterpretation interpretation;
+			interpretation.ycbcr_coefficients_auto = selected[1].toBool();
+			interpretation.ycbcr_coefficients = YCbCrLumaCoefficients(selected[2].toUInt(nullptr));
+			interpretation.full_range = selected[3].toBool();
+			global_mixer->set_input_ycbcr_interpretation(current_card, interpretation);
 		} else {
 			assert(false);
 		}