diff options
Diffstat (limited to 'libfaad2/syntax.h')
| -rw-r--r-- | libfaad2/syntax.h | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/libfaad2/syntax.h b/libfaad2/syntax.h index 8d8f2ae78c..75260d04b2 100644 --- a/libfaad2/syntax.h +++ b/libfaad2/syntax.h @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software 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 @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: syntax.h,v 1.37 2003/09/24 19:55:34 menno Exp $ +** $Id: syntax.h,v 1.2 2003/10/03 22:22:27 alex Exp $ **/ #ifndef __SYNTAX_H__ @@ -33,7 +33,6 @@ extern "C" { #endif #include "decoder.h" -#include "drc.h" #include "bits.h" #define MAIN 1 @@ -104,51 +103,17 @@ extern "C" { #define INTENSITY_HCB2 14 #define INTENSITY_HCB 15 +#define INVALID_SBR_ELEMENT 255 + int8_t GASpecificConfig(bitfile *ld, mp4AudioSpecificConfig *mp4ASC, program_config *pce); uint8_t adts_frame(adts_header *adts, bitfile *ld); void get_adif_header(adif_header *adif, bitfile *ld); - - -/* static functions */ -static uint8_t single_lfe_channel_element(faacDecHandle hDecoder, - element *sce, bitfile *ld, - real_t *spec_coef); -static uint8_t channel_pair_element(faacDecHandle hDecoder, element *cpe, - bitfile *ld, - real_t *spec_coef1, real_t *spec_coef2); -static uint8_t coupling_channel_element(faacDecHandle hDecoder, bitfile *ld); -static uint16_t data_stream_element(faacDecHandle 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 -#ifdef SBR_DEC - ,uint8_t sbr_ele -#endif - ); -static uint8_t individual_channel_stream(faacDecHandle 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, - 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 void gain_control_data(bitfile *ld, ic_stream *ics); -static uint8_t spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld, - int16_t *spectral_data); -static uint16_t extension_payload(bitfile *ld, drc_info *drc, uint16_t count); -#ifdef ERROR_RESILIENCE -uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, - bitfile *ld, int16_t *spectral_data); -#endif -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 void ltp_data(faacDecHandle 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); -static uint8_t dynamic_range_info(bitfile *ld, drc_info *drc); -static uint8_t excluded_channels(bitfile *ld, drc_info *drc); +void raw_data_block(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, + bitfile *ld, program_config *pce, drc_info *drc); +uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld, + int16_t *spectral_data); #ifdef __cplusplus |