Qt: Fix image dimensions passed to camera_video_sink::present

Author: Megamouse

rpcs3/rpcs3qt/camera_settings_dialog.cpp

@@ -273,7 +273,7 @@ void camera_settings_dialog::handle_qt_camera_change(const QVariant& item_data)
 		int index = 0;
 		bool success = false;
 		const std::string key = camera_info.id().toStdString();
-		cfg_camera::camera_setting cfg_setting = g_cfg_camera.get_camera_setting(fmt::format("%s", camera_handler::qt), key, success);
+		const cfg_camera::camera_setting cfg_setting = g_cfg_camera.get_camera_setting(fmt::format("%s", camera_handler::qt), key, success);
 
 		if (success)
 		{

rpcs3/rpcs3qt/qt_camera_video_sink.cpp

@@ -34,20 +34,22 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
 	}
 
 	// Get image. This usually also converts the image to ARGB32.
-	QImage image = frame.toImage();
-	const u32 width = image.isNull() ? 0 : static_cast<u32>(image.width());
-	const u32 height = image.isNull() ? 0 : static_cast<u32>(image.height());
+	QImage image = tmp.toImage();
+	u32 width = image.isNull() ? 0 : static_cast<u32>(image.width());
+	u32 height = image.isNull() ? 0 : static_cast<u32>(image.height());
 
 	if (image.isNull())
 	{
-		camera_log.warning("Image is invalid: pixel_format=%s, format=%d", tmp.pixelFormat(), static_cast<int>(QVideoFrameFormat::imageFormatFromPixelFormat(tmp.pixelFormat())));
+		camera_log.warning("Image is invalid: pixel_format=%s, format=%d", tmp.pixelFormat(), static_cast<s32>(QVideoFrameFormat::imageFormatFromPixelFormat(tmp.pixelFormat())));
 	}
 	else
 	{
 		// Scale image if necessary
 		if (m_width > 0 && m_height > 0 && m_width != width && m_height != height)
 		{
 			image = image.scaled(m_width, m_height, Qt::AspectRatioMode::IgnoreAspectRatio, Qt::SmoothTransformation);
+			width = static_cast<u32>(image.width());
+			height = static_cast<u32>(image.height());
 		}
 
 		// Determine image flip