Release Nageru 1.7.4.

[nageru] / main.cpp

diff --git a/main.cpp b/main.cpp
index 65eade924ecc15e559c655e9fa47a9864ac65bdb..023424191ea6af800af0e219e56794adb19a5c30 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -13,20 +13,27 @@ extern "C" {
 #include <QSurfaceFormat>
 #include <string>
 
+#ifdef HAVE_CEF
 #include <cef_app.h>
 #include <cef_browser.h>
 #include <cef_client.h>
 #include <cef_version.h>
+#endif
 
 #include "basic_stats.h"
+#ifdef HAVE_CEF
 #include "nageru_cef_app.h"
+#endif
 #include "context.h"
 #include "flags.h"
 #include "image_input.h"
 #include "mainwindow.h"
 #include "mixer.h"
+#include "quicksync_encoder.h"
 
+#ifdef HAVE_CEF
 CefRefPtr<NageruCefApp> cef_app;
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -49,6 +56,13 @@ int main(int argc, char *argv[])
 
        parse_flags(PROGRAM_NAGERU, argc, argv);
 
+       if (global_flags.va_display.empty()) {
+               // The user didn't specify a VA-API display. See if the default works,
+               // and if not, let's try to help the user by seeing if there's any
+               // that would work automatically.
+               global_flags.va_display = QuickSyncEncoder::get_usable_va_display();
+       }
+
        if (global_flags.va_display.empty() ||
            global_flags.va_display[0] != '/') {
                // We normally use EGL for zerocopy, but if we use VA against DRM
@@ -84,7 +98,7 @@ int main(int argc, char *argv[])
        }
 
        MainWindow mainWindow;
-       mainWindow.resize(QSize(1500, 850));
+       mainWindow.resize(QSize(1500, 910));
        mainWindow.show();
 
        app.installEventFilter(&mainWindow);  // For white balance color picking.