@@ -124,8 +124,18 @@ static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order)
}
}
-#ifndef ff_lsp2polyf
-void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order)
+#ifndef lsp2polyf
+/**
+ * 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[out] f polynomial input/output as a vector
+ *
+ * TIA/EIA/IS-733 2.4.3.3.5-1/2
+ */
+static void lsp2polyf(const double *lsp, double *f, int lp_half_order)
{
f[0] = 1.0;
f[1] = -2 * lsp[0];
@@ -138,7 +148,7 @@ void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order)
f[1] += val;
}
}
-#endif /* ff_lsp2polyf */
+#endif /* lsp2polyf */
void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order)
{
@@ -172,8 +182,8 @@ void ff_amrwb_lsp2lpc(const double *lsp, float *lp, int lp_order)
qa[-1] = 0.0;
- ff_lsp2polyf(lsp , pa, lp_half_order );
- ff_lsp2polyf(lsp + 1, qa, lp_half_order - 1);
+ lsp2polyf(lsp , pa, lp_half_order );
+ lsp2polyf(lsp + 1, qa, lp_half_order - 1);
for (i = 1, j = lp_order - 1; i < lp_half_order; i++, j--) {
double paf = pa[i] * (1 + lsp[lp_order - 1]);
@@ -214,8 +224,8 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order)
av_assert2(lp_half_order <= MAX_LP_HALF_ORDER);
- ff_lsp2polyf(lsp, pa, lp_half_order);
- ff_lsp2polyf(lsp + 1, qa, lp_half_order);
+ lsp2polyf(lsp, pa, lp_half_order);
+ lsp2polyf(lsp + 1, qa, lp_half_order);
while (lp_half_order--) {
double paf = pa[lp_half_order+1] + pa[lp_half_order];
@@ -115,16 +115,4 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order);
*/
void ff_sort_nearly_sorted_floats(float *vals, int len);
-/**
- * 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[out] f polynomial input/output as a vector
- *
- * TIA/EIA/IS-733 2.4.3.3.5-1/2
- */
-void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order);
-
#endif /* AVCODEC_LSP_H */
@@ -61,7 +61,7 @@
#include "libavutil/attributes.h"
#include "libavutil/mips/asmdefs.h"
-static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int lp_half_order)
+static av_always_inline void lsp2polyf_mips(const double *lsp, double *f, int lp_half_order)
{
int i, j = 0;
double * p_fi = f;
@@ -88,8 +88,8 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int
"addiu %[j], %[i], -2 \n\t"
"ldc1 %[f_j_2], -8(%[p_f]) \n\t"
"sdc1 %[tmp], 16(%[p_f]) \n\t"
- "beqz %[j], ff_lsp2polyf_lp_j_end%= \n\t"
- "ff_lsp2polyf_lp_j%=: \n\t"
+ "beqz %[j], lsp2polyf_lp_j_end%= \n\t"
+ "lsp2polyf_lp_j%=: \n\t"
"add.d %[tmp], %[f_j], %[f_j_2] \n\t"
"madd.d %[tmp], %[tmp], %[f_j_1], %[val] \n\t"
"mov.d %[f_j], %[f_j_1] \n\t"
@@ -98,8 +98,8 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int
"ldc1 %[f_j_2], -16(%[p_f]) \n\t"
"sdc1 %[tmp], 8(%[p_f]) \n\t"
PTR_ADDIU "%[p_f], -8 \n\t"
- "bgtz %[j], ff_lsp2polyf_lp_j%= \n\t"
- "ff_lsp2polyf_lp_j_end%=: \n\t"
+ "bgtz %[j], lsp2polyf_lp_j%= \n\t"
+ "lsp2polyf_lp_j_end%=: \n\t"
: [f_j_2]"=&f"(f_j_2), [f_j_1]"=&f"(f_j_1), [val]"+f"(val),
[tmp]"=&f"(tmp), [f_j]"=&f"(f_j), [p_f]"+r"(p_f),
@@ -110,7 +110,7 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int
f[1] += val;
}
}
-#define ff_lsp2polyf ff_lsp2polyf_mips
+#define lsp2polyf lsp2polyf_mips
#endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */
#endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM */
#endif /* AVCODEC_MIPS_LSP_MIPS_H */
Possible since 48ac225db2563fe534b1d9e999bf8e70d5a577f8. Furthermore, the current code would not work on mips in case ff_lsp2polyf() were used outside of lsp.c, because it is not compiled on mips since commit 3827a86eacd04d9d7b356f769be553f7b8cca361 at all; instead it is overridden with a static av_always_inline function which only works for the callers in lsp.c. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/lsp.c | 24 +++++++++++++++++------- libavcodec/lsp.h | 12 ------------ libavcodec/mips/lsp_mips.h | 12 ++++++------ 3 files changed, 23 insertions(+), 25 deletions(-)