faad update to v2.6

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@315 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 300 insertions, 300 deletions

diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c b/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c
index 64dede43a..ab79db813 100644
--- a/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c
+++ b/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c
@@ -1,300 +1,300 @@
-/*

-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding

-** Copyright (C) 2003-2005 M. Bakker, Nero 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.

-**

-** Software using this code must display the following message visibly in or

-** on each copy of the software:

-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"

-** in, for example, the about-box or help/startup screen.

-**

-** Commercial non-GPL licensing of this software is possible.

-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.

-**

-** $Id: mp4.c 441 2005-11-01 21:41:43Z gabest $

-**/

-

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

-    0, /*  6 AAC Scalable */

-    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

-    0, /* 20 ER AAC scalable */

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

-        {

-            uint8_t tmp_OTi = (uint8_t)faad_getbits(&ld, 5

-                DEBUGVAR(1,10,"parse_audio_decoder_specific_info(): extensionAudioObjectType"));

-

-            if (tmp_OTi == 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;

-

-					/* Don't set OT to SBR until checked that it is actually there */

-					mp4ASC->objectTypeIndex = tmp_OTi;

-

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

-}

+/*
+** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
+** Copyright (C) 2003-2005 M. Bakker, Nero 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.
+**
+** Software using this code must display the following message visibly in or
+** on each copy of the software:
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+** in, for example, the about-box or help/startup screen.
+**
+** Commercial non-GPL licensing of this software is possible.
+** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
+**
+** $Id: mp4.c,v 1.37 2007/10/11 18:41:51 menno 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
+    0, /*  6 AAC Scalable */
+    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
+    0, /* 20 ER AAC scalable */
+    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)
+        {
+            uint8_t tmp_OTi = (uint8_t)faad_getbits(&ld, 5
+                DEBUGVAR(1,10,"parse_audio_decoder_specific_info(): extensionAudioObjectType"));
+
+            if (tmp_OTi == 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;
+
+					/* Don't set OT to SBR until checked that it is actually there */
+					mp4ASC->objectTypeIndex = tmp_OTi;
+
+                    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;
+}