RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b' 

* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-30 10:54:12 +02:00
parent ff130d7363 cc6714bb16
commit d3bd320e63
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/lpc.c
View File

@ -226,7 +226,7 @@ int ff_lpc_calc_coefs(LPCContext *s,
}else
weight++;
avpriv_update_lls(&m[pass&1], var, 1.0);
avpriv_update_lls(&m[pass&1], var);
}
avpriv_solve_lls(&m[pass&1], 0.001, 0);
}

7
libavutil/lls.c
View File

@ -38,13 +38,12 @@ av_cold void avpriv_init_lls(LLSModel *m, int indep_count)
m->indep_count = indep_count;
}
void avpriv_update_lls(LLSModel *m, double *var, double decay)
void avpriv_update_lls(LLSModel *m, double *var)
{
int i, j;
for (i = 0; i <= m->indep_count; i++) {
for (j = i; j <= m->indep_count; j++) {
m->covariance[i][j] *= decay;
m->covariance[i][j] += var[i] * var[j];
}
}
@ -125,7 +124,7 @@ av_cold void av_init_lls(LLSModel *m, int indep_count)
}
void av_update_lls(LLSModel *m, double *param, double decay)
{
avpriv_update_lls(m, param, decay);
avpriv_update_lls(m, param);
}
void av_solve_lls(LLSModel *m, double threshold, int min_order)
{
@ -160,7 +159,7 @@ int main(void)
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[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5;
avpriv_update_lls(&m, var, 0.99);
avpriv_update_lls(&m, var);
avpriv_solve_lls(&m, 0.001, 0);
for (order = 0; order < 3; order++) {
eval = avpriv_evaluate_lls(&m, var + 1, order);

2
libavutil/lls.h
View File

@ -40,7 +40,7 @@ typedef struct LLSModel {
} LLSModel;
void avpriv_init_lls(LLSModel *m, int indep_count);
void avpriv_update_lls(LLSModel *m, double *param, double decay);
void avpriv_update_lls(LLSModel *m, double *param);
void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order);
double avpriv_evaluate_lls(LLSModel *m, double *param, int order);