Unified · Split
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | #define MLP_MIN_LPC_ORDER 1 |
| 43 | 43 | #define MLP_MAX_LPC_ORDER 8 |
| 44 | −#define MLP_MIN_LPC_SHIFT 8 | |
| 44 | +#define MLP_MIN_LPC_SHIFT 0 | |
| 45 | 45 | #define MLP_MAX_LPC_SHIFT 15 |
| 46 | 46 | |
| 47 | 47 | typedef struct { |
| @@ -1334,13 +1334,12 @@ static void set_filter_params(MLPEncodeContext *ctx, · 1286 unmodified lines | ||
| 1334 | 1334 | } else if (filter == IIR) { |
| 1335 | 1335 | fp->order = 0; |
| 1336 | 1336 | } else if (filter == FIR) { |
| 1337 | − const int max_order = (ctx->substream_info & SUBSTREAM_INFO_HIGH_RATE) | |
| 1338 | − ? 4 : MLP_MAX_LPC_ORDER; | |
| 1337 | + const int max_order = MAX_FIR_ORDER; | |
| 1339 | 1338 | int32_t *sample_buffer = ctx->sample_buffer + channel; |
| 1340 | 1339 | int32_t coefs[MAX_LPC_ORDER][MAX_LPC_ORDER]; |
| 1341 | 1340 | int32_t *lpc_samples = ctx->lpc_sample_buffer; |
| 1342 | 1341 | int32_t *fcoeff = ctx->cur_channel_params[channel].coeff[filter]; |
| 1343 | − int shift[MLP_MAX_LPC_ORDER]; | |
| 1342 | + int shift[MAX_LPC_ORDER]; | |
| 1344 | 1343 | int order; |
| 1345 | 1344 | |
| 1346 | 1345 | for (unsigned int i = 0; i < ctx->number_of_samples; i++) { |