diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 21:58:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 00:29:25 +0200 |
| commit | 83fd377c94d8fbffdb3e69fb3efe1976ff897a88 (patch) | |
| tree | 4aae47c689d2e4feee70c1d18cb75110e42b90ff /libavcodec/j2k.c | |
| parent | a510abd5d1f53193695323326c571c84fc5069a4 (diff) | |
j2k/jpeg2000: merge float DWT and related code
the float conditions are largely changed to check the DWT
instead of the bitexact flag, which previously was wrong
(DWT53 is always int)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
| -rw-r--r-- | libavcodec/j2k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c index 5a7949737b..d5be7c3394 100644 --- a/libavcodec/j2k.c +++ b/libavcodec/j2k.c @@ -184,7 +184,7 @@ int ff_j2k_init_component(Jpeg2000Component *comp, uint8_t log2_band_prec_width, log2_band_prec_height; int reslevelno, bandno, gbandno = 0, ret, i, j, csize = 1; - if (ret=ff_jpeg2000_dwt_init(&comp->dwt, comp->coord, codsty->nreslevels2decode-1, codsty->transform == FF_DWT53 ? FF_DWT53 : FF_DWT97_INT)) + if (ret=ff_jpeg2000_dwt_init(&comp->dwt, comp->coord, codsty->nreslevels2decode-1, codsty->transform)) return ret; for (i = 0; i < 2; i++) csize *= comp->coord[i][1] - comp->coord[i][0]; @@ -261,7 +261,7 @@ int ff_j2k_init_component(Jpeg2000Component *comp, case JPEG2000_QSTY_SI: /*TODO: Compute formula to implement. */ numbps = cbps + - lut_gain[codsty->transform][bandno + (reslevelno > 0)]; + lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)]; band->f_stepsize = SHL(2048 + qntsty->mant[gbandno], 2 + numbps - qntsty->expn[gbandno]); break; |