diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /mp3lib/dct36.c | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'mp3lib/dct36.c')
| -rw-r--r-- | mp3lib/dct36.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mp3lib/dct36.c b/mp3lib/dct36.c index b884bb949d..22ec273277 100644 --- a/mp3lib/dct36.c +++ b/mp3lib/dct36.c @@ -189,21 +189,21 @@ static void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)]; \ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)]; #define MACRO1(v) { \ - real sum0,sum1; \ + real sum0, sum1; \ sum0 = tmp1a + tmp2a; \ - sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \ - MACRO0(v); } + sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \ + MACRO0(v); } #define MACRO2(v) { \ - real sum0,sum1; \ + real sum0, sum1; \ sum0 = tmp2a - tmp1a; \ sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \ - MACRO0(v); } + MACRO0(v); } register const real *c = COS9; register real *out2 = o2; - register real *w = wintab; - register real *out1 = o1; - register real *ts = tsbuf; + register real *w = wintab; + register real *out1 = o1; + register real *ts = tsbuf; real ta33,ta66,tb33,tb66; @@ -256,12 +256,12 @@ static void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf) MACRO2(5); } - { - real sum0,sum1; - sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0]; - sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4]; - MACRO0(4); - } + { + real sum0,sum1; + sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0]; + sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4]; + MACRO0(4); + } } #endif |