From: Michael Niedermayer <[email protected]>
Scalar derived case is represented by JPEG2K_QSTY_SI define.
---
libavcodec/jpeg2k.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/jpeg2k.c b/libavcodec/jpeg2k.c
index 1fac808..b7c0b7a 100644
--- a/libavcodec/jpeg2k.c
+++ b/libavcodec/jpeg2k.c
@@ -284,14 +284,14 @@ int ff_jpeg2k_init_component(Jpeg2KComponent *comp,
int numbps;
case JPEG2K_QSTY_NONE:
/* TODO: to verify. No quantization in this case */
- numbps = cbps +
- lut_gain[codsty->transform][bandno + (reslevelno >
0)];
- band->stepsize = (float)SHL(2048 + qntsty->mant[gbandno],
- 2 + numbps -
qntsty->expn[gbandno]);
+ band->f_stepsize = 1;
break;
case JPEG2K_QSTY_SI:
/*TODO: Compute formula to implement. */
- band->stepsize = (float) (1 << 13);
+ numbps = cbps +
+ lut_gain[codsty->transform == FF_DWT53][bandno +
(reslevelno > 0)];
+ band->stepsize = (float)SHL(2048 + qntsty->mant[gbandno],
+ 2 + numbps -
qntsty->expn[gbandno]);
break;
case JPEG2K_QSTY_SE:
/* Exponent quantization step.
@@ -305,15 +305,15 @@ int ff_jpeg2k_init_component(Jpeg2KComponent *comp,
gain = cbps;
band->stepsize = pow(2.0, gain - qntsty->expn[gbandno]);
band->stepsize *= (float)qntsty->mant[gbandno] / 2048.0 + 1.0;
- /* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
- * If not set output of entropic decoder is not correct. */
- band->stepsize *= 0.5;
break;
default:
band->stepsize = 0;
av_log(avctx, AV_LOG_ERROR, "Unknown quantization format\n");
break;
}
+ /* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
+ * If not set output of entropic decoder is not correct. */
+ band->stepsize *= 0.5;
/* BITEXACT computing case --> convert to int */
if (avctx->flags & CODEC_FLAG_BITEXACT)
band->stepsize = (int32_t)(band->stepsize * (1 << 16));
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
