1 files changed, 80 insertions, 70 deletions

diff --git a/core/multimedia/opieplayer/libmad/layer3.c b/core/multimedia/opieplayer/libmad/layer3.c
index 194fc7e..03f13fe 100644
--- a/core/multimedia/opieplayer/libmad/layer3.c
+++ b/core/multimedia/opieplayer/libmad/layer3.c
@@ -1,4 +1,4 @@
 /*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
  * Copyright (C) 2000-2001 Robert Leslie
  *
@@ -28,5 +28,8 @@
 # include <stdlib.h>
 # include <string.h>
-# include <assert.h>
+
+# ifdef HAVE_ASSERT_H
+#  include <assert.h>
+# endif
 
 # ifdef HAVE_LIMITS_H
@@ -52,4 +55,9 @@ enum {
 };
 
+enum {
+  I_STEREO  = 0x1,
+  MS_STEREO = 0x2
+};
+
 struct sideinfo {
   unsigned int main_data_begin;
@@ -504,5 +512,5 @@ enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
 {
   unsigned int ngr, gr, ch, i;
-  enum mad_error result = 0;
+  enum mad_error result = MAD_ERROR_NONE;
 
   *data_bitlen = 0;
@@ -603,5 +611,5 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
     ((channel->flags & mixed_block_flag) ? 2 : 1) : 0;
 
-  if (!((mode_extension & 0x1) && gr1ch)) {
+  if (!((mode_extension & I_STEREO) && gr1ch)) {
     if (scalefac_compress < 400) {
       slen[0] = (scalefac_compress >> 4) / 5;
@@ -644,5 +652,5 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
       channel->scalefac[n++] = 0;
   }
-  else {  /* (mode_extension & 0x1) && gr1ch (i.e. ch == 1) */
+  else {  /* (mode_extension & I_STEREO) && gr1ch (i.e. ch == 1) */
     scalefac_compress >>= 1;
 
@@ -776,4 +784,26 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
 
 /*
+ * The Layer III formula for requantization and scaling is defined by
+ * section 2.4.3.4.7.1 of ISO/IEC 11172-3, as follows:
+ *
+ *   long blocks:
+ *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
+ *           2^((1/4) * (global_gain - 210)) *
+ *           2^-(scalefac_multiplier *
+ *               (scalefac_l[sfb] + preflag * pretab[sfb]))
+ *
+ *   short blocks:
+ *   xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
+ *           2^((1/4) * (global_gain - 210 - 8 * subblock_gain[w])) *
+ *           2^-(scalefac_multiplier * scalefac_s[sfb][w])
+ *
+ *   where:
+ *   scalefac_multiplier = (scalefac_scale + 1) / 2
+ *
+ * The routines III_exponents() and III_requantize() facilitate this
+ * calculation.
+ */
+
+/*
  * NAME:	III_exponents()
  * DESCRIPTION:	calculate scalefactor exponents
@@ -857,21 +887,5 @@ mad_fixed_t III_requantize(unsigned int value, signed int exp)
   struct fixedfloat const *power;
 
-  /*
-   * long blocks:
-   * xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
-   *         2^((1/4) * (global_gain - 210)) *
-   *         2^-(scalefac_multiplier *
-   *             (scalefac_l[sfb] + preflag * pretab[sfb]))
-   *
-   * short blocks:
-   * xr[i] = sign(is[i]) * abs(is[i])^(4/3) *
-   *         2^((1/4) * (global_gain - 210 - 8 * subblock_gain[w])) *
-   *         2^-(scalefac_multiplier * scalefac_s[sfb][w])
-   *
-   * where:
-   * scalefac_multiplier = (scalefac_scale + 1) / 2
-   */
-
-  frac = exp % 4;
+  frac = exp % 4;  /* assumes sign(frac) == sign(exp) */
   exp /= 4;
 
@@ -885,6 +899,8 @@ mad_fixed_t III_requantize(unsigned int value, signed int exp)
       requantized = 0;
     }
-    else
+    else {
+      requantized += 1L << (-exp - 1);
       requantized >>= -exp;
+    }
   }
   else {
@@ -1252,5 +1268,5 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
   }
 
-  return 0;
+  return MAD_ERROR_NONE;
 }
 
@@ -1267,12 +1283,16 @@ void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
 {
   mad_fixed_t tmp[32][3][6];
-  unsigned int sb, l, sfbi, f, w, sbw[3], sw[3];
+  unsigned int sb, l, f, w, sbw[3], sw[3];
 
   /* this is probably wrong for 8000 Hz mixed blocks */
 
-  if (channel->flags & mixed_block_flag)
-    sb = 2, sfbi = 3 * 3;
-  else
-    sb = 0, sfbi = 0;
+  sb = 0;
+  if (channel->flags & mixed_block_flag) {
+    sb = 2;
+
+    l = 0;
+    while (l < 36)
+      l += *sfbwidth++;
+  }
 
   for (w = 0; w < 3; ++w) {
@@ -1281,8 +1301,13 @@ void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
   }
 
-  f = sfbwidth[sfbi];
+  f = *sfbwidth++;
   w = 0;
 
   for (l = 18 * sb; l < 576; ++l) {
+    if (f-- == 0) {
+      f = *sfbwidth++ - 1;
+      w = (w + 1) % 3;
+    }
+
     tmp[sbw[w]][w][sw[w]++] = xr[l];
 
@@ -1291,11 +1316,4 @@ void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
       ++sbw[w];
     }
-
-    if (--f == 0) {
-      if (++w == 3)
-	w = 0;
-
-      f = sfbwidth[++sfbi];
-    }
   }
 
@@ -1316,9 +1334,4 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
   unsigned int sfbi, l, n, i;
 
-  enum {
-    i_stereo  = 0x1,
-    ms_stereo = 0x2
-  };
-
   if (granule->ch[0].block_type !=
       granule->ch[1].block_type ||
@@ -1332,5 +1345,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
   /* intensity stereo */
 
-  if (header->mode_extension & i_stereo) {
+  if (header->mode_extension & I_STEREO) {
     struct channel const *right_ch = &granule->ch[1];
     mad_fixed_t const *right_xr = xr[1];
@@ -1388,5 +1401,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
 
       for (i = 0; i < lower; ++i)
-	modes[i] = header->mode_extension & ~i_stereo;
+	modes[i] = header->mode_extension & ~I_STEREO;
 
       /* short blocks */
@@ -1395,5 +1408,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
       for (i = start; i < max; ++i) {
 	if (i < bound[w])
-	  modes[i] = header->mode_extension & ~i_stereo;
+	  modes[i] = header->mode_extension & ~I_STEREO;
 
 	w = (w + 1) % 3;
@@ -1418,5 +1431,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
 
       for (i = 0; i < bound; ++i)
-	modes[i] = header->mode_extension & ~i_stereo;
+	modes[i] = header->mode_extension & ~I_STEREO;
     }
 
@@ -1433,9 +1446,9 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
 	n = sfbwidth[sfbi];
 
-	if (!(modes[sfbi] & i_stereo))
+	if (!(modes[sfbi] & I_STEREO))
 	  continue;
 
 	if (illegal_pos[sfbi]) {
-	  modes[sfbi] &= ~i_stereo;
+	  modes[sfbi] &= ~I_STEREO;
 	  continue;
 	}
@@ -1469,5 +1482,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
 	n = sfbwidth[sfbi];
 
-	if (!(modes[sfbi] & i_stereo))
+	if (!(modes[sfbi] & I_STEREO))
 	  continue;
 
@@ -1475,5 +1488,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
 
 	if (is_pos >= 7) {  /* illegal intensity position */
-	  modes[sfbi] &= ~i_stereo;
+	  modes[sfbi] &= ~I_STEREO;
 	  continue;
 	}
@@ -1493,5 +1506,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
   /* middle/side stereo */
 
-  if (header->mode_extension & ms_stereo) {
+  if (header->mode_extension & MS_STEREO) {
     register mad_fixed_t invsqrt2;
 
@@ -1503,5 +1516,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
       n = sfbwidth[sfbi];
 
-      if (modes[sfbi] != ms_stereo)
+      if (modes[sfbi] != MS_STEREO)
 	continue;
 
@@ -1518,5 +1531,5 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
   }
 
-  return 0;
+  return MAD_ERROR_NONE;
 }
 
@@ -1534,13 +1547,10 @@ void III_aliasreduce(mad_fixed_t xr[576], int lines)
   for (xr += 18; xr < bound; xr += 18) {
     for (i = 0; i < 8; ++i) {
-      register mad_fixed_t *aptr, *bptr, a, b;
+      register mad_fixed_t a, b;
       register mad_fixed64hi_t hi;
       register mad_fixed64lo_t lo;
 
-      aptr = &xr[-1 - i];
-      bptr = &xr[     i];
-
-      a = *aptr;
-      b = *bptr;
+      a = xr[-1 - i];
+      b = xr[     i];
 
 # if defined(ASO_ZEROCHECK)
@@ -1550,10 +1560,10 @@ void III_aliasreduce(mad_fixed_t xr[576], int lines)
 	MAD_F_MLA(hi, lo, -b, ca[i]);
 
-	*aptr = MAD_F_MLZ(hi, lo);
+	xr[-1 - i] = MAD_F_MLZ(hi, lo);
 
 	MAD_F_ML0(hi, lo,  b, cs[i]);
 	MAD_F_MLA(hi, lo,  a, ca[i]);
 
-	*bptr = MAD_F_MLZ(hi, lo);
+	xr[     i] = MAD_F_MLZ(hi, lo);
 # if defined(ASO_ZEROCHECK)
       }
@@ -2142,6 +2152,6 @@ void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
  */
 static
-int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
-		struct sideinfo *si, unsigned int nch)
+enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
+			  struct sideinfo *si, unsigned int nch)
 {
   struct mad_header *header = &frame->header;
@@ -2170,5 +2180,5 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
   for (gr = 0; gr < ngr; ++gr) {
     struct granule *granule = &si->gr[gr];
-    unsigned char const *sfbwidth = 0;
+    unsigned char const *sfbwidth[2];
     mad_fixed_t xr[2][576];
     unsigned int ch;
@@ -2179,7 +2189,7 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
       unsigned int part2_length;
 
-      sfbwidth = sfbwidth_table[sfreqi].l;
+      sfbwidth[ch] = sfbwidth_table[sfreqi].l;
       if (channel->block_type == 2) {
-	sfbwidth = (channel->flags & mixed_block_flag) ?
+	sfbwidth[ch] = (channel->flags & mixed_block_flag) ?
 	  sfbwidth_table[sfreqi].m : sfbwidth_table[sfreqi].s;
       }
@@ -2195,5 +2205,5 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
       }
 
-      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth, part2_length);
+      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
       if (error)
 	return error;
@@ -2203,5 +2213,5 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
 
     if (header->mode == MAD_MODE_JOINT_STEREO && header->mode_extension) {
-      error = III_stereo(xr, granule, header, sfbwidth);
+      error = III_stereo(xr, granule, header, sfbwidth[0]);
       if (error)
 	return error;
@@ -2217,5 +2227,5 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
 
       if (channel->block_type == 2) {
-	III_reorder(xr[ch], channel, sfbwidth_table[sfreqi].s);
+	III_reorder(xr[ch], channel, sfbwidth[ch]);
 
 # if !defined(OPT_STRICT)
@@ -2301,5 +2311,5 @@ int III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
   }
 
-  return 0;
+  return MAD_ERROR_NONE;
 }