Skip to content

F
ffmpeg.wasm-core
Commit 5161c625 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

j2k: fix band coord 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 369422db
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
libavcodec/j2k.c
View file @ 5161c625
...@@ -264,9 +264,8 @@ int ff_j2k_init_component(Jpeg2000Component *comp, ...@@ -264,9 +264,8 @@ int ff_j2k_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[i][j], ff_jpeg2000_ceildivpow2(comp->coord[i][j] - comp->coord[i][0],
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;
/* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */ /* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */
...@@ -281,7 +280,7 @@ int ff_j2k_init_component(Jpeg2000Component *comp, ...@@ -281,7 +280,7 @@ int ff_j2k_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[i][j] - ff_jpeg2000_ceildivpow2(comp->coord[i][j] - comp->coord[i][0] -
(((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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment