VERY experimental Nintendo Switch 2 emulator
C++
yuzu: Force camera output to be saved on a buffer (#8805)
Narr the Regd2dce477d3ce
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cppindex c262d0a2bb..d3fbdb09d1 100644--- a/src/yuzu/bootmanager.cpp+++ b/src/yuzu/bootmanager.cpp@@ -815,6 +815,12 @@ void GRenderWindow::InitializeCamera() {if (Settings::values.ir_sensor_device.GetValue() == cameraInfo.deviceName().toStdString() ||Settings::values.ir_sensor_device.GetValue() == "Auto") {camera = std::make_unique<QCamera>(cameraInfo);+ if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&+ !camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {+ LOG_ERROR(Frontend,+ "Camera doesn't support CaptureViewfinder or CaptureStillImage");+ continue;+ }camera_found = true;break;}@@ -825,10 +831,22 @@ void GRenderWindow::InitializeCamera() {}camera_capture = std::make_unique<QCameraImageCapture>(camera.get());++ if (!camera_capture->isCaptureDestinationSupported(+ QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {+ LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");+ return;+ }++ camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,&GRenderWindow::OnCameraCapture);camera->unload();- camera->setCaptureMode(QCamera::CaptureViewfinder);+ if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {+ camera->setCaptureMode(QCamera::CaptureViewfinder);+ } else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {+ camera->setCaptureMode(QCamera::CaptureStillImage);+ }camera->load();camera->start();diff --git a/src/yuzu/configuration/configure_camera.cpp b/src/yuzu/configuration/configure_camera.cppindex 73cdcf3f21..2a61de2a1e 100644--- a/src/yuzu/configuration/configure_camera.cpp+++ b/src/yuzu/configuration/configure_camera.cpp@@ -42,6 +42,12 @@ void ConfigureCamera::PreviewCamera() {LOG_INFO(Frontend, "Selected Camera {} {}", cameraInfo.description().toStdString(),cameraInfo.deviceName().toStdString());camera = std::make_unique<QCamera>(cameraInfo);+ if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&+ !camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {+ LOG_ERROR(Frontend,+ "Camera doesn't support CaptureViewfinder or CaptureStillImage");+ continue;+ }camera_found = true;break;}@@ -57,10 +63,22 @@ void ConfigureCamera::PreviewCamera() {}camera_capture = std::make_unique<QCameraImageCapture>(camera.get());++ if (!camera_capture->isCaptureDestinationSupported(+ QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {+ LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");+ return;+ }++ camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,&ConfigureCamera::DisplayCapturedFrame);camera->unload();- camera->setCaptureMode(QCamera::CaptureViewfinder);+ if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {+ camera->setCaptureMode(QCamera::CaptureViewfinder);+ } else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {+ camera->setCaptureMode(QCamera::CaptureStillImage);+ }camera->load();camera->start();