ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/qdm2.c

 /*
  * QDM2 compatible decoder
  * Copyright (c) 2003 Ewald Snel
  * Copyright (c) 2005 Benjamin Larsson
  * Copyright (c) 2005 Alex Beregszaszi
  * Copyright (c) 2005 Roberto Togni
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ skipping 20 matching lines @@
  */
 
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "fft.h"
 #include "mpegaudio.h"
 
 #include "qdm2data.h"
 
 #undef NDEBUG
 #include <assert.h>
 
 
 #define SOFTCLIP_THRESHOLD 27600
 #define HARDCLIP_THRESHOLD 35716
@@ skipping 64 matching lines @@
 
 typedef struct {
     int16_t sub_packet;
     uint8_t channel;
     int16_t offset;
     int16_t exp;
     uint8_t phase;
 } FFTCoefficient;
 
 typedef struct {
-    DECLARE_ALIGNED_16(QDM2Complex, complex)[MPA_MAX_CHANNELS][256];
+    DECLARE_ALIGNED(16, QDM2Complex, complex)[MPA_MAX_CHANNELS][256];
 } QDM2FFT;
 
 /**
  * QDM2 decoder context
  */
 typedef struct {
     /// Parameters from codec header, do not change during playback
     int nb_channels;         ///< number of channels
     int channels;            ///< number of channels
     int group_size;          ///< size of frame group (16 frames per group)
@@ skipping 29 matching lines @@
     int fft_level_exp[6];
     RDFTContext rdft_ctx;
     QDM2FFT fft;
 
     /// I/O data
     const uint8_t *compressed_data;
     int compressed_size;
     float output_buffer[1024];
 
     /// Synthesis filter
-    DECLARE_ALIGNED_16(MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512*2];
+    DECLARE_ALIGNED(16, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512*2];
     int synth_buf_offset[MPA_MAX_CHANNELS];
-    DECLARE_ALIGNED_16(int32_t, sb_samples)[MPA_MAX_CHANNELS][128][SBLIMIT];
+    DECLARE_ALIGNED(16, int32_t, sb_samples)[MPA_MAX_CHANNELS][128][SBLIMIT];
 
     /// Mixed temporary data used in decoding
     float tone_level[MPA_MAX_CHANNELS][30][64];
     int8_t coding_method[MPA_MAX_CHANNELS][30][64];
     int8_t quantized_coeffs[MPA_MAX_CHANNELS][10][8];
     int8_t tone_level_idx_base[MPA_MAX_CHANNELS][30][8];
     int8_t tone_level_idx_hi1[MPA_MAX_CHANNELS][3][8][8];
     int8_t tone_level_idx_mid[MPA_MAX_CHANNELS][26][8];
     int8_t tone_level_idx_hi2[MPA_MAX_CHANNELS][26];
     int8_t tone_level_idx[MPA_MAX_CHANNELS][30][64];
@@ skipping 1732 matching lines @@
         s->coeff_per_sb_select = 1;
     else
         s->coeff_per_sb_select = 2;
 
     // Fail on unknown fft order
     if ((s->fft_order < 7) || (s->fft_order > 9)) {
         av_log(avctx, AV_LOG_ERROR, "Unknown FFT order (%d), contact the developers!\n", s->fft_order);
         return -1;
     }
 
-    ff_rdft_init(&s->rdft_ctx, s->fft_order, IRDFT);
+    ff_rdft_init(&s->rdft_ctx, s->fft_order, IDFT_C2R);
 
     qdm2_init(s);
 
     avctx->sample_fmt = SAMPLE_FMT_S16;
 
 //    dump_context(s);
     return 0;
 }
 
 
@@ skipping 99 matching lines @@
 {
     .name = "qdm2",
     .type = CODEC_TYPE_AUDIO,
     .id = CODEC_ID_QDM2,
     .priv_data_size = sizeof(QDM2Context),
     .init = qdm2_decode_init,
     .close = qdm2_decode_close,
     .decode = qdm2_decode_frame,
     .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"),
 };