etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-24 04:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

nvidia/vfx/superresolution: Round to nearest instead of truncate

Browse source 
Slightly improves the accuracy of the scaled size calculations.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-06-24 20:36:51 +02:00
parent 48d4f195da
commit 7c7ea3c3b6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/nvidia/vfx/nvidia-vfx-superresolution.cpp
View file

@ -19,6 +19,7 @@
// SOFTWARE. // SOFTWARE.
#include "nvidia-vfx-superresolution.hpp" #include "nvidia-vfx-superresolution.hpp"
#include <cmath>
#include <utility> #include <utility>
#include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-helper.hpp"
#include "util/util-logging.hpp" #include "util/util-logging.hpp"
@ -187,13 +188,13 @@ void streamfx::nvidia::vfx::superresolution::size(std::pair<uint32_t, uint32_t>
double ar = static_cast<double>(input_size.second) / static_cast<double>(input_size.first); double ar = static_cast<double>(input_size.second) / static_cast<double>(input_size.first);
input_size.first = std::clamp<uint32_t>(input_size.first, min_width, max_width); input_size.first = std::clamp<uint32_t>(input_size.first, min_width, max_width);
input_size.second = std::clamp<uint32_t>( input_size.second = std::clamp<uint32_t>(
static_cast<uint32_t>(round(static_cast<double>(input_size.first) * ar)), min_height, max_height); static_cast<uint32_t>(std::lround(static_cast<double>(input_size.first) * ar)), min_height, max_height);
} else { } else {
// Dominant Height // Dominant Height
double ar = static_cast<double>(input_size.first) / static_cast<double>(input_size.second); double ar = static_cast<double>(input_size.first) / static_cast<double>(input_size.second);
input_size.second = std::clamp<uint32_t>(input_size.second, min_height, max_height); input_size.second = std::clamp<uint32_t>(input_size.second, min_height, max_height);
input_size.first = std::clamp<uint32_t>( input_size.first = std::clamp<uint32_t>(
static_cast<uint32_t>(round(static_cast<double>(input_size.second) * ar)), min_width, max_width); static_cast<uint32_t>(std::lround(static_cast<double>(input_size.second) * ar)), min_width, max_width);
} }
// Calculate Output Size. // Calculate Output Size.
@ -298,8 +299,8 @@ std::shared_ptr<::streamfx::obs::gs::texture>
void streamfx::nvidia::vfx::superresolution::resize(uint32_t width, uint32_t height) void streamfx::nvidia::vfx::superresolution::resize(uint32_t width, uint32_t height)
{ {
uint32_t out_width = static_cast<uint32_t>(width * _scale); uint32_t out_width = static_cast<uint32_t>(std::lround(width * _scale));
uint32_t out_height = static_cast<uint32_t>(height * _scale); uint32_t out_height = static_cast<uint32_t>(std::lround(height * _scale));
auto gctx = ::streamfx::obs::gs::context(); auto gctx = ::streamfx::obs::gs::context();
auto cctx = ::streamfx::nvidia::cuda::obs::get()->get_context()->enter(); auto cctx = ::streamfx::nvidia::cuda::obs::get()->get_context()->enter();