diff options
Diffstat (limited to 'src/libfaad/decoder.h')
| -rw-r--r-- | src/libfaad/decoder.h | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/src/libfaad/decoder.h b/src/libfaad/decoder.h index ad7de8898..5a3a2663f 100644 --- a/src/libfaad/decoder.h +++ b/src/libfaad/decoder.h @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: decoder.h,v 1.8 2004/12/03 01:15:30 tmattern Exp $ +** $Id: decoder.h,v 1.9 2005/10/29 23:57:06 tmmm Exp $ **/ #ifndef __DECODER_H__ @@ -34,28 +34,22 @@ extern "C" { #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 -#include "bits.h" -#include "syntax.h" -#include "drc.h" -#include "specrec.h" -#include "filtbank.h" -#include "ic_predict.h" - /* library output formats */ #define FAAD_FMT_16BIT 1 #define FAAD_FMT_24BIT 2 #define FAAD_FMT_32BIT 3 #define FAAD_FMT_FLOAT 4 +#define FAAD_FMT_FIXED FAAD_FMT_FLOAT #define FAAD_FMT_DOUBLE 5 #define LC_DEC_CAP (1<<0) @@ -76,41 +70,46 @@ extern "C" { #define LFE_CHANNEL (9) #define UNKNOWN_CHANNEL (0) -int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode); +char* 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 NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder); -void FAADAPI faacDecClose(faacDecHandle hDecoder); +void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, int32_t frame); -void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, int32_t frame); +void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder, + NeAACDecFrameInfo *hInfo, + uint8_t *buffer, + uint32_t buffer_size); -void* FAADAPI faacDecDecode(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, - uint8_t *buffer, - uint32_t buffer_size); +void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder, + NeAACDecFrameInfo *hInfo, + uint8_t *buffer, uint32_t buffer_size, + void **sample_buffer, uint32_t sample_buffer_size); #ifdef _WIN32 #pragma pack(pop) |