diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-12-03 01:15:29 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-12-03 01:15:29 +0000 |
| commit | 177aca572a9e0f4256034e51ffded0b3815d4f61 (patch) | |
| tree | 071a5f96a627a1c0124ff57a4b806d52068fdba0 /src/libfaad/sbr_dec.h | |
| parent | 575782a9f76583abd8c4374466472b376023f8dd (diff) | |
| download | xine-lib-177aca572a9e0f4256034e51ffded0b3815d4f61.tar.gz xine-lib-177aca572a9e0f4256034e51ffded0b3815d4f61.tar.bz2 | |
Update to libfaad2 2.0.
CVS patchset: 7185
CVS date: 2004/12/03 01:15:29
Diffstat (limited to 'src/libfaad/sbr_dec.h')
| -rw-r--r-- | src/libfaad/sbr_dec.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/libfaad/sbr_dec.h b/src/libfaad/sbr_dec.h index bf8d82cef..46feaa120 100644 --- a/src/libfaad/sbr_dec.h +++ b/src/libfaad/sbr_dec.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_dec.h,v 1.5 2004/01/26 22:34:11 jstembridge Exp $ +** $Id: sbr_dec.h,v 1.6 2004/12/03 01:15:30 tmattern Exp $ **/ #ifndef __SBR_DEC_H__ @@ -158,8 +158,10 @@ typedef struct int8_t lcstereo_flag; uint8_t bs_dataextra; uint8_t Is_DRM_SBR; +#ifdef DRM_PS drm_ps_info drm_ps; #endif +#endif uint8_t numTimeSlotsRate; uint8_t numTimeSlots; @@ -169,6 +171,9 @@ typedef struct #ifdef PS_DEC ps_info ps; #endif +#if (defined(PS_DEC) || defined(DRM_PS)) + uint8_t ps_used; +#endif /* to get it compiling */ /* we'll see during the coding of all the tools, whether @@ -221,6 +226,10 @@ uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_cha const uint8_t just_seeked, const uint8_t upsample_only); uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, const uint8_t just_seeked, const uint8_t upsample_only); +#if (defined(PS_DEC) || defined(DRM_PS)) +uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, + const uint8_t just_seeked, const uint8_t upsample_only); +#endif #ifdef __cplusplus |