diff lsp.h @ 6770:e6338dd4a6e3 libavcodec

Replace hardcoded LP filter order with parameter. This will allow to reuse the code in the SIPR decoder.

--- a/lsp.h	Sat May 10 16:05:12 2008 +0000
+++ b/lsp.h	Sun May 11 03:18:18 2008 +0000
@@ -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 @@
  * \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 */