Browse Source

ac3enc: clip coupling coordinates during calculation

This is faster than using the clip_coefficients() function. Also,
clipping the coordinates before determining reuse is better since it
will compare coordinates that are closer to their final encoded values.
tags/n0.9
Justin Ruggles 14 years ago
parent
commit
069083a419
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/ac3enc_template.c

+ 1
- 2
libavcodec/ac3enc_template.c View File

@@ -126,7 +126,7 @@ static inline float calc_cpl_coord(float energy_ch, float energy_cpl)
float coord = 0.125; float coord = 0.125;
if (energy_cpl > 0) if (energy_cpl > 0)
coord *= sqrtf(energy_ch / energy_cpl); coord *= sqrtf(energy_ch / energy_cpl);
return coord;
return FFMIN(coord, COEF_MAX);
} }




@@ -291,7 +291,6 @@ static void apply_channel_coupling(AC3EncodeContext *s)
if (!block->cpl_in_use) if (!block->cpl_in_use)
continue; continue;


clip_coefficients(&s->dsp, cpl_coords[blk][1], s->fbw_channels * 16);
s->ac3dsp.float_to_fixed24(fixed_cpl_coords[blk][1], s->ac3dsp.float_to_fixed24(fixed_cpl_coords[blk][1],
cpl_coords[blk][1], cpl_coords[blk][1],
s->fbw_channels * 16); s->fbw_channels * 16);


Loading…
Cancel
Save