diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 14:43:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 15:26:31 +0200 |
| commit | 96e73fa6494194d8c918e75e23df293327d5228a (patch) | |
| tree | d13e0294a3f5a6e1944a8593b9cb5c4c9f19a77c /libavcodec/jpeg2000.c | |
| parent | 9a345802edf7f430b3335f486aecdd8552f8367b (diff) | |
| download | ffmpeg-96e73fa6494194d8c918e75e23df293327d5228a.tar.gz | |
avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index b60e770987..683728e374 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -330,13 +330,14 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, band->f_stepsize *= pow(F_LFTG_K, 2*(codsty->nreslevels2decode - reslevelno) + lband - 2); } } + + band->i_stepsize = band->f_stepsize * (1 << 15); + /* FIXME: In openjepg code stespize = stepsize * 0.5. Why? * If not set output of entropic decoder is not correct. */ if (!av_codec_is_encoder(avctx->codec)) band->f_stepsize *= 0.5; - band->i_stepsize = band->f_stepsize * (1 << 15); - /* computation of tbx_0, tbx_1, tby_0, tby_1 * see ISO/IEC 15444-1:2002 B.5 eq. B-15 and tbl B.1 * codeblock width and height is computed for |