virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

lls: move to the private namespace

Browse Source 
The functions are private.
This commit is contained in:
Luca Barbato 2013-02-25 08:06:59 +01:00
parent 7ac6d2423e
commit 9d4da474f5
4 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/lpc.c
View File

@ -203,7 +203,7 @@ int ff_lpc_calc_coefs(LPCContext *s,
double var[MAX_LPC_ORDER+1], av_uninit(weight); double var[MAX_LPC_ORDER+1], av_uninit(weight);
for(pass=0; pass<lpc_passes; pass++){ for(pass=0; pass<lpc_passes; pass++){
av_init_lls(&m[pass&1], max_order); avpriv_init_lls(&m[pass&1], max_order);
weight=0; weight=0;
for(i=max_order; i<blocksize; i++){ for(i=max_order; i<blocksize; i++){
@ -212,7 +212,7 @@ int ff_lpc_calc_coefs(LPCContext *s,
if(pass){ if(pass){
double eval, inv, rinv; double eval, inv, rinv;
eval= av_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1); eval= avpriv_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1);
eval= (512>>pass) + fabs(eval - var[0]); eval= (512>>pass) + fabs(eval - var[0]);
inv = 1/eval; inv = 1/eval;
rinv = sqrt(inv); rinv = sqrt(inv);
@ -222,9 +222,9 @@ int ff_lpc_calc_coefs(LPCContext *s,
}else }else
weight++; weight++;
av_update_lls(&m[pass&1], var, 1.0); avpriv_update_lls(&m[pass&1], var, 1.0);
} }
av_solve_lls(&m[pass&1], 0.001, 0); avpriv_solve_lls(&m[pass&1], 0.001, 0);
} }
for(i=0; i<max_order; i++){ for(i=0; i<max_order; i++){

35
libavutil/lls.c
View File

@ -30,13 +30,13 @@
#include "lls.h" #include "lls.h"
void av_init_lls(LLSModel *m, int indep_count) void avpriv_init_lls(LLSModel *m, int indep_count)
{ {
memset(m, 0, sizeof(LLSModel)); memset(m, 0, sizeof(LLSModel));
m->indep_count = indep_count; m->indep_count = indep_count;
} }
void av_update_lls(LLSModel *m, double *var, double decay) void avpriv_update_lls(LLSModel *m, double *var, double decay)
{ {
int i, j; int i, j;
@ -48,7 +48,7 @@ void av_update_lls(LLSModel *m, double *var, double decay)
} }
} }
void av_solve_lls(LLSModel *m, double threshold, int min_order) void avpriv_solve_lls(LLSModel *m, double threshold, int min_order)
{ {
int i, j, k; int i, j, k;
double (*factor)[MAX_VARS + 1] = (void *) &m->covariance[1][0]; double (*factor)[MAX_VARS + 1] = (void *) &m->covariance[1][0];
@ -105,7 +105,7 @@ void av_solve_lls(LLSModel *m, double threshold, int min_order)
} }
} }
double av_evaluate_lls(LLSModel *m, double *param, int order) double avpriv_evaluate_lls(LLSModel *m, double *param, int order)
{ {
int i; int i;
double out = 0; double out = 0;
@ -116,6 +116,25 @@ double av_evaluate_lls(LLSModel *m, double *param, int order)
return out; return out;
} }
#ifndef FF_API_LLS_PRIVATE
void av_init_lls(LLSModel *m, int indep_count)
{
return avpriv_init_lls(m, indep_count);
}
void av_update_lls(LLSModel *m, double *param, double decay)
{
return avpriv_update_lls(m, param, decay);
}
void av_solve_lls(LLSModel *m, double threshold, int min_order)
{
return avpriv_solve_lls(m, threshold, min_order);
}
double av_evaluate_lls(LLSModel *m, double *param, int order)
{
return avpriv_evaluate_lls(m, param, order);
}
#endif
#ifdef TEST #ifdef TEST
#include <stdio.h> #include <stdio.h>
@ -129,7 +148,7 @@ int main(void)
AVLFG lfg; AVLFG lfg;
av_lfg_init(&lfg, 1); av_lfg_init(&lfg, 1);
av_init_lls(&m, 3); avpriv_init_lls(&m, 3);
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
double var[4]; double var[4];
@ -139,10 +158,10 @@ int main(void)
var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
av_update_lls(&m, var, 0.99); avpriv_update_lls(&m, var, 0.99);
av_solve_lls(&m, 0.001, 0); avpriv_solve_lls(&m, 0.001, 0);
for (order = 0; order < 3; order++) { for (order = 0; order < 3; order++) {
eval = av_evaluate_lls(&m, var + 1, order); eval = avpriv_evaluate_lls(&m, var + 1, order);
printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n", printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n",
var[0], order, eval, sqrt(m.variance[order] / (i + 1)), var[0], order, eval, sqrt(m.variance[order] / (i + 1)),
m.coeff[order][0], m.coeff[order][1], m.coeff[order][0], m.coeff[order][1],

8
libavutil/lls.h
View File

@ -37,9 +37,15 @@ typedef struct LLSModel {
int indep_count; int indep_count;
} LLSModel; } LLSModel;
void avpriv_init_lls(LLSModel *m, int indep_count);
void avpriv_update_lls(LLSModel *m, double *param, double decay);
void avpriv_solve_lls(LLSModel *m, double threshold, int min_order);
double avpriv_evaluate_lls(LLSModel *m, double *param, int order);
#ifndef FF_API_LLS_PRIVATE
void av_init_lls(LLSModel *m, int indep_count); void av_init_lls(LLSModel *m, int indep_count);
void av_update_lls(LLSModel *m, double *param, double decay); void av_update_lls(LLSModel *m, double *param, double decay);
void av_solve_lls(LLSModel *m, double threshold, int min_order); void av_solve_lls(LLSModel *m, double threshold, int min_order);
double av_evaluate_lls(LLSModel *m, double *param, int order); double av_evaluate_lls(LLSModel *m, double *param, int order);
#endif
#endif /* AVUTIL_LLS_H */ #endif /* AVUTIL_LLS_H */

4
libavutil/version.h
View File

@ -79,6 +79,10 @@
#ifndef FF_API_CPU_FLAG_MMX2 #ifndef FF_API_CPU_FLAG_MMX2
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 53) #define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_LLS_PRIVATE
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 53)
#endif
/** /**
* @} * @}