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, 267 deletions

diff --git a/src/libfaad/ic_predict.c b/src/libfaad/ic_predict.c
deleted file mode 100644
index 82753a9f2..000000000
--- a/src/libfaad/ic_predict.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2004 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: ic_predict.c,v 1.7 2005/10/29 23:57:06 tmmm Exp $
-**/
-
-#include "common.h"
-#include "structs.h"
-
-#ifdef MAIN_DEC
-
-#include "syntax.h"
-#include "ic_predict.h"
-#include "pns.h"
-
-
-static void flt_round(float32_t *pf)
-{
-    int32_t flg;
-    uint32_t tmp, tmp1, tmp2;
-
-    tmp = *(uint32_t*)pf;
-    flg = tmp & (uint32_t)0x00008000;
-    tmp &= (uint32_t)0xffff0000;
-    tmp1 = tmp;
-    /* round 1/2 lsb toward infinity */
-    if (flg)
-    {
-        tmp &= (uint32_t)0xff800000;       /* extract exponent and sign */
-        tmp |= (uint32_t)0x00010000;       /* insert 1 lsb */
-        tmp2 = tmp;                             /* add 1 lsb and elided one */
-        tmp &= (uint32_t)0xff800000;       /* extract exponent and sign */
-        
-        *pf = *(float32_t*)&tmp1 + *(float32_t*)&tmp2 - *(float32_t*)&tmp;
-    } else {
-        *pf = *(float32_t*)&tmp;
-    }
-}
-
-static int16_t quant_pred(float32_t x)
-{
-    int16_t q;
-    uint32_t *tmp = (uint32_t*)&x;
-
-    q = (int16_t)(*tmp>>16);
-
-    return q;
-}
-
-static float32_t inv_quant_pred(int16_t q)
-{
-    float32_t x;
-    uint32_t *tmp = (uint32_t*)&x;
-    *tmp = ((uint32_t)q)<<16;
-
-    return x;
-}
-
-static void ic_predict(pred_state *state, real_t input, real_t *output, uint8_t pred)
-{
-    uint16_t tmp;
-    int16_t i, j;
-    real_t dr1, predictedvalue;
-    real_t e0, e1;
-    real_t k1, k2;
-
-    real_t r[2];
-    real_t COR[2];
-    real_t VAR[2];
-
-    r[0] = inv_quant_pred(state->r[0]);
-    r[1] = inv_quant_pred(state->r[1]);
-    COR[0] = inv_quant_pred(state->COR[0]);
-    COR[1] = inv_quant_pred(state->COR[1]);
-    VAR[0] = inv_quant_pred(state->VAR[0]);
-    VAR[1] = inv_quant_pred(state->VAR[1]);
-
-
-#if 1
-    tmp = state->VAR[0];
-    j = (tmp >> 7);
-    i = tmp & 0x7f;
-    if (j >= 128)
-    {
-        j -= 128;
-        k1 = COR[0] * exp_table[j] * mnt_table[i];
-    } else {
-        k1 = REAL_CONST(0);
-    }
-#else
-
-    {
-#define B 0.953125
-        real_t c = COR[0];
-        real_t v = VAR[0];
-        real_t tmp;
-        if (c == 0 || v <= 1)
-        {
-            k1 = 0;
-        } else {
-            tmp = B / v;
-            flt_round(&tmp);
-            k1 = c * tmp;
-        }
-    }
-#endif
-
-    if (pred)
-    {
-#if 1
-        tmp = state->VAR[1];
-        j = (tmp >> 7);
-        i = tmp & 0x7f;
-        if (j >= 128)
-        {
-            j -= 128;
-            k2 = COR[1] * exp_table[j] * mnt_table[i];
-        } else {
-            k2 = REAL_CONST(0);
-        }
-#else
-
-#define B 0.953125
-        real_t c = COR[1];
-        real_t v = VAR[1];
-        real_t tmp;
-        if (c == 0 || v <= 1)
-        {
-            k2 = 0;
-        } else {
-            tmp = B / v;
-            flt_round(&tmp);
-            k2 = c * tmp;
-        }
-#endif
-
-        predictedvalue = k1*r[0] + k2*r[1];
-        flt_round(&predictedvalue);
-        *output = input + predictedvalue;
-    }
-
-    /* calculate new state data */
-    e0 = *output;
-    e1 = e0 - k1*r[0];
-    dr1 = k1*e0;
-
-    VAR[0] = ALPHA*VAR[0] + 0.5f * (r[0]*r[0] + e0*e0);
-    COR[0] = ALPHA*COR[0] + r[0]*e0;
-    VAR[1] = ALPHA*VAR[1] + 0.5f * (r[1]*r[1] + e1*e1);
-    COR[1] = ALPHA*COR[1] + r[1]*e1;
-
-    r[1] = A * (r[0]-dr1);
-    r[0] = A * e0;
-
-    state->r[0] = quant_pred(r[0]);
-    state->r[1] = quant_pred(r[1]);
-    state->COR[0] = quant_pred(COR[0]);
-    state->COR[1] = quant_pred(COR[1]);
-    state->VAR[0] = quant_pred(VAR[0]);
-    state->VAR[1] = quant_pred(VAR[1]);
-}
-
-static void reset_pred_state(pred_state *state)
-{
-    state->r[0]   = 0;
-    state->r[1]   = 0;
-    state->COR[0] = 0;
-    state->COR[1] = 0;
-    state->VAR[0] = 0x3F80;
-    state->VAR[1] = 0x3F80;
-}
-
-void pns_reset_pred_state(ic_stream *ics, pred_state *state)
-{
-    uint8_t sfb, g, b;
-    uint16_t i, offs, offs2;
-
-    /* prediction only for long blocks */
-    if (ics->window_sequence == EIGHT_SHORT_SEQUENCE)
-        return;
-
-    for (g = 0; g < ics->num_window_groups; g++)
-    {
-        for (b = 0; b < ics->window_group_length[g]; b++)
-        {
-            for (sfb = 0; sfb < ics->max_sfb; sfb++)
-            {
-                if (is_noise(ics, g, sfb))
-                {
-                    offs = ics->swb_offset[sfb];
-                    offs2 = ics->swb_offset[sfb+1];
-
-                    for (i = offs; i < offs2; i++)
-                        reset_pred_state(&state[i]);
-                }
-            }
-        }
-    }
-}
-
-void reset_all_predictors(pred_state *state, uint16_t frame_len)
-{
-    uint16_t i;
-
-    for (i = 0; i < frame_len; i++)
-        reset_pred_state(&state[i]);
-}
-
-/* intra channel prediction */
-void ic_prediction(ic_stream *ics, real_t *spec, pred_state *state,
-                   uint16_t frame_len, uint8_t sf_index)
-{
-    uint8_t sfb;
-    uint16_t bin;
-
-    if (ics->window_sequence == EIGHT_SHORT_SEQUENCE)
-    {
-        reset_all_predictors(state, frame_len);
-    } else {
-        for (sfb = 0; sfb < max_pred_sfb(sf_index); sfb++)
-        {
-            uint16_t low  = ics->swb_offset[sfb];
-            uint16_t high = ics->swb_offset[sfb+1];
-
-            for (bin = low; bin < high; bin++)
-            {
-                ic_predict(&state[bin], spec[bin], &spec[bin],
-                    (ics->predictor_data_present && ics->pred.prediction_used[sfb]));
-            }
-        }
-
-        if (ics->predictor_data_present)
-        {
-            if (ics->pred.predictor_reset)
-            {
-                for (bin = ics->pred.predictor_reset_group_number - 1;
-                     bin < frame_len; bin += 30)
-                {
-                    reset_pred_state(&state[bin]);
-                }
-            }
-        }
-    }
-}
-
-#endif