Add approved chunks to AAC encoder

[ffmpeg] / libavcodec / lsp.h

diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h
index 7fdb66e9435ac133134990b3f4457822ce1c796d..d4bc4957db61a2d1fedaad3725655d049b3c719c 100644 (file)
--- a/libavcodec/lsp.h
+++ b/libavcodec/lsp.h
@@ -20,44 +20,51 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_LPC_H
-#define FFMPEG_ACELP_LPC_H
+#ifndef FFMPEG_LSP_H
+#define FFMPEG_LSP_H
+
+#include <stdint.h>
+
 /**
   (I.F) means fixed-point value with F fractional and I integer bits
 */
 
 /**
- * \brief keep distance between LSFs.
+ * \brief ensure a minimum distance between LSFs
  * \param lsfq [in/out] LSF to check and adjust
  * \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 lsfq_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 in lsf and lsp parameters
+ * \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)
- * \param lp_1st [out] decoded LP coefficients for 1st subframe (-0x8000 <= (3.12) < 0x8000)
+ * \param lp_1st [out] decoded LP coefficients for first subframe (-0x8000 <= (3.12) < 0x8000)
  * \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 past LSP coefficients (-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_ACELP_LPC_H
+#endif /* FFMPEG_LSP_H */