Originally committed as revision 21918 to svn://svn.ffmpeg.org/ffmpeg/trunk
Stefan Gehrer authored on 2010/02/20 21:32:30... | ... |
@@ -903,10 +903,6 @@ static const float codebook_vector0_vals[] = { |
903 | 903 |
-1.0000000, 0.0000000, 1.0000000 |
904 | 904 |
}; |
905 | 905 |
|
906 |
-static const float codebook_vector2_vals[] = { |
|
907 |
- 0.0000000, 1.0000000, 2.5198421, |
|
908 |
-}; |
|
909 |
- |
|
910 | 906 |
/* |
911 | 907 |
* bits 0:1, 2:3, 4:5, 6:7 index into _vals array |
912 | 908 |
* 8:11 number of non-zero values |
... | ... |
@@ -947,11 +943,6 @@ static const uint16_t codebook_vector4_idx[] = { |
947 | 947 |
0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088, |
948 | 948 |
}; |
949 | 949 |
|
950 |
-static const float codebook_vector6_vals[] = { |
|
951 |
- 0.0000000, 1.0000000, 2.5198421, 4.3267487, |
|
952 |
- 6.3496042, 8.5498797, 10.9027236, 13.3905183, |
|
953 |
-}; |
|
954 |
- |
|
955 | 950 |
/* |
956 | 951 |
* bits 0:3, 4:7 index into _vals array |
957 | 952 |
* 8:11 number of non-zero values |
... | ... |
@@ -969,16 +960,6 @@ static const uint16_t codebook_vector6_idx[] = { |
969 | 969 |
0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277, |
970 | 970 |
}; |
971 | 971 |
|
972 |
-static const float codebook_vector8_vals[] = { |
|
973 |
- 0.0000000, 1.0000000, |
|
974 |
- 2.5198421, 4.3267487, |
|
975 |
- 6.3496042, 8.5498797, |
|
976 |
- 10.9027236, 13.3905183, |
|
977 |
- 16.0000000, 18.7207544, |
|
978 |
- 21.5443469, 24.4637810, |
|
979 |
- 27.4731418, |
|
980 |
-}; |
|
981 |
- |
|
982 | 972 |
/* |
983 | 973 |
* bits 0:3, 4:7 index into _vals array |
984 | 974 |
* 8:11 number of non-zero values |
... | ... |
@@ -1068,11 +1049,11 @@ static const uint16_t codebook_vector10_idx[] = { |
1068 | 1068 |
}; |
1069 | 1069 |
|
1070 | 1070 |
const float *const ff_aac_codebook_vector_vals[] = { |
1071 |
- codebook_vector0_vals, codebook_vector0_vals, |
|
1072 |
- codebook_vector2_vals, codebook_vector2_vals, |
|
1073 |
- codebook_vector4_vals, codebook_vector4_vals, |
|
1074 |
- codebook_vector6_vals, codebook_vector6_vals, |
|
1075 |
- codebook_vector8_vals, codebook_vector8_vals, |
|
1071 |
+ codebook_vector0_vals, codebook_vector0_vals, |
|
1072 |
+ codebook_vector10_vals, codebook_vector10_vals, |
|
1073 |
+ codebook_vector4_vals, codebook_vector4_vals, |
|
1074 |
+ codebook_vector10_vals, codebook_vector10_vals, |
|
1075 |
+ codebook_vector10_vals, codebook_vector10_vals, |
|
1076 | 1076 |
codebook_vector10_vals, |
1077 | 1077 |
}; |
1078 | 1078 |
|