diff options
| author | Vladimir Voroshilov <voroshil@gmail.com> | 2008-05-11 03:18:18 +0000 |
|---|---|---|
| committer | Vladimir Voroshilov <voroshil@gmail.com> | 2008-05-11 03:18:18 +0000 |
| commit | 3f3865d30bf220a8224126ee05c97f659619448d (patch) | |
| tree | 763a958c096d749b362f7682bfb698607c705de0 /libavcodec/lsp.h | |
| parent | bf21a10f1cacaa3bb3150dc2d3461ec46dc4cf10 (diff) | |
Replace hardcoded LP filter order with parameter.
This will allow to reuse the code in the SIPR decoder.
Originally committed as revision 13108 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/lsp.h')
| -rw-r--r-- | libavcodec/lsp.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index c7040848a5..fca0136a39 100644 --- a/libavcodec/lsp.h +++ b/libavcodec/lsp.h @@ -35,24 +35,27 @@ * \param lsfq_min_distance minimum distance between LSFs * \param lsfq_min minimum allowed LSF value * \param lsfq_max maximum allowed LSF value + * \param lp_order LP filter order */ -void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsqf_min, int lsfq_max); +void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsqf_min, int lsfq_max, int lp_order); /** * \brief Convert LSF to LSP * \param lsp [out] LSP coefficients (-0x8000 <= (0.15) < 0x8000) * \param lsf normalized LSF coefficients (0 <= (2.13) < 0x2000 * PI) + * \param lp_order LP filter order * * \remark It is safe to pass the same array into the lsf and lsp parameters. */ -void ff_acelp_lsf2lsp(int16_t *lsp, const int16_t *lsf); +void ff_acelp_lsf2lsp(int16_t *lsp, const int16_t *lsf, int lp_order); /** * \brief LSP to LP conversion (3.2.6 of G.729) * \param lp [out] decoded LP coefficients (-0x8000 <= (3.12) < 0x8000) * \param lsp LSP coefficients (-0x8000 <= (0.15) < 0x8000) + * \param lp_half_order LP filter order, divided by 2 */ -void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp); +void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order); /** * \brief Interpolate LSP for the first subframe and convert LSP -> LP for both subframes (3.2.5 and 3.2.6 of G.729) @@ -60,7 +63,8 @@ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp); * \param lp_2nd [out] decoded LP coefficients for second subframe (-0x8000 <= (3.12) < 0x8000) * \param lsp_2nd LSP coefficients of the second subframe (-0x8000 <= (0.15) < 0x8000) * \param lsp_prev LSP coefficients from the second subframe of the previous frame (-0x8000 <= (0.15) < 0x8000) + * \param lp_order LP filter order */ -void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev); +void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order); #endif /* FFMPEG_LSP_H */ |