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

diff --git a/src/libfaad/mp4.c b/src/libfaad/mp4.c
deleted file mode 100644
index 651280805..000000000
--- a/src/libfaad/mp4.c
+++ /dev/null
@@ -1,299 +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: mp4.c,v 1.9 2005/10/29 23:57:07 tmmm Exp $
-**/
-
-#include "common.h"
-#include "structs.h"
-
-#include <stdlib.h>
-
-#include "bits.h"
-#include "mp4.h"
-#include "syntax.h"
-
-/* defines if an object type can be decoded by this library or not */
-static uint8_t ObjectTypesTable[32] = {
-    0, /*  0 NULL */
-#ifdef MAIN_DEC
-    1, /*  1 AAC Main */
-#else
-    0, /*  1 AAC Main */
-#endif
-    1, /*  2 AAC LC */
-#ifdef SSR_DEC
-    1, /*  3 AAC SSR */
-#else
-    0, /*  3 AAC SSR */
-#endif
-#ifdef LTP_DEC
-    1, /*  4 AAC LTP */
-#else
-    0, /*  4 AAC LTP */
-#endif
-#ifdef SBR_DEC
-    1, /*  5 SBR */
-#else
-    0, /*  5 SBR */
-#endif
-#ifdef SCALABLE_DEC
-    1, /*  6 AAC Scalable */
-#else
-    0, /*  6 AAC Scalable */
-#endif
-    0, /*  7 TwinVQ */
-    0, /*  8 CELP */
-    0, /*  9 HVXC */
-    0, /* 10 Reserved */
-    0, /* 11 Reserved */
-    0, /* 12 TTSI */
-    0, /* 13 Main synthetic */
-    0, /* 14 Wavetable synthesis */
-    0, /* 15 General MIDI */
-    0, /* 16 Algorithmic Synthesis and Audio FX */
-
-    /* MPEG-4 Version 2 */
-#ifdef ERROR_RESILIENCE
-    1, /* 17 ER AAC LC */
-    0, /* 18 (Reserved) */
-#ifdef LTP_DEC
-    1, /* 19 ER AAC LTP */
-#else
-    0, /* 19 ER AAC LTP */
-#endif
-#ifdef SCALABLE_DEC
-    1, /* 20 ER AAC scalable */
-#else
-    0, /* 20 ER AAC scalable */
-#endif
-    0, /* 21 ER TwinVQ */
-    0, /* 22 ER BSAC */
-#ifdef LD_DEC
-    1, /* 23 ER AAC LD */
-#else
-    0, /* 23 ER AAC LD */
-#endif
-    0, /* 24 ER CELP */
-    0, /* 25 ER HVXC */
-    0, /* 26 ER HILN */
-    0, /* 27 ER Parametric */
-#else /* No ER defined */
-    0, /* 17 ER AAC LC */
-    0, /* 18 (Reserved) */
-    0, /* 19 ER AAC LTP */
-    0, /* 20 ER AAC scalable */
-    0, /* 21 ER TwinVQ */
-    0, /* 22 ER BSAC */
-    0, /* 23 ER AAC LD */
-    0, /* 24 ER CELP */
-    0, /* 25 ER HVXC */
-    0, /* 26 ER HILN */
-    0, /* 27 ER Parametric */
-#endif
-    0, /* 28 (Reserved) */
-    0, /* 29 (Reserved) */
-    0, /* 30 (Reserved) */
-    0  /* 31 (Reserved) */
-};
-
-/* Table 1.6.1 */
-int8_t NEAACDECAPI NeAACDecAudioSpecificConfig(uint8_t *pBuffer,
-                                               uint32_t buffer_size,
-                                               mp4AudioSpecificConfig *mp4ASC)
-{
-    return AudioSpecificConfig2(pBuffer, buffer_size, mp4ASC, NULL);
-}
-
-int8_t AudioSpecificConfig2(uint8_t *pBuffer,
-                            uint32_t buffer_size,
-                            mp4AudioSpecificConfig *mp4ASC,
-                            program_config *pce)
-{
-    bitfile ld;
-    int8_t result = 0;
-#ifdef SBR_DEC
-    int8_t bits_to_decode = 0;
-#endif
-
-    if (pBuffer == NULL)
-        return -7;
-    if (mp4ASC == NULL)
-        return -8;
-
-    memset(mp4ASC, 0, sizeof(mp4AudioSpecificConfig));
-
-    faad_initbits(&ld, pBuffer, buffer_size);
-    faad_byte_align(&ld);
-
-    mp4ASC->objectTypeIndex = (uint8_t)faad_getbits(&ld, 5
-        DEBUGVAR(1,1,"parse_audio_decoder_specific_info(): ObjectTypeIndex"));
-
-    mp4ASC->samplingFrequencyIndex = (uint8_t)faad_getbits(&ld, 4
-        DEBUGVAR(1,2,"parse_audio_decoder_specific_info(): SamplingFrequencyIndex"));
-
-    mp4ASC->channelsConfiguration = (uint8_t)faad_getbits(&ld, 4
-        DEBUGVAR(1,3,"parse_audio_decoder_specific_info(): ChannelsConfiguration"));
-
-    mp4ASC->samplingFrequency = get_sample_rate(mp4ASC->samplingFrequencyIndex);
-
-    if (ObjectTypesTable[mp4ASC->objectTypeIndex] != 1)
-    {
-        faad_endbits(&ld);
-        return -1;
-    }
-
-    if (mp4ASC->samplingFrequency == 0)
-    {
-        faad_endbits(&ld);
-        return -2;
-    }
-
-    if (mp4ASC->channelsConfiguration > 7)
-    {
-        faad_endbits(&ld);
-        return -3;
-    }
-
-#if (defined(PS_DEC) || defined(DRM_PS))
-    /* check if we have a mono file */
-    if (mp4ASC->channelsConfiguration == 1)
-    {
-        /* upMatrix to 2 channels for implicit signalling of PS */
-        mp4ASC->channelsConfiguration = 2;
-    }
-#endif
-
-#ifdef SBR_DEC
-    mp4ASC->sbr_present_flag = -1;
-    if (mp4ASC->objectTypeIndex == 5)
-    {
-        uint8_t tmp;
-
-        mp4ASC->sbr_present_flag = 1;
-        tmp = (uint8_t)faad_getbits(&ld, 4
-            DEBUGVAR(1,5,"parse_audio_decoder_specific_info(): extensionSamplingFrequencyIndex"));
-        /* check for downsampled SBR */
-        if (tmp == mp4ASC->samplingFrequencyIndex)
-            mp4ASC->downSampledSBR = 1;
-        mp4ASC->samplingFrequencyIndex = tmp;
-        if (mp4ASC->samplingFrequencyIndex == 15)
-        {
-            mp4ASC->samplingFrequency = (uint32_t)faad_getbits(&ld, 24
-                DEBUGVAR(1,6,"parse_audio_decoder_specific_info(): extensionSamplingFrequencyIndex"));
-        } else {
-            mp4ASC->samplingFrequency = get_sample_rate(mp4ASC->samplingFrequencyIndex);
-        }
-        mp4ASC->objectTypeIndex = (uint8_t)faad_getbits(&ld, 5
-            DEBUGVAR(1,7,"parse_audio_decoder_specific_info(): ObjectTypeIndex"));
-    }
-#endif
-
-    /* get GASpecificConfig */
-    if (mp4ASC->objectTypeIndex == 1 || mp4ASC->objectTypeIndex == 2 ||
-        mp4ASC->objectTypeIndex == 3 || mp4ASC->objectTypeIndex == 4 ||
-        mp4ASC->objectTypeIndex == 6 || mp4ASC->objectTypeIndex == 7)
-    {
-        result = GASpecificConfig(&ld, mp4ASC, pce);
-
-#ifdef ERROR_RESILIENCE
-    } else if (mp4ASC->objectTypeIndex >= ER_OBJECT_START) { /* ER */
-        result = GASpecificConfig(&ld, mp4ASC, pce);
-        mp4ASC->epConfig = (uint8_t)faad_getbits(&ld, 2
-            DEBUGVAR(1,143,"parse_audio_decoder_specific_info(): epConfig"));
-
-        if (mp4ASC->epConfig != 0)
-            result = -5;
-#endif
-
-    } else {
-        result = -4;
-    }
-
-#ifdef SSR_DEC
-    /* shorter frames not allowed for SSR */
-    if ((mp4ASC->objectTypeIndex == 4) && mp4ASC->frameLengthFlag)
-        return -6;
-#endif
-
-
-#ifdef SBR_DEC
-    bits_to_decode = (int8_t)(buffer_size*8 - faad_get_processed_bits(&ld));
-
-    if ((mp4ASC->objectTypeIndex != 5) && (bits_to_decode >= 16))
-    {
-        int16_t syncExtensionType = (int16_t)faad_getbits(&ld, 11
-            DEBUGVAR(1,9,"parse_audio_decoder_specific_info(): syncExtensionType"));
-
-        if (syncExtensionType == 0x2b7)
-        {
-            mp4ASC->objectTypeIndex = (uint8_t)faad_getbits(&ld, 5
-                DEBUGVAR(1,10,"parse_audio_decoder_specific_info(): extensionAudioObjectType"));
-
-            if (mp4ASC->objectTypeIndex == 5)
-            {
-                mp4ASC->sbr_present_flag = (uint8_t)faad_get1bit(&ld
-                    DEBUGVAR(1,11,"parse_audio_decoder_specific_info(): sbr_present_flag"));
-
-                if (mp4ASC->sbr_present_flag)
-                {
-                    uint8_t tmp;
-                    tmp = (uint8_t)faad_getbits(&ld, 4
-                        DEBUGVAR(1,12,"parse_audio_decoder_specific_info(): extensionSamplingFrequencyIndex"));
-
-                    /* check for downsampled SBR */
-                    if (tmp == mp4ASC->samplingFrequencyIndex)
-                        mp4ASC->downSampledSBR = 1;
-                    mp4ASC->samplingFrequencyIndex = tmp;
-
-                    if (mp4ASC->samplingFrequencyIndex == 15)
-                    {
-                        mp4ASC->samplingFrequency = (uint32_t)faad_getbits(&ld, 24
-                            DEBUGVAR(1,13,"parse_audio_decoder_specific_info(): extensionSamplingFrequencyIndex"));
-                    } else {
-                        mp4ASC->samplingFrequency = get_sample_rate(mp4ASC->samplingFrequencyIndex);
-                    }
-                }
-            }
-        }
-    }
-
-    /* no SBR signalled, this could mean either implicit signalling or no SBR in this file */
-    /* MPEG specification states: assume SBR on files with samplerate <= 24000 Hz */
-    if (mp4ASC->sbr_present_flag == -1)
-    {
-        if (mp4ASC->samplingFrequency <= 24000)
-        {
-            mp4ASC->samplingFrequency *= 2;
-            mp4ASC->forceUpSampling = 1;
-        } else /* > 24000*/ {
-            mp4ASC->downSampledSBR = 1;
-        }
-    }
-#endif
-
-    faad_endbits(&ld);
-
-    return result;
-}