More OKed AAC decoder code hunks

Originally committed as revision 14828 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 91b18a1..a64497d 100644 (file)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -232,6 +232,14 @@ typedef struct {
     /** @} */
 
     /**
+     * @defgroup temporary aligned temporary buffers (We do not want to have these on the stack.)
+     * @{
+     */
+    DECLARE_ALIGNED_16(float, buf_mdct[2048]);
+    DECLARE_ALIGNED_16(float, revers[1024]);
+    /** @} */
+
+    /**
      * @defgroup tables   Computed / set up during initialization.
      * @{
      */

diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index b7a9787..c10eb71 100644 (file)
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -156,4 +156,19 @@ static const uint16_t *swb_offset_128[] = {
 
 // @}
 
+/* @name tns_max_bands
+ * The maximum number of scalefactor bands on which TNS can operate for the long
+ * and short transforms respectively. The index to these tables is related to
+ * the sample rate of the audio.
+ * @{
+ */
+static const uint8_t tns_max_bands_1024[] = {
+    31, 31, 34, 40, 42, 51, 46, 46, 42, 42, 42, 39
+};
+
+static const uint8_t tns_max_bands_128[] = {
+    9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14
+};
+// @}
+
 #endif /* FFMPEG_AACDECTAB_H */