[FFmpeg-soc] [soc]: r3353 - aacenc/aacpsy.c

[Michael Niedermayer]

On Sat, Aug 16, 2008 at 02:25:29PM +0200, kostya wrote:
> Author: kostya
> Date: Sat Aug 16 14:25:28 2008
> New Revision: 3353
> 
> Log:
> Postpone form factor calculation till we decided to code mid/side stereo and get rid of /2 in calculations
> 
> Modified:
>    aacenc/aacpsy.c
> 
> Modified: aacenc/aacpsy.c
> ==============================================================================
> --- aacenc/aacpsy.c	(original)
> +++ aacenc/aacpsy.c	Sat Aug 16 14:25:28 2008
> @@ -594,26 +594,28 @@ static void psy_3gpp_process(AACPsyConte
>                  if(pch->band[0][g2].energy == 0.0 || pch->band[1][g2].energy == 0.0)
>                      continue;
>                  for(i = 0; i < cpe->ch[0].ics.swb_sizes[g]; i++){
> -                    m = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0;
> -                    s = (cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i]) / 2.0;
> +                    m = cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i];
> +                    s = cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i];
>                      en_m += m*m;
>                      en_s += s*s;
[...]
>                  }
> -                en_m /= 262144.0;
> -                en_s /= 262144.0;
[...]
> +                en_m /= 262144.0*2.0;
> +                en_s /= 262144.0*2.0;

this is not equivalent, are you actually testing your changes?


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-soc/attachments/20080816/e5664453/attachment.pgp>