diff options
Diffstat (limited to 'libfaad2/sbr_syntax.h')
| -rw-r--r-- | libfaad2/sbr_syntax.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/libfaad2/sbr_syntax.h b/libfaad2/sbr_syntax.h index 544792ee87..3c942581b7 100644 --- a/libfaad2/sbr_syntax.h +++ b/libfaad2/sbr_syntax.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: sbr_syntax.h,v 1.6 2003/07/29 08:20:13 menno Exp $ +** $Id: sbr_syntax.h,v 1.7 2003/09/09 18:09:52 menno Exp $ **/ #ifndef __SBR_SYNTAX_H__ @@ -34,8 +34,12 @@ extern "C" { #include "bits.h" -#define tHFGen 8 -#define tHFAdj 2 +#ifdef DRM +# define T_HFGEN_DRM 32 +# define T_HFADJ_DRM 0 +#endif +#define T_HFGEN 8 +#define T_HFADJ 2 #define EXT_SBR_DATA 13 #define EXT_SBR_DATA_CRC 14 @@ -48,20 +52,21 @@ extern "C" { #define LO_RES 0 #define HI_RES 1 +#define NO_TIME_SLOTS_960 15 #define NO_TIME_SLOTS 16 +#define RATE 2 + #define NOISE_FLOOR_OFFSET 6.0 uint8_t sbr_extension_data(bitfile *ld, sbr_info *sbr, uint8_t id_aac); static void sbr_header(bitfile *ld, sbr_info *sbr, uint8_t id_aac); -static void sbr_data(bitfile *ld, sbr_info *sbr, uint8_t id_aac); -static void sbr_single_channel_element(bitfile *ld, sbr_info *sbr); -static void sbr_channel_pair_element(bitfile *ld, sbr_info *sbr); -static void sbr_grid(bitfile *ld, sbr_info *sbr, uint8_t ch); +static uint8_t sbr_data(bitfile *ld, sbr_info *sbr, uint8_t id_aac); +static uint8_t sbr_single_channel_element(bitfile *ld, sbr_info *sbr); +static uint8_t sbr_channel_pair_element(bitfile *ld, sbr_info *sbr); +static uint8_t sbr_grid(bitfile *ld, sbr_info *sbr, uint8_t ch); static void sbr_dtdf(bitfile *ld, sbr_info *sbr, uint8_t ch); static void invf_mode(bitfile *ld, sbr_info *sbr, uint8_t ch); -static void sbr_envelope(bitfile *ld, sbr_info *sbr, uint8_t ch); -static void sbr_noise(bitfile *ld, sbr_info *sbr, uint8_t ch); static void sinusoidal_coding(bitfile *ld, sbr_info *sbr, uint8_t ch); #ifdef __cplusplus |