Use MAP_FAILED to check for mmap failure instead of manually

[ffmpeg] / libavcodec / lsp.h

diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h
index c3aee7b7dca012df30589a77e8e86b8228214cb9..e3af30d3002299b66614b7d4cad1262213ecdde2 100644 (file)
--- a/libavcodec/lsp.h
+++ b/libavcodec/lsp.h
@@ -31,7 +31,7 @@
 
 /**
  * \brief ensure a minimum distance between LSFs
- * \param lsfq [in/out] LSF to check and adjust
+ * \param[in,out] lsfq 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
@@ -48,13 +48,13 @@ void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, in
  *
  * @param[in,out] lsf    LSFs in Hertz
  * @param min_spacing    minimum distance between two consecutive lsf values
- * @param                size size of the lsf vector
+ * @param size           size of the lsf vector
  */
-void ff_set_min_dist_lsf(float *lsf, double min_spacing, int order);
+void ff_set_min_dist_lsf(float *lsf, double min_spacing, int size);
 
 /**
  * \brief Convert LSF to LSP
- * \param lsp [out] LSP coefficients (-0x8000 <= (0.15) < 0x8000)
+ * \param[out] lsp LSP coefficients (-0x8000 <= (0.15) < 0x8000)
  * \param lsf normalized LSF coefficients (0 <= (2.13) < 0x2000 * PI)
  * \param lp_order LP filter order
  *
@@ -62,18 +62,28 @@ void ff_set_min_dist_lsf(float *lsf, double min_spacing, int order);
  */
 void ff_acelp_lsf2lsp(int16_t *lsp, const int16_t *lsf, int lp_order);
 
+/**
+ * Floating point version of ff_acelp_lsf2lsp()
+ */
+void ff_acelp_lsf2lspd(double *lsp, const float *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[out] lp 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, int lp_half_order);
 
+/**
+ * LSP to LP conversion (5.2.4 of AMR-WB)
+ */
+void ff_amrwb_lsp2lpc(const double *lsp, float *lp, int lp_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 first subframe (-0x8000 <= (3.12) < 0x8000)
- * \param lp_2nd [out] decoded LP coefficients for second subframe (-0x8000 <= (3.12) < 0x8000)
+ * \param[out] lp_1st decoded LP coefficients for first subframe  (-0x8000 <= (3.12) < 0x8000)
+ * \param[out] lp_2nd 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
@@ -82,9 +92,10 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd
 
 
 #define MAX_LP_HALF_ORDER 8
+#define MAX_LP_ORDER      (2*MAX_LP_HALF_ORDER)
 
 /**
- * Reconstructs LPC coefficients from the line spectral pair frequencies.
+ * Reconstruct LPC coefficients from the line spectral pair frequencies.
  *
  * @param lsp line spectral pairs in cosine domain
  * @param lpc linear predictive coding coefficients
@@ -105,12 +116,12 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order);
 void ff_sort_nearly_sorted_floats(float *vals, int len);
 
 /**
- * Computes the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients
+ * Compute the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients
  * needed for LSP to LPC conversion.
  * We only need to calculate the 6 first elements of the polynomial.
  *
  * @param lsp line spectral pairs in cosine domain
- * @param f [out] polynomial input/output as a vector
+ * @param[out] f polynomial input/output as a vector
  *
  * TIA/EIA/IS-733 2.4.3.3.5-1/2
  */