X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=37ac4a4ae226943cfb279ddc857f649770427fdd;hb=5cb4274907d32fb8946558988461224196c2be59;hp=53ba77d1441b1b5db1f705a7a4d6d941ab961d5f;hpb=9f1e8fb59e1b68b68b4bb1a05e1f4ee37ea47471;p=nageru

diff --git a/main.cpp b/main.cpp
index 53ba77d..37ac4a4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/mman.h>
 #include <epoxy/gl.h>
 
 #include <QApplication>
@@ -14,15 +15,22 @@ extern "C" {
 
 #include "context.h"
 #include "flags.h"
+#include "image_input.h"
 #include "mainwindow.h"
 #include "mixer.h"
 
 int main(int argc, char *argv[])
 {
-	setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
+	parse_flags(argc, argv);
+
+	if (global_flags.va_display.empty() ||
+	    global_flags.va_display[0] != '/') {
+		// We normally use EGL for zerocopy, but if we use VA against DRM
+		// instead of against X11, we turn it off, and then don't need EGL.
+		setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
+	}
 	setlinebuf(stdout);
 	av_register_all();
-	parse_flags(argc, argv);
 
 	QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
 	QApplication app(argc, argv);
@@ -33,6 +41,11 @@ int main(int argc, char *argv[])
 	fmt.setProfile(QSurfaceFormat::CoreProfile);
 	fmt.setMajorVersion(3);
 	fmt.setMinorVersion(1);
+
+	// Turn off vsync, since Qt generally gives us at most frame rate
+	// (display frequency) / (number of QGLWidgets active).
+	fmt.setSwapInterval(0);
+
 	QSurfaceFormat::setDefaultFormat(fmt);
 
 	QGLFormat::setDefaultFormat(QGLFormat::fromSurfaceFormat(fmt));
@@ -40,13 +53,29 @@ int main(int argc, char *argv[])
 	global_share_widget = new QGLWidget();
 
 	MainWindow mainWindow;
-	mainWindow.resize(QSize(1500, 685));
+	mainWindow.resize(QSize(1500, 850));
 	mainWindow.show();
 
 	app.installEventFilter(&mainWindow);  // For white balance color picking.
 
+	// Even on an otherwise unloaded system, it would seem writing the recording
+	// to disk (potentially terabytes of data as time goes by) causes Nageru
+	// to be pushed out of RAM. If we have the right privileges, simply lock us
+	// into memory for better realtime behavior.
+	if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) {
+		perror("mlockall()");
+		fprintf(stderr, "Failed to lock Nageru into RAM. You probably want to\n");
+		fprintf(stderr, "increase \"memlock\" for your user in limits.conf\n");
+		fprintf(stderr, "for better realtime behavior.\n");
+		uses_mlock = false;
+	} else {
+		uses_mlock = true;
+	}
+
 	int rc = app.exec();
 	global_mixer->quit();
+	mainWindow.mixer_shutting_down();
 	delete global_mixer;
+	ImageInput::shutdown_updaters();
 	return rc;
 }