X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fatrac3data.h;h=9076d3ae8d480568274e5f718e8ea5bdcfeec502;hb=62acb4937e06a3802735106a9d9fa48db87d0d36;hp=786629d0317634c899bb6db7c612abc50cf6e729;hpb=5b21bdabe43611385d1d55a21d5b1f607b133d29;p=ffmpeg

diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h
index 786629d0317..9076d3ae8d4 100644
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@@ -3,30 +3,30 @@
  * Copyright (c) 2006-2007 Maxim Poliakovski
  * Copyright (c) 2006-2007 Benjamin Larsson
  *
- * 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
  */
 
 /**
- * @file atrac3data.h
+ * @file
  * Atrac 3 AKA RealAudio 8 compatible decoder data
  */
 
-#ifndef FFMPEG_ATRAC3DATA_H
-#define FFMPEG_ATRAC3DATA_H
+#ifndef AVCODEC_ATRAC3DATA_H
+#define AVCODEC_ATRAC3DATA_H
 
 #include <stdint.h>
 
@@ -97,14 +97,18 @@ static const uint8_t huff_tab_sizes[7] = {
   9, 5, 7, 9, 15, 31, 63,
 };
 
-static const uint8_t* huff_codes[7] = {
+static const uint8_t* const huff_codes[7] = {
   huffcode1,huffcode2,huffcode3,huffcode4,huffcode5,huffcode6,huffcode7,
 };
 
-static const uint8_t* huff_bits[7] = {
+static const uint8_t* const huff_bits[7] = {
   huffbits1,huffbits2,huffbits3,huffbits4,huffbits5,huffbits6,huffbits7,
 };
 
+static const uint16_t atrac3_vlc_offs[] = {
+    0,512,1024,1536,2048,2560,3072,3584,4096
+};
+
 /* selector tables */
 
 static const uint8_t CLCLengthTab[8] = {0, 4, 3, 3, 4, 4, 5, 6};
@@ -123,18 +127,7 @@ static const uint16_t subbandTab[33] = {
   256, 288, 320, 352, 384, 416, 448, 480, 512, 576, 640, 704, 768, 896, 1024
 };
 
-/* transform data */
-
-static const float qmf_48tap_half[24] = {
-   -0.00001461907, -0.00009205479, -0.000056157569, 0.00030117269,
-    0.0002422519,-0.00085293897, -0.0005205574, 0.0020340169,
-    0.00078333891, -0.0042153862, -0.00075614988, 0.0078402944,
-   -0.000061169922, -0.01344162, 0.0024626821, 0.021736089,
-   -0.007801671, -0.034090221, 0.01880949, 0.054326009,
-   -0.043596379, -0.099384367, 0.13207909, 0.46424159
-};
-
 /* joint stereo related tables */
 static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};
 
-#endif /* FFMPEG_ATRAC3DATA_H */
+#endif /* AVCODEC_ATRAC3DATA_H */