hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Disable WPP when Tiles are enabled

Browse source 
Closes #142.
This commit is contained in:
Ari Koivula 2016-10-27 02:07:10 +03:00
parent 4990b0d528
commit cb6672b452
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cfg.c
View file

@ -655,18 +655,32 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
cfg->cqmfile = strdup(value); cfg->cqmfile = strdup(value);
else if OPT("tiles-width-split") { else if OPT("tiles-width-split") {
int retval = parse_tiles_specification(value, &cfg->tiles_width_count, &cfg->tiles_width_split); int retval = parse_tiles_specification(value, &cfg->tiles_width_count, &cfg->tiles_width_split);
if (cfg->tiles_width_count > 1 && cfg->tmvp_enable) { if (cfg->tiles_width_count > 1 && cfg->tmvp_enable) {
cfg->tmvp_enable = false; cfg->tmvp_enable = false;
fprintf(stderr, "Disabling TMVP because tiles are used.\n"); fprintf(stderr, "Disabling TMVP because tiles are used.\n");
} }
if (cfg->wpp) {
cfg->wpp = false;
fprintf(stderr, "Disabling WPP because tiles were enabled.\n");
}
return retval; return retval;
} }
else if OPT("tiles-height-split") { else if OPT("tiles-height-split") {
int retval = parse_tiles_specification(value, &cfg->tiles_height_count, &cfg->tiles_height_split); int retval = parse_tiles_specification(value, &cfg->tiles_height_count, &cfg->tiles_height_split);
if (cfg->tiles_height_count > 1 && cfg->tmvp_enable) { if (cfg->tiles_height_count > 1 && cfg->tmvp_enable) {
cfg->tmvp_enable = false; cfg->tmvp_enable = false;
fprintf(stderr, "Disabling TMVP because tiles are used.\n"); fprintf(stderr, "Disabling TMVP because tiles are used.\n");
} }
if (cfg->wpp) {
cfg->wpp = false;
fprintf(stderr, "Disabling WPP because tiles were enabled.\n");
}
return retval; return retval;
} }
else if OPT("tiles") else if OPT("tiles")
@ -699,6 +713,11 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
fprintf(stderr, "Disabling TMVP because tiles are used.\n"); fprintf(stderr, "Disabling TMVP because tiles are used.\n");
} }
if (cfg->wpp) {
cfg->wpp = false;
fprintf(stderr, "Disabling WPP because tiles were enabled.\n");
}
return 1; return 1;
} }
else if OPT("wpp") else if OPT("wpp")

4
src/cli.c
View file

@ -445,7 +445,9 @@ void print_help(void)
" in which case it produces rows of uniform height.\n" " in which case it produces rows of uniform height.\n"
"\n" "\n"
" Wpp:\n" " Wpp:\n"
" --wpp : Enable wavefront parallel processing\n" " --wpp, --no-wpp : Wavefront parallel processing [enabled]\n"
" Enabling tiles automatically disabled WPP. To enable\n"
" WPP with tiles, re-enable it after enabling tiles.\n"
" --owf <integer>|auto : Number of parallel frames to process. 0 to disable.\n" " --owf <integer>|auto : Number of parallel frames to process. 0 to disable.\n"
"\n" "\n"
/*" Slices:\n" /*" Slices:\n"