[FFmpeg-cvslog] cosmetics related to LPC changes.
Justin Ruggles
git
Sun Jan 23 21:01:53 CET 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Jan 21 00:12:18 2011 +0000| [384dbd617f7c28950e902634d400189f22033202] | committer: Michael Niedermayer
cosmetics related to LPC changes.
Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 1c189fc5334d4a687b15861d81d22c8ba2c9cd5e)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=384dbd617f7c28950e902634d400189f22033202
---
libavcodec/lpc.c | 9 +++++----
libavcodec/x86/lpc_mmx.c | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index fd51491..6d7671c 100644
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -28,7 +28,8 @@
/**
* 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;
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.
*/
static void lpc_compute_autocorr_c(const double *data, int len, int lag,
- double *autoc)
+ double *autoc)
{
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->lpc_apply_welch_window = apply_welch_window_c;
- s->lpc_compute_autocorr = lpc_compute_autocorr_c;
+ s->lpc_apply_welch_window = lpc_apply_welch_window_c;
+ s->lpc_compute_autocorr = lpc_compute_autocorr_c;
if (HAVE_MMX)
ff_lpc_init_x86(s);
diff --git a/libavcodec/x86/lpc_mmx.c b/libavcodec/x86/lpc_mmx.c
index 3a0a1f0..1c202e2 100644
--- a/libavcodec/x86/lpc_mmx.c
+++ b/libavcodec/x86/lpc_mmx.c
@@ -23,7 +23,8 @@
#include "libavutil/cpu.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);
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,
- double *autoc)
+ double *autoc)
{
int j;
@@ -140,7 +141,7 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
int mm_flags = av_get_cpu_flags();
if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
- c->lpc_apply_welch_window = apply_welch_window_sse2;
- c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
+ c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
+ c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
}
}
More information about the ffmpeg-cvslog
mailing list