From: Michael Niedermayer <[email protected]>
Signed-off-by: Luca Barbato <[email protected]>
---
libavcodec/jpeg2k.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/jpeg2k.c b/libavcodec/jpeg2k.c
index 8cfa481..8936240 100644
--- a/libavcodec/jpeg2k.c
+++ b/libavcodec/jpeg2k.c
@@ -335,9 +335,8 @@ int ff_jpeg2k_init_component(Jpeg2KComponent *comp,
for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++)
band->coord[i][j] =
- ff_jpeg2k_ceildivpow2(comp->coord_o[i][j],
+ ff_jpeg2k_ceildivpow2(comp->coord_o[i][j] -
comp->coord_o[i][0],
declvl - 1);
-
log2_band_prec_width = reslevel->log2_prec_width;
log2_band_prec_height = reslevel->log2_prec_height;
/* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */
@@ -352,7 +351,7 @@ int ff_jpeg2k_init_component(Jpeg2KComponent *comp,
for (j = 0; j < 2; j++)
/* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^
(declvl - 1) * x0_b) / declvl) */
band->coord[i][j] =
- ff_jpeg2k_ceildivpow2(comp->coord_o[i][j] -
+ ff_jpeg2k_ceildivpow2(comp->coord_o[i][j] -
comp->coord_o[i][0] -
(((bandno + 1 >> i) & 1)
<< declvl - 1),
declvl);
/* TODO: Manage case of 3 band offsets here or
@@ -368,6 +367,11 @@ int ff_jpeg2k_init_component(Jpeg2KComponent *comp,
log2_band_prec_height = reslevel->log2_prec_height - 1;
}
+ for (j = 0; j < 2; j++)
+ band->coord[0][j] = ff_jpeg2k_ceildiv(band->coord[0][j], dx);
+ for (j = 0; j < 2; j++)
+ band->coord[1][j] = ff_jpeg2k_ceildiv(band->coord[1][j], dy);
+
band->prec = av_malloc_array(reslevel->num_precincts_x *
reslevel->num_precincts_y,
sizeof(*band->prec));
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
