From: Michael Niedermayer <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
Conflicts:
libavcodec/j2k.c
---
libavcodec/jpeg2000.c | 10 ++++++++++
libavcodec/jpeg2000dec.c | 8 --------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 90efca9..230a836 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -426,6 +426,16 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
/* Compute Cy1 */
cblk->coord[1][1] = FFMIN(Cy0 + (1 <<
band->log2_cblk_height),
prec->coord[1][1]);
+
+ if((bandno + !!reslevelno) & 1) {
+ cblk->coord[0][0] +=
comp->reslevel[reslevelno-1].coord[0][1] -
comp->reslevel[reslevelno-1].coord[0][0];
+ cblk->coord[0][1] +=
comp->reslevel[reslevelno-1].coord[0][1] -
comp->reslevel[reslevelno-1].coord[0][0];
+ }
+ if((bandno + !!reslevelno) & 2) {
+ cblk->coord[1][0] +=
comp->reslevel[reslevelno-1].coord[1][1] -
comp->reslevel[reslevelno-1].coord[1][0];
+ cblk->coord[1][1] +=
comp->reslevel[reslevelno-1].coord[1][1] -
comp->reslevel[reslevelno-1].coord[1][0];
+ }
+
cblk->zero = 0;
cblk->lblock = 3;
cblk->length = 0;
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index e1be5a0..84a0711 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1062,14 +1062,6 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext
*s, Jpeg2000Tile *tile,
/* Manage band offsets */
x = cblk->coord[0][0];
y = cblk->coord[1][0];
- if ((reslevelno > 0) && ((bandno + 1) & 1)) {
- Jpeg2000ResLevel *pres = comp->reslevel +
(reslevelno - 1);
- x += pres->coord[0][1] - pres->coord[0][0];
- }
- if ((reslevelno > 0) && ((bandno + 1) & 2)) {
- Jpeg2000ResLevel *pres = comp->reslevel +
(reslevelno - 1);
- y += pres->coord[1][1] - pres->coord[1][0];
- }
if (s->avctx->flags & CODEC_FLAG_BITEXACT)
dequantization_int(x, y, cblk, comp, &t1, band);
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
