aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/include
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-08-27 15:57:28 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2013-08-27 15:57:28 -0700
commit3a0a695565d1d360f9a82173469c8ef858bc08a0 (patch)
tree11ca521b5ca3b674f02a605d0fc08d11624b205f /libFDK/include
parent16c472c201c197d3660334df5952eb4084897f9f (diff)
downloadfdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.tar.gz
fdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.tar.bz2
fdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.zip
FDK update for downsampled SBR
Add missing support for downsampled SBR in libFDK Bug 9428126 Change-Id: Idb732f8d31a115d36dd4b22916599db7fab98cae
Diffstat (limited to 'libFDK/include')
-rw-r--r--libFDK/include/FDK_tools_rom.h3
-rw-r--r--libFDK/include/qmf.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/libFDK/include/FDK_tools_rom.h b/libFDK/include/FDK_tools_rom.h
index 2079c5b..9361c81 100644
--- a/libFDK/include/FDK_tools_rom.h
+++ b/libFDK/include/FDK_tools_rom.h
@@ -171,6 +171,9 @@ extern const FIXP_WTP sin_twiddle_L64[];
extern const FIXP_QTW qmf_phaseshift_cos32[32];
extern const FIXP_QTW qmf_phaseshift_sin32[32];
+/* Adapted analysis post-twiddles for down-sampled HQ SBR */
+extern const FIXP_QTW qmf_phaseshift_cos_downsamp32[32];
+extern const FIXP_QTW qmf_phaseshift_sin_downsamp32[32];
extern const FIXP_QTW qmf_phaseshift_cos64[64];
extern const FIXP_QTW qmf_phaseshift_sin64[64];
diff --git a/libFDK/include/qmf.h b/libFDK/include/qmf.h
index 8777960..be69477 100644
--- a/libFDK/include/qmf.h
+++ b/libFDK/include/qmf.h
@@ -137,6 +137,8 @@ amm-info@iis.fraunhofer.de
#define QMF_FLAG_MPSLDFB 16
/* Complex Low Delay Filter Bank used in MPEG Surround Encoder allows a optimized calculation of the modulation in qmfForwardModulationHQ() */
#define QMF_FLAG_MPSLDFB_OPTIMIZE_MODULATION 32
+/* Flag to indicate HE-AAC down-sampled SBR mode (decoder) -> adapt analysis post twiddling */
+#define QMF_FLAG_DOWNSAMPLED 64
typedef struct