walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Set number of jobs to rh." 

This reverts commit 26a5626830.
This commit is contained in:
Eharve14 2022-01-15 21:01:49 -05:00
parent a46ab03f33
commit 79e41332c2
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib/openjp2/dwt.c
View File

@ -1797,9 +1797,12 @@ static INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_thread_pool_t* tp,
rw - j);
}
} else {
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
OPJ_UINT32 step_j;
num_jobs = rw;
if (rw < num_jobs) {
num_jobs = rw;
}
step_j = ((rw / num_jobs) / NB_ELTS_V8) * NB_ELTS_V8;
for (j = 0; j < num_jobs; j++) {
@ -1843,10 +1846,12 @@ static INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_thread_pool_t* tp,
cas_row == 0 ? OPJ_TRUE : OPJ_FALSE);
}
} else {
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
OPJ_UINT32 step_j;
num_jobs = rh;
if (rh < num_jobs) {
num_jobs = rh;
}
step_j = (rh / num_jobs);
for (j = 0; j < num_jobs; j++) {
@ -2118,9 +2123,12 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
opj_idwt53_h(&h, &tiledp[(OPJ_SIZE_T)j * w]);
}
} else {
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads * 2;
OPJ_UINT32 step_j;
num_jobs = rh;
if (rh < num_jobs) {
num_jobs = rh;
}
step_j = (rh / num_jobs);
for (j = 0; j < num_jobs; j++) {
@ -2170,9 +2178,12 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
opj_idwt53_v(&v, &tiledp[j], (OPJ_SIZE_T)w, (OPJ_INT32)(rw - j));
}
} else {
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
OPJ_UINT32 step_j;
num_jobs = rw;
if (rw < num_jobs) {
num_jobs = rw;
}
step_j = (rw / num_jobs);
for (j = 0; j < num_jobs; j++) {
@ -3369,9 +3380,12 @@ OPJ_BOOL opj_dwt_decode_tile_97(opj_thread_pool_t* tp,
aj += w * NB_ELTS_V8;
}
} else {
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
OPJ_UINT32 step_j;
num_jobs = rh / NB_ELTS_V8;
if ((rh / NB_ELTS_V8) < num_jobs) {
num_jobs = rh / NB_ELTS_V8;
}
step_j = ((rh / num_jobs) / NB_ELTS_V8) * NB_ELTS_V8;
for (j = 0; j < num_jobs; j++) {
opj_dwt97_decode_h_job_t* job;
@ -3445,9 +3459,12 @@ OPJ_BOOL opj_dwt_decode_tile_97(opj_thread_pool_t* tp,
transfer being the limiting factor. So limit the number of
threads.
*/
OPJ_UINT32 num_jobs;
OPJ_UINT32 num_jobs = opj_uint_max((OPJ_UINT32)num_threads / 2, 2U);
OPJ_UINT32 step_j;
num_jobs = rw / NB_ELTS_V8;
if ((rw / NB_ELTS_V8) < num_jobs) {
num_jobs = rw / NB_ELTS_V8;
}
step_j = ((rw / num_jobs) / NB_ELTS_V8) * NB_ELTS_V8;
for (j = 0; j < num_jobs; j++) {
opj_dwt97_decode_v_job_t* job;