diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 14:31:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 15:13:18 +0200 |
| commit | 5161c62595d694ecaa451f4f016c2cac4de98bec (patch) | |
| tree | 2eb2f498883509348c7e86cf12179daba81c51d8 | |
| parent | 369422db0c6dafa08c9b22f676eb4c480bee72fb (diff) | |
| download | ffmpeg-5161c62595d694ecaa451f4f016c2cac4de98bec.tar.gz | |
j2k: fix band coord
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/j2k.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index 0425267c71..c34a7d1fa3 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -264,9 +264,8 @@ int ff_j2k_init_component(Jpeg2000Component *comp, for (i = 0; i < 2; i++) for (j = 0; j < 2; j++) band->coord[i][j] = - ff_jpeg2000_ceildivpow2(comp->coord[i][j], + ff_jpeg2000_ceildivpow2(comp->coord[i][j] - comp->coord[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 */ @@ -281,7 +280,7 @@ int ff_j2k_init_component(Jpeg2000Component *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_jpeg2000_ceildivpow2(comp->coord[i][j] - + ff_jpeg2000_ceildivpow2(comp->coord[i][j] - comp->coord[i][0] - (((bandno + 1 >> i) & 1) << declvl - 1), declvl); /* TODO: Manage case of 3 band offsets here or |