X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftruespeech_data.h;h=6e9806a0b5b4dceec6aab72e4b2f720d0c7475e1;hb=f963f80399deb1a2b44c1bac3af7123e8a0c9e46;hp=cd8822fdeb41991ca130f8ed9f7b62aa253de9f0;hpb=b78e7197a81e193827cf2408fe25bc1f14843a72;p=ffmpeg

diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h
index cd8822fdeb4..6e9806a0b5b 100644
--- a/libavcodec/truespeech_data.h
+++ b/libavcodec/truespeech_data.h
@@ -2,25 +2,27 @@
  * DSP Group TrueSpeech compatible decoder
  * copyright (c) 2005 Konstantin Shishkov
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __TRUESPEECH_DATA__
-#define __TRUESPEECH_DATA__
+#ifndef AVCODEC_TRUESPEECH_DATA_H
+#define AVCODEC_TRUESPEECH_DATA_H
+
+#include <stdint.h>
 
 /* codebooks fo expanding input filter */
 static const int16_t ts_cb_0[32] = {
@@ -64,12 +66,12 @@ static const int16_t ts_cb_7[8] = {
     0xCEF0, 0xE4F9, 0xF6BB, 0x0646, 0x14F5, 0x23FF, 0x356F, 0x4A8D,
 };
 
-static const int16_t *ts_codebook[8] = {
+static const int16_t * const ts_codebook[8] = {
     ts_cb_0, ts_cb_1, ts_cb_2, ts_cb_3, ts_cb_4, ts_cb_5, ts_cb_6, ts_cb_7
 };
 
 /* table used for decoding pulse positions */
-static const int16_t ts_140[120] = {
+static const int16_t ts_pulse_values[120] = {
     0x0E46, 0x0CCC, 0x0B6D, 0x0A28, 0x08FC, 0x07E8, 0x06EB, 0x0604,
     0x0532, 0x0474, 0x03C9, 0x0330, 0x02A8, 0x0230, 0x01C7, 0x016C,
     0x011E, 0x00DC, 0x00A5, 0x0078, 0x0054, 0x0038, 0x0023, 0x0014,
@@ -92,11 +94,11 @@ static const int16_t ts_140[120] = {
 };
 
 /* filter for correlated input filter */
-static const int16_t ts_230[8] =
+static const int16_t ts_decay_994_1000[8] =
     { 0x7F3B, 0x7E78, 0x7DB6, 0x7CF5, 0x7C35, 0x7B76, 0x7AB8, 0x79FC };
 
 /* two-point filters table */
-static const int16_t ts_240[25 * 2] = {
+static const int16_t ts_order2_coeffs[25 * 2] = {
     0xED2F, 0x5239,
     0x54F1, 0xE4A9,
     0x2620, 0xEE3E,
@@ -129,7 +131,7 @@ static const int16_t ts_240[25 * 2] = {
 };
 
 /* possible pulse values */
-static const int16_t ts_562[64] = {
+static const int16_t ts_pulse_scales[64] = {
     0x0002, 0x0006, 0xFFFE, 0xFFFA,
     0x0004, 0x000C, 0xFFFC, 0xFFF4,
     0x0006, 0x0012, 0xFFFA, 0xFFEE,
@@ -149,9 +151,9 @@ static const int16_t ts_562[64] = {
 };
 
 /* filters used in final output calculations */
-static const int16_t ts_5E2[8] =
+static const int16_t ts_decay_35_64[8] =
     { 0x4666, 0x26B8, 0x154C, 0x0BB6, 0x0671, 0x038B, 0x01F3, 0x0112 };
-static const int16_t ts_5F2[8] =
+static const int16_t ts_decay_3_4[8] =
     { 0x6000, 0x4800, 0x3600, 0x2880, 0x1E60, 0x16C8, 0x1116, 0x0CD1 };
 
-#endif
+#endif /* AVCODEC_TRUESPEECH_DATA_H */