From 19ef115f50710c0cd9708d69dfcc66ac77d77125 Mon Sep 17 00:00:00 2001 From: Valentin Vanelslande Date: Fri, 5 Oct 2018 07:22:26 -0500 Subject: [PATCH] Address comment --- src/citra_qt/camera/qt_multimedia_camera.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/citra_qt/camera/qt_multimedia_camera.cpp b/src/citra_qt/camera/qt_multimedia_camera.cpp index dabccac94..5c0b73f2b 100644 --- a/src/citra_qt/camera/qt_multimedia_camera.cpp +++ b/src/citra_qt/camera/qt_multimedia_camera.cpp @@ -172,9 +172,12 @@ void QtMultimediaCameraHandler::CreateCamera(const std::string& camera_name) { } settings.setMinimumFrameRate(30); settings.setMaximumFrameRate(30); -#ifdef __linux__ - settings.setPixelFormat(QVideoFrame::PixelFormat::Format_RGB565); -#endif + if (camera->supportedViewfinderPixelFormats().isEmpty()) { + // The gstreamer plugin (used on linux systems) returns an empty list on querying supported + // viewfinder pixel formats, and will not work without expliciting setting it to some value, + // so we are defaulting to RGB565 here which should be fairly widely supported. + settings.setPixelFormat(QVideoFrame::PixelFormat::Format_RGB565); + } camera->setViewfinder(&camera_surface); camera->load(); }