summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2015-10-17 02:06:09 +0100
committerRostislav Pehlivanov <atomnuker@gmail.com>2015-10-17 02:31:20 +0100
commitb9fb1db9b42cfad6b4073daf70ca7b89840a1c15 (patch)
tree78ba2213772be0337d4fdec04808bd7a291a9bab
parenta878dfa4f57d068eb69fb6614f7a4a20f769ee7b (diff)
aactab: move ltp_coef[] from aacdectab to aactab
The encoder makes use of it in the following commits.
-rw-r--r--libavcodec/aacdectab.h8
-rw-r--r--libavcodec/aactab.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index 5c89a93d5d..baf51a74bf 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -35,14 +35,6 @@
#include <stdint.h>
-/* @name ltp_coef
- * Table of the LTP coefficients
- */
-static const INTFLOAT ltp_coef[8] = {
- Q30(0.570829f), Q30(0.696616f), Q30(0.813004f), Q30(0.911304f),
- Q30(0.984900f), Q30(1.067894f), Q30(1.194601f), Q30(1.369533f),
-};
-
static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 4, 5, 0, 5, 0 };
static const uint8_t aac_channel_layout_map[16][5][3] = {
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 9f333801e9..eb915166a2 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -41,6 +41,14 @@
* encoder.
*/
+/* @name ltp_coef
+ * Table of the LTP coefficients
+ */
+static const INTFLOAT ltp_coef[8] = {
+ Q30(0.570829f), Q30(0.696616f), Q30(0.813004f), Q30(0.911304f),
+ Q30(0.984900f), Q30(1.067894f), Q30(1.194601f), Q30(1.369533f),
+};
+
/* @name tns_tmp2_map
* Tables of the tmp2[] arrays of LPC coefficients used for TNS.
* The suffix _M_N[] indicate the values of coef_compress and coef_res