diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-02 12:28:01 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-05-10 07:42:33 +0200 |
| commit | 188dea1dbfd8761133ca138bba0d8f19beac6c09 (patch) | |
| tree | 55f768f571b0ac9a6370586084dbb92b45f55916 /libavcodec/lpc.c | |
| parent | bc97695af84304e5e95658ca26e00c6e7074eca4 (diff) | |
| download | ffmpeg-streaming-188dea1dbfd8761133ca138bba0d8f19beac6c09.zip ffmpeg-streaming-188dea1dbfd8761133ca138bba0d8f19beac6c09.tar.gz | |
lavc: move some flac-specific options to its private context.
Diffstat (limited to 'libavcodec/lpc.c')
| -rw-r--r-- | libavcodec/lpc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 58bb02d..ed985d3 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -158,7 +158,7 @@ int ff_lpc_calc_coefs(LPCContext *s, const int32_t *samples, int blocksize, int min_order, int max_order, int precision, int32_t coefs[][MAX_LPC_ORDER], int *shift, - enum AVLPCType lpc_type, int lpc_passes, + enum FFLPCType lpc_type, int lpc_passes, int omethod, int max_shift, int zero_shift) { double autoc[MAX_LPC_ORDER+1]; @@ -168,7 +168,7 @@ int ff_lpc_calc_coefs(LPCContext *s, int opt_order; assert(max_order >= MIN_LPC_ORDER && max_order <= MAX_LPC_ORDER && - lpc_type > AV_LPC_TYPE_FIXED); + lpc_type > FF_LPC_TYPE_FIXED); /* reinit LPC context if parameters have changed */ if (blocksize != s->blocksize || max_order != s->max_order || @@ -177,7 +177,7 @@ int ff_lpc_calc_coefs(LPCContext *s, ff_lpc_init(s, blocksize, max_order, lpc_type); } - if (lpc_type == AV_LPC_TYPE_LEVINSON) { + if (lpc_type == FF_LPC_TYPE_LEVINSON) { double *windowed_samples = s->windowed_samples + max_order; s->lpc_apply_welch_window(samples, blocksize, windowed_samples); @@ -188,7 +188,7 @@ int ff_lpc_calc_coefs(LPCContext *s, for(i=0; i<max_order; i++) ref[i] = fabs(lpc[i][i]); - } else if (lpc_type == AV_LPC_TYPE_CHOLESKY) { + } else if (lpc_type == FF_LPC_TYPE_CHOLESKY) { LLSModel m[2]; double var[MAX_LPC_ORDER+1], av_uninit(weight); @@ -241,13 +241,13 @@ int ff_lpc_calc_coefs(LPCContext *s, } av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order, - enum AVLPCType lpc_type) + enum FFLPCType lpc_type) { s->blocksize = blocksize; s->max_order = max_order; s->lpc_type = lpc_type; - if (lpc_type == AV_LPC_TYPE_LEVINSON) { + if (lpc_type == FF_LPC_TYPE_LEVINSON) { s->windowed_samples = av_mallocz((blocksize + max_order + 2) * sizeof(*s->windowed_samples)); if (!s->windowed_samples) |
