Skip to content

F
ffmpeg.wasm-core
Commit c2ac389b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

jpeg2000: remove unneeded casts 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 09e03a84
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavcodec/jpeg2000.c
View file @ c2ac389b
...@@ -279,7 +279,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, ...@@ -279,7 +279,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
/*TODO: Compute formula to implement. */ /*TODO: Compute formula to implement. */
numbps = cbps + numbps = cbps +
lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)]; lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)];
band->f_stepsize = (float)SHL(2048 + qntsty->mant[gbandno], band->f_stepsize = SHL(2048 + qntsty->mant[gbandno],
2 + numbps - qntsty->expn[gbandno]); 2 + numbps - qntsty->expn[gbandno]);
break; break;
case JPEG2000_QSTY_SE: case JPEG2000_QSTY_SE:
...@@ -293,7 +293,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, ...@@ -293,7 +293,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
* Further investigation needed. */ * Further investigation needed. */
gain = cbps; gain = cbps;
band->f_stepsize = pow(2.0, gain - qntsty->expn[gbandno]); band->f_stepsize = pow(2.0, gain - qntsty->expn[gbandno]);
band->f_stepsize *= (float)qntsty->mant[gbandno] / 2048.0 + 1.0; band->f_stepsize *= qntsty->mant[gbandno] / 2048.0 + 1.0;
break; break;
default: default:
band->f_stepsize = 0; band->f_stepsize = 0;
...@@ -305,7 +305,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, ...@@ -305,7 +305,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
if (!av_codec_is_encoder(avctx->codec)) if (!av_codec_is_encoder(avctx->codec))
band->f_stepsize *= 0.5; band->f_stepsize *= 0.5;
band->i_stepsize = (int32_t)(band->f_stepsize * (1 << 16)); band->i_stepsize = band->f_stepsize * (1 << 16);
/* computation of tbx_0, tbx_1, tby_0, tby_1 /* 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 * see ISO/IEC 15444-1:2002 B.5 eq. B-15 and tbl B.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment