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

1 files changed, 22 insertions, 2 deletions

diff --git a/libSBRenc/src/ps_const.h b/libSBRenc/src/ps_const.h
index 20fcc88..376528b 100644
--- a/libSBRenc/src/ps_const.h
+++ b/libSBRenc/src/ps_const.h
@@ -28,6 +28,17 @@
 #ifndef PS_CONST_H
 #define PS_CONST_H
 
+#define MAX_PS_CHANNELS          (  2 )
+#define HYBRID_MAX_QMF_BANDS     (  3 )
+#define HYBRID_FILTER_LENGTH     ( 13 )
+#define HYBRID_FILTER_DELAY      ( (HYBRID_FILTER_LENGTH-1)/2 )
+
+#define  HYBRID_FRAMESIZE        ( QMF_MAX_TIME_SLOTS )
+#define  HYBRID_READ_OFFSET      ( 10 )
+
+#define MAX_HYBRID_BANDS         ( (QMF_CHANNELS-HYBRID_MAX_QMF_BANDS+10) )
+
+
 typedef enum {
   PS_RES_COARSE  = 0,
   PS_RES_MID     = 1,
@@ -37,8 +48,7 @@ typedef enum {
 typedef enum {
   PS_BANDS_COARSE  = 10,
   PS_BANDS_MID     = 20,
-  PS_BANDS_FINE    = 34,
-  PS_MAX_BANDS     = PS_BANDS_FINE
+  PS_MAX_BANDS     = PS_BANDS_MID
 } PS_BANDS;
 
 typedef enum {
@@ -62,4 +72,14 @@ typedef enum {
 
 } PS_CONSTS;
 
+typedef enum {
+    PSENC_OK                    = 0x0000,   /*!< No error happened. All fine. */
+    PSENC_INVALID_HANDLE        = 0x0020,   /*!< Handle passed to function call was invalid. */
+    PSENC_MEMORY_ERROR          = 0x0021,   /*!< Memory allocation failed. */
+    PSENC_INIT_ERROR            = 0x0040,   /*!< General initialization error. */
+    PSENC_ENCODE_ERROR          = 0x0060    /*!< The encoding process was interrupted by an unexpected error. */
+
+} FDK_PSENC_ERROR;
+
+
 #endif