mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2026-05-01 03:56:53 +08:00
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>
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user