Created a small&clean public interface for the ac3 decoder (see ac3_decoder.h)

[vlc] / src / ac3_decoder / ac3_rematrix.c

diff --git a/src/ac3_decoder/ac3_rematrix.c b/src/ac3_decoder/ac3_rematrix.c
index 39f9dcc8fbb728e3849ffce7b874b96c47936ab2..1c5d4763331c6f927dce6efb417b63cd101b3eb3 100644 (file)
--- a/src/ac3_decoder/ac3_rematrix.c
+++ b/src/ac3_decoder/ac3_rematrix.c
@@ -1,23 +1,22 @@
 #include "int_types.h"
 #include "ac3_decoder.h"
-#include "ac3_rematrix.h"
+#include "ac3_internal.h"
 
-struct rematrix_band_s
-{
+struct rematrix_band_s {
     u32 start;
     u32 end;
 };
 
 static struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}};
 
-static __inline__ u32 min( u32 a, u32 b )
+static __inline__ u32 min (u32 a, u32 b)
 {
-    return( a < b ? a : b );
+    return (a < b ? a : b);
 }
 
 /* This routine simply does stereo rematixing for the 2 channel
  * stereo mode */
-void rematrix( ac3dec_t * p_ac3dec )
+void rematrix (ac3dec_t * p_ac3dec)
 {
     u32 num_bands;
     u32 start;
@@ -25,23 +24,21 @@ void rematrix( ac3dec_t * p_ac3dec )
     u32 i,j;
     float left,right;
 
-    if(p_ac3dec->audblk.cplinu || p_ac3dec->audblk.cplbegf > 2)
+    if (p_ac3dec->audblk.cplinu || p_ac3dec->audblk.cplbegf > 2)
         num_bands = 4;
     else if (p_ac3dec->audblk.cplbegf > 0)
         num_bands = 3;
     else
         num_bands = 2;
 
-    for(i=0;i < num_bands; i++)
-    {
-        if(!p_ac3dec->audblk.rematflg[i])
+    for (i=0;i < num_bands; i++) {
+        if (!p_ac3dec->audblk.rematflg[i])
             continue;
 
         start = rematrix_band[i].start;
         end = min(rematrix_band[i].end ,12 * p_ac3dec->audblk.cplbegf + 36);
 
-        for(j=start;j < end; j++)
-        {
+        for (j=start;j < end; j++) {
             left  = 0.5f * (p_ac3dec->coeffs.fbw[0][j] + p_ac3dec->coeffs.fbw[1][j]);
             right = 0.5f * (p_ac3dec->coeffs.fbw[0][j] - p_ac3dec->coeffs.fbw[1][j]);
             p_ac3dec->coeffs.fbw[0][j] = left;