Move libfaad in contrib/ and contextually move the plugin in src/libxineadec/.

--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libfaad/analysis.h => contrib/libfaad/analysis.h
rename : src/libfaad/bits.c => contrib/libfaad/bits.c
rename : src/libfaad/bits.h => contrib/libfaad/bits.h
rename : src/libfaad/cfft.c => contrib/libfaad/cfft.c
rename : src/libfaad/cfft.h => contrib/libfaad/cfft.h
rename : src/libfaad/cfft_tab.h => contrib/libfaad/cfft_tab.h
rename : src/libfaad/codebook/Makefile.am => contrib/libfaad/codebook/Makefile.am
rename : src/libfaad/codebook/hcb.h => contrib/libfaad/codebook/hcb.h
rename : src/libfaad/codebook/hcb_1.h => contrib/libfaad/codebook/hcb_1.h
rename : src/libfaad/codebook/hcb_10.h => contrib/libfaad/codebook/hcb_10.h
rename : src/libfaad/codebook/hcb_11.h => contrib/libfaad/codebook/hcb_11.h
rename : src/libfaad/codebook/hcb_2.h => contrib/libfaad/codebook/hcb_2.h
rename : src/libfaad/codebook/hcb_3.h => contrib/libfaad/codebook/hcb_3.h
rename : src/libfaad/codebook/hcb_4.h => contrib/libfaad/codebook/hcb_4.h
rename : src/libfaad/codebook/hcb_5.h => contrib/libfaad/codebook/hcb_5.h
rename : src/libfaad/codebook/hcb_6.h => contrib/libfaad/codebook/hcb_6.h
rename : src/libfaad/codebook/hcb_7.h => contrib/libfaad/codebook/hcb_7.h
rename : src/libfaad/codebook/hcb_8.h => contrib/libfaad/codebook/hcb_8.h
rename : src/libfaad/codebook/hcb_9.h => contrib/libfaad/codebook/hcb_9.h
rename : src/libfaad/codebook/hcb_sf.h => contrib/libfaad/codebook/hcb_sf.h
rename : src/libfaad/common.c => contrib/libfaad/common.c
rename : src/libfaad/common.h => contrib/libfaad/common.h
rename : src/libfaad/decoder.c => contrib/libfaad/decoder.c
rename : src/libfaad/decoder.h => contrib/libfaad/decoder.h
rename : src/libfaad/diff_to_faad2_cvs.patch => contrib/libfaad/diff_to_faad2_cvs.patch
rename : src/libfaad/drc.c => contrib/libfaad/drc.c
rename : src/libfaad/drc.h => contrib/libfaad/drc.h
rename : src/libfaad/drm_dec.c => contrib/libfaad/drm_dec.c
rename : src/libfaad/drm_dec.h => contrib/libfaad/drm_dec.h
rename : src/libfaad/error.c => contrib/libfaad/error.c
rename : src/libfaad/error.h => contrib/libfaad/error.h
rename : src/libfaad/faad.h => contrib/libfaad/faad.h
rename : src/libfaad/filtbank.c => contrib/libfaad/filtbank.c
rename : src/libfaad/filtbank.h => contrib/libfaad/filtbank.h
rename : src/libfaad/fixed.h => contrib/libfaad/fixed.h
rename : src/libfaad/hcr.c => contrib/libfaad/hcr.c
rename : src/libfaad/huffman.c => contrib/libfaad/huffman.c
rename : src/libfaad/huffman.h => contrib/libfaad/huffman.h
rename : src/libfaad/ic_predict.c => contrib/libfaad/ic_predict.c
rename : src/libfaad/ic_predict.h => contrib/libfaad/ic_predict.h
rename : src/libfaad/iq_table.h => contrib/libfaad/iq_table.h
rename : src/libfaad/is.c => contrib/libfaad/is.c
rename : src/libfaad/is.h => contrib/libfaad/is.h
rename : src/libfaad/kbd_win.h => contrib/libfaad/kbd_win.h
rename : src/libfaad/lt_predict.c => contrib/libfaad/lt_predict.c
rename : src/libfaad/lt_predict.h => contrib/libfaad/lt_predict.h
rename : src/libfaad/mdct.c => contrib/libfaad/mdct.c
rename : src/libfaad/mdct.h => contrib/libfaad/mdct.h
rename : src/libfaad/mdct_tab.h => contrib/libfaad/mdct_tab.h
rename : src/libfaad/mp4.c => contrib/libfaad/mp4.c
rename : src/libfaad/mp4.h => contrib/libfaad/mp4.h
rename : src/libfaad/ms.c => contrib/libfaad/ms.c
rename : src/libfaad/ms.h => contrib/libfaad/ms.h
rename : src/libfaad/output.c => contrib/libfaad/output.c
rename : src/libfaad/output.h => contrib/libfaad/output.h
rename : src/libfaad/pns.c => contrib/libfaad/pns.c
rename : src/libfaad/pns.h => contrib/libfaad/pns.h
rename : src/libfaad/ps_dec.c => contrib/libfaad/ps_dec.c
rename : src/libfaad/ps_dec.h => contrib/libfaad/ps_dec.h
rename : src/libfaad/ps_syntax.c => contrib/libfaad/ps_syntax.c
rename : src/libfaad/ps_tables.h => contrib/libfaad/ps_tables.h
rename : src/libfaad/pulse.c => contrib/libfaad/pulse.c
rename : src/libfaad/pulse.h => contrib/libfaad/pulse.h
rename : src/libfaad/rvlc.c => contrib/libfaad/rvlc.c
rename : src/libfaad/rvlc.h => contrib/libfaad/rvlc.h
rename : src/libfaad/sbr_dct.c => contrib/libfaad/sbr_dct.c
rename : src/libfaad/sbr_dct.h => contrib/libfaad/sbr_dct.h
rename : src/libfaad/sbr_dec.c => contrib/libfaad/sbr_dec.c
rename : src/libfaad/sbr_dec.h => contrib/libfaad/sbr_dec.h
rename : src/libfaad/sbr_e_nf.c => contrib/libfaad/sbr_e_nf.c
rename : src/libfaad/sbr_e_nf.h => contrib/libfaad/sbr_e_nf.h
rename : src/libfaad/sbr_fbt.c => contrib/libfaad/sbr_fbt.c
rename : src/libfaad/sbr_fbt.h => contrib/libfaad/sbr_fbt.h
rename : src/libfaad/sbr_hfadj.c => contrib/libfaad/sbr_hfadj.c
rename : src/libfaad/sbr_hfadj.h => contrib/libfaad/sbr_hfadj.h
rename : src/libfaad/sbr_hfgen.c => contrib/libfaad/sbr_hfgen.c
rename : src/libfaad/sbr_hfgen.h => contrib/libfaad/sbr_hfgen.h
rename : src/libfaad/sbr_huff.c => contrib/libfaad/sbr_huff.c
rename : src/libfaad/sbr_huff.h => contrib/libfaad/sbr_huff.h
rename : src/libfaad/sbr_noise.h => contrib/libfaad/sbr_noise.h
rename : src/libfaad/sbr_qmf.c => contrib/libfaad/sbr_qmf.c
rename : src/libfaad/sbr_qmf.h => contrib/libfaad/sbr_qmf.h
rename : src/libfaad/sbr_qmf_c.h => contrib/libfaad/sbr_qmf_c.h
rename : src/libfaad/sbr_syntax.c => contrib/libfaad/sbr_syntax.c
rename : src/libfaad/sbr_syntax.h => contrib/libfaad/sbr_syntax.h
rename : src/libfaad/sbr_tf_grid.c => contrib/libfaad/sbr_tf_grid.c
rename : src/libfaad/sbr_tf_grid.h => contrib/libfaad/sbr_tf_grid.h
rename : src/libfaad/sine_win.h => contrib/libfaad/sine_win.h
rename : src/libfaad/specrec.c => contrib/libfaad/specrec.c
rename : src/libfaad/specrec.h => contrib/libfaad/specrec.h
rename : src/libfaad/ssr.c => contrib/libfaad/ssr.c
rename : src/libfaad/ssr.h => contrib/libfaad/ssr.h
rename : src/libfaad/ssr_fb.c => contrib/libfaad/ssr_fb.c
rename : src/libfaad/ssr_fb.h => contrib/libfaad/ssr_fb.h
rename : src/libfaad/ssr_ipqf.c => contrib/libfaad/ssr_ipqf.c
rename : src/libfaad/ssr_ipqf.h => contrib/libfaad/ssr_ipqf.h
rename : src/libfaad/ssr_win.h => contrib/libfaad/ssr_win.h
rename : src/libfaad/structs.h => contrib/libfaad/structs.h
rename : src/libfaad/syntax.c => contrib/libfaad/syntax.c
rename : src/libfaad/syntax.h => contrib/libfaad/syntax.h
rename : src/libfaad/tns.c => contrib/libfaad/tns.c
rename : src/libfaad/tns.h => contrib/libfaad/tns.h
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c

1 files changed, 0 insertions, 609 deletions

diff --git a/src/libfaad/output.c b/src/libfaad/output.c
deleted file mode 100644
index 33ebed39c..000000000
--- a/src/libfaad/output.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program 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 General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
-**
-** $Id: output.c,v 1.9 2006/06/30 21:36:27 dgp85 Exp $
-**/
-
-#include "common.h"
-#include "structs.h"
-
-#include "output.h"
-#include "decoder.h"
-
-#ifndef FIXED_POINT
-
-
-#define FLOAT_SCALE (1.0f/(1<<15))
-
-#define DM_MUL REAL_CONST(0.3203772410170407) // 1/(1+sqrt(2) + 1/sqrt(2))
-#define RSQRT2 REAL_CONST(0.7071067811865475244) // 1/sqrt(2)
-
-
-static INLINE real_t get_sample(real_t **input, uint8_t channel, uint16_t sample,
-                                uint8_t down_matrix, uint8_t *internal_channel)
-{
-    if (!down_matrix)
-        return input[internal_channel[channel]][sample];
-
-    if (channel == 0)
-    {
-        return DM_MUL * (input[internal_channel[1]][sample] +
-            input[internal_channel[0]][sample] * RSQRT2 +
-            input[internal_channel[3]][sample] * RSQRT2);
-    } else {
-        return DM_MUL * (input[internal_channel[2]][sample] +
-            input[internal_channel[0]][sample] * RSQRT2 +
-            input[internal_channel[4]][sample] * RSQRT2);
-    }
-}
-
-#ifndef HAS_LRINTF
-#define CLIP(sample, max, min) \
-if (sample >= 0.0f)            \
-{                              \
-    sample += 0.5f;            \
-    if (sample >= max)         \
-        sample = max;          \
-} else {                       \
-    sample += -0.5f;           \
-    if (sample <= min)         \
-        sample = min;          \
-}
-#else
-#define CLIP(sample, max, min) \
-if (sample >= 0.0f)            \
-{                              \
-    if (sample >= max)         \
-        sample = max;          \
-} else {                       \
-    if (sample <= min)         \
-        sample = min;          \
-}
-#endif
-
-#define CONV(a,b) ((a<<1)|(b&0x1))
-
-static void to_PCM_16bit(NeAACDecHandle hDecoder, real_t **input,
-                         uint8_t channels, uint16_t frame_len,
-                         int16_t **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-
-            CLIP(inp, 32767.0f, -32768.0f);
-
-            (*sample_buffer)[i] = (int16_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        if (hDecoder->upMatrix)
-        {
-            ch  = hDecoder->internal_channel[0];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch][i];
-
-                CLIP(inp0, 32767.0f, -32768.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int16_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int16_t)lrintf(inp0);
-            }
-        } else {
-            ch  = hDecoder->internal_channel[0];
-            ch1 = hDecoder->internal_channel[1];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch ][i];
-                real_t inp1 = input[ch1][i];
-
-                CLIP(inp0, 32767.0f, -32768.0f);
-                CLIP(inp1, 32767.0f, -32768.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int16_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int16_t)lrintf(inp1);
-            }
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-
-                CLIP(inp, 32767.0f, -32768.0f);
-
-                (*sample_buffer)[(i*channels)+ch] = (int16_t)lrintf(inp);
-            }
-        }
-        break;
-    }
-}
-
-static void to_PCM_24bit(NeAACDecHandle hDecoder, real_t **input,
-                         uint8_t channels, uint16_t frame_len,
-                         int32_t **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-
-            inp *= 256.0f;
-            CLIP(inp, 8388607.0f, -8388608.0f);
-
-            (*sample_buffer)[i] = (int32_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        if (hDecoder->upMatrix)
-        {
-            ch = hDecoder->internal_channel[0];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch][i];
-
-                inp0 *= 256.0f;
-                CLIP(inp0, 8388607.0f, -8388608.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp0);
-            }
-        } else {
-            ch  = hDecoder->internal_channel[0];
-            ch1 = hDecoder->internal_channel[1];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch ][i];
-                real_t inp1 = input[ch1][i];
-
-                inp0 *= 256.0f;
-                inp1 *= 256.0f;
-                CLIP(inp0, 8388607.0f, -8388608.0f);
-                CLIP(inp1, 8388607.0f, -8388608.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
-            }
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-
-                inp *= 256.0f;
-                CLIP(inp, 8388607.0f, -8388608.0f);
-
-                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
-            }
-        }
-        break;
-    }
-}
-
-static void to_PCM_32bit(NeAACDecHandle hDecoder, real_t **input,
-                         uint8_t channels, uint16_t frame_len,
-                         int32_t **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-
-            inp *= 65536.0f;
-            CLIP(inp, 2147483647.0f, -2147483648.0f);
-
-            (*sample_buffer)[i] = (int32_t)lrintf(inp);
-        }
-        break;
-    case CONV(2,0):
-        if (hDecoder->upMatrix)
-        {
-            ch = hDecoder->internal_channel[0];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch][i];
-
-                inp0 *= 65536.0f;
-                CLIP(inp0, 2147483647.0f, -2147483648.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp0);
-            }
-        } else {
-            ch  = hDecoder->internal_channel[0];
-            ch1 = hDecoder->internal_channel[1];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch ][i];
-                real_t inp1 = input[ch1][i];
-
-                inp0 *= 65536.0f;
-                inp1 *= 65536.0f;
-                CLIP(inp0, 2147483647.0f, -2147483648.0f);
-                CLIP(inp1, 2147483647.0f, -2147483648.0f);
-
-                (*sample_buffer)[(i*2)+0] = (int32_t)lrintf(inp0);
-                (*sample_buffer)[(i*2)+1] = (int32_t)lrintf(inp1);
-            }
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-
-                inp *= 65536.0f;
-                CLIP(inp, 2147483647.0f, -2147483648.0f);
-
-                (*sample_buffer)[(i*channels)+ch] = (int32_t)lrintf(inp);
-            }
-        }
-        break;
-    }
-}
-
-static void to_PCM_float(NeAACDecHandle hDecoder, real_t **input,
-                         uint8_t channels, uint16_t frame_len,
-                         float32_t **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-            (*sample_buffer)[i] = inp*FLOAT_SCALE;
-        }
-        break;
-    case CONV(2,0):
-        if (hDecoder->upMatrix)
-        {
-            ch = hDecoder->internal_channel[0];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch][i];
-                (*sample_buffer)[(i*2)+0] = inp0*FLOAT_SCALE;
-                (*sample_buffer)[(i*2)+1] = inp0*FLOAT_SCALE;
-            }
-        } else {
-            ch  = hDecoder->internal_channel[0];
-            ch1 = hDecoder->internal_channel[1];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch ][i];
-                real_t inp1 = input[ch1][i];
-                (*sample_buffer)[(i*2)+0] = inp0*FLOAT_SCALE;
-                (*sample_buffer)[(i*2)+1] = inp1*FLOAT_SCALE;
-            }
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-                (*sample_buffer)[(i*channels)+ch] = inp*FLOAT_SCALE;
-            }
-        }
-        break;
-    }
-}
-
-static void to_PCM_double(NeAACDecHandle hDecoder, real_t **input,
-                          uint8_t channels, uint16_t frame_len,
-                          double **sample_buffer)
-{
-    uint8_t ch, ch1;
-    uint16_t i;
-
-    switch (CONV(channels,hDecoder->downMatrix))
-    {
-    case CONV(1,0):
-    case CONV(1,1):
-        for(i = 0; i < frame_len; i++)
-        {
-            real_t inp = input[hDecoder->internal_channel[0]][i];
-            (*sample_buffer)[i] = (double)inp*FLOAT_SCALE;
-        }
-        break;
-    case CONV(2,0):
-        if (hDecoder->upMatrix)
-        {
-            ch = hDecoder->internal_channel[0];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch][i];
-                (*sample_buffer)[(i*2)+0] = (double)inp0*FLOAT_SCALE;
-                (*sample_buffer)[(i*2)+1] = (double)inp0*FLOAT_SCALE;
-            }
-        } else {
-            ch  = hDecoder->internal_channel[0];
-            ch1 = hDecoder->internal_channel[1];
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp0 = input[ch ][i];
-                real_t inp1 = input[ch1][i];
-                (*sample_buffer)[(i*2)+0] = (double)inp0*FLOAT_SCALE;
-                (*sample_buffer)[(i*2)+1] = (double)inp1*FLOAT_SCALE;
-            }
-        }
-        break;
-    default:
-        for (ch = 0; ch < channels; ch++)
-        {
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t inp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->internal_channel);
-                (*sample_buffer)[(i*channels)+ch] = (double)inp*FLOAT_SCALE;
-            }
-        }
-        break;
-    }
-}
-
-void *output_to_PCM(NeAACDecHandle hDecoder,
-                    real_t **input, void *sample_buffer, uint8_t channels,
-                    uint16_t frame_len, uint8_t format)
-{
-    int16_t   *short_sample_buffer = (int16_t*)sample_buffer;
-    int32_t   *int_sample_buffer = (int32_t*)sample_buffer;
-    float32_t *float_sample_buffer = (float32_t*)sample_buffer;
-    double    *double_sample_buffer = (double*)sample_buffer;
-
-#ifdef PROFILE
-    int64_t count = faad_get_ts();
-#endif
-
-    /* Copy output to a standard PCM buffer */
-    switch (format)
-    {
-    case FAAD_FMT_16BIT:
-        to_PCM_16bit(hDecoder, input, channels, frame_len, &short_sample_buffer);
-        break;
-    case FAAD_FMT_24BIT:
-        to_PCM_24bit(hDecoder, input, channels, frame_len, &int_sample_buffer);
-        break;
-    case FAAD_FMT_32BIT:
-        to_PCM_32bit(hDecoder, input, channels, frame_len, &int_sample_buffer);
-        break;
-    case FAAD_FMT_FLOAT:
-        to_PCM_float(hDecoder, input, channels, frame_len, &float_sample_buffer);
-        break;
-    case FAAD_FMT_DOUBLE:
-        to_PCM_double(hDecoder, input, channels, frame_len, &double_sample_buffer);
-        break;
-    }
-
-#ifdef PROFILE
-    count = faad_get_ts() - count;
-    hDecoder->output_cycles += count;
-#endif
-
-    return sample_buffer;
-}
-
-#else
-
-#define DM_MUL FRAC_CONST(0.3203772410170407) // 1/(1+sqrt(2) + 1/sqrt(2))
-#define RSQRT2 FRAC_CONST(0.7071067811865475244) // 1/sqrt(2)
-
-static INLINE real_t get_sample(real_t **input, uint8_t channel, uint16_t sample,
-                                uint8_t down_matrix, uint8_t up_matrix,
-                                uint8_t *internal_channel)
-{
-    if (up_matrix == 1)
-        return input[internal_channel[0]][sample];
-
-    if (!down_matrix)
-        return input[internal_channel[channel]][sample];
-
-    if (channel == 0)
-    {
-        real_t C   = MUL_F(input[internal_channel[0]][sample], RSQRT2);
-        real_t L_S = MUL_F(input[internal_channel[3]][sample], RSQRT2);
-        real_t cum = input[internal_channel[1]][sample] + C + L_S;
-        return MUL_F(cum, DM_MUL);
-    } else {
-        real_t C   = MUL_F(input[internal_channel[0]][sample], RSQRT2);
-        real_t R_S = MUL_F(input[internal_channel[4]][sample], RSQRT2);
-        real_t cum = input[internal_channel[2]][sample] + C + R_S;
-        return MUL_F(cum, DM_MUL);
-    }
-}
-
-static void* output_to_PCM_orig(NeAACDecHandle hDecoder,
-                    real_t **input, void *sample_buffer, uint8_t channels,
-                    uint16_t frame_len, uint8_t format)
-{
-    uint8_t ch;
-    uint16_t i;
-    int16_t *short_sample_buffer = (int16_t*)sample_buffer;
-    int32_t *int_sample_buffer = (int32_t*)sample_buffer;
-
-    /* Copy output to a standard PCM buffer */
-    for (ch = 0; ch < channels; ch++)
-    {
-        switch (format)
-        {
-        case FAAD_FMT_16BIT:
-            for(i = 0; i < frame_len; i++)
-            {
-                int32_t tmp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->upMatrix,
-                    hDecoder->internal_channel);
-                if (tmp >= 0)
-                {
-                    tmp += (1 << (REAL_BITS-1));
-                    if (tmp >= REAL_CONST(32767))
-                    {
-                        tmp = REAL_CONST(32767);
-                    }
-                } else {
-                    tmp += -(1 << (REAL_BITS-1));
-                    if (tmp <= REAL_CONST(-32768))
-                    {
-                        tmp = REAL_CONST(-32768);
-                    }
-                }
-                tmp >>= REAL_BITS;
-                short_sample_buffer[(i*channels)+ch] = (int16_t)tmp;
-            }
-            break;
-        case FAAD_FMT_24BIT:
-            for(i = 0; i < frame_len; i++)
-            {
-                int32_t tmp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->upMatrix,
-                    hDecoder->internal_channel);
-                if (tmp >= 0)
-                {
-                    tmp += (1 << (REAL_BITS-9));
-                    tmp >>= (REAL_BITS-8);
-                    if (tmp >= 8388607)
-                    {
-                        tmp = 8388607;
-                    }
-                } else {
-                    tmp += -(1 << (REAL_BITS-9));
-                    tmp >>= (REAL_BITS-8);
-                    if (tmp <= -8388608)
-                    {
-                        tmp = -8388608;
-                    }
-                }
-                int_sample_buffer[(i*channels)+ch] = (int32_t)tmp;
-            }
-            break;
-        case FAAD_FMT_32BIT:
-            for(i = 0; i < frame_len; i++)
-            {
-                int32_t tmp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->upMatrix,
-                    hDecoder->internal_channel);
-                if (tmp >= 0)
-                {
-                    tmp += (1 << (16-REAL_BITS-1));
-                    tmp <<= (16-REAL_BITS);
-                } else {
-                    tmp += -(1 << (16-REAL_BITS-1));
-                    tmp <<= (16-REAL_BITS);
-                }
-                int_sample_buffer[(i*channels)+ch] = (int32_t)tmp;
-            }
-            break;
-        case FAAD_FMT_FIXED:
-            for(i = 0; i < frame_len; i++)
-            {
-                real_t tmp = get_sample(input, ch, i, hDecoder->downMatrix, hDecoder->upMatrix,
-                    hDecoder->internal_channel);
-                int_sample_buffer[(i*channels)+ch] = (int32_t)tmp;
-            }
-            break;
-        }
-    }
-
-    return sample_buffer;
-}
-
-void *output_to_PCM(NeAACDecHandle hDecoder,
-                    real_t **input, void *sample_buffer, uint8_t channels,
-                    uint16_t frame_len, uint8_t format)
-{
-    int ch, i;
-    int16_t *short_sample_buffer;
-    real_t *ch0, *ch1, *ch2, *ch3, *ch4;
-
-    if (format != FAAD_FMT_16BIT)
-        return output_to_PCM_orig(hDecoder, input, sample_buffer, channels, frame_len, format);
-
-    short_sample_buffer = (int16_t *)sample_buffer;
-    ch0 = input[hDecoder->internal_channel[0]];
-    ch1 = input[hDecoder->internal_channel[1]];
-    ch2 = input[hDecoder->internal_channel[2]];
-    ch3 = input[hDecoder->internal_channel[3]];
-    ch4 = input[hDecoder->internal_channel[4]];
-
-    if (hDecoder->downMatrix)
-    {
-        for (i = 0; i < frame_len; ++i)
-        {
-            int32_t tmp = (ch1[i] + ((ch0[i] + ch3[i]) >> 1) + ((ch0[i] + ch3[i]) >> 2) + (1 << (REAL_BITS))) >> (REAL_BITS + 1);
-            if ((tmp + 0x8000) & ~0xffff)
-                tmp = ~(tmp >> 31) - 0x8000;
-            short_sample_buffer[0] = tmp;
-            tmp = (ch2[i] + ((ch0[i] + ch4[i]) >> 1) + ((ch0[i] + ch4[i]) >> 2) + (1 << (REAL_BITS))) >> (REAL_BITS + 1);
-            if ((tmp + 0x8000) & ~0xffff)
-                tmp = ~(tmp >> 31) - 0x8000;
-            short_sample_buffer[1] = tmp;
-            short_sample_buffer += channels;
-        }
-        return sample_buffer;
-    }
-
-    /* Copy output to a standard PCM buffer */
-    for (i = 0; i < frame_len; ++i)
-    {
-        for (ch = 0; ch < channels; ++ch)
-        {
-            int32_t tmp = input[hDecoder->internal_channel[ch]][i];
-            tmp += (1 << (REAL_BITS - 1));
-            tmp >>= REAL_BITS;
-            if ((tmp + 0x8000) & ~0xffff)
-                tmp = ~(tmp >> 31) - 0x8000;
-            *(short_sample_buffer++) = tmp;
-        }
-    }
-
-    return sample_buffer;
-}
-
-#endif