summaryrefslogtreecommitdiff
path: root/libSYS
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-05-20 17:39:03 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2014-05-20 17:39:03 -0700
commit6792cf6361ff339e336287affb0bfe54bf6957a9 (patch)
tree6c4e2434c706bb4b13763a097c1ae2c160eb96c0 /libSYS
parent8e087bf394c5ceddcdb8b1d029795aff3026eea0 (diff)
AAC-Decoder: SBR delay for gapless
Revise decoder output delay determination. The output delay consisted of concealment and limiter delay. SBR delay was not covered but must be considered for gapless playback delay compensation. Bug 9428126 Change-Id: I67483712c284de9b5378694f9db7acbed2547dd7
Diffstat (limited to 'libSYS')
-rw-r--r--libSYS/include/FDK_audio.h8
-rw-r--r--libSYS/src/genericStds.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/libSYS/include/FDK_audio.h b/libSYS/include/FDK_audio.h
index 97770a7..0660f4c 100644
--- a/libSYS/include/FDK_audio.h
+++ b/libSYS/include/FDK_audio.h
@@ -232,6 +232,14 @@ typedef enum
} AUDIO_OBJECT_TYPE;
+#define IS_USAC(aot) \
+ ((aot) == AOT_USAC \
+|| (aot) == AOT_RSVD50)
+
+#define IS_LOWDELAY(aot) \
+ ((aot) == AOT_ER_AAC_LD \
+|| (aot) == AOT_ER_AAC_ELD)
+
/** Channel Mode ( 1-7 equals MPEG channel configurations, others are arbitrary). */
typedef enum {
MODE_INVALID = -1,
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp
index e67db38..3381e37 100644
--- a/libSYS/src/genericStds.cpp
+++ b/libSYS/src/genericStds.cpp
@@ -99,7 +99,7 @@ amm-info@iis.fraunhofer.de
/* library info */
#define SYS_LIB_VL0 1
#define SYS_LIB_VL1 3
-#define SYS_LIB_VL2 5
+#define SYS_LIB_VL2 6
#define SYS_LIB_TITLE "System Integration Library"
#define SYS_LIB_BUILD_DATE __DATE__
#define SYS_LIB_BUILD_TIME __TIME__