diff options
Diffstat (limited to 'src/libfaad/structs.h')
| -rw-r--r-- | src/libfaad/structs.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/libfaad/structs.h b/src/libfaad/structs.h index c69abf9bc..3defe7a10 100644 --- a/src/libfaad/structs.h +++ b/src/libfaad/structs.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: structs.h,v 1.5 2004/01/26 22:34:11 jstembridge Exp $ +** $Id: structs.h,v 1.6 2004/12/03 01:15:31 tmattern Exp $ **/ #ifndef __STRUCTS_H__ @@ -381,12 +381,27 @@ typedef struct uint8_t downMatrix; uint8_t first_syn_ele; uint8_t has_lfe; + /* number of channels in current frame */ uint8_t fr_channels; + /* number of elements in current frame */ uint8_t fr_ch_ele; - void *sample_buffer; + /* element_output_channels: + determines the number of channels the element will output + */ + uint8_t element_output_channels[MAX_SYNTAX_ELEMENTS]; + /* element_alloced: + determines whether the data needed for the element is allocated or not + */ + uint8_t element_alloced[MAX_SYNTAX_ELEMENTS]; + /* alloced_channels: + determines the number of channels where output data is allocated for + */ uint8_t alloced_channels; + /* output data buffer */ + void *sample_buffer; + uint8_t window_shape_prev[MAX_CHANNELS]; #ifdef LTP_DEC uint16_t ltp_lag[MAX_CHANNELS]; @@ -400,6 +415,7 @@ typedef struct #ifdef SBR_DEC int8_t sbr_present_flag; int8_t forceUpSampling; + /* determines whether SBR data is allocated for the gives element */ uint8_t sbr_alloced[MAX_SYNTAX_ELEMENTS]; sbr_info *sbr[MAX_SYNTAX_ELEMENTS]; @@ -407,6 +423,9 @@ typedef struct int8_t lcstereo_flag; #endif #endif +#if (defined(PS_DEC) || defined(DRM_PS)) + uint8_t ps_used[MAX_SYNTAX_ELEMENTS]; +#endif #ifdef SSR_DEC real_t *ssr_overlap[MAX_CHANNELS]; @@ -425,7 +444,6 @@ typedef struct uint8_t pce_set; program_config pce; uint8_t element_id[MAX_CHANNELS]; - uint8_t channel_element[MAX_CHANNELS]; uint8_t internal_channel[MAX_CHANNELS]; /* Configuration data */ |