diff options
| author | Dave Burke <daveburke@google.com> | 2012-05-12 13:17:25 -0700 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2012-05-12 13:47:46 -0700 |
| commit | 698b536f3b34a7cfc41a80e1034cc359456bdd66 (patch) | |
| tree | fa3dfa75d535b188725f1b84316cb4b06db79771 /libSBRenc/src/ps_encode.h | |
| parent | 9bf37cc9712506b2483650c82d3c41152337ef7e (diff) | |
| download | fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.tar.gz fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.tar.bz2 fdk-aac-698b536f3b34a7cfc41a80e1034cc359456bdd66.zip | |
Update to 2012_05_11 version.
Fixes:
- Don't throw error for invalid bitrate but limit to functional value
- More robust ASC parsing
- More robust handling of corrupt bitstreams
- Handle multiple raw access units
Change-Id: Ib49fe2545ff4185fe924126da702fe84ac5c2d87
Diffstat (limited to 'libSBRenc/src/ps_encode.h')
| -rw-r--r-- | libSBRenc/src/ps_encode.h | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/libSBRenc/src/ps_encode.h b/libSBRenc/src/ps_encode.h index 6ce9d1f..be8ba9a 100644 --- a/libSBRenc/src/ps_encode.h +++ b/libSBRenc/src/ps_encode.h @@ -27,7 +27,7 @@ ******************************************************************************/ /*! \file - \brief PS parameter extraction, encoding functions $Revision: 36847 $ + \brief PS parameter extraction, encoding functions $Revision: 37142 $ */ #ifndef __INCLUDED_PS_ENCODE_H @@ -35,7 +35,7 @@ #include "ps_const.h" #include "ps_bitenc.h" -#include "psenc_hybrid.h" + #define IID_SCALE_FT (64.f) /* maxVal in Quant tab is +/- 50 */ #define IID_SCALE 6 /* maxVal in Quant tab is +/- 50 */ @@ -81,7 +81,7 @@ typedef struct T_PS_DATA { typedef struct T_PS_ENCODE{ - HANDLE_PS_DATA hPsData; + PS_DATA psData; PS_BANDS psEncMode; INT nQmfIidGroups; @@ -97,21 +97,29 @@ typedef struct T_PS_ENCODE{ typedef struct T_PS_ENCODE *HANDLE_PS_ENCODE; -typedef struct T_PS_CHANNEL_DATA *HANDLE_PS_CHANNEL_DATA; - -HANDLE_ERROR_INFO FDKsbrEnc_CreatePSEncode(HANDLE_PS_ENCODE *phPsEncode); - -HANDLE_ERROR_INFO FDKsbrEnc_InitPSEncode(HANDLE_PS_ENCODE hPsEncode, const PS_BANDS psEncMode, const FIXP_DBL iidQuantErrorThreshold); - -HANDLE_ERROR_INFO FDKsbrEnc_DestroyPSEncode(HANDLE_PS_ENCODE *phPsEncode); - -HANDLE_ERROR_INFO FDKsbrEnc_PSEncode(HANDLE_PS_ENCODE hPsEncode, - HANDLE_PS_OUT hPsOut, - HANDLE_PS_CHANNEL_DATA hChanDatal, - HANDLE_PS_CHANNEL_DATA hChanDatar, - UCHAR *dynBandScale, - UINT maxEnvelopes, - const int sendHeader); +FDK_PSENC_ERROR FDKsbrEnc_CreatePSEncode( + HANDLE_PS_ENCODE *phPsEncode + ); + +FDK_PSENC_ERROR FDKsbrEnc_InitPSEncode( + HANDLE_PS_ENCODE hPsEncode, + const PS_BANDS psEncMode, + const FIXP_DBL iidQuantErrorThreshold + ); + +FDK_PSENC_ERROR FDKsbrEnc_DestroyPSEncode( + HANDLE_PS_ENCODE *phPsEncode + ); + +FDK_PSENC_ERROR FDKsbrEnc_PSEncode( + HANDLE_PS_ENCODE hPsEncode, + HANDLE_PS_OUT hPsOut, + UCHAR *dynBandScale, + UINT maxEnvelopes, + FIXP_DBL *hybridData[HYBRID_FRAMESIZE][MAX_PS_CHANNELS][2], + const INT frameSize, + const INT sendHeader + ); #endif |