@@ -3314,7 +3314,7 @@ SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD}

 SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}

 SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}

 SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}

-SAMPLES=${samples:-\$(FATE_SAMPLES)}

+SAMPLES:=${samples:-\$(FATE_SAMPLES)}

 EOF

 get_version(){

@@ -12,6 +12,46 @@ libavutil:   2009-03-08

 API changes, most recent first:

+2011-04-03 - lavf 52.105.0 - avio.h

+  Large-scale renaming/deprecating of AVIOContext-related functions:

+    724f6a0 deprecate url_fdopen

+    403ee83 deprecate url_open_dyn_packet_buf

+    6dc7d80 rename url_close_dyn_buf       -> avio_close_dyn_buf

+    b92c545 rename url_open_dyn_buf        -> avio_open_dyn_buf

+    8978fed introduce an AVIOContext.seekable field as a replacement for

+            AVIOContext.is_streamed and url_is_streamed()

+    b64030f deprecate get_checksum()

+    4c4427a deprecate init_checksum()

+    4ec153b deprecate udp_set_remote_url/get_local_port

+    933e90a deprecate av_url_read_fseek/fpause

+    8d9769a deprecate url_fileno

+    b7f2fdd rename put_flush_packet -> avio_flush

+    35f1023 deprecate url_close_buf

+    83fddae deprecate url_open_buf

+    d9d86e0 rename url_fprintf -> avio_printf

+    59f65d9 deprecate url_setbufsize

+    3e68b3b deprecate url_ferror

+    66e5b1d deprecate url_feof

+    e8bb2e2 deprecate url_fget_max_packet_size

+    76aa876 rename url_fsize -> avio_size

+    e519753 deprecate url_fgetc

+    655e45e deprecate url_fgets

+    a2704c9 rename url_ftell -> avio_tell

+    e16ead0 deprecate get_strz() in favor of avio_get_str

+    0300db8,2af07d3 rename url_fskip -> avio_skip

+    6b4aa5d rename url_fseek -> avio_seek

+    61840b4 deprecate put_tag

+    22a3212 rename url_fopen/fclose -> avio_open/close.

+    0ac8e2b deprecate put_nbyte

+    77eb550 rename put_byte          -> avio_w8

+                   put_[b/l]e<type>  -> avio_w[b/l]<type>

+                   put_buffer        -> avio_write

+    b7effd4 rename get_byte          -> avio_r8,

+                   get_[b/l]e<type>  -> avio_r[b/l]<type>

+                   get_buffer        -> avio_read

+    b3db9ce deprecate get_partial_buffer

+    8d9ac96 rename av_alloc_put_byte -> avio_alloc_context

+

 2011-03-25 - 34b47d7 - lavc 52.115.0 - AVCodecContext.audio_service_type

   Add audio_service_type field to AVCodecContext.

@@ -33,6 +33,8 @@

 #include "libavformat/os_support.h"

 #include "libavformat/rtpdec.h"

 #include "libavformat/rtsp.h"

+// XXX for ffio_open_dyn_packet_buffer, to be removed

+#include "libavformat/avio_internal.h"

 #include "libavutil/avstring.h"

 #include "libavutil/lfg.h"

 #include "libavutil/random_seed.h"

@@ -869,10 +871,10 @@ static void close_connection(HTTPContext *c)

     if (!c->last_packet_sent && c->state == HTTPSTATE_SEND_DATA_TRAILER) {

         if (ctx->oformat) {

             /* prepare header */

-            if (url_open_dyn_buf(&ctx->pb) >= 0) {

+            if (avio_open_dyn_buf(&ctx->pb) >= 0) {

                 av_write_trailer(ctx);

                 av_freep(&c->pb_buffer);

-                url_close_dyn_buf(ctx->pb, &c->pb_buffer);

+                avio_close_dyn_buf(ctx->pb, &c->pb_buffer);

             }

         }

     }

@@ -1873,7 +1875,7 @@ static void compute_status(HTTPContext *c)

     int i, len;

     AVIOContext *pb;

-    if (url_open_dyn_buf(&pb) < 0) {

+    if (avio_open_dyn_buf(&pb) < 0) {

         /* XXX: return an error ? */

         c->buffer_ptr = c->buffer;

         c->buffer_end = c->buffer;

@@ -2101,7 +2103,7 @@ static void compute_status(HTTPContext *c)

     avio_printf(pb, "<hr size=1 noshade>Generated at %s", p);

     avio_printf(pb, "</body>\n</html>\n");

-    len = url_close_dyn_buf(pb, &c->pb_buffer);

+    len = avio_close_dyn_buf(pb, &c->pb_buffer);

     c->buffer_ptr = c->pb_buffer;

     c->buffer_end = c->pb_buffer + len;

 }

@@ -2256,11 +2258,11 @@ static int http_prepare_data(HTTPContext *c)

         c->got_key_frame = 0;

         /* prepare header and save header data in a stream */

-        if (url_open_dyn_buf(&c->fmt_ctx.pb) < 0) {

+        if (avio_open_dyn_buf(&c->fmt_ctx.pb) < 0) {

             /* XXX: potential leak */

             return -1;

         }

-        c->fmt_ctx.pb->is_streamed = 1;

+        c->fmt_ctx.pb->seekable = 0;

         /*

          * HACK to avoid mpeg ps muxer to spit many underflow errors

@@ -2277,7 +2279,7 @@ static int http_prepare_data(HTTPContext *c)

         }

         av_metadata_free(&c->fmt_ctx.metadata);

-        len = url_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer);

+        len = avio_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer);

         c->buffer_ptr = c->pb_buffer;

         c->buffer_end = c->pb_buffer + len;

@@ -2389,9 +2391,9 @@ static int http_prepare_data(HTTPContext *c)

                             max_packet_size = RTSP_TCP_MAX_PACKET_SIZE;

                         else

                             max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]);

-                        ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size);

+                        ret = ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size);

                     } else {

-                        ret = url_open_dyn_buf(&ctx->pb);

+                        ret = avio_open_dyn_buf(&ctx->pb);

                     }

                     if (ret < 0) {

                         /* XXX: potential leak */

@@ -2399,7 +2401,7 @@ static int http_prepare_data(HTTPContext *c)

                     }

                     ost = ctx->streams[pkt.stream_index];

-                    ctx->pb->is_streamed = 1;

+                    ctx->pb->seekable = 0;

                     if (pkt.dts != AV_NOPTS_VALUE)

                         pkt.dts = av_rescale_q(pkt.dts, ist->time_base, ost->time_base);

                     if (pkt.pts != AV_NOPTS_VALUE)

@@ -2410,7 +2412,7 @@ static int http_prepare_data(HTTPContext *c)

                         c->state = HTTPSTATE_SEND_DATA_TRAILER;

                     }

-                    len = url_close_dyn_buf(ctx->pb, &c->pb_buffer);

+                    len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);

                     c->cur_frame_bytes = len;

                     c->buffer_ptr = c->pb_buffer;

                     c->buffer_end = c->pb_buffer + len;

@@ -2432,13 +2434,13 @@ static int http_prepare_data(HTTPContext *c)

             return -1;

         ctx = &c->fmt_ctx;

         /* prepare header */

-        if (url_open_dyn_buf(&ctx->pb) < 0) {

+        if (avio_open_dyn_buf(&ctx->pb) < 0) {

             /* XXX: potential leak */

             return -1;

         }

-        c->fmt_ctx.pb->is_streamed = 1;

+        c->fmt_ctx.pb->seekable = 0;

         av_write_trailer(ctx);

-        len = url_close_dyn_buf(ctx->pb, &c->pb_buffer);

+        len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);

         c->buffer_ptr = c->pb_buffer;

         c->buffer_end = c->pb_buffer + len;

@@ -2503,7 +2505,7 @@ static int http_send_data(HTTPContext *c)

                     /* if already sending something, then wait. */

                     if (rtsp_c->state != RTSPSTATE_WAIT_REQUEST)

                         break;

-                    if (url_open_dyn_buf(&pb) < 0)

+                    if (avio_open_dyn_buf(&pb) < 0)

                         goto fail1;

                     interleaved_index = c->packet_stream_index * 2;

                     /* RTCP packets are sent at odd indexes */

@@ -2518,7 +2520,7 @@ static int http_send_data(HTTPContext *c)

                     /* write RTP packet data */

                     c->buffer_ptr += 4;

                     avio_write(pb, c->buffer_ptr, len);

-                    size = url_close_dyn_buf(pb, &c->packet_buffer);

+                    size = avio_close_dyn_buf(pb, &c->packet_buffer);

                     /* prepare asynchronous TCP sending */

                     rtsp_c->packet_buffer_ptr = c->packet_buffer;

                     rtsp_c->packet_buffer_end = c->packet_buffer + size;

@@ -2723,7 +2725,7 @@ static int http_receive_data(HTTPContext *c)

             pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer,

                                     0, NULL, NULL, NULL, NULL);

-            pb->is_streamed = 1;

+            pb->seekable = 0;

             if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) {

                 av_free(pb);

@@ -2850,7 +2852,7 @@ static int rtsp_parse_request(HTTPContext *c)

     av_strlcpy(c->url, url, sizeof(c->url));

     av_strlcpy(c->protocol, protocol, sizeof(c->protocol));

-    if (url_open_dyn_buf(&c->pb) < 0) {

+    if (avio_open_dyn_buf(&c->pb) < 0) {

         /* XXX: cannot do more */

         c->pb = NULL; /* safety */

         return -1;

@@ -2907,7 +2909,7 @@ static int rtsp_parse_request(HTTPContext *c)

         rtsp_reply_error(c, RTSP_STATUS_METHOD);

  the_end:

-    len = url_close_dyn_buf(c->pb, &c->pb_buffer);

+    len = avio_close_dyn_buf(c->pb, &c->pb_buffer);

     c->pb = NULL; /* safety */

     if (len < 0) {

         /* XXX: cannot do more */

@@ -3444,7 +3446,7 @@ static int rtp_new_av_stream(HTTPContext *c,

              c->stream->filename, stream_index, c->protocol);

     /* normally, no packets should be output here, but the packet size may be checked */

-    if (url_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) {

+    if (ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) {

         /* XXX: close stream */

         goto fail;

     }

@@ -3456,7 +3458,7 @@ static int rtp_new_av_stream(HTTPContext *c,

         av_free(ctx);

         return -1;

     }

-    url_close_dyn_buf(ctx->pb, &dummy_buf);

+    avio_close_dyn_buf(ctx->pb, &dummy_buf);

     av_free(dummy_buf);

     c->rtp_ctx[stream_index] = ctx;

@@ -29,6 +29,8 @@

 //#define DEBUG

 //#define ASSERT_LEVEL 2

+#include <stdint.h>

+

 #include "libavutil/audioconvert.h"

 #include "libavutil/avassert.h"

 #include "libavutil/crc.h"

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

 #include "ac3dsp.h"

 #include "ac3.h"

 #include "audioconvert.h"

+#include "fft.h"

 #ifndef CONFIG_AC3ENC_FLOAT

@@ -55,16 +58,22 @@

 #define AC3_REMATRIXING_NONE    1

 #define AC3_REMATRIXING_ALWAYS  3

-/** Scale a float value by 2^bits and convert to an integer. */

-#define SCALE_FLOAT(a, bits) lrintf((a) * (float)(1 << (bits)))

-

-

 #if CONFIG_AC3ENC_FLOAT

-#include "ac3enc_float.h"

+#define MAC_COEF(d,a,b) ((d)+=(a)*(b))

+typedef float SampleType;

+typedef float CoefType;

+typedef float CoefSumType;

 #else

-#include "ac3enc_fixed.h"

+#define MAC_COEF(d,a,b) MAC64(d,a,b)

+typedef int16_t SampleType;

+typedef int32_t CoefType;

+typedef int64_t CoefSumType;

 #endif

+typedef struct AC3MDCTContext {

+    const SampleType *window;           ///< MDCT window function

+    FFTContext fft;                     ///< FFT context for MDCT calculation

+} AC3MDCTContext;

 /**

  * Encoding Options used by AVOption.

@@ -279,8 +288,6 @@ static av_cold void mdct_end(AC3MDCTContext *mdct);

 static av_cold int mdct_init(AVCodecContext *avctx, AC3MDCTContext *mdct,

                              int nbits);

-static void mdct512(AC3MDCTContext *mdct, CoefType *out, SampleType *in);

-

 static void apply_window(DSPContext *dsp, SampleType *output, const SampleType *input,

                          const SampleType *window, unsigned int len);

@@ -386,7 +393,8 @@ static void apply_mdct(AC3EncodeContext *s)

             block->coeff_shift[ch] = normalize_samples(s);

-            mdct512(&s->mdct, block->mdct_coef[ch], s->windowed_samples);

+            s->mdct.fft.mdct_calcw(&s->mdct.fft, block->mdct_coef[ch],

+                                   s->windowed_samples);

         }

     }

 }

@@ -26,54 +26,17 @@

  * fixed-point AC-3 encoder.

  */

+#define CONFIG_FFT_FLOAT 0

 #undef CONFIG_AC3ENC_FLOAT

 #include "ac3enc.c"

-/** Scale a float value by 2^15, convert to an integer, and clip to range -32767..32767. */

-#define FIX15(a) av_clip(SCALE_FLOAT(a, 15), -32767, 32767)

-

-

 /**

  * Finalize MDCT and free allocated memory.

  */

 static av_cold void mdct_end(AC3MDCTContext *mdct)

 {

-    mdct->nbits = 0;

-    av_freep(&mdct->costab);

-    av_freep(&mdct->sintab);

-    av_freep(&mdct->xcos1);

-    av_freep(&mdct->xsin1);

-    av_freep(&mdct->rot_tmp);

-    av_freep(&mdct->cplx_tmp);

-}

-

-

-/**

- * Initialize FFT tables.

- * @param ln log2(FFT size)

- */

-static av_cold int fft_init(AVCodecContext *avctx, AC3MDCTContext *mdct, int ln)

-{

-    int i, n, n2;

-    float alpha;

-

-    n  = 1 << ln;

-    n2 = n >> 1;

-

-    FF_ALLOC_OR_GOTO(avctx, mdct->costab, n2 * sizeof(*mdct->costab), fft_alloc_fail);

-    FF_ALLOC_OR_GOTO(avctx, mdct->sintab, n2 * sizeof(*mdct->sintab), fft_alloc_fail);

-

-    for (i = 0; i < n2; i++) {

-        alpha     = 2.0 * M_PI * i / n;

-        mdct->costab[i] = FIX15(cos(alpha));

-        mdct->sintab[i] = FIX15(sin(alpha));

-    }

-

-    return 0;

-fft_alloc_fail:

-    mdct_end(mdct);

-    return AVERROR(ENOMEM);

+    ff_fft_end(&mdct->fft);

 }

@@ -84,167 +47,9 @@ fft_alloc_fail:

 static av_cold int mdct_init(AVCodecContext *avctx, AC3MDCTContext *mdct,

                              int nbits)

 {

-    int i, n, n4, ret;

-

-    n  = 1 << nbits;

-    n4 = n >> 2;

-

-    mdct->nbits = nbits;

-

-    ret = fft_init(avctx, mdct, nbits - 2);

-    if (ret)

-        return ret;

-

+    int ret = ff_mdct_init(&mdct->fft, nbits, 0, 1.0);

     mdct->window = ff_ac3_window;

-

-    FF_ALLOC_OR_GOTO(avctx, mdct->xcos1,    n4 * sizeof(*mdct->xcos1),    mdct_alloc_fail);

-    FF_ALLOC_OR_GOTO(avctx, mdct->xsin1,    n4 * sizeof(*mdct->xsin1),    mdct_alloc_fail);

-    FF_ALLOC_OR_GOTO(avctx, mdct->rot_tmp,  n  * sizeof(*mdct->rot_tmp),  mdct_alloc_fail);

-    FF_ALLOC_OR_GOTO(avctx, mdct->cplx_tmp, n4 * sizeof(*mdct->cplx_tmp), mdct_alloc_fail);

-

-    for (i = 0; i < n4; i++) {

-        float alpha = 2.0 * M_PI * (i + 1.0 / 8.0) / n;

-        mdct->xcos1[i] = FIX15(-cos(alpha));

-        mdct->xsin1[i] = FIX15(-sin(alpha));

-    }

-

-    return 0;

-mdct_alloc_fail:

-    mdct_end(mdct);

-    return AVERROR(ENOMEM);

-}

-

-

-/** Butterfly op */

-#define BF(pre, pim, qre, qim, pre1, pim1, qre1, qim1)  \

-{                                                       \

-  int ax, ay, bx, by;                                   \

-  bx  = pre1;                                           \

-  by  = pim1;                                           \

-  ax  = qre1;                                           \

-  ay  = qim1;                                           \

-  pre = (bx + ax) >> 1;                                 \

-  pim = (by + ay) >> 1;                                 \

-  qre = (bx - ax) >> 1;                                 \

-  qim = (by - ay) >> 1;                                 \

-}

-

-

-/** Complex multiply */

-#define CMUL(pre, pim, are, aim, bre, bim, rshift)      \

-{                                                       \

-   pre = (MUL16(are, bre) - MUL16(aim, bim)) >> rshift; \

-   pim = (MUL16(are, bim) + MUL16(bre, aim)) >> rshift; \

-}

-

-

-/**

- * Calculate a 2^n point complex FFT on 2^ln points.

- * @param z  complex input/output samples

- * @param ln log2(FFT size)

- */

-static void fft(AC3MDCTContext *mdct, IComplex *z, int ln)

-{

-    int j, l, np, np2;

-    int nblocks, nloops;

-    register IComplex *p,*q;

-    int tmp_re, tmp_im;

-

-    np = 1 << ln;

-

-    /* reverse */

-    for (j = 0; j < np; j++) {

-        int k = av_reverse[j] >> (8 - ln);

-        if (k < j)

-            FFSWAP(IComplex, z[k], z[j]);

-    }

-

-    /* pass 0 */

-

-    p = &z[0];

-    j = np >> 1;

-    do {

-        BF(p[0].re, p[0].im, p[1].re, p[1].im,

-           p[0].re, p[0].im, p[1].re, p[1].im);

-        p += 2;

-    } while (--j);

-

-    /* pass 1 */

-

-    p = &z[0];

-    j = np >> 2;

-    do {

-        BF(p[0].re, p[0].im, p[2].re,  p[2].im,

-           p[0].re, p[0].im, p[2].re,  p[2].im);

-        BF(p[1].re, p[1].im, p[3].re,  p[3].im,

-           p[1].re, p[1].im, p[3].im, -p[3].re);

-        p+=4;

-    } while (--j);

-

-    /* pass 2 .. ln-1 */

-

-    nblocks = np >> 3;

-    nloops  =  1 << 2;

-    np2     = np >> 1;

-    do {

-        p = z;

-        q = z + nloops;

-        for (j = 0; j < nblocks; j++) {

-            BF(p->re, p->im, q->re, q->im,

-               p->re, p->im, q->re, q->im);

-            p++;

-            q++;

-            for(l = nblocks; l < np2; l += nblocks) {

-                CMUL(tmp_re, tmp_im, mdct->costab[l], -mdct->sintab[l], q->re, q->im, 15);

-                BF(p->re, p->im, q->re,  q->im,

-                   p->re, p->im, tmp_re, tmp_im);

-                p++;

-                q++;

-            }

-            p += nloops;

-            q += nloops;

-        }

-        nblocks = nblocks >> 1;

-        nloops  = nloops  << 1;

-    } while (nblocks);

-}

-

-

-/**

- * Calculate a 512-point MDCT

- * @param out 256 output frequency coefficients

- * @param in  512 windowed input audio samples

- */

-static void mdct512(AC3MDCTContext *mdct, int32_t *out, int16_t *in)

-{

-    int i, re, im, n, n2, n4;

-    int16_t *rot = mdct->rot_tmp;

-    IComplex *x  = mdct->cplx_tmp;

-

-    n  = 1 << mdct->nbits;

-    n2 = n >> 1;

-    n4 = n >> 2;

-

-    /* shift to simplify computations */

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

-        rot[i] = -in[i + 3*n4];

-    memcpy(&rot[n4], &in[0], 3*n4*sizeof(*in));

-

-    /* pre rotation */

-    for (i = 0; i < n4; i++) {

-        re =  ((int)rot[   2*i] - (int)rot[ n-1-2*i]) >> 1;

-        im = -((int)rot[n2+2*i] - (int)rot[n2-1-2*i]) >> 1;

-        CMUL(x[i].re, x[i].im, re, im, -mdct->xcos1[i], mdct->xsin1[i], 15);

-    }

-

-    fft(mdct, x, mdct->nbits - 2);

-

-    /* post rotation */

-    for (i = 0; i < n4; i++) {

-        re = x[i].re;

-        im = x[i].im;

-        CMUL(out[n2-1-2*i], out[2*i], re, im, mdct->xsin1[i], mdct->xcos1[i], 0);

-    }

+    return ret;

 }

@@ -304,101 +109,6 @@ static void scale_coefficients(AC3EncodeContext *s)

 }

-#ifdef TEST

-/*************************************************************************/

-/* TEST */

-

-#include "libavutil/lfg.h"

-

-#define MDCT_NBITS 9

-#define MDCT_SAMPLES (1 << MDCT_NBITS)

-#define FN (MDCT_SAMPLES/4)

-

-

-static void fft_test(AC3MDCTContext *mdct, AVLFG *lfg)

-{

-    IComplex in[FN], in1[FN];

-    int k, n, i;

-    float sum_re, sum_im, a;

-

-    for (i = 0; i < FN; i++) {

-        in[i].re = av_lfg_get(lfg) % 65535 - 32767;

-        in[i].im = av_lfg_get(lfg) % 65535 - 32767;

-        in1[i]   = in[i];

-    }

-    fft(mdct, in, 7);

-

-    /* do it by hand */

-    for (k = 0; k < FN; k++) {

-        sum_re = 0;

-        sum_im = 0;

-        for (n = 0; n < FN; n++) {

-            a = -2 * M_PI * (n * k) / FN;

-            sum_re += in1[n].re * cos(a) - in1[n].im * sin(a);

-            sum_im += in1[n].re * sin(a) + in1[n].im * cos(a);

-        }

-        av_log(NULL, AV_LOG_DEBUG, "%3d: %6d,%6d %6.0f,%6.0f\n",

-               k, in[k].re, in[k].im, sum_re / FN, sum_im / FN);

-    }

-}

-

-

-static void mdct_test(AC3MDCTContext *mdct, AVLFG *lfg)

-{

-    int16_t input[MDCT_SAMPLES];

-    int32_t output[AC3_MAX_COEFS];

-    float input1[MDCT_SAMPLES];

-    float output1[AC3_MAX_COEFS];

-    float s, a, err, e, emax;

-    int i, k, n;

-

-    for (i = 0; i < MDCT_SAMPLES; i++) {

-        input[i]  = (av_lfg_get(lfg) % 65535 - 32767) * 9 / 10;

-        input1[i] = input[i];

-    }

-

-    mdct512(mdct, output, input);

-

-    /* do it by hand */

-    for (k = 0; k < AC3_MAX_COEFS; k++) {

-        s = 0;

-        for (n = 0; n < MDCT_SAMPLES; n++) {

-            a = (2*M_PI*(2*n+1+MDCT_SAMPLES/2)*(2*k+1) / (4 * MDCT_SAMPLES));

-            s += input1[n] * cos(a);

-        }

-        output1[k] = -2 * s / MDCT_SAMPLES;

-    }

-

-    err  = 0;

-    emax = 0;

-    for (i = 0; i < AC3_MAX_COEFS; i++) {

-        av_log(NULL, AV_LOG_DEBUG, "%3d: %7d %7.0f\n", i, output[i], output1[i]);

-        e = output[i] - output1[i];

-        if (e > emax)

-            emax = e;

-        err += e * e;

-    }

-    av_log(NULL, AV_LOG_DEBUG, "err2=%f emax=%f\n", err / AC3_MAX_COEFS, emax);

-}

-

-

-int main(void)

-{

-    AVLFG lfg;

-    AC3MDCTContext mdct;

-

-    mdct.avctx = NULL;

-    av_log_set_level(AV_LOG_DEBUG);

-    mdct_init(&mdct, 9);

-

-    fft_test(&mdct, &lfg);

-    mdct_test(&mdct, &lfg);

-

-    return 0;

-}

-#endif /* TEST */

-

-

 AVCodec ff_ac3_fixed_encoder = {

     "ac3_fixed",

     AVMEDIA_TYPE_AUDIO,

deleted file mode 100644

@@ -1,61 +0,0 @@

-/*

- * The simplest AC-3 encoder

- * Copyright (c) 2000 Fabrice Bellard

- * Copyright (c) 2006-2010 Justin Ruggles <justin.ruggles@gmail.com>

- * Copyright (c) 2006-2010 Prakash Punnoor <prakash@punnoor.de>

- *

- * 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

- * fixed-point AC-3 encoder header.

- */

-

-#ifndef AVCODEC_AC3ENC_FIXED_H

-#define AVCODEC_AC3ENC_FIXED_H

-

-#include <stdint.h>

-

-

-typedef int16_t SampleType;

-typedef int32_t CoefType;

-typedef int64_t CoefSumType;

-

-#define MAC_COEF(d,a,b) MAC64(d,a,b)

-

-

-/**

- * Compex number.

- * Used in fixed-point MDCT calculation.

- */

-typedef struct IComplex {

-    int16_t re,im;

-} IComplex;

-

-typedef struct AC3MDCTContext {

-    const int16_t *window;                  ///< MDCT window function

-    int nbits;                              ///< log2(transform size)

-    int16_t *costab;                        ///< FFT cos table

-    int16_t *sintab;                        ///< FFT sin table

-    int16_t *xcos1;                         ///< MDCT cos table

-    int16_t *xsin1;                         ///< MDCT sin table

-    int16_t *rot_tmp;                       ///< temp buffer for pre-rotated samples

-    IComplex *cplx_tmp;                     ///< temp buffer for complex pre-rotated samples

-} AC3MDCTContext;

-

-#endif /* AVCODEC_AC3ENC_FIXED_H */

@@ -69,17 +69,6 @@ static av_cold int mdct_init(AVCodecContext *avctx, AC3MDCTContext *mdct,

 /**

- * Calculate a 512-point MDCT

- * @param out 256 output frequency coefficients

- * @param in  512 windowed input audio samples

- */

-static void mdct512(AC3MDCTContext *mdct, float *out, float *in)

-{

-    mdct->fft.mdct_calc(&mdct->fft, out, in);

-}

-

-

-/**

  * Apply KBD window to input samples prior to MDCT.

  */

 static void apply_window(DSPContext *dsp, float *output, const float *input,

deleted file mode 100644

@@ -1,47 +0,0 @@

-/*

- * The simplest AC-3 encoder

- * Copyright (c) 2000 Fabrice Bellard

- * Copyright (c) 2006-2010 Justin Ruggles <justin.ruggles@gmail.com>

- * Copyright (c) 2006-2010 Prakash Punnoor <prakash@punnoor.de>

- *

- * 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

- * floating-point AC-3 encoder header.

- */

-

-#ifndef AVCODEC_AC3ENC_FLOAT_H

-#define AVCODEC_AC3ENC_FLOAT_H

-

-#include "fft.h"

-

-

-typedef float SampleType;

-typedef float CoefType;

-typedef float CoefSumType;

-

-#define MAC_COEF(d,a,b) ((d)+=(a)*(b))

-

-

-typedef struct AC3MDCTContext {

-    const float *window;    ///< MDCT window function

-    FFTContext fft;         ///< FFT context for MDCT calculation

-} AC3MDCTContext;

-

-#endif /* AVCODEC_AC3ENC_FLOAT_H */

@@ -16,6 +16,7 @@ OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o

 OBJS                                   += arm/dsputil_init_arm.o        \

                                           arm/dsputil_arm.o             \

                                           arm/fft_init_arm.o            \

+                                          arm/fft_fixed_init_arm.o      \

                                           arm/fmtconvert_init_arm.o     \

                                           arm/jrevdct_arm.o             \

                                           arm/mpegvideo_arm.o           \

@@ -41,8 +42,10 @@ OBJS-$(HAVE_IWMMXT)                    += arm/dsputil_iwmmxt.o          \

                                           arm/mpegvideo_iwmmxt.o        \

 NEON-OBJS-$(CONFIG_FFT)                += arm/fft_neon.o                \

+                                          arm/fft_fixed_neon.o          \

 NEON-OBJS-$(CONFIG_MDCT)               += arm/mdct_neon.o               \

+                                          arm/mdct_fixed_neon.o         \

 NEON-OBJS-$(CONFIG_RDFT)               += arm/rdft_neon.o               \

new file mode 100644

@@ -0,0 +1,42 @@

+/*

+ * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>

+ *

+ * 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

+ */

+

+#define CONFIG_FFT_FLOAT 0

+#include "libavcodec/fft.h"

+

+void ff_fft_fixed_calc_neon(FFTContext *s, FFTComplex *z);

+void ff_mdct_fixed_calc_neon(FFTContext *s, FFTSample *o, const FFTSample *i);

+void ff_mdct_fixed_calcw_neon(FFTContext *s, FFTDouble *o, const FFTSample *i);

+

+av_cold void ff_fft_fixed_init_arm(FFTContext *s)

+{

+    if (HAVE_NEON) {

+        s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;

+        s->fft_calc        = ff_fft_fixed_calc_neon;

+

+#if CONFIG_MDCT

+        if (!s->inverse && s->mdct_bits >= 5) {

+            s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;

+            s->mdct_calc        = ff_mdct_fixed_calc_neon;

+            s->mdct_calcw       = ff_mdct_fixed_calcw_neon;

+        }

+#endif

+    }

+}

new file mode 100644

@@ -0,0 +1,261 @@

+/*

+ * Copyright (c) 2011 Mans Rullgard <mans@mansr.com>

+ *

+ * This file is part of Libav.

+ *

+ * Libav 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.

+ *

+ * Libav 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 Libav; if not, write to the Free Software

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

+ */

+

+#include "asm.S"

+

+.macro  bflies          d0,  d1,  r0,  r1

+        vrev64.32       \r0, \d1                @ t5, t6, t1, t2

+        vhsub.s16       \r1, \d1, \r0           @ t1-t5, t2-t6, t5-t1, t6-t2

+        vhadd.s16       \r0, \d1, \r0           @ t1+t5, t2+t6, t5+t1, t6+t2

+        vext.16         \r1, \r1, \r1, #1       @ t2-t6, t5-t1, t6-t2, t1-t5

+        vtrn.32         \r0, \r1                @ t1+t5, t2+t6, t2-t6, t5-t1

+                                                @ t5,    t6,    t4,    t3