1. ffmpeg
  2. Commit 384dbd617f7c28950e902634d400189f22033202
Browse code

cosmetics related to LPC changes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1c189fc5334d4a687b15861d81d22c8ba2c9cd5e)

Justin Ruggles authored on 2011/01/21 09:12:18
Showing 2 changed files
libavcodec/lpc.c
History View file @ 384dbd6
... ... 
@@ -28,7 +28,8 @@
28 28 
 /**
29 29 
  * Apply Welch window function to audio block
30 30 
  */
31 
-static void apply_welch_window_c(const int32_t *data, int len, double *w_data)
31 
+static void lpc_apply_welch_window_c(const int32_t *data, int len,
32 
+                                     double *w_data)
32 33 
 {
33 34 
     int i, n2;
34 35 
     double w;
... ... 
@@ -55,7 +56,7 @@ static void apply_welch_window_c(const int32_t *data, int len, double *w_data)
55 55 
  * A Welch window function is applied before calculation.
56 56 
  */
57 57 
 static void lpc_compute_autocorr_c(const double *data, int len, int lag,
58 
-                             double *autoc)
58 
+                                   double *autoc)
59 59 
 {
60 60 
     int i, j;
61 61
... ... 
@@ -255,8 +256,8 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order,
255 255 
         s->windowed_samples = NULL;
256 256 
     }
257 257
258 
-    s->lpc_apply_welch_window = apply_welch_window_c;
259 
-    s->lpc_compute_autocorr = lpc_compute_autocorr_c;
258 
+    s->lpc_apply_welch_window = lpc_apply_welch_window_c;
259 
+    s->lpc_compute_autocorr   = lpc_compute_autocorr_c;
260 260
261 261 
     if (HAVE_MMX)
262 262 
         ff_lpc_init_x86(s);
libavcodec/x86/lpc_mmx.c
History View file @ 384dbd6
... ... 
@@ -23,7 +23,8 @@
23 23 
 #include "libavutil/cpu.h"
24 24 
 #include "libavcodec/lpc.h"
25 25
26 
-static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
26 
+static void lpc_apply_welch_window_sse2(const int32_t *data, int len,
27 
+                                        double *w_data)
27 28 
 {
28 29 
     double c = 2.0 / (len-1.0);
29 30 
     int n2 = len>>1;
... ... 
@@ -70,7 +71,7 @@ static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data
70 70 
 }
71 71
72 72 
 static void lpc_compute_autocorr_sse2(const double *data, int len, int lag,
73 
-                                   double *autoc)
73 
+                                      double *autoc)
74 74 
 {
75 75 
     int j;
76 76
... ... 
@@ -140,7 +141,7 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
140 140 
     int mm_flags = av_get_cpu_flags();
141 141
142 142 
     if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
143 
-        c->lpc_apply_welch_window = apply_welch_window_sse2;
144 
-        c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
143 
+        c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
144 
+        c->lpc_compute_autocorr   = lpc_compute_autocorr_sse2;
145 145 
     }
146 146 
 }