[FFmpeg-cvslog] r21918 - trunk/libavcodec/aactab.c
stefang
subversion
Sat Feb 20 13:32:31 CET 2010
Author: stefang
Date: Sat Feb 20 13:32:30 2010
New Revision: 21918
Log:
remove tables of codebook vector values which are contained in
another table
Modified:
trunk/libavcodec/aactab.c
Modified: trunk/libavcodec/aactab.c
==============================================================================
--- trunk/libavcodec/aactab.c Sat Feb 20 13:22:24 2010 (r21917)
+++ trunk/libavcodec/aactab.c Sat Feb 20 13:32:30 2010 (r21918)
@@ -903,10 +903,6 @@ static const float codebook_vector0_vals
-1.0000000, 0.0000000, 1.0000000
};
-static const float codebook_vector2_vals[] = {
- 0.0000000, 1.0000000, 2.5198421,
-};
-
/*
* bits 0:1, 2:3, 4:5, 6:7 index into _vals array
* 8:11 number of non-zero values
@@ -947,11 +943,6 @@ static const uint16_t codebook_vector4_i
0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088,
};
-static const float codebook_vector6_vals[] = {
- 0.0000000, 1.0000000, 2.5198421, 4.3267487,
- 6.3496042, 8.5498797, 10.9027236, 13.3905183,
-};
-
/*
* bits 0:3, 4:7 index into _vals array
* 8:11 number of non-zero values
@@ -969,16 +960,6 @@ static const uint16_t codebook_vector6_i
0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277,
};
-static const float codebook_vector8_vals[] = {
- 0.0000000, 1.0000000,
- 2.5198421, 4.3267487,
- 6.3496042, 8.5498797,
- 10.9027236, 13.3905183,
- 16.0000000, 18.7207544,
- 21.5443469, 24.4637810,
- 27.4731418,
-};
-
/*
* bits 0:3, 4:7 index into _vals array
* 8:11 number of non-zero values
@@ -1068,11 +1049,11 @@ static const uint16_t codebook_vector10_
};
const float *const ff_aac_codebook_vector_vals[] = {
- codebook_vector0_vals, codebook_vector0_vals,
- codebook_vector2_vals, codebook_vector2_vals,
- codebook_vector4_vals, codebook_vector4_vals,
- codebook_vector6_vals, codebook_vector6_vals,
- codebook_vector8_vals, codebook_vector8_vals,
+ codebook_vector0_vals, codebook_vector0_vals,
+ codebook_vector10_vals, codebook_vector10_vals,
+ codebook_vector4_vals, codebook_vector4_vals,
+ codebook_vector10_vals, codebook_vector10_vals,
+ codebook_vector10_vals, codebook_vector10_vals,
codebook_vector10_vals,
};
More information about the ffmpeg-cvslog
mailing list