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

nvidia/cv/image: Store alignment for later use

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-06-24 13:19:11 +02:00
parent faf85138fe
commit cfc463ec0d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/nvidia/cv/nvidia-cv-image.cpp
View file

@ -51,7 +51,7 @@ image::~image()
_cv->NvCVImage_Dealloc(&_image); _cv->NvCVImage_Dealloc(&_image);
} }
image::image() : _cv(::streamfx::nvidia::cv::cv::get()), _image() image::image() : _cv(::streamfx::nvidia::cv::cv::get()), _image(), _alignment(1)
{ {
// Forcefully clear the image storage. // Forcefully clear the image storage.
memset(&_image, sizeof(_image), 0); memset(&_image, sizeof(_image), 0);
@ -64,8 +64,9 @@ image::image(uint32_t width, uint32_t height, pixel_format pix_fmt, component_ty
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();
_alignment = alignment;
if (auto res = _cv->NvCVImage_Alloc(&_image, width, height, pix_fmt, cmp_type, static_cast<uint32_t>(cmp_layout), if (auto res = _cv->NvCVImage_Alloc(&_image, width, height, pix_fmt, cmp_type, static_cast<uint32_t>(cmp_layout),
static_cast<uint32_t>(location), alignment); static_cast<uint32_t>(location), _alignment);
res != result::SUCCESS) { res != result::SUCCESS) {
throw std::runtime_error(_cv->NvCV_GetErrorStringFromCode(res)); throw std::runtime_error(_cv->NvCV_GetErrorStringFromCode(res));
} }
@ -83,13 +84,13 @@ void streamfx::nvidia::cv::image::reallocate(uint32_t width, uint32_t height, pi
res != result::SUCCESS) { res != result::SUCCESS) {
throw std::runtime_error(_cv->NvCV_GetErrorStringFromCode(res)); throw std::runtime_error(_cv->NvCV_GetErrorStringFromCode(res));
} }
_alignment = alignment;
} }
void streamfx::nvidia::cv::image::resize(uint32_t width, uint32_t height) void streamfx::nvidia::cv::image::resize(uint32_t width, uint32_t height)
{ {
// TODO: Is pixel_bytes correct?
reallocate(width, height, _image.pxl_format, _image.comp_type, static_cast<component_layout>(_image.comp_layout), reallocate(width, height, _image.pxl_format, _image.comp_type, static_cast<component_layout>(_image.comp_layout),
static_cast<memory_location>(_image.mem_location), _image.pixel_bytes); static_cast<memory_location>(_image.mem_location), _alignment);
} }
streamfx::nvidia::cv::image_t* streamfx::nvidia::cv::image::get_image() streamfx::nvidia::cv::image_t* streamfx::nvidia::cv::image::get_image()

1
source/nvidia/cv/nvidia-cv-image.hpp
View file

@ -32,6 +32,7 @@ namespace streamfx::nvidia::cv {
protected: protected:
std::shared_ptr<::streamfx::nvidia::cv::cv> _cv; std::shared_ptr<::streamfx::nvidia::cv::cv> _cv;
image_t _image; image_t _image;
size_t _alignment;
public: public:
virtual ~image(); virtual ~image();