highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/jpeg2000: Fix band coords

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-14 19:43:08 +02:00
parent 6b08dc393b
commit 59c107292c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/jpeg2000.c
View File

@@ -333,7 +333,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
band->coord[i][j] = band->coord[i][j] =
ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0], ff_jpeg2000_ceildivpow2(comp->coord_o[i][j],
declvl - 1); declvl - 1);
log2_band_prec_width = reslevel->log2_prec_width; log2_band_prec_width = reslevel->log2_prec_width;
log2_band_prec_height = reslevel->log2_prec_height; log2_band_prec_height = reslevel->log2_prec_height;
@@ -349,7 +349,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
/* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */ /* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */
band->coord[i][j] = band->coord[i][j] =
ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0] - ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] -
(((bandno + 1 >> i) & 1) << declvl - 1), (((bandno + 1 >> i) & 1) << declvl - 1),
declvl); declvl);
/* TODO: Manage case of 3 band offsets here or /* TODO: Manage case of 3 band offsets here or
@@ -384,22 +384,22 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
/* Compute P_x0 */ /* Compute P_x0 */
prec->coord[0][0] = (precno % reslevel->num_precincts_x) * prec->coord[0][0] = (precno % reslevel->num_precincts_x) *
(1 << log2_band_prec_width); (1 << log2_band_prec_width);
prec->coord[0][0] = FFMAX(prec->coord[0][0], band->coord[0][0]); prec->coord[0][0] = FFMAX(prec->coord[0][0], band->coord[0][0] - band->coord[0][0]);
/* Compute P_y0 */ /* Compute P_y0 */
prec->coord[1][0] = (precno / reslevel->num_precincts_x) * prec->coord[1][0] = (precno / reslevel->num_precincts_x) *
(1 << log2_band_prec_height); (1 << log2_band_prec_height);
prec->coord[1][0] = FFMAX(prec->coord[1][0], band->coord[1][0]); prec->coord[1][0] = FFMAX(prec->coord[1][0], band->coord[1][0] - band->coord[1][0]);
/* Compute P_x1 */ /* Compute P_x1 */
prec->coord[0][1] = prec->coord[0][0] + prec->coord[0][1] = prec->coord[0][0] +
(1 << log2_band_prec_width); (1 << log2_band_prec_width);
prec->coord[0][1] = FFMIN(prec->coord[0][1], band->coord[0][1]); prec->coord[0][1] = FFMIN(prec->coord[0][1], band->coord[0][1] - band->coord[0][0]);
/* Compute P_y1 */ /* Compute P_y1 */
prec->coord[1][1] = prec->coord[1][0] + prec->coord[1][1] = prec->coord[1][0] +
(1 << log2_band_prec_height); (1 << log2_band_prec_height);
prec->coord[1][1] = FFMIN(prec->coord[1][1], band->coord[1][1]); prec->coord[1][1] = FFMIN(prec->coord[1][1], band->coord[1][1] - band->coord[1][0]);
prec->nb_codeblocks_width = prec->nb_codeblocks_width =
ff_jpeg2000_ceildivpow2(prec->coord[0][1] - ff_jpeg2000_ceildivpow2(prec->coord[0][1] -