diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
commit | e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8 (patch) | |
tree | 8553b3a4ef8164d14ff1b4a3f67e57cfa1d8908a /libfaad2/structs.h | |
parent | 2887bacbdb6bd320e4840fd230e92a59cc74b9ae (diff) | |
download | mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.bz2 mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.xz |
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/structs.h')
-rw-r--r-- | libfaad2/structs.h | 100 |
1 files changed, 53 insertions, 47 deletions
diff --git a/libfaad2/structs.h b/libfaad2/structs.h index ffbbb9b550..a3513be1ab 100644 --- a/libfaad2/structs.h +++ b/libfaad2/structs.h @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 -** $Id: structs.h,v 1.3 2004/06/02 22:59:04 diego Exp $ +** $Id: structs.h,v 1.4 2004/06/23 13:50:53 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -184,6 +184,7 @@ typedef struct program_config pce[16]; } adif_header; +#ifdef LTP_DEC typedef struct { uint8_t last_band; @@ -196,7 +197,9 @@ typedef struct uint8_t short_lag_present[8]; uint8_t short_lag[8]; } ltp_info; +#endif +#ifdef MAIN_DEC typedef struct { uint8_t limit; @@ -204,6 +207,7 @@ typedef struct uint8_t predictor_reset_group_number; uint8_t prediction_used[MAX_SFB]; } pred_info; +#endif typedef struct { @@ -270,9 +274,13 @@ typedef struct pulse_info pul; tns_info tns; +#ifdef MAIN_DEC pred_info pred; +#endif +#ifdef LTP_DEC ltp_info ltp; ltp_info ltp2; +#endif #ifdef SSR_DEC ssr_info ssr; #endif @@ -294,8 +302,6 @@ typedef struct typedef struct { - uint8_t ele_id; - uint8_t channel; int16_t paired_channel; @@ -309,59 +315,60 @@ typedef struct typedef struct mp4AudioSpecificConfig { /* Audio Specific Info */ - uint8_t objectTypeIndex; - uint8_t samplingFrequencyIndex; - uint32_t samplingFrequency; - uint8_t channelsConfiguration; + /*uint8_t*/ unsigned char objectTypeIndex; + /*uint8_t*/ unsigned char samplingFrequencyIndex; + /*uint32_t*/ unsigned long samplingFrequency; + /*uint8_t*/ unsigned char channelsConfiguration; /* GA Specific Info */ - uint8_t frameLengthFlag; - uint8_t dependsOnCoreCoder; - uint16_t coreCoderDelay; - uint8_t extensionFlag; - uint8_t aacSectionDataResilienceFlag; - uint8_t aacScalefactorDataResilienceFlag; - uint8_t aacSpectralDataResilienceFlag; - uint8_t epConfig; - - int8_t sbr_present_flag; - int8_t forceUpSampling; + /*uint8_t*/ unsigned char frameLengthFlag; + /*uint8_t*/ unsigned char dependsOnCoreCoder; + /*uint16_t*/ unsigned short coreCoderDelay; + /*uint8_t*/ unsigned char extensionFlag; + /*uint8_t*/ unsigned char aacSectionDataResilienceFlag; + /*uint8_t*/ unsigned char aacScalefactorDataResilienceFlag; + /*uint8_t*/ unsigned char aacSpectralDataResilienceFlag; + /*uint8_t*/ unsigned char epConfig; + + /*uint8_t*/ char sbr_present_flag; + /*uint8_t*/ char forceUpSampling; + /*uint8_t*/ char downSampledSBR; } mp4AudioSpecificConfig; -typedef struct faacDecConfiguration +typedef struct NeAACDecConfiguration { - uint8_t defObjectType; - uint32_t defSampleRate; - uint8_t outputFormat; - uint8_t downMatrix; - uint8_t useOldADTSFormat; - uint8_t dontUpSampleImplicitSBR; -} faacDecConfiguration, *faacDecConfigurationPtr; - -typedef struct faacDecFrameInfo + /*uint8_t*/ unsigned char defObjectType; + /*uint32_t*/ unsigned long defSampleRate; + /*uint8_t*/ unsigned char outputFormat; + /*uint8_t*/ unsigned char downMatrix; + /*uint8_t*/ unsigned char useOldADTSFormat; + /*uint8_t*/ unsigned char dontUpSampleImplicitSBR; +} NeAACDecConfiguration, *NeAACDecConfigurationPtr; + +typedef struct NeAACDecFrameInfo { - uint32_t bytesconsumed; - uint32_t samples; - uint8_t channels; - uint8_t error; - uint32_t samplerate; + /*uint32_t*/ unsigned long bytesconsumed; + /*uint32_t*/ unsigned long samples; + /*uint8_t*/ unsigned char channels; + /*uint8_t*/ unsigned char error; + /*uint32_t*/ unsigned long samplerate; /* SBR: 0: off, 1: on; normal, 2: on; downsampled */ - uint8_t sbr; + /*uint8_t*/ unsigned char sbr; /* MPEG-4 ObjectType */ - uint8_t object_type; + /*uint8_t*/ unsigned char object_type; /* AAC header type; MP4 will be signalled as RAW also */ - uint8_t header_type; + /*uint8_t*/ unsigned char header_type; /* multichannel configuration */ - uint8_t num_front_channels; - uint8_t num_side_channels; - uint8_t num_back_channels; - uint8_t num_lfe_channels; - uint8_t channel_position[MAX_CHANNELS]; -} faacDecFrameInfo; + /*uint8_t*/ unsigned char num_front_channels; + /*uint8_t*/ unsigned char num_side_channels; + /*uint8_t*/ unsigned char num_back_channels; + /*uint8_t*/ unsigned char num_lfe_channels; + /*uint8_t*/ unsigned char channel_position[MAX_CHANNELS]; +} NeAACDecFrameInfo; typedef struct { @@ -381,6 +388,7 @@ typedef struct uint32_t frame; uint8_t downMatrix; + uint8_t upMatrix; uint8_t first_syn_ele; uint8_t has_lfe; /* number of channels in current frame */ @@ -417,13 +425,11 @@ typedef struct #ifdef SBR_DEC int8_t sbr_present_flag; int8_t forceUpSampling; + int8_t downSampledSBR; /* determines whether SBR data is allocated for the gives element */ uint8_t sbr_alloced[MAX_SYNTAX_ELEMENTS]; sbr_info *sbr[MAX_SYNTAX_ELEMENTS]; -#ifdef DRM - int8_t lcstereo_flag; -#endif #endif #if (defined(PS_DEC) || defined(DRM_PS)) uint8_t ps_used[MAX_SYNTAX_ELEMENTS]; @@ -449,7 +455,7 @@ typedef struct 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); @@ -462,7 +468,7 @@ typedef struct int64_t scalefac_cycles; int64_t requant_cycles; #endif -} faacDecStruct, *faacDecHandle; +} NeAACDecStruct, *NeAACDecHandle; |