@@ -48,7 +48,7 @@ OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o

 OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o mpeg12data.o

 OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o mpeg12data.o

 OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.o mpeg12data.o

-OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o

+OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o atrac.o

 OBJS-$(CONFIG_AVS_DECODER)             += avs.o

 OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.o

 OBJS-$(CONFIG_BFI_DECODER)             += bfi.o

new file mode 100644

@@ -0,0 +1,119 @@

+/*

+ * Atrac common functions

+ * Copyright (c) 2006-2008 Maxim Poliakovski

+ * Copyright (c) 2006-2008 Benjamin Larsson

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file libavcodec/atrac.c

+ */

+

+#include <math.h>

+#include <stddef.h>

+#include <stdio.h>

+

+#include "avcodec.h"

+#include "dsputil.h"

+

+float sf_table[64];

+float qmf_window[48];

+

+static const float qmf_48tap_half[24] = {

+   -0.00001461907, -0.00009205479,-0.000056157569,0.00030117269,

+    0.0002422519,  -0.00085293897,-0.0005205574,  0.0020340169,

+    0.00078333891, -0.0042153862, -0.00075614988, 0.0078402944,

+   -0.000061169922,-0.01344162,    0.0024626821,  0.021736089,

+   -0.007801671,   -0.034090221,   0.01880949,    0.054326009,

+   -0.043596379,   -0.099384367,   0.13207909,    0.46424159

+};

+

+/**

+ * Generate common tables

+ */

+

+void atrac_generate_tables(void)

+{

+    int i;

+    float s;

+

+    /* Generate scale factors */

+    if (!sf_table[63])

+        for (i=0 ; i<64 ; i++)

+            sf_table[i] = pow(2.0, (i - 15) / 3.0);

+

+    /* Generate the QMF window. */

+    if (!qmf_window[47])

+        for (i=0 ; i<24; i++) {

+            s = qmf_48tap_half[i] * 2.0;

+            qmf_window[i] = qmf_window[47 - i] = s;

+        }

+}

+

+

+/**

+ * Quadrature mirror synthesis filter.

+ *

+ * @param inlo      lower part of spectrum

+ * @param inhi      higher part of spectrum

+ * @param nIn       size of spectrum buffer

+ * @param pOut      out buffer

+ * @param delayBuf  delayBuf buffer

+ * @param temp      temp buffer

+ */

+

+

+void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)

+{

+    int   i, j;

+    float   *p1, *p3;

+

+    memcpy(temp, delayBuf, 46*sizeof(float));

+

+    p3 = temp + 46;

+

+    /* loop1 */

+    for(i=0; i<nIn; i+=2){

+        p3[2*i+0] = inlo[i  ] + inhi[i  ];

+        p3[2*i+1] = inlo[i  ] - inhi[i  ];

+        p3[2*i+2] = inlo[i+1] + inhi[i+1];

+        p3[2*i+3] = inlo[i+1] - inhi[i+1];

+    }

+

+    /* loop2 */

+    p1 = temp;

+    for (j = nIn; j != 0; j--) {

+        float s1 = 0.0;

+        float s2 = 0.0;

+

+        for (i = 0; i < 48; i += 2) {

+            s1 += p1[i] * qmf_window[i];

+            s2 += p1[i+1] * qmf_window[i+1];

+        }

+

+        pOut[0] = s2;

+        pOut[1] = s1;

+

+        p1 += 2;

+        pOut += 2;

+    }

+

+    /* Update the delay buffer. */

+    memcpy(delayBuf, temp + nIn*2, 46*sizeof(float));

+}

+

new file mode 100644

@@ -0,0 +1,38 @@

+/*

+ * Atrac common data

+ * Copyright (c) 2009 Maxim Poliakovski

+ * Copyright (c) 2009 Benjamin Larsson

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file libavcodec/atrac1data.h

+ * Atrac 1 compatible decoder data

+ */

+

+#ifndef AVCODEC_ATRAC_H

+#define AVCODEC_ATRAC_H

+

+

+extern float sf_table[64];

+extern float qmf_window[48];

+

+void atrac_generate_tables(void);

+void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);

+

+#endif /* AVCODEC_ATRAC_H */

@@ -41,6 +41,7 @@

 #include "dsputil.h"

 #include "bytestream.h"

+#include "atrac.h"

 #include "atrac3data.h"

 #define JOINT_STEREO    0x12

@@ -119,68 +120,13 @@ typedef struct {

 } ATRAC3Context;

 static DECLARE_ALIGNED_16(float,mdct_window[512]);

-static float            qmf_window[48];

 static VLC              spectral_coeff_tab[7];

-static float            SFTable[64];

 static float            gain_tab1[16];

 static float            gain_tab2[31];

 static MDCTContext      mdct_ctx;

 static DSPContext       dsp;

-/* quadrature mirror synthesis filter */

-

-/**

- * Quadrature mirror synthesis filter.

- *

- * @param inlo      lower part of spectrum

- * @param inhi      higher part of spectrum

- * @param nIn       size of spectrum buffer

- * @param pOut      out buffer

- * @param delayBuf  delayBuf buffer

- * @param temp      temp buffer

- */

-

-

-static void iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)

-{

-    int   i, j;

-    float   *p1, *p3;

-

-    memcpy(temp, delayBuf, 46*sizeof(float));

-

-    p3 = temp + 46;

-

-    /* loop1 */

-    for(i=0; i<nIn; i+=2){

-        p3[2*i+0] = inlo[i  ] + inhi[i  ];

-        p3[2*i+1] = inlo[i  ] - inhi[i  ];

-        p3[2*i+2] = inlo[i+1] + inhi[i+1];

-        p3[2*i+3] = inlo[i+1] - inhi[i+1];

-    }

-

-    /* loop2 */

-    p1 = temp;

-    for (j = nIn; j != 0; j--) {

-        float s1 = 0.0;

-        float s2 = 0.0;

-

-        for (i = 0; i < 48; i += 2) {

-            s1 += p1[i] * qmf_window[i];

-            s2 += p1[i+1] * qmf_window[i+1];

-        }

-

-        pOut[0] = s2;

-        pOut[1] = s1;

-

-        p1 += 2;

-        pOut += 2;

-    }

-

-    /* Update the delay buffer. */

-    memcpy(delayBuf, temp + nIn*2, 46*sizeof(float));

-}

-

 /**

  * Regular 512 points IMDCT without overlapping, with the exception of the swapping of odd bands

  * caused by the reverse spectra of the QMF.

@@ -386,7 +332,7 @@ static int decodeSpectrum (GetBitContext *gb, float *pOut)

             readQuantSpectralCoeffs (gb, subband_vlc_index[cnt], codingMode, mantissas, subbWidth);

             /* Decode the scale factor for this subband. */

-            SF = SFTable[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];

+            SF = sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];

             /* Inverse quantize the coefficients. */

             for (pIn=mantissas ; first<last; first++, pIn++)

@@ -459,7 +405,7 @@ static int decodeTonalComponents (GetBitContext *gb, tonal_component *pComponent

                 coded_values = coded_values_per_component + 1;

                 coded_values = FFMIN(max_coded_values,coded_values);

-                scalefactor = SFTable[sfIndx] * iMaxQuant[quant_step_index];

+                scalefactor = sf_table[sfIndx] * iMaxQuant[quant_step_index];

                 readQuantSpectralCoeffs(gb, quant_step_index, coding_mode, mantissa, coded_values);

@@ -860,9 +806,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf)

         p2= p1+256;

         p3= p2+256;

         p4= p3+256;

-        iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf);

-        iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf);

-        iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf);

+        atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf);

+        atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf);

+        atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf);

         p1 +=1024;

     }

@@ -1038,9 +984,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)

     init_atrac3_transforms(q);

-    /* Generate the scale factors. */

-    for (i=0 ; i<64 ; i++)

-        SFTable[i] = pow(2.0, (i - 15) / 3.0);

+    atrac_generate_tables();

     /* Generate gain tables. */

     for (i=0 ; i<16 ; i++)