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 /libSYS | |
| 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 'libSYS')
| -rw-r--r-- | libSYS/include/FDK_audio.h | 6 | ||||
| -rw-r--r-- | libSYS/include/genericStds.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libSYS/include/FDK_audio.h b/libSYS/include/FDK_audio.h index 1d28187..6003eb3 100644 --- a/libSYS/include/FDK_audio.h +++ b/libSYS/include/FDK_audio.h @@ -236,6 +236,7 @@ typedef enum { #define CC_IS_BASELAYER 0x00200000 #define CC_PROTECTION 0x00400000 #define CC_SBR 0x00800000 +#define CC_SBRCRC 0x00010000 #define CC_RVLC 0x01000000 #define CC_VCB11 0x02000000 #define CC_HCR 0x04000000 @@ -284,6 +285,11 @@ typedef enum ID_LAST } MP4_ELEMENT_ID; +#define IS_CHANNEL_ELEMENT(elementId) \ + ((elementId) == ID_SCE \ +|| (elementId) == ID_CPE \ +|| (elementId) == ID_LFE) + #define EXT_ID_BITS 4 /**< Size in bits of extension payload type tags. */ /** Extension payload types. */ diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h index 8009050..d1058b9 100644 --- a/libSYS/include/genericStds.h +++ b/libSYS/include/genericStds.h @@ -40,7 +40,7 @@ /* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */ #if defined(DEBUG) || defined(FDK_DEBUG) -#define MEMORY_MEASUREMENT +//#define MEMORY_MEASUREMENT #endif #ifndef M_PI |