videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

cosmetics related to LPC changes. 

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1c189fc533)
This commit is contained in:
Justin Ruggles 2011-01-21 00:12:18 +00:00 committed by Michael Niedermayer
parent 7101b18508
commit 384dbd617f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/lpc.c
View File

@ -28,7 +28,8 @@
/** /**
* Apply Welch window function to audio block * Apply Welch window function to audio block
*/ */
static void apply_welch_window_c(const int32_t *data, int len, double *w_data) static void lpc_apply_welch_window_c(const int32_t *data, int len,
double *w_data)
{ {
int i, n2; int i, n2;
double w; double w;
@ -55,7 +56,7 @@ static void apply_welch_window_c(const int32_t *data, int len, double *w_data)
* A Welch window function is applied before calculation. * A Welch window function is applied before calculation.
*/ */
static void lpc_compute_autocorr_c(const double *data, int len, int lag, static void lpc_compute_autocorr_c(const double *data, int len, int lag,
double *autoc) double *autoc)
{ {
int i, j; int i, j;
@ -255,8 +256,8 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order,
s->windowed_samples = NULL; s->windowed_samples = NULL;
} }
s->lpc_apply_welch_window = apply_welch_window_c; s->lpc_apply_welch_window = lpc_apply_welch_window_c;
s->lpc_compute_autocorr = lpc_compute_autocorr_c; s->lpc_compute_autocorr = lpc_compute_autocorr_c;
if (HAVE_MMX) if (HAVE_MMX)
ff_lpc_init_x86(s); ff_lpc_init_x86(s);

9
libavcodec/x86/lpc_mmx.c
View File

@ -23,7 +23,8 @@
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavcodec/lpc.h" #include "libavcodec/lpc.h"
static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data) static void lpc_apply_welch_window_sse2(const int32_t *data, int len,
double *w_data)
{ {
double c = 2.0 / (len-1.0); double c = 2.0 / (len-1.0);
int n2 = len>>1; int n2 = len>>1;
@ -70,7 +71,7 @@ static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data
} }
static void lpc_compute_autocorr_sse2(const double *data, int len, int lag, static void lpc_compute_autocorr_sse2(const double *data, int len, int lag,
double *autoc) double *autoc)
{ {
int j; int j;
@ -140,7 +141,7 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) { if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
c->lpc_apply_welch_window = apply_welch_window_sse2; c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
c->lpc_compute_autocorr = lpc_compute_autocorr_sse2; c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
} }
} }