scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 19:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcomp/cmpto_j2k: move CUDA buf alloc to set_pool

Browse Source 
The allocation was before set_pool, which can, however, now set
cuda_convert_func to nullptr, therefore the malloc would be unneeded.
This commit is contained in:
Martin Pulec
2024-09-03 14:03:59 +02:00
parent 1cffc72fa8
commit 7b91ebb5d4
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/video_compress/cmpto_j2k.cpp
View File

@@ -189,11 +189,21 @@ static struct {
}; };
static void static void
set_pool(struct state_video_compress_j2k *s) set_pool(struct state_video_compress_j2k *s, struct video_desc desc)
{ {
s->pool_in_device_memory = false; s->pool_in_device_memory = false;
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
if (cuda_devices_count == 1) { if (cuda_devices_count == 1) {
cuda_wrapper_set_device((int) cuda_devices[0]);
if (s->cuda_convert_func != nullptr) {
cuda_wrapper_free(s->cuda_conv_tmp_buf);
cuda_wrapper_malloc(
(void **) &s->cuda_conv_tmp_buf,
vc_get_datalen(desc.width, desc.height, desc.color_spec) +
MAX_PADDING);
}
s->pool_in_device_memory = true; s->pool_in_device_memory = true;
s->pool = video_frame_pool( s->pool = video_frame_pool(
s->max_in_frames, s->max_in_frames,
@@ -226,17 +236,6 @@ static bool configure_with(struct state_video_compress_j2k *s, struct video_desc
} }
} }
#ifdef HAVE_CUDA
cuda_wrapper_set_device((int) cuda_devices[0]);
if (s->cuda_convert_func != nullptr) {
cuda_wrapper_free(s->cuda_conv_tmp_buf);
cuda_wrapper_malloc(
(void **) &s->cuda_conv_tmp_buf,
vc_get_datalen(desc.width, desc.height, desc.color_spec) +
MAX_PADDING);
}
#endif
if(!found){ if(!found){
log_msg(LOG_LEVEL_ERROR, "[J2K] Failed to find suitable pixel format\n"); log_msg(LOG_LEVEL_ERROR, "[J2K] Failed to find suitable pixel format\n");
return false; return false;
@@ -262,7 +261,7 @@ static bool configure_with(struct state_video_compress_j2k *s, struct video_desc
"Setting MCT", "Setting MCT",
NOOP); NOOP);
set_pool(s); set_pool(s, desc);
s->compressed_desc = desc; s->compressed_desc = desc;
s->compressed_desc.color_spec = codec_is_a_rgb(desc.color_spec) ? J2KR : J2K; s->compressed_desc.color_spec = codec_is_a_rgb(desc.color_spec) ? J2KR : J2K;