scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 00:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

VRG, dummy: make managed default

Browse Source 
HostMalloc was poor for unstriped GPUJPEG dec
This commit is contained in:
Martin Pulec
2021-06-01 11:47:04 +02:00
parent 2c7a7c3d2d
commit f7354f6ab4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_display/dummy.cpp
View File

@@ -82,7 +82,8 @@ struct dummy_display_state {
size_t dump_bytes = 0;
bool dump_to_file = false;
int dump_to_file_skip_frames = 0;
bool cuda_managed = false;
bool cuda_host = false;
bool cuda_managed = true;
struct rtp *rtp;
};
@@ -91,13 +92,13 @@ static auto display_dummy_init(struct module * /* parent */, const char *cfg, un
{
if ("help"s == cfg) {
cout << "Usage:\n";
cout << "\t" << style::bold << fg::red << "-d dummy" << fg::reset << "[:codec=<codec>][:rgb_shift=<r>,<g>,<b>][:hexdump[=<n>]][:dump_to_file[=skip=<n>]][:managed]\n" << style::reset;
cout << "\t" << style::bold << fg::red << "-d dummy" << fg::reset << "[:codec=<codec>][:rgb_shift=<r>,<g>,<b>][:hexdump[=<n>]][:dump_to_file[=skip=<n>]][:managed|:host]\n" << style::reset;
cout << "where\n";
cout << "\t" << style::bold << "<codec>" << style::reset << " - force the use of a codec instead of default set\n";
cout << "\t" << style::bold << "rgb_shift" << style::reset << " - if using output codec RGBA, use specified shifts instead of default (0, 8, 16)\n";
cout << "\t" << style::bold << "hexdump[=<n>]" << style::reset << " - dump first n (default " << DEFAULT_DUMP_LEN << ") bytes of every frame in hexadecimal format\n";
cout << "\t" << style::bold << "dump_to_file" << style::reset << " - dump first frame to file dummy.<ext> (optionally skip <n> first frames)\n";
cout << "\t" << style::bold << "managed" << style::reset << " - use managed memory for CUDA codecs instead of \n";
cout << "\t" << style::bold << "managed|host" << style::reset << " - use managed/host memory for CUDA codecs instead of \n";
return static_cast<void *>(&display_init_noerr);
}
auto s = make_unique<dummy_display_state>();
@@ -113,6 +114,8 @@ static auto display_dummy_init(struct module * /* parent */, const char *cfg, un
LOG(LOG_LEVEL_ERROR) << MOD_NAME << "Wrong codec spec!\n";
return nullptr;
}
} else if (strstr(item, "host") != nullptr) {
s->cuda_managed = false;
} else if (strstr(item, "managed") != nullptr) {
s->cuda_managed = true;
} else if (strstr(item, "dump_to_file") != nullptr) {

10
src/video_display/vrg.cpp
View File

@@ -132,7 +132,7 @@ struct state_vrg {
uint32_t magic;
struct video_desc saved_desc;
#ifdef HAVE_CUDA
video_frame_pool pool{0, vrg_cuda_allocator<cuda_malloc_host_allocate>()};
video_frame_pool pool{0, vrg_cuda_allocator<cuda_malloc_managed_allocate>()};
#else
video_frame_pool pool{0, vrg_cuda_allocator<default_data_allocator>()};
#endif
@@ -162,7 +162,7 @@ static void *display_vrg_init(struct module *parent, const char *fmt, unsigned i
UNUSED(flags);
UNUSED(parent);
if ("help"s == fmt) {
cout << "Usage:\n\t-d vrg[:managed|:malloc]\n";
cout << "Usage:\n\t-d vrg[:host|:managed|:malloc]\n";
cout << "where\n\tmanaged - use managed memory\n";
return NULL;
}
@@ -173,7 +173,11 @@ static void *display_vrg_init(struct module *parent, const char *fmt, unsigned i
}
s->magic = MAGIC_VRG;
if ("managed"s == fmt) {
if ("host"s == fmt) {
#ifdef HAVE_CUDA
s->pool.replace_allocator(vrg_cuda_allocator<cuda_malloc_host_allocate>());
#endif
} else if ("managed"s == fmt) {
#ifdef HAVE_CUDA
s->pool.replace_allocator(vrg_cuda_allocator<cuda_malloc_managed_allocate>());
#endif