comparison aactab.c @ 11221:69f548fd1a3f libavcodec

remove tables of codebook vector values which are contained in another table
author stefang
date Sat, 20 Feb 2010 12:32:30 +0000
parents 34a65026fa06
children 98970e51365a
comparison
equal deleted inserted replaced
11220:5518cf6b6f2e 11221:69f548fd1a3f
901 901
902 static const float codebook_vector0_vals[] = { 902 static const float codebook_vector0_vals[] = {
903 -1.0000000, 0.0000000, 1.0000000 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 * bits 0:1, 2:3, 4:5, 6:7 index into _vals array 907 * bits 0:1, 2:3, 4:5, 6:7 index into _vals array
912 * 8:11 number of non-zero values 908 * 8:11 number of non-zero values
913 * 12:15 bit mask of non-zero values 909 * 12:15 bit mask of non-zero values
914 */ 910 */
945 0x0006, 0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0066, 0x0076, 0x0086, 941 0x0006, 0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0066, 0x0076, 0x0086,
946 0x0007, 0x0017, 0x0027, 0x0037, 0x0047, 0x0057, 0x0067, 0x0077, 0x0087, 942 0x0007, 0x0017, 0x0027, 0x0037, 0x0047, 0x0057, 0x0067, 0x0077, 0x0087,
947 0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088, 943 0x0008, 0x0018, 0x0028, 0x0038, 0x0048, 0x0058, 0x0068, 0x0078, 0x0088,
948 }; 944 };
949 945
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 /* 946 /*
956 * bits 0:3, 4:7 index into _vals array 947 * bits 0:3, 4:7 index into _vals array
957 * 8:11 number of non-zero values 948 * 8:11 number of non-zero values
958 * 12:15 1: only second value non-zero 949 * 12:15 1: only second value non-zero
959 * 0: other cases 950 * 0: other cases
965 0x1103, 0x0213, 0x0223, 0x0233, 0x0243, 0x0253, 0x0263, 0x0273, 956 0x1103, 0x0213, 0x0223, 0x0233, 0x0243, 0x0253, 0x0263, 0x0273,
966 0x1104, 0x0214, 0x0224, 0x0234, 0x0244, 0x0254, 0x0264, 0x0274, 957 0x1104, 0x0214, 0x0224, 0x0234, 0x0244, 0x0254, 0x0264, 0x0274,
967 0x1105, 0x0215, 0x0225, 0x0235, 0x0245, 0x0255, 0x0265, 0x0275, 958 0x1105, 0x0215, 0x0225, 0x0235, 0x0245, 0x0255, 0x0265, 0x0275,
968 0x1106, 0x0216, 0x0226, 0x0236, 0x0246, 0x0256, 0x0266, 0x0276, 959 0x1106, 0x0216, 0x0226, 0x0236, 0x0246, 0x0256, 0x0266, 0x0276,
969 0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277, 960 0x1107, 0x0217, 0x0227, 0x0237, 0x0247, 0x0257, 0x0267, 0x0277,
970 };
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 }; 961 };
981 962
982 /* 963 /*
983 * bits 0:3, 4:7 index into _vals array 964 * bits 0:3, 4:7 index into _vals array
984 * 8:11 number of non-zero values 965 * 8:11 number of non-zero values
1066 0x1100, 0x2110, 0x2120, 0x2130, 0x2140, 0x2150, 0x2160, 0x2170, 1047 0x1100, 0x2110, 0x2120, 0x2130, 0x2140, 0x2150, 0x2160, 0x2170,
1067 0x2180, 0x2190, 0x21a0, 0x21b0, 0x21c0, 0x21d0, 0x21e0, 0x21f0, 0x2300, 1048 0x2180, 0x2190, 0x21a0, 0x21b0, 0x21c0, 0x21d0, 0x21e0, 0x21f0, 0x2300,
1068 }; 1049 };
1069 1050
1070 const float *const ff_aac_codebook_vector_vals[] = { 1051 const float *const ff_aac_codebook_vector_vals[] = {
1071 codebook_vector0_vals, codebook_vector0_vals, 1052 codebook_vector0_vals, codebook_vector0_vals,
1072 codebook_vector2_vals, codebook_vector2_vals, 1053 codebook_vector10_vals, codebook_vector10_vals,
1073 codebook_vector4_vals, codebook_vector4_vals, 1054 codebook_vector4_vals, codebook_vector4_vals,
1074 codebook_vector6_vals, codebook_vector6_vals, 1055 codebook_vector10_vals, codebook_vector10_vals,
1075 codebook_vector8_vals, codebook_vector8_vals, 1056 codebook_vector10_vals, codebook_vector10_vals,
1076 codebook_vector10_vals, 1057 codebook_vector10_vals,
1077 }; 1058 };
1078 1059
1079 const uint16_t *const ff_aac_codebook_vector_idx[] = { 1060 const uint16_t *const ff_aac_codebook_vector_idx[] = {
1080 codebook_vector02_idx, codebook_vector02_idx, 1061 codebook_vector02_idx, codebook_vector02_idx,