MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sorting function used in TwinVQ a shared function

Browse Source 
Originally committed as revision 20584 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2009-11-22 22:25:58 +00:00
parent 6c2289b52e
commit 419b2be813
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/lsp.c
View File

@ -173,3 +173,12 @@ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order)
lpc2[-lp_half_order] = 0.5*(paf-qaf);
}
}
void ff_sort_nearly_sorted_floats(float *vals, int len)
{
int i,j;
for (i = 0; i < len - 1; i++)
for (j = i; j >= 0 && vals[j] > vals[j+1]; j--)
FFSWAP(float, vals[j], vals[j+1]);
}

7
libavcodec/lsp.h
View File

@ -97,4 +97,11 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd
*/
void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order);
/**
* Sort values in ascending order.
*
* @note O(n) if data already sorted, O(n^2) - otherwise
*/
void ff_sort_nearly_sorted_floats(float *vals, int len);
#endif /* AVCODEC_LSP_H */

13
libavcodec/twinvq.c
View File

@ -536,17 +536,6 @@ static void rearrange_lsp(int order, float *lsp, float min_dist)
}
}
static void bubblesort(float *lsp, int lp_order)
{
int i,j;
/* sort lsp in ascending order. float bubble agorithm,
O(n) if data already sorted, O(n^2) - otherwise */
for (i = 0; i < lp_order - 1; i++)
for (j = i; j >= 0 && lsp[j] > lsp[j+1]; j--)
FFSWAP(float, lsp[j], lsp[j+1]);
}
static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2,
int lpc_hist_idx, float *lsp, float *hist)
{
@ -583,7 +572,7 @@ static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2,
rearrange_lsp(mtab->n_lsp, lsp, 0.0001);
rearrange_lsp(mtab->n_lsp, lsp, 0.000095);
bubblesort(lsp, mtab->n_lsp);
ff_sort_nearly_sorted_floats(lsp, mtab->n_lsp);
}
static void dec_lpc_spectrum_inv(TwinContext *tctx, float *lsp,