ref: dc0ef687a8ba3854af43f34d6381388f384febab
parent: 493e73cf0b0c76ce1d7d2cbe8a5fc6d7357765f6
author: menno <menno>
date: Tue Mar 2 15:09:58 EST 2004
Changed all exported function names
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: main.c,v 1.71 2004/02/26 09:29:25 menno Exp $
+** $Id: main.c,v 1.72 2004/03/02 20:09:58 menno Exp $
**/
#ifdef _WIN32
@@ -197,7 +197,7 @@
#define SPEAKER_TOP_BACK_RIGHT 0x20000
#define SPEAKER_RESERVED 0x80000000
-long aacChannelConfig2wavexChannelMask(faacDecFrameInfo *hInfo)
+long aacChannelConfig2wavexChannelMask(NeAACDecFrameInfo *hInfo)
{if (hInfo->channels == 6 && hInfo->num_lfe_channels)
{@@ -229,7 +229,7 @@
return "";
}
-void print_channel_info(faacDecFrameInfo *frameInfo)
+void print_channel_info(NeAACDecFrameInfo *frameInfo)
{/* print some channel info */
int i;
@@ -273,7 +273,7 @@
return 16 - 1;
}
-unsigned char *MakeAdtsHeader(int *dataSize, faacDecFrameInfo *hInfo, int old_format)
+unsigned char *MakeAdtsHeader(int *dataSize, NeAACDecFrameInfo *hInfo, int old_format)
{unsigned char *data;
int profile = (hInfo->object_type - 1) & 0x3;
@@ -387,9 +387,9 @@
unsigned char *adtsData;
int adtsDataSize;
- faacDecHandle hDecoder;
- faacDecFrameInfo frameInfo;
- faacDecConfigurationPtr config;
+ NeAACDecHandle hDecoder;
+ NeAACDecFrameInfo frameInfo;
+ NeAACDecConfigurationPtr config;
char percents[200];
int percent, old_percent = -1;
@@ -453,11 +453,11 @@
fill_buffer(&b);
}
- hDecoder = faacDecOpen();
+ hDecoder = NeAACDecOpen();
/* Set the default object type and samplerate */
/* This is useful for RAW AAC files */
- config = faacDecGetCurrentConfiguration(hDecoder);
+ config = NeAACDecGetCurrentConfiguration(hDecoder);
if (def_srate)
config->defSampleRate = def_srate;
config->defObjectType = object_type;
@@ -465,7 +465,7 @@
config->downMatrix = downMatrix;
config->useOldADTSFormat = old_format;
//config->dontUpSampleImplicitSBR = 1;
- faacDecSetConfiguration(hDecoder, config);
+ NeAACDecSetConfiguration(hDecoder, config);
/* get AAC infos for printing */
header_type = 0;
@@ -505,7 +505,7 @@
*song_length = length;
fill_buffer(&b);
- if ((bread = faacDecInit(hDecoder, b.buffer,
+ if ((bread = NeAACDecInit(hDecoder, b.buffer,
b.bytes_into_buffer, &samplerate, &channels)) < 0)
{/* If some error initializing occured, skip the file */
@@ -512,7 +512,7 @@
fprintf(stderr, "Error initializing decoder library.\n");
if (b.buffer)
free(b.buffer);
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
fclose(b.infile);
return 1;
}
@@ -538,7 +538,7 @@
if (infoOnly)
{- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
fclose(b.infile);
if (b.buffer)
free(b.buffer);
@@ -547,7 +547,7 @@
do
{- sample_buffer = faacDecDecode(hDecoder, &frameInfo,
+ sample_buffer = NeAACDecDecode(hDecoder, &frameInfo,
b.buffer, b.bytes_into_buffer);
if (adts_out == 1)
@@ -571,7 +571,7 @@
if (frameInfo.error > 0)
{fprintf(stderr, "Error: %s\n",
- faacDecGetErrorMessage(frameInfo.error));
+ NeAACDecGetErrorMessage(frameInfo.error));
}
/* open the sound file now that the number of channels are known */
@@ -595,7 +595,7 @@
{if (b.buffer)
free(b.buffer);
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
fclose(b.infile);
return 0;
}
@@ -629,7 +629,7 @@
} while (sample_buffer != NULL);
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
if (adts_out == 1)
{@@ -663,7 +663,7 @@
if (buff)
{- rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
+ rc = NeAACDecAudioSpecificConfig(buff, buff_size, &mp4ASC);
free(buff);
if (rc < 0)
@@ -701,9 +701,9 @@
unsigned char *adtsData;
int adtsDataSize;
- faacDecHandle hDecoder;
- faacDecConfigurationPtr config;
- faacDecFrameInfo frameInfo;
+ NeAACDecHandle hDecoder;
+ NeAACDecConfigurationPtr config;
+ NeAACDecFrameInfo frameInfo;
mp4AudioSpecificConfig mp4ASC;
unsigned char *buffer;
@@ -730,14 +730,14 @@
mp4cb->user_data = mp4File;
- hDecoder = faacDecOpen();
+ hDecoder = NeAACDecOpen();
/* Set configuration */
- config = faacDecGetCurrentConfiguration(hDecoder);
+ config = NeAACDecGetCurrentConfiguration(hDecoder);
config->outputFormat = outputFormat;
config->downMatrix = downMatrix;
//config->dontUpSampleImplicitSBR = 1;
- faacDecSetConfiguration(hDecoder, config);
+ NeAACDecSetConfiguration(hDecoder, config);
if (adts_out)
{@@ -760,7 +760,7 @@
if ((track = GetAACTrack(infile)) < 0)
{fprintf(stderr, "Unable to find correct AAC sound track in the MP4 file.\n");
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
mp4ff_close(infile);
free(mp4cb);
fclose(mp4File);
@@ -771,12 +771,12 @@
buffer_size = 0;
mp4ff_get_decoder_config(infile, track, &buffer, &buffer_size);
- if(faacDecInit2(hDecoder, buffer, buffer_size,
+ if(NeAACDecInit2(hDecoder, buffer, buffer_size,
&samplerate, &channels) < 0)
{/* If some error initializing occured, skip the file */
fprintf(stderr, "Error initializing decoder library.\n");
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
mp4ff_close(infile);
free(mp4cb);
fclose(mp4File);
@@ -789,7 +789,7 @@
if (buffer)
{- if (AudioSpecificConfig(buffer, buffer_size, &mp4ASC) >= 0)
+ if (NeAACDecAudioSpecificConfig(buffer, buffer_size, &mp4ASC) >= 0)
{if (mp4ASC.frameLengthFlag == 1) framesize = 960;
if (mp4ASC.sbr_present_flag == 1) framesize *= 2;
@@ -838,7 +838,7 @@
if (infoOnly)
{- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
mp4ff_close(infile);
free(mp4cb);
fclose(mp4File);
@@ -863,7 +863,7 @@
if (rc == 0)
{fprintf(stderr, "Reading from MP4 file failed.\n");
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
mp4ff_close(infile);
free(mp4cb);
fclose(mp4File);
@@ -870,7 +870,7 @@
return 1;
}
- sample_buffer = faacDecDecode(hDecoder, &frameInfo, buffer, buffer_size);
+ sample_buffer = NeAACDecDecode(hDecoder, &frameInfo, buffer, buffer_size);
if (adts_out == 1)
{@@ -929,7 +929,7 @@
}
if (aufile == NULL)
{- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
mp4ff_close(infile);
free(mp4cb);
fclose(mp4File);
@@ -960,11 +960,11 @@
if (frameInfo.error > 0)
{fprintf(stderr, "Warning: %s\n",
- faacDecGetErrorMessage(frameInfo.error));
+ NeAACDecGetErrorMessage(frameInfo.error));
}
}
- faacDecClose(hDecoder);
+ NeAACDecClose(hDecoder);
if (adts_out == 1)
{@@ -1013,7 +1013,7 @@
clock_t begin;
#endif
- unsigned long cap = faacDecGetCapabilities();
+ unsigned long cap = NeAACDecGetCapabilities();
fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", FAAD2_VERSION);
fprintf(stderr, " Build: %s\n", __DATE__);
--- a/include/faad.h
+++ b/include/faad.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: faad.h,v 1.42 2004/03/02 19:37:26 menno Exp $
+** $Id: faad.h,v 1.43 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __AACDEC_H__
@@ -32,14 +32,35 @@
extern "C" {#endif /* __cplusplus */
+
+#if 1
+/* MACROS FOR BACKWARDS COMPATIBILITY */
+/* structs */
+#define faacDecHandle NeAACDecHandle
+#define faacDecConfiguration NeAACDecConfiguration
+#define faacDecConfigurationPtr NeAACDecConfigurationPtr
+#define faacDecFrameInfo NeAACDecFrameInfo
+/* functions */
+#define faacDecGetErrorMessage NeAACDecGetErrorMessage
+#define faacDecSetConfiguration NeAACDecSetConfiguration
+#define faacDecInit NeAACDecInit
+#define faacDecInit2 NeAACDecInit2
+#define faacDecInitDRM NeAACDecInitDRM
+#define faacDecPostSeekReset NeAACDecPostSeekReset
+#define faacDecClose NeAACDecClose
+#define faacDecDecode NeAACDecDecode
+#define AudioSpecificConfig NeAACDecAudioSpecificConfig
+#endif
+
+
#ifdef _WIN32
#pragma pack(push, 8)
- #ifndef FAADAPI
- #define FAADAPI __cdecl
+ #ifndef NEAACDECAPI
+ #define NEAACDECAPI __cdecl
#endif
#else
- #ifndef FAADAPI
- #define FAADAPI
+ #ifndef NEAACDECAPI
+ #define NEAACDECAPI
#endif
#endif
@@ -107,7 +128,7 @@
#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-typedef void *faacDecHandle;
+typedef void *NeAACDecHandle;
typedef struct mp4AudioSpecificConfig
{@@ -132,7 +153,7 @@
char downSampledSBR;
} mp4AudioSpecificConfig;
-typedef struct faacDecConfiguration
+typedef struct NeAACDecConfiguration
{unsigned char defObjectType;
unsigned long defSampleRate;
@@ -140,9 +161,9 @@
unsigned char downMatrix;
unsigned char useOldADTSFormat;
unsigned char dontUpSampleImplicitSBR;
-} faacDecConfiguration, *faacDecConfigurationPtr;
+} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-typedef struct faacDecFrameInfo
+typedef struct NeAACDecFrameInfo
{unsigned long bytesconsumed;
unsigned long samples;
@@ -165,47 +186,47 @@
unsigned char num_back_channels;
unsigned char num_lfe_channels;
unsigned char channel_position[64];
-} faacDecFrameInfo;
+} NeAACDecFrameInfo;
-char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);
+char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-unsigned long FAADAPI faacDecGetCapabilities(void);
+unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-faacDecHandle FAADAPI faacDecOpen(void);
+NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);
+NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-unsigned char FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder,
- faacDecConfigurationPtr config);
+unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
+ NeAACDecConfigurationPtr config);
/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long FAADAPI faacDecInit(faacDecHandle hDecoder,
- unsigned char *buffer,
- unsigned long buffer_size,
- unsigned long *samplerate,
- unsigned char *channels);
+long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
+ unsigned char *buffer,
+ unsigned long buffer_size,
+ unsigned long *samplerate,
+ unsigned char *channels);
/* Init the library using a DecoderSpecificInfo */
-char FAADAPI faacDecInit2(faacDecHandle hDecoder, unsigned char *pBuffer,
- unsigned long SizeOfDecoderSpecificInfo,
- unsigned long *samplerate, unsigned char *channels);
+char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, unsigned char *pBuffer,
+ unsigned long SizeOfDecoderSpecificInfo,
+ unsigned long *samplerate, unsigned char *channels);
/* Init the library for DRM */
-char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned long samplerate,
- unsigned char channels);
+char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle hDecoder, unsigned long samplerate,
+ unsigned char channels);
-void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, long frame);
+void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-void FAADAPI faacDecClose(faacDecHandle hDecoder);
+void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-void* FAADAPI faacDecDecode(faacDecHandle hDecoder,
- faacDecFrameInfo *hInfo,
- unsigned char *buffer,
- unsigned long buffer_size);
+void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
+ NeAACDecFrameInfo *hInfo,
+ unsigned char *buffer,
+ unsigned long buffer_size);
-char FAADAPI AudioSpecificConfig(unsigned char *pBuffer,
- unsigned long buffer_size,
- mp4AudioSpecificConfig *mp4ASC);
+char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
+ unsigned long buffer_size,
+ mp4AudioSpecificConfig *mp4ASC);
#ifdef _WIN32
#pragma pack(pop)
--- a/libfaad/decoder.c
+++ b/libfaad/decoder.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: decoder.c,v 1.96 2004/03/02 19:37:26 menno Exp $
+** $Id: decoder.c,v 1.97 2004/03/02 20:09:58 menno Exp $
**/
#include "common.h"
@@ -50,7 +50,7 @@
uint16_t dbg_count;
#endif
-int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode)
+int8_t* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode)
{if (errcode >= NUM_ERROR_MESSAGES)
return NULL;
@@ -57,7 +57,7 @@
return err_msg[errcode];
}
-uint32_t FAADAPI faacDecGetCapabilities(void)
+uint32_t NEAACDECAPI NeAACDecGetCapabilities(void)
{uint32_t cap = 0;
@@ -83,15 +83,15 @@
return cap;
}
-faacDecHandle FAADAPI faacDecOpen(void)
+NeAACDecHandle NEAACDECAPI NeAACDecOpen(void)
{uint8_t i;
- faacDecHandle hDecoder = NULL;
+ NeAACDecHandle hDecoder = NULL;
- if ((hDecoder = (faacDecHandle)faad_malloc(sizeof(faacDecStruct))) == NULL)
+ if ((hDecoder = (NeAACDecHandle)faad_malloc(sizeof(NeAACDecStruct))) == NULL)
return NULL;
- memset(hDecoder, 0, sizeof(faacDecStruct));
+ memset(hDecoder, 0, sizeof(NeAACDecStruct));
hDecoder->config.outputFormat = FAAD_FMT_16BIT;
hDecoder->config.defObjectType = MAIN;
@@ -148,11 +148,11 @@
return hDecoder;
}
-faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder)
+NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder)
{if (hDecoder)
{- faacDecConfigurationPtr config = &(hDecoder->config);
+ NeAACDecConfigurationPtr config = &(hDecoder->config);
return config;
}
@@ -160,8 +160,8 @@
return NULL;
}
-uint8_t FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder,
- faacDecConfigurationPtr config)
+uint8_t NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
+ NeAACDecConfigurationPtr config)
{if (hDecoder && config)
{@@ -190,9 +190,9 @@
return 0;
}
-int32_t FAADAPI faacDecInit(faacDecHandle hDecoder, uint8_t *buffer,
- uint32_t buffer_size,
- uint32_t *samplerate, uint8_t *channels)
+int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, uint8_t *buffer,
+ uint32_t buffer_size,
+ uint32_t *samplerate, uint8_t *channels)
{uint32_t bits = 0;
bitfile ld;
@@ -286,9 +286,9 @@
}
/* Init the library using a DecoderSpecificInfo */
-int8_t FAADAPI faacDecInit2(faacDecHandle hDecoder, uint8_t *pBuffer,
- uint32_t SizeOfDecoderSpecificInfo,
- uint32_t *samplerate, uint8_t *channels)
+int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer,
+ uint32_t SizeOfDecoderSpecificInfo,
+ uint32_t *samplerate, uint8_t *channels)
{int8_t rc;
mp4AudioSpecificConfig mp4ASC;
@@ -369,8 +369,8 @@
}
#ifdef DRM
-int8_t FAADAPI faacDecInitDRM(faacDecHandle hDecoder, uint32_t samplerate,
- uint8_t channels)
+int8_t NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle hDecoder, uint32_t samplerate,
+ uint8_t channels)
{uint8_t i;
@@ -457,7 +457,7 @@
}
#endif
-void FAADAPI faacDecClose(faacDecHandle hDecoder)
+void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder)
{uint8_t i;
@@ -510,7 +510,7 @@
if (hDecoder) faad_free(hDecoder);
}
-void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, int32_t frame)
+void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, int32_t frame)
{if (hDecoder)
{@@ -521,7 +521,7 @@
}
}
-static void create_channel_config(faacDecHandle hDecoder, faacDecFrameInfo *hInfo)
+static void create_channel_config(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo)
{hInfo->num_front_channels = 0;
hInfo->num_side_channels = 0;
@@ -726,9 +726,9 @@
}
}
-void* FAADAPI faacDecDecode(faacDecHandle hDecoder,
- faacDecFrameInfo *hInfo,
- uint8_t *buffer, uint32_t buffer_size)
+void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
+ NeAACDecFrameInfo *hInfo,
+ uint8_t *buffer, uint32_t buffer_size)
{uint8_t channels = 0;
uint8_t output_channels = 0;
@@ -750,7 +750,7 @@
frame_len = hDecoder->frameLength;
- memset(hInfo, 0, sizeof(faacDecFrameInfo));
+ memset(hInfo, 0, sizeof(NeAACDecFrameInfo));
memset(hDecoder->internal_channel, 0, MAX_CHANNELS*sizeof(hDecoder->internal_channel[0]));
/* initialize the bitstream */
@@ -767,7 +767,7 @@
}
faad_getbits(&ld, 8
- DEBUGVAR(1,1,"faacDecDecode(): skip CRC"));
+ DEBUGVAR(1,1,"NeAACDecDecode(): skip CRC"));
}
#endif
--- a/libfaad/decoder.h
+++ b/libfaad/decoder.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: decoder.h,v 1.36 2004/02/26 09:29:26 menno Exp $
+** $Id: decoder.h,v 1.37 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __DECODER_H__
@@ -34,12 +34,12 @@
#ifdef _WIN32
#pragma pack(push, 8)
- #ifndef FAADAPI
- #define FAADAPI __cdecl
+ #ifndef NEAACDECAPI
+ #define NEAACDECAPI __cdecl
#endif
#else
- #ifndef FAADAPI
- #define FAADAPI
+ #ifndef NEAACDECAPI
+ #define NEAACDECAPI
#endif
#endif
@@ -69,41 +69,41 @@
#define LFE_CHANNEL (9)
#define UNKNOWN_CHANNEL (0)
-int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode);
+int8_t* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode);
-uint32_t FAADAPI faacDecGetCapabilities(void);
+uint32_t NEAACDECAPI NeAACDecGetCapabilities(void);
-faacDecHandle FAADAPI faacDecOpen(void);
+NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);
+NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-uint8_t FAADAPI faacDecSetConfiguration(faacDecHandle hDecoder,
- faacDecConfigurationPtr config);
+uint8_t NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
+ NeAACDecConfigurationPtr config);
/* Init the library based on info from the AAC file (ADTS/ADIF) */
-int32_t FAADAPI faacDecInit(faacDecHandle hDecoder,
- uint8_t *buffer,
- uint32_t buffer_size,
- uint32_t *samplerate,
- uint8_t *channels);
+int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
+ uint8_t *buffer,
+ uint32_t buffer_size,
+ uint32_t *samplerate,
+ uint8_t *channels);
/* Init the library using a DecoderSpecificInfo */
-int8_t FAADAPI faacDecInit2(faacDecHandle hDecoder, uint8_t *pBuffer,
- uint32_t SizeOfDecoderSpecificInfo,
- uint32_t *samplerate, uint8_t *channels);
+int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer,
+ uint32_t SizeOfDecoderSpecificInfo,
+ uint32_t *samplerate, uint8_t *channels);
/* Init the library for DRM */
-int8_t FAADAPI faacDecInitDRM(faacDecHandle hDecoder, uint32_t samplerate,
- uint8_t channels);
+int8_t NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle hDecoder, uint32_t samplerate,
+ uint8_t channels);
-void FAADAPI faacDecClose(faacDecHandle hDecoder);
+void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, int32_t frame);
+void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, int32_t frame);
-void* FAADAPI faacDecDecode(faacDecHandle hDecoder,
- faacDecFrameInfo *hInfo,
- uint8_t *buffer,
- uint32_t buffer_size);
+void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
+ NeAACDecFrameInfo *hInfo,
+ uint8_t *buffer,
+ uint32_t buffer_size);
#ifdef _WIN32
#pragma pack(pop)
--- a/libfaad/hcr.c
+++ b/libfaad/hcr.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: hcr.c,v 1.14 2004/02/26 09:29:27 menno Exp $
+** $Id: hcr.c,v 1.15 2004/03/02 20:09:58 menno Exp $
**/
#include "common.h"
@@ -142,7 +142,7 @@
#define segmentWidth( codebook ) min( maxCwLen[codebook], ics->length_of_longest_codeword )
-uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+uint8_t reordered_spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
int16_t *spectral_data)
{uint16_t sp_offset[8];
--- a/libfaad/mp4.c
+++ b/libfaad/mp4.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: mp4.c,v 1.27 2004/02/26 09:29:27 menno Exp $
+** $Id: mp4.c,v 1.28 2004/03/02 20:09:58 menno Exp $
**/
#include "common.h"
@@ -119,17 +119,17 @@
};
/* Table 1.6.1 */
-int8_t FAADAPI AudioSpecificConfig(uint8_t *pBuffer,
- uint32_t buffer_size,
- mp4AudioSpecificConfig *mp4ASC)
+int8_t NEAACDECAPI NeAACDecAudioSpecificConfig(uint8_t *pBuffer,
+ uint32_t buffer_size,
+ mp4AudioSpecificConfig *mp4ASC)
{return AudioSpecificConfig2(pBuffer, buffer_size, mp4ASC, NULL);
}
-int8_t FAADAPI AudioSpecificConfig2(uint8_t *pBuffer,
- uint32_t buffer_size,
- mp4AudioSpecificConfig *mp4ASC,
- program_config *pce)
+int8_t AudioSpecificConfig2(uint8_t *pBuffer,
+ uint32_t buffer_size,
+ mp4AudioSpecificConfig *mp4ASC,
+ program_config *pce)
{bitfile ld;
int8_t result = 0;
--- a/libfaad/mp4.h
+++ b/libfaad/mp4.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: mp4.h,v 1.18 2004/02/26 09:29:27 menno Exp $
+** $Id: mp4.h,v 1.19 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __MP4_H__
@@ -34,14 +34,14 @@
#include "decoder.h"
-int8_t FAADAPI AudioSpecificConfig(uint8_t *pBuffer,
- uint32_t buffer_size,
- mp4AudioSpecificConfig *mp4ASC);
+int8_t NEAACDECAPI NeAACDecAudioSpecificConfig(uint8_t *pBuffer,
+ uint32_t buffer_size,
+ mp4AudioSpecificConfig *mp4ASC);
-int8_t FAADAPI AudioSpecificConfig2(uint8_t *pBuffer,
- uint32_t buffer_size,
- mp4AudioSpecificConfig *mp4ASC,
- program_config *pce);
+int8_t AudioSpecificConfig2(uint8_t *pBuffer,
+ uint32_t buffer_size,
+ mp4AudioSpecificConfig *mp4ASC,
+ program_config *pce);
#ifdef __cplusplus
}
--- a/libfaad/output.c
+++ b/libfaad/output.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: output.c,v 1.35 2004/02/26 09:29:27 menno Exp $
+** $Id: output.c,v 1.36 2004/03/02 20:09:58 menno Exp $
**/
#include "common.h"
@@ -84,7 +84,7 @@
#define CONV(a,b) ((a<<1)|(b&0x1))
-static void to_PCM_16bit(faacDecHandle hDecoder, real_t **input,
+static void to_PCM_16bit(NeAACDecHandle hDecoder, real_t **input,
uint8_t channels, uint16_t frame_len,
int16_t **sample_buffer)
{@@ -135,7 +135,7 @@
}
}
-static void to_PCM_24bit(faacDecHandle hDecoder, real_t **input,
+static void to_PCM_24bit(NeAACDecHandle hDecoder, real_t **input,
uint8_t channels, uint16_t frame_len,
int32_t **sample_buffer)
{@@ -190,7 +190,7 @@
}
}
-static void to_PCM_32bit(faacDecHandle hDecoder, real_t **input,
+static void to_PCM_32bit(NeAACDecHandle hDecoder, real_t **input,
uint8_t channels, uint16_t frame_len,
int32_t **sample_buffer)
{@@ -245,7 +245,7 @@
}
}
-static void to_PCM_float(faacDecHandle hDecoder, real_t **input,
+static void to_PCM_float(NeAACDecHandle hDecoder, real_t **input,
uint8_t channels, uint16_t frame_len,
float32_t **sample_buffer)
{@@ -286,7 +286,7 @@
}
}
-static void to_PCM_double(faacDecHandle hDecoder, real_t **input,
+static void to_PCM_double(NeAACDecHandle hDecoder, real_t **input,
uint8_t channels, uint16_t frame_len,
double **sample_buffer)
{@@ -327,7 +327,7 @@
}
}
-void *output_to_PCM(faacDecHandle hDecoder,
+void *output_to_PCM(NeAACDecHandle hDecoder,
real_t **input, void *sample_buffer, uint8_t channels,
uint16_t frame_len, uint8_t format)
{@@ -393,7 +393,7 @@
}
}
-void* output_to_PCM(faacDecHandle hDecoder,
+void* output_to_PCM(NeAACDecHandle hDecoder,
real_t **input, void *sample_buffer, uint8_t channels,
uint16_t frame_len, uint8_t format)
{--- a/libfaad/output.h
+++ b/libfaad/output.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: output.h,v 1.18 2004/02/26 09:29:27 menno Exp $
+** $Id: output.h,v 1.19 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __OUTPUT_H__
@@ -32,7 +32,7 @@
extern "C" {#endif
-void* output_to_PCM(faacDecHandle hDecoder,
+void* output_to_PCM(NeAACDecHandle hDecoder,
real_t **input,
void *samplebuffer,
uint8_t channels,
--- a/libfaad/specrec.c
+++ b/libfaad/specrec.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: specrec.c,v 1.45 2004/03/02 19:37:26 menno Exp $
+** $Id: specrec.c,v 1.46 2004/03/02 20:09:58 menno Exp $
**/
/*
@@ -295,7 +295,7 @@
in section named section. This offset depends on window_sequence and
scale_factor_grouping and is needed to decode the spectral_data().
*/
-uint8_t window_grouping_info(faacDecHandle hDecoder, ic_stream *ics)
+uint8_t window_grouping_info(NeAACDecHandle hDecoder, ic_stream *ics)
{uint8_t i, g;
@@ -557,7 +557,7 @@
};
#endif
-void apply_scalefactors(faacDecHandle hDecoder, ic_stream *ics,
+void apply_scalefactors(NeAACDecHandle hDecoder, ic_stream *ics,
real_t *x_invquant, uint16_t frame_len)
{ALIGN static const real_t pow2_table[] =
@@ -646,7 +646,7 @@
}
#ifdef USE_SSE
-void apply_scalefactors_sse(faacDecHandle hDecoder, ic_stream *ics,
+void apply_scalefactors_sse(NeAACDecHandle hDecoder, ic_stream *ics,
real_t *x_invquant, uint16_t frame_len)
{uint8_t g, sfb;
@@ -686,7 +686,7 @@
}
#endif
-static uint8_t allocate_single_channel(faacDecHandle hDecoder, uint8_t channel,
+static uint8_t allocate_single_channel(NeAACDecHandle hDecoder, uint8_t channel,
uint8_t output_channels)
{uint8_t mul = 1;
@@ -769,7 +769,7 @@
return 0;
}
-static uint8_t allocate_channel_pair(faacDecHandle hDecoder,
+static uint8_t allocate_channel_pair(NeAACDecHandle hDecoder,
uint8_t channel, uint8_t paired_channel)
{uint8_t mul = 1;
@@ -874,7 +874,7 @@
return 0;
}
-uint8_t reconstruct_single_channel(faacDecHandle hDecoder, ic_stream *ics,
+uint8_t reconstruct_single_channel(NeAACDecHandle hDecoder, ic_stream *ics,
element *sce, int16_t *spec_data)
{uint8_t retval, output_channels;
@@ -1065,7 +1065,7 @@
return 0;
}
-uint8_t reconstruct_channel_pair(faacDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
+uint8_t reconstruct_channel_pair(NeAACDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
element *cpe, int16_t *spec_data1, int16_t *spec_data2)
{uint8_t retval;
--- a/libfaad/specrec.h
+++ b/libfaad/specrec.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: specrec.h,v 1.24 2004/02/26 09:29:28 menno Exp $
+** $Id: specrec.h,v 1.25 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __SPECREC_H__
@@ -34,16 +34,16 @@
#include "syntax.h"
-uint8_t window_grouping_info(faacDecHandle hDecoder, ic_stream *ics);
-void apply_scalefactors(faacDecHandle hDecoder, ic_stream *ics, real_t *x_invquant,
+uint8_t window_grouping_info(NeAACDecHandle hDecoder, ic_stream *ics);
+void apply_scalefactors(NeAACDecHandle hDecoder, ic_stream *ics, real_t *x_invquant,
uint16_t frame_len);
#ifdef USE_SSE
-void apply_scalefactors_sse(faacDecHandle hDecoder, ic_stream *ics, real_t *x_invquant,
+void apply_scalefactors_sse(NeAACDecHandle hDecoder, ic_stream *ics, real_t *x_invquant,
uint16_t frame_len);
#endif
-uint8_t reconstruct_channel_pair(faacDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
+uint8_t reconstruct_channel_pair(NeAACDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
element *cpe, int16_t *spec_data1, int16_t *spec_data2);
-uint8_t reconstruct_single_channel(faacDecHandle hDecoder, ic_stream *ics, element *sce,
+uint8_t reconstruct_single_channel(NeAACDecHandle hDecoder, ic_stream *ics, element *sce,
int16_t *spec_data);
#ifdef __cplusplus
--- a/libfaad/structs.h
+++ b/libfaad/structs.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: structs.h,v 1.33 2004/03/02 19:37:26 menno Exp $
+** $Id: structs.h,v 1.34 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __STRUCTS_H__
@@ -327,7 +327,7 @@
int8_t downSampledSBR;
} mp4AudioSpecificConfig;
-typedef struct faacDecConfiguration
+typedef struct NeAACDecConfiguration
{uint8_t defObjectType;
uint32_t defSampleRate;
@@ -335,9 +335,9 @@
uint8_t downMatrix;
uint8_t useOldADTSFormat;
uint8_t dontUpSampleImplicitSBR;
-} faacDecConfiguration, *faacDecConfigurationPtr;
+} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-typedef struct faacDecFrameInfo
+typedef struct NeAACDecFrameInfo
{uint32_t bytesconsumed;
uint32_t samples;
@@ -360,7 +360,7 @@
uint8_t num_back_channels;
uint8_t num_lfe_channels;
uint8_t channel_position[MAX_CHANNELS];
-} faacDecFrameInfo;
+} NeAACDecFrameInfo;
typedef struct
{@@ -446,7 +446,7 @@
uint8_t internal_channel[MAX_CHANNELS];
/* Configuration data */
- faacDecConfiguration config;
+ NeAACDecConfiguration config;
#ifdef USE_SSE
void (*apply_sf_func)(void *a, void *b, void *c, uint16_t d);
@@ -459,7 +459,7 @@
int64_t scalefac_cycles;
int64_t requant_cycles;
#endif
-} faacDecStruct, *faacDecHandle;
+} NeAACDecStruct, *NeAACDecHandle;
--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: syntax.c,v 1.73 2004/03/02 19:37:26 menno Exp $
+** $Id: syntax.c,v 1.74 2004/03/02 20:09:58 menno Exp $
**/
/*
@@ -52,40 +52,40 @@
/* static function declarations */
-static void decode_sce_lfe(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, bitfile *ld,
+static void decode_sce_lfe(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, bitfile *ld,
uint8_t id_syn_ele);
-static void decode_cpe(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, bitfile *ld,
+static void decode_cpe(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, bitfile *ld,
uint8_t id_syn_ele);
-static uint8_t single_lfe_channel_element(faacDecHandle hDecoder, bitfile *ld,
+static uint8_t single_lfe_channel_element(NeAACDecHandle hDecoder, bitfile *ld,
uint8_t channel, uint8_t *tag);
-static uint8_t channel_pair_element(faacDecHandle hDecoder, bitfile *ld,
+static uint8_t channel_pair_element(NeAACDecHandle hDecoder, bitfile *ld,
uint8_t channel, uint8_t *tag);
#ifdef COUPLING_DEC
-static uint8_t coupling_channel_element(faacDecHandle hDecoder, bitfile *ld);
+static uint8_t coupling_channel_element(NeAACDecHandle hDecoder, bitfile *ld);
#endif
-static uint16_t data_stream_element(faacDecHandle hDecoder, bitfile *ld);
+static uint16_t data_stream_element(NeAACDecHandle hDecoder, bitfile *ld);
static uint8_t program_config_element(program_config *pce, bitfile *ld);
-static uint8_t fill_element(faacDecHandle hDecoder, bitfile *ld, drc_info *drc
+static uint8_t fill_element(NeAACDecHandle hDecoder, bitfile *ld, drc_info *drc
#ifdef SBR_DEC
,uint8_t sbr_ele
#endif
);
-static uint8_t individual_channel_stream(faacDecHandle hDecoder, element *ele,
+static uint8_t individual_channel_stream(NeAACDecHandle hDecoder, element *ele,
bitfile *ld, ic_stream *ics, uint8_t scal_flag,
int16_t *spec_data);
-static uint8_t ics_info(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+static uint8_t ics_info(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
uint8_t common_window);
-static uint8_t section_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld);
-static uint8_t scale_factor_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld);
+static uint8_t section_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld);
+static uint8_t scale_factor_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld);
#ifdef SSR_DEC
static void gain_control_data(bitfile *ld, ic_stream *ics);
#endif
-static uint8_t spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+static uint8_t spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
int16_t *spectral_data);
static uint16_t extension_payload(bitfile *ld, drc_info *drc, uint16_t count);
static uint8_t pulse_data(ic_stream *ics, pulse_info *pul, bitfile *ld);
static void tns_data(ic_stream *ics, tns_info *tns, bitfile *ld);
-static uint8_t ltp_data(faacDecHandle hDecoder, ic_stream *ics, ltp_info *ltp, bitfile *ld);
+static uint8_t ltp_data(NeAACDecHandle hDecoder, ic_stream *ics, ltp_info *ltp, bitfile *ld);
static uint8_t adts_fixed_header(adts_header *adts, bitfile *ld);
static void adts_variable_header(adts_header *adts, bitfile *ld);
static void adts_error_check(adts_header *adts, bitfile *ld);
@@ -92,7 +92,7 @@
static uint8_t dynamic_range_info(bitfile *ld, drc_info *drc);
static uint8_t excluded_channels(bitfile *ld, drc_info *drc);
#ifdef SCALABLE_DEC
-static int8_t aac_scalable_main_header(faacDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
+static int8_t aac_scalable_main_header(NeAACDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
bitfile *ld, uint8_t this_layer_stereo);
#endif
@@ -314,8 +314,8 @@
return 0;
}
-static void decode_sce_lfe(faacDecHandle hDecoder,
- faacDecFrameInfo *hInfo, bitfile *ld,
+static void decode_sce_lfe(NeAACDecHandle hDecoder,
+ NeAACDecFrameInfo *hInfo, bitfile *ld,
uint8_t id_syn_ele)
{uint8_t channels = hDecoder->fr_channels;
@@ -359,7 +359,7 @@
hDecoder->fr_ch_ele++;
}
-static void decode_cpe(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, bitfile *ld,
+static void decode_cpe(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, bitfile *ld,
uint8_t id_syn_ele)
{uint8_t channels = hDecoder->fr_channels;
@@ -407,7 +407,7 @@
hDecoder->fr_ch_ele++;
}
-void raw_data_block(faacDecHandle hDecoder, faacDecFrameInfo *hInfo,
+void raw_data_block(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo,
bitfile *ld, program_config *pce, drc_info *drc)
{uint8_t id_syn_ele;
@@ -423,7 +423,7 @@
#endif
/* Table 4.4.3: raw_data_block() */
while ((id_syn_ele = (uint8_t)faad_getbits(ld, LEN_SE_ID
- DEBUGVAR(1,4,"faacDecDecode(): id_syn_ele"))) != ID_END)
+ DEBUGVAR(1,4,"NeAACDecDecode(): id_syn_ele"))) != ID_END)
{ switch (id_syn_ele) {case ID_SCE:
@@ -556,7 +556,7 @@
/* Table 4.4.4 and */
/* Table 4.4.9 */
-static uint8_t single_lfe_channel_element(faacDecHandle hDecoder, bitfile *ld,
+static uint8_t single_lfe_channel_element(NeAACDecHandle hDecoder, bitfile *ld,
uint8_t channel, uint8_t *tag)
{uint8_t retval = 0;
@@ -599,7 +599,7 @@
}
/* Table 4.4.5 */
-static uint8_t channel_pair_element(faacDecHandle hDecoder, bitfile *ld,
+static uint8_t channel_pair_element(NeAACDecHandle hDecoder, bitfile *ld,
uint8_t channels, uint8_t *tag)
{ ALIGN int16_t spec_data1[1024] = {0};@@ -710,7 +710,7 @@
}
/* Table 4.4.6 */
-static uint8_t ics_info(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+static uint8_t ics_info(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
uint8_t common_window)
{uint8_t retval = 0;
@@ -835,7 +835,7 @@
#ifdef COUPLING_DEC
/* Table 4.4.8: Currently just for skipping the bits... */
-static uint8_t coupling_channel_element(faacDecHandle hDecoder, bitfile *ld)
+static uint8_t coupling_channel_element(NeAACDecHandle hDecoder, bitfile *ld)
{uint8_t c, result = 0;
uint8_t ind_sw_cce_flag = 0;
@@ -924,7 +924,7 @@
#endif
/* Table 4.4.10 */
-static uint16_t data_stream_element(faacDecHandle hDecoder, bitfile *ld)
+static uint16_t data_stream_element(NeAACDecHandle hDecoder, bitfile *ld)
{uint8_t byte_aligned;
uint16_t i, count;
@@ -953,7 +953,7 @@
}
/* Table 4.4.11 */
-static uint8_t fill_element(faacDecHandle hDecoder, bitfile *ld, drc_info *drc
+static uint8_t fill_element(NeAACDecHandle hDecoder, bitfile *ld, drc_info *drc
#ifdef SBR_DEC
,uint8_t sbr_ele
#endif
@@ -1002,7 +1002,7 @@
#if 0
if (hDecoder->sbr[sbr_ele]->ret > 0)
{- printf("%s\n", faacDecGetErrorMessage(hDecoder->sbr[sbr_ele]->ret));+ printf("%s\n", NeAACDecGetErrorMessage(hDecoder->sbr[sbr_ele]->ret));}
#endif
@@ -1124,7 +1124,7 @@
#ifdef SCALABLE_DEC
/* Table 4.4.13 ASME */
-void aac_scalable_main_element(faacDecHandle hDecoder, faacDecFrameInfo *hInfo,
+void aac_scalable_main_element(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo,
bitfile *ld, program_config *pce, drc_info *drc)
{uint8_t retval = 0;
@@ -1268,7 +1268,7 @@
}
/* Table 4.4.15 */
-static int8_t aac_scalable_main_header(faacDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
+static int8_t aac_scalable_main_header(NeAACDecHandle hDecoder, ic_stream *ics1, ic_stream *ics2,
bitfile *ld, uint8_t this_layer_stereo)
{uint8_t retval = 0;
@@ -1378,7 +1378,7 @@
#endif
/* Table 4.4.24 */
-static uint8_t individual_channel_stream(faacDecHandle hDecoder, element *ele,
+static uint8_t individual_channel_stream(NeAACDecHandle hDecoder, element *ele,
bitfile *ld, ic_stream *ics, uint8_t scal_flag,
int16_t *spec_data)
{@@ -1514,7 +1514,7 @@
}
/* Table 4.4.25 */
-static uint8_t section_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld)
+static uint8_t section_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld)
{uint8_t g;
uint8_t sect_esc_val, sect_bits;
@@ -1698,7 +1698,7 @@
}
/* Table 4.4.26 */
-static uint8_t scale_factor_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld)
+static uint8_t scale_factor_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld)
{uint8_t ret = 0;
#ifdef PROFILE
@@ -1785,7 +1785,7 @@
#ifdef LTP_DEC
/* Table 4.4.28 */
-static uint8_t ltp_data(faacDecHandle hDecoder, ic_stream *ics, ltp_info *ltp, bitfile *ld)
+static uint8_t ltp_data(NeAACDecHandle hDecoder, ic_stream *ics, ltp_info *ltp, bitfile *ld)
{uint8_t sfb, w;
@@ -1848,7 +1848,7 @@
#endif
/* Table 4.4.29 */
-static uint8_t spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+static uint8_t spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
int16_t *spectral_data)
{int8_t i;
--- a/libfaad/syntax.h
+++ b/libfaad/syntax.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through [email protected].
**
-** $Id: syntax.h,v 1.50 2004/03/02 19:37:27 menno Exp $
+** $Id: syntax.h,v 1.51 2004/03/02 20:09:58 menno Exp $
**/
#ifndef __SYNTAX_H__
@@ -110,9 +110,9 @@
uint8_t adts_frame(adts_header *adts, bitfile *ld);
void get_adif_header(adif_header *adif, bitfile *ld);
-void raw_data_block(faacDecHandle hDecoder, faacDecFrameInfo *hInfo,
+void raw_data_block(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo,
bitfile *ld, program_config *pce, drc_info *drc);
-uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld,
+uint8_t reordered_spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld,
int16_t *spectral_data);