diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 14:27:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 19:02:00 +0200 |
| commit | 32475f56f38d321b123fce116bc4521f6af0d738 (patch) | |
| tree | 3795b719acbc76697c58d949b951024b1498533b /libavcodec/jpeg2000.c | |
| parent | f0a2c8285a4e14b977b7d949cc7323f9be876b1f (diff) | |
| download | ffmpeg-32475f56f38d321b123fce116bc4521f6af0d738.tar.gz | |
j2kdec/jpeg2000dec: partially merge quantization code
The quantization code needs more work, not so much work
merging but more work investigating what is correct.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 5b15efcc29..c5fc35dbd1 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -288,15 +288,15 @@ int ff_jpeg2000_init_component(Jpeg2000Component *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)); |