| @@ -26,7 +26,6 @@ · 25 unmodified lines |
| 26 | 26 | #include <stddef.h> |
| 27 | 27 | #include "libavutil/avassert.h" |
| 28 | 28 | #include "libavutil/lls.h" |
| 29 | | −#include "aac_defines.h" |
| 30 | 29 | |
| 31 | 30 | #define ORDER_METHOD_EST 0 |
| 32 | 31 | #define ORDER_METHOD_2LEVEL 1 |
| @@ -117,10 +116,20 @@ void ff_lpc_init_x86(LPCContext *s); · 84 unmodified lines |
| 117 | 116 | */ |
| 118 | 117 | void ff_lpc_end(LPCContext *s); |
| 119 | 118 | |
| 120 | | −#if USE_FIXED |
| 119 | +#ifndef LPC_USE_FIXED |
| 120 | +#define LPC_USE_FIXED 0 |
| 121 | +#endif |
| 122 | + |
| 123 | +#if LPC_USE_FIXED |
| 121 | 124 | typedef int LPC_TYPE; |
| 122 | 125 | typedef unsigned LPC_TYPE_U; |
| 123 | 126 | #else |
| 127 | +#ifndef LPC_SRA_R |
| 128 | +#define LPC_SRA_R(x, y) (x) |
| 129 | +#define LPC_MUL26(x, y) ((x) * (y)) |
| 130 | +#define LPC_FIXR(x) ((float)(x)) |
| 131 | +#endif |
| 132 | + |
| 124 | 133 | #ifdef LPC_USE_DOUBLE |
| 125 | 134 | typedef double LPC_TYPE; |
| 126 | 135 | typedef double LPC_TYPE_U; |
| @@ -145,7 +154,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 18 unmodified lines |
| 145 | 154 | gen0[i] = gen1[i] = autoc[i + 1]; |
| 146 | 155 | |
| 147 | 156 | err = autoc[0]; |
| 148 | | − ref[0] = -gen1[0] / ((USE_FIXED || err) ? err : 1); |
| 157 | + ref[0] = -gen1[0] / ((LPC_USE_FIXED || err) ? err : 1); |
| 149 | 158 | err += gen1[0] * ref[0]; |
| 150 | 159 | if (error) |
| 151 | 160 | error[0] = err; |
| @@ -154,7 +163,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 2 unmodified lines |
| 154 | 163 | gen1[j] = gen1[j + 1] + ref[i - 1] * gen0[j]; |
| 155 | 164 | gen0[j] = gen1[j + 1] * ref[i - 1] + gen0[j]; |
| 156 | 165 | } |
| 157 | | − ref[i] = -gen1[0] / ((USE_FIXED || err) ? err : 1); |
| 166 | + ref[i] = -gen1[0] / ((LPC_USE_FIXED || err) ? err : 1); |
| 158 | 167 | err += gen1[0] * ref[i]; |
| 159 | 168 | if (error) |
| 160 | 169 | error[i] = err; |
| @@ -165,7 +174,7 @@ static inline void compute_ref_coefs(const LPC_TYPE *autoc, int max_order, · 4 unmodified lines |
| 165 | 174 | * Levinson-Durbin recursion. |
| 166 | 175 | * Produce LPC coefficients from autocorrelation data. |
| 167 | 176 | */ |
| 168 | | −static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_order, |
| 177 | +static inline int compute_lpc_coefs(const LPC_TYPE *autoc, int max_order, |
| 169 | 178 | LPC_TYPE *lpc, int lpc_stride, int fail, |
| 170 | 179 | int normalize) |
| 171 | 180 | { |
| @@ -182,7 +191,7 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 10 unmodified lines |
| 182 | 191 | return -1; |
| 183 | 192 | |
| 184 | 193 | for(i=0; i<max_order; i++) { |
| 185 | | − LPC_TYPE r = AAC_SRA_R(-autoc[i], 5); |
| 194 | + LPC_TYPE r = LPC_SRA_R(-autoc[i], 5); |
| 186 | 195 | |
| 187 | 196 | if (normalize) { |
| 188 | 197 | for(j=0; j<i; j++) |
| @@ -190,7 +199,7 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 1 unmodified line |
| 190 | 199 | |
| 191 | 200 | if (err) |
| 192 | 201 | r /= err; |
| 193 | | − err *= FIXR(1.0) - (r * r); |
| 202 | + err *= LPC_FIXR(1.0) - (r * r); |
| 194 | 203 | } |
| 195 | 204 | |
| 196 | 205 | lpc[i] = r; |
| @@ -198,8 +207,8 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o · 1 unmodified line |
| 198 | 207 | for(j=0; j < (i+1)>>1; j++) { |
| 199 | 208 | LPC_TYPE f = lpc_last[ j]; |
| 200 | 209 | LPC_TYPE b = lpc_last[i-1-j]; |
| 201 | | − lpc[ j] = f + (LPC_TYPE_U)AAC_MUL26(r, b); |
| 202 | | − lpc[i-1-j] = b + (LPC_TYPE_U)AAC_MUL26(r, f); |
| 210 | + lpc[ j] = f + (LPC_TYPE_U)LPC_MUL26(r, b); |
| 211 | + lpc[i-1-j] = b + (LPC_TYPE_U)LPC_MUL26(r, f); |
| 203 | 212 | } |
| 204 | 213 | |
| 205 | 214 | if (fail && err < 0) |