* AC3 IMDCT and downmix functions are now in plugins, --imdct and

[vlc] / src / ac3_decoder / ac3_exponent.c

diff --git a/src/ac3_decoder/ac3_exponent.c b/src/ac3_decoder/ac3_exponent.c
index 96e3c704f6ef18f37bce1fc491b876ed917dc442..f9bb5c4cee7b8ab4d0de753b8ed4b02804715fbd 100644 (file)
--- a/src/ac3_decoder/ac3_exponent.c
+++ b/src/ac3_decoder/ac3_exponent.c
@@ -2,7 +2,7 @@
  * ac3_exponent.c: ac3 exponent calculations
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_exponent.c,v 1.24 2001/05/14 15:58:04 reno Exp $
+ * $Id: ac3_exponent.c,v 1.25 2001/05/15 16:19:42 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Michel Lespinasse <walken@zoy.org>
@@ -22,6 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
 #include "defs.h"
 
 #include <string.h>                                    /* memcpy(), memset() */
@@ -38,136 +42,13 @@
 
 #include "audio_output.h"
 
+#include "ac3_imdct.h"
+#include "ac3_downmix.h"
 #include "ac3_decoder.h"
 
 #include "ac3_internal.h"
 
-static const s16 exps_1[128] =
-{
-    -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-     0, 0, 0
-};
-
-static const s16 exps_2[128] =
-{
-    -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-    -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-    -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-    -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-    -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
-     0, 0, 0
-};
-
-static const s16 exps_3[128] =
-{
-    -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,
-    -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,
-    -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,
-    -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,
-    -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,
-     0, 0, 0
-};
-
-#define UNPACK_FBW 1 
-#define UNPACK_CPL 2 
-#define UNPACK_LFE 4
-
-static __inline__ int exp_unpack_ch (ac3dec_t * p_ac3dec, u16 type,
-                                     u16 expstr, u16 ngrps, u16 initial_exp,
-                                     u16 exps[], u16 * dest)
-{
-    u16 i,j;
-    s16 exp_acc;
-
-    if  (expstr == EXP_REUSE)
-    {
-        return 0;
-    }
-
-    /* Handle the initial absolute exponent */
-    exp_acc = initial_exp;
-    j = 0;
-
-    /* In the case of a fbw channel then the initial absolute values is
-     * also an exponent */
-    if (type != UNPACK_CPL)
-    {
-        dest[j++] = exp_acc;
-    }
-
-    /* Loop through the groups and fill the dest array appropriately */
-    switch (expstr)
-    {
-    case EXP_D15:        /* 1 */
-        for (i = 0; i < ngrps; i++)
-        {
-            if (exps[i] > 124)
-            {
-                intf_ErrMsg ( "ac3dec error: invalid exponent" );
-                return 1;
-            }
-            exp_acc += (exps_1[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            exp_acc += (exps_2[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            exp_acc += (exps_3[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-        }
-        break;
-
-    case EXP_D25:        /* 2 */
-        for (i = 0; i < ngrps; i++)
-        {
-            if (exps[i] > 124)
-            {
-                intf_ErrMsg ( "ac3dec error: invalid exponent" );
-                return 1;
-            }
-            exp_acc += (exps_1[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            exp_acc += (exps_2[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            exp_acc += (exps_3[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-        }
-        break;
-
-    case EXP_D45:        /* 3 */
-        for (i = 0; i < ngrps; i++)
-        {
-            if (exps[i] > 124)
-            {
-                intf_ErrMsg ( "ac3dec error: invalid exponent" );
-                return 1;
-            }
-            exp_acc += (exps_1[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            exp_acc += (exps_2[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            exp_acc += (exps_3[exps[i]] /*- 2*/);
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-            dest[j++] = exp_acc;
-        }
-        break;
-    }
-
-    return 0;
-}
+#include "ac3_exponent.h"
 
 int exponent_unpack (ac3dec_t * p_ac3dec)
 {