X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=023424191ea6af800af0e219e56794adb19a5c30;hb=refs%2Ftags%2F1.7.4;hp=4287b7e56f8d4faf321f28221d432492ac54c1bd;hpb=36afa76e579a3afaaf6826a76f33baff049a54ed;p=nageru diff --git a/main.cpp b/main.cpp index 4287b7e..0234241 100644 --- a/main.cpp +++ b/main.cpp @@ -29,6 +29,7 @@ extern "C" { #include "image_input.h" #include "mainwindow.h" #include "mixer.h" +#include "quicksync_encoder.h" #ifdef HAVE_CEF CefRefPtr cef_app; @@ -55,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 @@ -90,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.