33 files changed, 799 insertions, 342 deletions
diff --git a/core/multimedia/opieplayer/libmad/D.dat b/core/multimedia/opieplayer/libmad/D.dat
index c3ee74c..89b01da 100644
--- a/core/multimedia/opieplayer/libmad/D.dat
+++ b/core/multimedia/opieplayer/libmad/D.dat
@@ -1,607 +1,607 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 /*
 * These are the coefficients for the subband synthesis window. This is a
 * reordered version of Table B.3 from ISO/IEC 11172-3.
 *
 * Every value is parameterized so that shift optimizations can be made at
 * compile-time. For example, every value can be right-shifted 12 bits to
 * minimize multiply instruction times without any loss of accuracy.
 */
          {  PRESHIFT(0x00000000) /*  0.000000000 */,/*  0 */
    -PRESHIFT(0x0001d000) /* -0.000442505 */,
     PRESHIFT(0x000d5000) /*  0.003250122 */,
    -PRESHIFT(0x001cb000) /* -0.007003784 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
    -PRESHIFT(0x01421000) /* -0.078628540 */,
     PRESHIFT(0x019ae000) /*  0.100311279 */,
    -PRESHIFT(0x09271000) /* -0.572036743 */,
     PRESHIFT(0x1251e000) /*  1.144989014 */,
     PRESHIFT(0x09271000) /*  0.572036743 */,
     PRESHIFT(0x019ae000) /*  0.100311279 */,
     PRESHIFT(0x01421000) /*  0.078628540 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
     PRESHIFT(0x001cb000) /*  0.007003784 */,
     PRESHIFT(0x000d5000) /*  0.003250122 */,
     PRESHIFT(0x0001d000) /*  0.000442505 */,
     PRESHIFT(0x00000000) /*  0.000000000 */,
    -PRESHIFT(0x0001d000) /* -0.000442505 */,
     PRESHIFT(0x000d5000) /*  0.003250122 */,
    -PRESHIFT(0x001cb000) /* -0.007003784 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
    -PRESHIFT(0x01421000) /* -0.078628540 */,
     PRESHIFT(0x019ae000) /*  0.100311279 */,
    -PRESHIFT(0x09271000) /* -0.572036743 */,
     PRESHIFT(0x1251e000) /*  1.144989014 */,
     PRESHIFT(0x09271000) /*  0.572036743 */,
     PRESHIFT(0x019ae000) /*  0.100311279 */,
     PRESHIFT(0x01421000) /*  0.078628540 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
     PRESHIFT(0x001cb000) /*  0.007003784 */,
     PRESHIFT(0x000d5000) /*  0.003250122 */,
     PRESHIFT(0x0001d000) /*  0.000442505 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  1 */
    -PRESHIFT(0x0001f000) /* -0.000473022 */,
     PRESHIFT(0x000da000) /*  0.003326416 */,
    -PRESHIFT(0x00207000) /* -0.007919312 */,
     PRESHIFT(0x007d0000) /*  0.030517578 */,
    -PRESHIFT(0x0158d000) /* -0.084182739 */,
     PRESHIFT(0x01747000) /*  0.090927124 */,
    -PRESHIFT(0x099a8000) /* -0.600219727 */,
     PRESHIFT(0x124f0000) /*  1.144287109 */,
     PRESHIFT(0x08b38000) /*  0.543823242 */,
     PRESHIFT(0x01bde000) /*  0.108856201 */,
     PRESHIFT(0x012b4000) /*  0.073059082 */,
     PRESHIFT(0x0080f000) /*  0.031478882 */,
     PRESHIFT(0x00191000) /*  0.006118774 */,
     PRESHIFT(0x000d0000) /*  0.003173828 */,
     PRESHIFT(0x0001a000) /*  0.000396729 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x0001f000) /* -0.000473022 */,
     PRESHIFT(0x000da000) /*  0.003326416 */,
    -PRESHIFT(0x00207000) /* -0.007919312 */,
     PRESHIFT(0x007d0000) /*  0.030517578 */,
    -PRESHIFT(0x0158d000) /* -0.084182739 */,
     PRESHIFT(0x01747000) /*  0.090927124 */,
    -PRESHIFT(0x099a8000) /* -0.600219727 */,
     PRESHIFT(0x124f0000) /*  1.144287109 */,
     PRESHIFT(0x08b38000) /*  0.543823242 */,
     PRESHIFT(0x01bde000) /*  0.108856201 */,
     PRESHIFT(0x012b4000) /*  0.073059082 */,
     PRESHIFT(0x0080f000) /*  0.031478882 */,
     PRESHIFT(0x00191000) /*  0.006118774 */,
     PRESHIFT(0x000d0000) /*  0.003173828 */,
     PRESHIFT(0x0001a000) /*  0.000396729 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  2 */
    -PRESHIFT(0x00023000) /* -0.000534058 */,
     PRESHIFT(0x000de000) /*  0.003387451 */,
    -PRESHIFT(0x00245000) /* -0.008865356 */,
     PRESHIFT(0x007a0000) /*  0.029785156 */,
    -PRESHIFT(0x016f7000) /* -0.089706421 */,
     PRESHIFT(0x014a8000) /*  0.080688477 */,
    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
     PRESHIFT(0x12468000) /*  1.142211914 */,
     PRESHIFT(0x083ff000) /*  0.515609741 */,
     PRESHIFT(0x01dd8000) /*  0.116577148 */,
     PRESHIFT(0x01149000) /*  0.067520142 */,
     PRESHIFT(0x00820000) /*  0.031738281 */,
     PRESHIFT(0x0015b000) /*  0.005294800 */,
     PRESHIFT(0x000ca000) /*  0.003082275 */,
     PRESHIFT(0x00018000) /*  0.000366211 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x00023000) /* -0.000534058 */,
     PRESHIFT(0x000de000) /*  0.003387451 */,
    -PRESHIFT(0x00245000) /* -0.008865356 */,
     PRESHIFT(0x007a0000) /*  0.029785156 */,
    -PRESHIFT(0x016f7000) /* -0.089706421 */,
     PRESHIFT(0x014a8000) /*  0.080688477 */,
    -PRESHIFT(0x0a0d8000) /* -0.628295898 */,
     PRESHIFT(0x12468000) /*  1.142211914 */,
     PRESHIFT(0x083ff000) /*  0.515609741 */,
     PRESHIFT(0x01dd8000) /*  0.116577148 */,
     PRESHIFT(0x01149000) /*  0.067520142 */,
     PRESHIFT(0x00820000) /*  0.031738281 */,
     PRESHIFT(0x0015b000) /*  0.005294800 */,
     PRESHIFT(0x000ca000) /*  0.003082275 */,
     PRESHIFT(0x00018000) /*  0.000366211 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  3 */
    -PRESHIFT(0x00026000) /* -0.000579834 */,
     PRESHIFT(0x000e1000) /*  0.003433228 */,
    -PRESHIFT(0x00285000) /* -0.009841919 */,
     PRESHIFT(0x00765000) /*  0.028884888 */,
    -PRESHIFT(0x0185d000) /* -0.095169067 */,
     PRESHIFT(0x011d1000) /*  0.069595337 */,
    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
     PRESHIFT(0x12386000) /*  1.138763428 */,
     PRESHIFT(0x07ccb000) /*  0.487472534 */,
     PRESHIFT(0x01f9c000) /*  0.123474121 */,
     PRESHIFT(0x00fdf000) /*  0.061996460 */,
     PRESHIFT(0x00827000) /*  0.031845093 */,
     PRESHIFT(0x00126000) /*  0.004486084 */,
     PRESHIFT(0x000c4000) /*  0.002990723 */,
     PRESHIFT(0x00015000) /*  0.000320435 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x00026000) /* -0.000579834 */,
     PRESHIFT(0x000e1000) /*  0.003433228 */,
    -PRESHIFT(0x00285000) /* -0.009841919 */,
     PRESHIFT(0x00765000) /*  0.028884888 */,
    -PRESHIFT(0x0185d000) /* -0.095169067 */,
     PRESHIFT(0x011d1000) /*  0.069595337 */,
    -PRESHIFT(0x0a7fe000) /* -0.656219482 */,
     PRESHIFT(0x12386000) /*  1.138763428 */,
     PRESHIFT(0x07ccb000) /*  0.487472534 */,
     PRESHIFT(0x01f9c000) /*  0.123474121 */,
     PRESHIFT(0x00fdf000) /*  0.061996460 */,
     PRESHIFT(0x00827000) /*  0.031845093 */,
     PRESHIFT(0x00126000) /*  0.004486084 */,
     PRESHIFT(0x000c4000) /*  0.002990723 */,
     PRESHIFT(0x00015000) /*  0.000320435 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  4 */
    -PRESHIFT(0x00029000) /* -0.000625610 */,
     PRESHIFT(0x000e3000) /*  0.003463745 */,
    -PRESHIFT(0x002c7000) /* -0.010848999 */,
     PRESHIFT(0x0071e000) /*  0.027801514 */,
    -PRESHIFT(0x019bd000) /* -0.100540161 */,
     PRESHIFT(0x00ec0000) /*  0.057617187 */,
    -PRESHIFT(0x0af15000) /* -0.683914185 */,
     PRESHIFT(0x12249000) /*  1.133926392 */,
     PRESHIFT(0x075a0000) /*  0.459472656 */,
     PRESHIFT(0x0212c000) /*  0.129577637 */,
     PRESHIFT(0x00e79000) /*  0.056533813 */,
     PRESHIFT(0x00825000) /*  0.031814575 */,
     PRESHIFT(0x000f4000) /*  0.003723145 */,
     PRESHIFT(0x000be000) /*  0.002899170 */,
     PRESHIFT(0x00013000) /*  0.000289917 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x00029000) /* -0.000625610 */,
     PRESHIFT(0x000e3000) /*  0.003463745 */,
    -PRESHIFT(0x002c7000) /* -0.010848999 */,
     PRESHIFT(0x0071e000) /*  0.027801514 */,
    -PRESHIFT(0x019bd000) /* -0.100540161 */,
     PRESHIFT(0x00ec0000) /*  0.057617187 */,
    -PRESHIFT(0x0af15000) /* -0.683914185 */,
     PRESHIFT(0x12249000) /*  1.133926392 */,
     PRESHIFT(0x075a0000) /*  0.459472656 */,
     PRESHIFT(0x0212c000) /*  0.129577637 */,
     PRESHIFT(0x00e79000) /*  0.056533813 */,
     PRESHIFT(0x00825000) /*  0.031814575 */,
     PRESHIFT(0x000f4000) /*  0.003723145 */,
     PRESHIFT(0x000be000) /*  0.002899170 */,
     PRESHIFT(0x00013000) /*  0.000289917 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  5 */
    -PRESHIFT(0x0002d000) /* -0.000686646 */,
     PRESHIFT(0x000e4000) /*  0.003479004 */,
    -PRESHIFT(0x0030b000) /* -0.011886597 */,
     PRESHIFT(0x006cb000) /*  0.026535034 */,
    -PRESHIFT(0x01b17000) /* -0.105819702 */,
     PRESHIFT(0x00b77000) /*  0.044784546 */,
    -PRESHIFT(0x0b619000) /* -0.711318970 */,
     PRESHIFT(0x120b4000) /*  1.127746582 */,
     PRESHIFT(0x06e81000) /*  0.431655884 */,
     PRESHIFT(0x02288000) /*  0.134887695 */,
     PRESHIFT(0x00d17000) /*  0.051132202 */,
     PRESHIFT(0x0081b000) /*  0.031661987 */,
     PRESHIFT(0x000c5000) /*  0.003005981 */,
     PRESHIFT(0x000b7000) /*  0.002792358 */,
     PRESHIFT(0x00011000) /*  0.000259399 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x0002d000) /* -0.000686646 */,
     PRESHIFT(0x000e4000) /*  0.003479004 */,
    -PRESHIFT(0x0030b000) /* -0.011886597 */,
     PRESHIFT(0x006cb000) /*  0.026535034 */,
    -PRESHIFT(0x01b17000) /* -0.105819702 */,
     PRESHIFT(0x00b77000) /*  0.044784546 */,
    -PRESHIFT(0x0b619000) /* -0.711318970 */,
     PRESHIFT(0x120b4000) /*  1.127746582 */,
     PRESHIFT(0x06e81000) /*  0.431655884 */,
     PRESHIFT(0x02288000) /*  0.134887695 */,
     PRESHIFT(0x00d17000) /*  0.051132202 */,
     PRESHIFT(0x0081b000) /*  0.031661987 */,
     PRESHIFT(0x000c5000) /*  0.003005981 */,
     PRESHIFT(0x000b7000) /*  0.002792358 */,
     PRESHIFT(0x00011000) /*  0.000259399 */ },
          { -PRESHIFT(0x00001000) /* -0.000015259 */,/*  6 */
    -PRESHIFT(0x00031000) /* -0.000747681 */,
     PRESHIFT(0x000e4000) /*  0.003479004 */,
    -PRESHIFT(0x00350000) /* -0.012939453 */,
     PRESHIFT(0x0066c000) /*  0.025085449 */,
    -PRESHIFT(0x01c67000) /* -0.110946655 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
     PRESHIFT(0x11ec7000) /*  1.120223999 */,
     PRESHIFT(0x06772000) /*  0.404083252 */,
     PRESHIFT(0x023b3000) /*  0.139450073 */,
     PRESHIFT(0x00bbc000) /*  0.045837402 */,
     PRESHIFT(0x00809000) /*  0.031387329 */,
     PRESHIFT(0x00099000) /*  0.002334595 */,
     PRESHIFT(0x000b0000) /*  0.002685547 */,
     PRESHIFT(0x00010000) /*  0.000244141 */,
    -PRESHIFT(0x00001000) /* -0.000015259 */,
    -PRESHIFT(0x00031000) /* -0.000747681 */,
     PRESHIFT(0x000e4000) /*  0.003479004 */,
    -PRESHIFT(0x00350000) /* -0.012939453 */,
     PRESHIFT(0x0066c000) /*  0.025085449 */,
    -PRESHIFT(0x01c67000) /* -0.110946655 */,
     PRESHIFT(0x007f5000) /*  0.031082153 */,
    -PRESHIFT(0x0bd06000) /* -0.738372803 */,
     PRESHIFT(0x11ec7000) /*  1.120223999 */,
     PRESHIFT(0x06772000) /*  0.404083252 */,
     PRESHIFT(0x023b3000) /*  0.139450073 */,
     PRESHIFT(0x00bbc000) /*  0.045837402 */,
     PRESHIFT(0x00809000) /*  0.031387329 */,
     PRESHIFT(0x00099000) /*  0.002334595 */,
     PRESHIFT(0x000b0000) /*  0.002685547 */,
     PRESHIFT(0x00010000) /*  0.000244141 */ },
          { -PRESHIFT(0x00002000) /* -0.000030518 */,/*  7 */
    -PRESHIFT(0x00035000) /* -0.000808716 */,
     PRESHIFT(0x000e3000) /*  0.003463745 */,
    -PRESHIFT(0x00397000) /* -0.014022827 */,
     PRESHIFT(0x005ff000) /*  0.023422241 */,
    -PRESHIFT(0x01dad000) /* -0.115921021 */,
     PRESHIFT(0x0043a000) /*  0.016510010 */,
    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
     PRESHIFT(0x11c83000) /*  1.111373901 */,
     PRESHIFT(0x06076000) /*  0.376800537 */,
     PRESHIFT(0x024ad000) /*  0.143264771 */,
     PRESHIFT(0x00a67000) /*  0.040634155 */,
     PRESHIFT(0x007f0000) /*  0.031005859 */,
     PRESHIFT(0x0006f000) /*  0.001693726 */,
     PRESHIFT(0x000a9000) /*  0.002578735 */,
     PRESHIFT(0x0000e000) /*  0.000213623 */,
    -PRESHIFT(0x00002000) /* -0.000030518 */,
    -PRESHIFT(0x00035000) /* -0.000808716 */,
     PRESHIFT(0x000e3000) /*  0.003463745 */,
    -PRESHIFT(0x00397000) /* -0.014022827 */,
     PRESHIFT(0x005ff000) /*  0.023422241 */,
    -PRESHIFT(0x01dad000) /* -0.115921021 */,
     PRESHIFT(0x0043a000) /*  0.016510010 */,
    -PRESHIFT(0x0c3d9000) /* -0.765029907 */,
     PRESHIFT(0x11c83000) /*  1.111373901 */,
     PRESHIFT(0x06076000) /*  0.376800537 */,
     PRESHIFT(0x024ad000) /*  0.143264771 */,
     PRESHIFT(0x00a67000) /*  0.040634155 */,
     PRESHIFT(0x007f0000) /*  0.031005859 */,
     PRESHIFT(0x0006f000) /*  0.001693726 */,
     PRESHIFT(0x000a9000) /*  0.002578735 */,
     PRESHIFT(0x0000e000) /*  0.000213623 */ },
          { -PRESHIFT(0x00002000) /* -0.000030518 */,/*  8 */
    -PRESHIFT(0x0003a000) /* -0.000885010 */,
     PRESHIFT(0x000e0000) /*  0.003417969 */,
    -PRESHIFT(0x003df000) /* -0.015121460 */,
     PRESHIFT(0x00586000) /*  0.021575928 */,
    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
     PRESHIFT(0x00046000) /*  0.001068115 */,
    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
     PRESHIFT(0x119e9000) /*  1.101211548 */,
     PRESHIFT(0x05991000) /*  0.349868774 */,
     PRESHIFT(0x02578000) /*  0.146362305 */,
     PRESHIFT(0x0091a000) /*  0.035552979 */,
     PRESHIFT(0x007d1000) /*  0.030532837 */,
     PRESHIFT(0x00048000) /*  0.001098633 */,
     PRESHIFT(0x000a1000) /*  0.002456665 */,
     PRESHIFT(0x0000d000) /*  0.000198364 */,
    -PRESHIFT(0x00002000) /* -0.000030518 */,
    -PRESHIFT(0x0003a000) /* -0.000885010 */,
     PRESHIFT(0x000e0000) /*  0.003417969 */,
    -PRESHIFT(0x003df000) /* -0.015121460 */,
     PRESHIFT(0x00586000) /*  0.021575928 */,
    -PRESHIFT(0x01ee6000) /* -0.120697021 */,
     PRESHIFT(0x00046000) /*  0.001068115 */,
    -PRESHIFT(0x0ca8d000) /* -0.791213989 */,
     PRESHIFT(0x119e9000) /*  1.101211548 */,
     PRESHIFT(0x05991000) /*  0.349868774 */,
     PRESHIFT(0x02578000) /*  0.146362305 */,
     PRESHIFT(0x0091a000) /*  0.035552979 */,
     PRESHIFT(0x007d1000) /*  0.030532837 */,
     PRESHIFT(0x00048000) /*  0.001098633 */,
     PRESHIFT(0x000a1000) /*  0.002456665 */,
     PRESHIFT(0x0000d000) /*  0.000198364 */ },
          { -PRESHIFT(0x00002000) /* -0.000030518 */,/*  9 */
    -PRESHIFT(0x0003f000) /* -0.000961304 */,
     PRESHIFT(0x000dd000) /*  0.003372192 */,
    -PRESHIFT(0x00428000) /* -0.016235352 */,
     PRESHIFT(0x00500000) /*  0.019531250 */,
    -PRESHIFT(0x02011000) /* -0.125259399 */,
    -PRESHIFT(0x003e6000) /* -0.015228271 */,
    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
     PRESHIFT(0x116fc000) /*  1.089782715 */,
     PRESHIFT(0x052c5000) /*  0.323318481 */,
     PRESHIFT(0x02616000) /*  0.148773193 */,
     PRESHIFT(0x007d6000) /*  0.030609131 */,
     PRESHIFT(0x007aa000) /*  0.029937744 */,
     PRESHIFT(0x00024000) /*  0.000549316 */,
     PRESHIFT(0x0009a000) /*  0.002349854 */,
     PRESHIFT(0x0000b000) /*  0.000167847 */,
    -PRESHIFT(0x00002000) /* -0.000030518 */,
    -PRESHIFT(0x0003f000) /* -0.000961304 */,
     PRESHIFT(0x000dd000) /*  0.003372192 */,
    -PRESHIFT(0x00428000) /* -0.016235352 */,
     PRESHIFT(0x00500000) /*  0.019531250 */,
    -PRESHIFT(0x02011000) /* -0.125259399 */,
    -PRESHIFT(0x003e6000) /* -0.015228271 */,
    -PRESHIFT(0x0d11e000) /* -0.816864014 */,
     PRESHIFT(0x116fc000) /*  1.089782715 */,
     PRESHIFT(0x052c5000) /*  0.323318481 */,
     PRESHIFT(0x02616000) /*  0.148773193 */,
     PRESHIFT(0x007d6000) /*  0.030609131 */,
     PRESHIFT(0x007aa000) /*  0.029937744 */,
     PRESHIFT(0x00024000) /*  0.000549316 */,
     PRESHIFT(0x0009a000) /*  0.002349854 */,
     PRESHIFT(0x0000b000) /*  0.000167847 */ },
          { -PRESHIFT(0x00002000) /* -0.000030518 */,/* 10 */
    -PRESHIFT(0x00044000) /* -0.001037598 */,
     PRESHIFT(0x000d7000) /*  0.003280640 */,
    -PRESHIFT(0x00471000) /* -0.017349243 */,
     PRESHIFT(0x0046b000) /*  0.017257690 */,
    -PRESHIFT(0x0212b000) /* -0.129562378 */,
    -PRESHIFT(0x0084a000) /* -0.032379150 */,
    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
     PRESHIFT(0x113be000) /*  1.077117920 */,
     PRESHIFT(0x04c16000) /*  0.297210693 */,
     PRESHIFT(0x02687000) /*  0.150497437 */,
     PRESHIFT(0x0069c000) /*  0.025817871 */,
     PRESHIFT(0x0077f000) /*  0.029281616 */,
     PRESHIFT(0x00002000) /*  0.000030518 */,
     PRESHIFT(0x00093000) /*  0.002243042 */,
     PRESHIFT(0x0000a000) /*  0.000152588 */,
    -PRESHIFT(0x00002000) /* -0.000030518 */,
    -PRESHIFT(0x00044000) /* -0.001037598 */,
     PRESHIFT(0x000d7000) /*  0.003280640 */,
    -PRESHIFT(0x00471000) /* -0.017349243 */,
     PRESHIFT(0x0046b000) /*  0.017257690 */,
    -PRESHIFT(0x0212b000) /* -0.129562378 */,
    -PRESHIFT(0x0084a000) /* -0.032379150 */,
    -PRESHIFT(0x0d78a000) /* -0.841949463 */,
     PRESHIFT(0x113be000) /*  1.077117920 */,
     PRESHIFT(0x04c16000) /*  0.297210693 */,
     PRESHIFT(0x02687000) /*  0.150497437 */,
     PRESHIFT(0x0069c000) /*  0.025817871 */,
     PRESHIFT(0x0077f000) /*  0.029281616 */,
     PRESHIFT(0x00002000) /*  0.000030518 */,
     PRESHIFT(0x00093000) /*  0.002243042 */,
     PRESHIFT(0x0000a000) /*  0.000152588 */ },
          { -PRESHIFT(0x00003000) /* -0.000045776 */,/* 11 */
    -PRESHIFT(0x00049000) /* -0.001113892 */,
     PRESHIFT(0x000d0000) /*  0.003173828 */,
    -PRESHIFT(0x004ba000) /* -0.018463135 */,
     PRESHIFT(0x003ca000) /*  0.014801025 */,
    -PRESHIFT(0x02233000) /* -0.133590698 */,
    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
     PRESHIFT(0x1102f000) /*  1.063217163 */,
     PRESHIFT(0x04587000) /*  0.271591187 */,
     PRESHIFT(0x026cf000) /*  0.151596069 */,
     PRESHIFT(0x0056c000) /*  0.021179199 */,
     PRESHIFT(0x0074e000) /*  0.028533936 */,
    -PRESHIFT(0x0001d000) /* -0.000442505 */,
     PRESHIFT(0x0008b000) /*  0.002120972 */,
     PRESHIFT(0x00009000) /*  0.000137329 */,
    -PRESHIFT(0x00003000) /* -0.000045776 */,
    -PRESHIFT(0x00049000) /* -0.001113892 */,
     PRESHIFT(0x000d0000) /*  0.003173828 */,
    -PRESHIFT(0x004ba000) /* -0.018463135 */,
     PRESHIFT(0x003ca000) /*  0.014801025 */,
    -PRESHIFT(0x02233000) /* -0.133590698 */,
    -PRESHIFT(0x00ce4000) /* -0.050354004 */,
    -PRESHIFT(0x0ddca000) /* -0.866363525 */,
     PRESHIFT(0x1102f000) /*  1.063217163 */,
     PRESHIFT(0x04587000) /*  0.271591187 */,
     PRESHIFT(0x026cf000) /*  0.151596069 */,
     PRESHIFT(0x0056c000) /*  0.021179199 */,
     PRESHIFT(0x0074e000) /*  0.028533936 */,
    -PRESHIFT(0x0001d000) /* -0.000442505 */,
     PRESHIFT(0x0008b000) /*  0.002120972 */,
     PRESHIFT(0x00009000) /*  0.000137329 */ },
          { -PRESHIFT(0x00003000) /* -0.000045776 */,/* 12 */
    -PRESHIFT(0x0004f000) /* -0.001205444 */,
     PRESHIFT(0x000c8000) /*  0.003051758 */,
    -PRESHIFT(0x00503000) /* -0.019577026 */,
     PRESHIFT(0x0031a000) /*  0.012115479 */,
    -PRESHIFT(0x02326000) /* -0.137298584 */,
    -PRESHIFT(0x011b5000) /* -0.069168091 */,
    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
     PRESHIFT(0x10c54000) /*  1.048156738 */,
     PRESHIFT(0x03f1b000) /*  0.246505737 */,
     PRESHIFT(0x026ee000) /*  0.152069092 */,
     PRESHIFT(0x00447000) /*  0.016708374 */,
     PRESHIFT(0x00719000) /*  0.027725220 */,
    -PRESHIFT(0x00039000) /* -0.000869751 */,
     PRESHIFT(0x00084000) /*  0.002014160 */,
     PRESHIFT(0x00008000) /*  0.000122070 */,
    -PRESHIFT(0x00003000) /* -0.000045776 */,
    -PRESHIFT(0x0004f000) /* -0.001205444 */,
     PRESHIFT(0x000c8000) /*  0.003051758 */,
    -PRESHIFT(0x00503000) /* -0.019577026 */,
     PRESHIFT(0x0031a000) /*  0.012115479 */,
    -PRESHIFT(0x02326000) /* -0.137298584 */,
    -PRESHIFT(0x011b5000) /* -0.069168091 */,
    -PRESHIFT(0x0e3dd000) /* -0.890090942 */,
     PRESHIFT(0x10c54000) /*  1.048156738 */,
     PRESHIFT(0x03f1b000) /*  0.246505737 */,
     PRESHIFT(0x026ee000) /*  0.152069092 */,
     PRESHIFT(0x00447000) /*  0.016708374 */,
     PRESHIFT(0x00719000) /*  0.027725220 */,
    -PRESHIFT(0x00039000) /* -0.000869751 */,
     PRESHIFT(0x00084000) /*  0.002014160 */,
     PRESHIFT(0x00008000) /*  0.000122070 */ },
          { -PRESHIFT(0x00004000) /* -0.000061035 */,/* 13 */
    -PRESHIFT(0x00055000) /* -0.001296997 */,
     PRESHIFT(0x000bd000) /*  0.002883911 */,
    -PRESHIFT(0x0054c000) /* -0.020690918 */,
     PRESHIFT(0x0025d000) /*  0.009231567 */,
    -PRESHIFT(0x02403000) /* -0.140670776 */,
    -PRESHIFT(0x016ba000) /* -0.088775635 */,
    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
     PRESHIFT(0x1082d000) /*  1.031936646 */,
     PRESHIFT(0x038d4000) /*  0.221984863 */,
     PRESHIFT(0x026e7000) /*  0.151962280 */,
     PRESHIFT(0x0032e000) /*  0.012420654 */,
     PRESHIFT(0x006df000) /*  0.026840210 */,
    -PRESHIFT(0x00053000) /* -0.001266479 */,
     PRESHIFT(0x0007d000) /*  0.001907349 */,
     PRESHIFT(0x00007000) /*  0.000106812 */,
    -PRESHIFT(0x00004000) /* -0.000061035 */,
    -PRESHIFT(0x00055000) /* -0.001296997 */,
     PRESHIFT(0x000bd000) /*  0.002883911 */,
    -PRESHIFT(0x0054c000) /* -0.020690918 */,
     PRESHIFT(0x0025d000) /*  0.009231567 */,
    -PRESHIFT(0x02403000) /* -0.140670776 */,
    -PRESHIFT(0x016ba000) /* -0.088775635 */,
    -PRESHIFT(0x0e9be000) /* -0.913055420 */,
     PRESHIFT(0x1082d000) /*  1.031936646 */,
     PRESHIFT(0x038d4000) /*  0.221984863 */,
     PRESHIFT(0x026e7000) /*  0.151962280 */,
     PRESHIFT(0x0032e000) /*  0.012420654 */,
     PRESHIFT(0x006df000) /*  0.026840210 */,
    -PRESHIFT(0x00053000) /* -0.001266479 */,
     PRESHIFT(0x0007d000) /*  0.001907349 */,
     PRESHIFT(0x00007000) /*  0.000106812 */ },
          { -PRESHIFT(0x00004000) /* -0.000061035 */,/* 14 */
    -PRESHIFT(0x0005b000) /* -0.001388550 */,
     PRESHIFT(0x000b1000) /*  0.002700806 */,
    -PRESHIFT(0x00594000) /* -0.021789551 */,
     PRESHIFT(0x00192000) /*  0.006134033 */,
    -PRESHIFT(0x024c8000) /* -0.143676758 */,
    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
     PRESHIFT(0x103be000) /*  1.014617920 */,
     PRESHIFT(0x032b4000) /*  0.198059082 */,
     PRESHIFT(0x026bc000) /*  0.151306152 */,
     PRESHIFT(0x00221000) /*  0.008316040 */,
     PRESHIFT(0x006a2000) /*  0.025909424 */,
    -PRESHIFT(0x0006a000) /* -0.001617432 */,
     PRESHIFT(0x00075000) /*  0.001785278 */,
     PRESHIFT(0x00007000) /*  0.000106812 */,
    -PRESHIFT(0x00004000) /* -0.000061035 */,
    -PRESHIFT(0x0005b000) /* -0.001388550 */,
     PRESHIFT(0x000b1000) /*  0.002700806 */,
    -PRESHIFT(0x00594000) /* -0.021789551 */,
     PRESHIFT(0x00192000) /*  0.006134033 */,
    -PRESHIFT(0x024c8000) /* -0.143676758 */,
    -PRESHIFT(0x01bf2000) /* -0.109161377 */,
    -PRESHIFT(0x0ef69000) /* -0.935195923 */,
     PRESHIFT(0x103be000) /*  1.014617920 */,
     PRESHIFT(0x032b4000) /*  0.198059082 */,
     PRESHIFT(0x026bc000) /*  0.151306152 */,
     PRESHIFT(0x00221000) /*  0.008316040 */,
     PRESHIFT(0x006a2000) /*  0.025909424 */,
    -PRESHIFT(0x0006a000) /* -0.001617432 */,
     PRESHIFT(0x00075000) /*  0.001785278 */,
     PRESHIFT(0x00007000) /*  0.000106812 */ },
          { -PRESHIFT(0x00005000) /* -0.000076294 */,/* 15 */
    -PRESHIFT(0x00061000) /* -0.001480103 */,
     PRESHIFT(0x000a3000) /*  0.002487183 */,
    -PRESHIFT(0x005da000) /* -0.022857666 */,
     PRESHIFT(0x000b9000) /*  0.002822876 */,
    -PRESHIFT(0x02571000) /* -0.146255493 */,
    -PRESHIFT(0x0215c000) /* -0.130310059 */,
    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
     PRESHIFT(0x02cbf000) /*  0.174789429 */,
     PRESHIFT(0x0266e000) /*  0.150115967 */,
     PRESHIFT(0x00120000) /*  0.004394531 */,
     PRESHIFT(0x00662000) /*  0.024932861 */,
    -PRESHIFT(0x0007f000) /* -0.001937866 */,
     PRESHIFT(0x0006f000) /*  0.001693726 */,
     PRESHIFT(0x00006000) /*  0.000091553 */,
    -PRESHIFT(0x00005000) /* -0.000076294 */,
    -PRESHIFT(0x00061000) /* -0.001480103 */,
     PRESHIFT(0x000a3000) /*  0.002487183 */,
    -PRESHIFT(0x005da000) /* -0.022857666 */,
     PRESHIFT(0x000b9000) /*  0.002822876 */,
    -PRESHIFT(0x02571000) /* -0.146255493 */,
    -PRESHIFT(0x0215c000) /* -0.130310059 */,
    -PRESHIFT(0x0f4dc000) /* -0.956481934 */,
     PRESHIFT(0x0ff0a000) /*  0.996246338 */,
     PRESHIFT(0x02cbf000) /*  0.174789429 */,
     PRESHIFT(0x0266e000) /*  0.150115967 */,
     PRESHIFT(0x00120000) /*  0.004394531 */,
     PRESHIFT(0x00662000) /*  0.024932861 */,
    -PRESHIFT(0x0007f000) /* -0.001937866 */,
     PRESHIFT(0x0006f000) /*  0.001693726 */,
     PRESHIFT(0x00006000) /*  0.000091553 */ },
          { -PRESHIFT(0x00005000) /* -0.000076294 */,/* 16 */
    -PRESHIFT(0x00068000) /* -0.001586914 */,
     PRESHIFT(0x00092000) /*  0.002227783 */,
    -PRESHIFT(0x0061f000) /* -0.023910522 */,
    -PRESHIFT(0x0002d000) /* -0.000686646 */,
    -PRESHIFT(0x025ff000) /* -0.148422241 */,
    -PRESHIFT(0x026f7000) /* -0.152206421 */,
    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
     PRESHIFT(0x0fa13000) /*  0.976852417 */,
     PRESHIFT(0x026f7000) /*  0.152206421 */,
     PRESHIFT(0x025ff000) /*  0.148422241 */,
     PRESHIFT(0x0002d000) /*  0.000686646 */,
     PRESHIFT(0x0061f000) /*  0.023910522 */,
    -PRESHIFT(0x00092000) /* -0.002227783 */,
     PRESHIFT(0x00068000) /*  0.001586914 */,
     PRESHIFT(0x00005000) /*  0.000076294 */,
    -PRESHIFT(0x00005000) /* -0.000076294 */,
    -PRESHIFT(0x00068000) /* -0.001586914 */,
     PRESHIFT(0x00092000) /*  0.002227783 */,
    -PRESHIFT(0x0061f000) /* -0.023910522 */,
    -PRESHIFT(0x0002d000) /* -0.000686646 */,
    -PRESHIFT(0x025ff000) /* -0.148422241 */,
    -PRESHIFT(0x026f7000) /* -0.152206421 */,
    -PRESHIFT(0x0fa13000) /* -0.976852417 */,
     PRESHIFT(0x0fa13000) /*  0.976852417 */,
     PRESHIFT(0x026f7000) /*  0.152206421 */,
     PRESHIFT(0x025ff000) /*  0.148422241 */,
     PRESHIFT(0x0002d000) /*  0.000686646 */,
     PRESHIFT(0x0061f000) /*  0.023910522 */,
    -PRESHIFT(0x00092000) /* -0.002227783 */,
     PRESHIFT(0x00068000) /*  0.001586914 */,
     PRESHIFT(0x00005000) /*  0.000076294 */ }
diff --git a/core/multimedia/opieplayer/libmad/bit.c b/core/multimedia/opieplayer/libmad/bit.c
index 4a4661b..568d204 100644
--- a/core/multimedia/opieplayer/libmad/bit.c
+++ b/core/multimedia/opieplayer/libmad/bit.c
@@ -1,237 +1,237 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # ifdef HAVE_LIMITS_H
 #  include <limits.h>
 # else
 #  define CHAR_BIT  8
 # endif
 # include "bit.h"
 /*
 * This is the lookup table for computing the CRC-check word.
 * As described in section 2.4.3.1 and depicted in Figure A.9
 * of ISO/IEC 11172-3, the generator polynomial is:
 *
 * G(X) = X^16 + X^15 + X^2 + 1
 */
 static
 unsigned short const crc_table[256] = {
  0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
  0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
  0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
  0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
  0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
  0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
  0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
  0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
  0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
  0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
  0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
  0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
  0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
  0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
  0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
  0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
  0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
  0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
  0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
  0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
  0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
  0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
  0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
  0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
  0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
  0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
  0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
  0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
  0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
  0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
  0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
  0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202
 };
 # define CRC_POLY  0x8005
 /*
         * NAME:bit->init()
         * DESCRIPTION:initialize bit pointer struct
 */
 void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte)
 {
  bitptr->byte  = byte;
  bitptr->cache = 0;
  bitptr->left  = CHAR_BIT;
 }
 /*
         * NAME:bit->length()
         * DESCRIPTION:return number of bits between start and end points
 */
 unsigned int mad_bit_length(struct mad_bitptr const *begin,
                            struct mad_bitptr const *end)
 {
  return begin->left +
    CHAR_BIT * (end->byte - (begin->byte + 1)) + (CHAR_BIT - end->left);
 }
 /*
         * NAME:bit->nextbyte()
         * DESCRIPTION:return pointer to next unprocessed byte
 */
 unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr)
 {
  return bitptr->left == CHAR_BIT ? bitptr->byte : bitptr->byte + 1;
 }
 /*
         * NAME:bit->skip()
         * DESCRIPTION:advance bit pointer
 */
 void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len)
 {
  bitptr->byte += len / CHAR_BIT;
  bitptr->left -= len % CHAR_BIT;
  if (bitptr->left > CHAR_BIT) {
    bitptr->byte++;
    bitptr->left += CHAR_BIT;
  }
  if (bitptr->left < CHAR_BIT)
    bitptr->cache = *bitptr->byte;
 }
 /*
         * NAME:bit->read()
         * DESCRIPTION:read an arbitrary number of bits and return their UIMSBF value
 */
 unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
 {
  register unsigned long value;
  if (bitptr->left == CHAR_BIT)
    bitptr->cache = *bitptr->byte;
  if (len < bitptr->left) {
    value = (bitptr->cache & ((1 << bitptr->left) - 1)) >>
      (bitptr->left - len);
    bitptr->left -= len;
    return value;
  }
  /* remaining bits in current byte */
  value = bitptr->cache & ((1 << bitptr->left) - 1);
  len  -= bitptr->left;
  bitptr->byte++;
  bitptr->left = CHAR_BIT;
  /* more bytes */
  while (len >= CHAR_BIT) {
    value = (value << CHAR_BIT) | *bitptr->byte++;
    len  -= CHAR_BIT;
  }
  if (len > 0) {
    bitptr->cache = *bitptr->byte;
    value = (value << len) | (bitptr->cache >> (CHAR_BIT - len));
    bitptr->left -= len;
  }
  return value;
 }
 # if 0
 /*
         * NAME:bit->write()
         * DESCRIPTION:write an arbitrary number of bits
 */
 void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len,
                   unsigned long value)
 {
  unsigned char *ptr;
  ptr = (unsigned char *) bitptr->byte;
  /* ... */
 }
 # endif
 /*
         * NAME:bit->crc()
         * DESCRIPTION:compute CRC-check word
 */
 unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len,
                           unsigned short init)
 {
  register unsigned int crc;
  for (crc = init; len >= 32; len -= 32) {
    register unsigned long data;
    data = mad_bit_read(&bitptr, 32);
    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 24)) & 0xff];
    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 16)) & 0xff];
    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  8)) & 0xff];
    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  0)) & 0xff];
  }
  switch (len / 8) {
  case 3: crc = (crc << 8) ^
            crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
  case 2: crc = (crc << 8) ^
            crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
  case 1: crc = (crc << 8) ^
            crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
  len %= 8;
  case 0: break;
  }
  while (len--) {
    register unsigned int msb;
    msb = mad_bit_read(&bitptr, 1) ^ (crc >> 15);
    crc <<= 1;
    if (msb & 1)
      crc ^= CRC_POLY;
  }
  return crc & 0xffff;
 }
diff --git a/core/multimedia/opieplayer/libmad/bit.h b/core/multimedia/opieplayer/libmad/bit.h
index 3448d40..22ae66c 100644
--- a/core/multimedia/opieplayer/libmad/bit.h
+++ b/core/multimedia/opieplayer/libmad/bit.h
@@ -1,47 +1,47 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_BIT_H
 # define LIBMAD_BIT_H
 struct mad_bitptr {
  unsigned char const *byte;
  unsigned short cache;
  unsigned short left;
 };
 void mad_bit_init(struct mad_bitptr *, unsigned char const *);
        # define mad_bit_finish(bitptr)         /* nothing */
 unsigned int mad_bit_length(struct mad_bitptr const *,
                            struct mad_bitptr const *);
 # define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
 unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
 void mad_bit_skip(struct mad_bitptr *, unsigned int);
 unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
 void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
 unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/decoder.c b/core/multimedia/opieplayer/libmad/decoder.c
index b2b6cbb..d039bfb 100644
--- a/core/multimedia/opieplayer/libmad/decoder.c
+++ b/core/multimedia/opieplayer/libmad/decoder.c
@@ -1,570 +1,582 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 # endif
 # ifdef HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
 # endif
 # ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 # endif
 # ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 # endif
 # include <stdlib.h>
 # ifdef HAVE_ERRNO_H
 #  include <errno.h>
 # endif
 # include "stream.h"
 # include "frame.h"
 # include "synth.h"
 # include "decoder.h"
+/*
+         * NAME:decoder->init()
+         * DESCRIPTION:initialize a decoder object with callback routines
+ */
 void mad_decoder_init(struct mad_decoder *decoder, void *data,
                      enum mad_flow (*input_func)(void *,
                                                  struct mad_stream *),
                      enum mad_flow (*header_func)(void *,
                                                   struct mad_header const *),
                      enum mad_flow (*filter_func)(void *,
                                                   struct mad_stream const *,
                                                   struct mad_frame *),
                      enum mad_flow (*output_func)(void *,
                                                   struct mad_header const *,
                                                   struct mad_pcm *),
                      enum mad_flow (*error_func)(void *,
                                                  struct mad_stream *,
                                                  struct mad_frame *),
                      enum mad_flow (*message_func)(void *,
                                                    void *, unsigned int *))
 {
  decoder->mode         = -1;
  decoder->options      = 0;
  decoder->async.pid    = 0;
  decoder->async.in     = -1;
  decoder->async.out    = -1;
  decoder->sync         = 0;
  decoder->cb_data      = data;
  decoder->input_func   = input_func;
  decoder->header_func  = header_func;
  decoder->filter_func  = filter_func;
  decoder->output_func  = output_func;
  decoder->error_func   = error_func;
  decoder->message_func = message_func;
 }
 int mad_decoder_finish(struct mad_decoder *decoder)
 {
 # if defined(USE_ASYNC)
  if (decoder->mode == MAD_DECODER_MODE_ASYNC && decoder->async.pid) {
    pid_t pid;
    int status;
    close(decoder->async.in);
    do
      pid = waitpid(decoder->async.pid, &status, 0);
    while (pid == -1 && errno == EINTR);
    decoder->mode = -1;
    close(decoder->async.out);
    decoder->async.pid = 0;
    decoder->async.in  = -1;
    decoder->async.out = -1;
    if (pid == -1)
      return -1;
    return (!WIFEXITED(status) || WEXITSTATUS(status)) ? -1 : 0;
  }
 # endif
  return 0;
 }
 # if defined(USE_ASYNC)
 static
 enum mad_flow send_io(int fd, void const *data, size_t len)
 {
  char const *ptr = data;
  ssize_t count;
  while (len) {
    do
      count = write(fd, ptr, len);
    while (count == -1 && errno == EINTR);
    if (count == -1)
      return MAD_FLOW_BREAK;
    len -= count;
    ptr += count;
  }
  return MAD_FLOW_CONTINUE;
 }
 static
 enum mad_flow receive_io(int fd, void *buffer, size_t len)
 {
  char *ptr = buffer;
  ssize_t count;
  while (len) {
    do
      count = read(fd, ptr, len);
    while (count == -1 && errno == EINTR);
    if (count == -1)
      return (errno == EAGAIN) ? MAD_FLOW_IGNORE : MAD_FLOW_BREAK;
    else if (count == 0)
      return MAD_FLOW_STOP;
    len -= count;
    ptr += count;
  }
  return MAD_FLOW_CONTINUE;
 }
 static
 enum mad_flow receive_io_blocking(int fd, void *buffer, size_t len)
 {
  int flags, blocking;
  enum mad_flow result;
  flags = fcntl(fd, F_GETFL);
  if (flags == -1)
    return MAD_FLOW_BREAK;
  blocking = flags & ~O_NONBLOCK;
  if (blocking != flags &&
      fcntl(fd, F_SETFL, blocking) == -1)
    return MAD_FLOW_BREAK;
  result = receive_io(fd, buffer, len);
  if (flags != blocking &&
      fcntl(fd, F_SETFL, flags) == -1)
    return MAD_FLOW_BREAK;
  return result;
 }
 static
 enum mad_flow send(int fd, void const *message, unsigned int size)
 {
  enum mad_flow result;
  /* send size */
  result = send_io(fd, &size, sizeof(size));
  /* send message */
  if (result == MAD_FLOW_CONTINUE)
    result = send_io(fd, message, size);
  return result;
 }
 static
 enum mad_flow receive(int fd, void **message, unsigned int *size)
 {
  enum mad_flow result;
  unsigned int actual;
  if (*message == 0)
    *size = 0;
  /* receive size */
  result = receive_io(fd, &actual, sizeof(actual));
  /* receive message */
  if (result == MAD_FLOW_CONTINUE) {
    if (actual > *size)
      actual -= *size;
    else {
      *size  = actual;
      actual = 0;
    }
    if (*size > 0) {
      if (*message == 0) {
        *message = malloc(*size);
        if (*message == 0)
          return MAD_FLOW_BREAK;
      }
      result = receive_io_blocking(fd, *message, *size);
    }
    /* throw away remainder of message */
    while (actual && result == MAD_FLOW_CONTINUE) {
      char sink[256];
      unsigned int len;
      len = actual > sizeof(sink) ? sizeof(sink) : actual;
      result = receive_io_blocking(fd, sink, len);
      actual -= len;
    }
  }
  return result;
 }
 static
 enum mad_flow check_message(struct mad_decoder *decoder)
 {
  enum mad_flow result;
  void *message = 0;
  unsigned int size;
  result = receive(decoder->async.in, &message, &size);
  if (result == MAD_FLOW_CONTINUE) {
    if (decoder->message_func == 0)
      size = 0;
    else {
      result = decoder->message_func(decoder->cb_data, message, &size);
      if (result == MAD_FLOW_IGNORE ||
          result == MAD_FLOW_BREAK)
        size = 0;
    }
    if (send(decoder->async.out, message, size) != MAD_FLOW_CONTINUE)
      result = MAD_FLOW_BREAK;
  }
  if (message)
    free(message);
  return result;
 }
 # endif
 static
 enum mad_flow error_default(void *data, struct mad_stream *stream,
                            struct mad_frame *frame)
 {
  int *bad_last_frame = data;
  switch (stream->error) {
  case MAD_ERROR_BADCRC:
    if (*bad_last_frame)
      mad_frame_mute(frame);
    else
      *bad_last_frame = 1;
    return MAD_FLOW_IGNORE;
  default:
    return MAD_FLOW_CONTINUE;
  }
 }
 static
 int run_sync(struct mad_decoder *decoder)
 {
  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
  void *error_data;
  int bad_last_frame = 0;
  struct mad_stream *stream;
  struct mad_frame *frame;
  struct mad_synth *synth;
  int result = 0;
  if (decoder->input_func == 0)
    return 0;
  if (decoder->error_func) {
    error_func = decoder->error_func;
    error_data = decoder->cb_data;
  }
  else {
    error_func = error_default;
    error_data = &bad_last_frame;
  }
  stream = &decoder->sync->stream;
  frame  = &decoder->sync->frame;
  synth  = &decoder->sync->synth;
  mad_stream_init(stream);
  mad_frame_init(frame);
  mad_synth_init(synth);
  mad_stream_options(stream, decoder->options);
  do {
    switch (decoder->input_func(decoder->cb_data, stream)) {
    case MAD_FLOW_STOP:
      goto done;
    case MAD_FLOW_BREAK:
      goto fail;
    case MAD_FLOW_IGNORE:
      continue;
    case MAD_FLOW_CONTINUE:
      break;
    }
    while (1) {
 # if defined(USE_ASYNC)
      if (decoder->mode == MAD_DECODER_MODE_ASYNC) {
        switch (check_message(decoder)) {
        case MAD_FLOW_IGNORE:
        case MAD_FLOW_CONTINUE:
          break;
        case MAD_FLOW_BREAK:
          goto fail;
        case MAD_FLOW_STOP:
          goto done;
        }
      }
 # endif
      if (decoder->header_func) {
        if (mad_header_decode(&frame->header, stream) == -1) {
          if (!MAD_RECOVERABLE(stream->error))
            break;
          switch (error_func(error_data, stream, frame)) {
          case MAD_FLOW_STOP:
            goto done;
          case MAD_FLOW_BREAK:
            goto fail;
          case MAD_FLOW_IGNORE:
          case MAD_FLOW_CONTINUE:
          default:
            continue;
          }
        }
        switch (decoder->header_func(decoder->cb_data, &frame->header)) {
        case MAD_FLOW_STOP:
          goto done;
        case MAD_FLOW_BREAK:
          goto fail;
        case MAD_FLOW_IGNORE:
          continue;
        case MAD_FLOW_CONTINUE:
          break;
        }
      }
      if (mad_frame_decode(frame, stream) == -1) {
        if (!MAD_RECOVERABLE(stream->error))
          break;
        switch (error_func(error_data, stream, frame)) {
        case MAD_FLOW_STOP:
          goto done;
        case MAD_FLOW_BREAK:
          goto fail;
        case MAD_FLOW_IGNORE:
          break;
        case MAD_FLOW_CONTINUE:
        default:
          continue;
        }
      }
      else
        bad_last_frame = 0;
      if (decoder->filter_func) {
        switch (decoder->filter_func(decoder->cb_data, stream, frame)) {
        case MAD_FLOW_STOP:
          goto done;
        case MAD_FLOW_BREAK:
          goto fail;
        case MAD_FLOW_IGNORE:
          continue;
        case MAD_FLOW_CONTINUE:
          break;
        }
      }
      mad_synth_frame(synth, frame);
      if (decoder->output_func) {
        switch (decoder->output_func(decoder->cb_data,
                                     &frame->header, &synth->pcm)) {
        case MAD_FLOW_STOP:
          goto done;
        case MAD_FLOW_BREAK:
          goto fail;
        case MAD_FLOW_IGNORE:
        case MAD_FLOW_CONTINUE:
          break;
        }
      }
    }
  }
  while (stream->error == MAD_ERROR_BUFLEN);
 fail:
  result = -1;
 done:
  mad_synth_finish(synth);
  mad_frame_finish(frame);
  mad_stream_finish(stream);
  return result;
 }
 # if defined(USE_ASYNC)
 static
 int run_async(struct mad_decoder *decoder)
 {
  pid_t pid;
  int ptoc[2], ctop[2], flags;
  if (pipe(ptoc) == -1)
    return -1;
  if (pipe(ctop) == -1) {
    close(ptoc[0]);
    close(ptoc[1]);
    return -1;
  }
  flags = fcntl(ptoc[0], F_GETFL);
  if (flags == -1 ||
      fcntl(ptoc[0], F_SETFL, flags | O_NONBLOCK) == -1) {
    close(ctop[0]);
    close(ctop[1]);
    close(ptoc[0]);
    close(ptoc[1]);
    return -1;
  }
  pid = fork();
  if (pid == -1) {
    close(ctop[0]);
    close(ctop[1]);
    close(ptoc[0]);
    close(ptoc[1]);
    return -1;
  }
  decoder->async.pid = pid;
  if (pid) {
    /* parent */
    close(ptoc[0]);
    close(ctop[1]);
    decoder->async.in  = ctop[0];
    decoder->async.out = ptoc[1];
    return 0;
  }
  /* child */
  close(ptoc[1]);
  close(ctop[0]);
  decoder->async.in  = ptoc[0];
  decoder->async.out = ctop[1];
  _exit(run_sync(decoder));
  /* not reached */
  return -1;
 }
 # endif
+/*
+         * NAME:decoder->run()
+         * DESCRIPTION:run the decoder thread either synchronously or asynchronously
+ */
 int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
 {
  int result;
  int (*run)(struct mad_decoder *) = 0;
  switch (decoder->mode = mode) {
  case MAD_DECODER_MODE_SYNC:
    run = run_sync;
    break;
  case MAD_DECODER_MODE_ASYNC:
 # if defined(USE_ASYNC)
    run = run_async;
 # endif
    break;
  }
  if (run == 0)
    return -1;
  decoder->sync = malloc(sizeof(*decoder->sync));
  if (decoder->sync == 0)
    return -1;
  result = run(decoder);
  free(decoder->sync);
  decoder->sync = 0;
  return result;
 }
+/*
+         * NAME:decoder->message()
+         * DESCRIPTION:send a message to and receive a reply from the decoder process
+ */
 int mad_decoder_message(struct mad_decoder *decoder,
                        void *message, unsigned int *len)
 {
 # if defined(USE_ASYNC)
  if (decoder->mode != MAD_DECODER_MODE_ASYNC ||
      send(decoder->async.out, message, *len) != MAD_FLOW_CONTINUE ||
      receive(decoder->async.in, &message, len) != MAD_FLOW_CONTINUE)
    return -1;
  return 0;
 # else
  return -1;
 # endif
 }
diff --git a/core/multimedia/opieplayer/libmad/decoder.h b/core/multimedia/opieplayer/libmad/decoder.h
index f34150d..714e72c 100644
--- a/core/multimedia/opieplayer/libmad/decoder.h
+++ b/core/multimedia/opieplayer/libmad/decoder.h
@@ -1,91 +1,91 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_DECODER_H
 # define LIBMAD_DECODER_H
 # include "stream.h"
 # include "frame.h"
 # include "synth.h"
 enum mad_decoder_mode {
  MAD_DECODER_MODE_SYNC  = 0,
  MAD_DECODER_MODE_ASYNC
 };
 enum mad_flow {
          MAD_FLOW_CONTINUE = 0x0000,/* continue normally */
          MAD_FLOW_STOP     = 0x0010,/* stop decoding normally */
          MAD_FLOW_BREAK    = 0x0011,/* stop decoding and signal an error */
          MAD_FLOW_IGNORE   = 0x0020/* ignore the current frame */
 };
 struct mad_decoder {
  enum mad_decoder_mode mode;
  int options;
  struct {
    long pid;
    int in;
    int out;
  } async;
  struct {
    struct mad_stream stream;
    struct mad_frame frame;
    struct mad_synth synth;
  } *sync;
  void *cb_data;
  enum mad_flow (*input_func)(void *, struct mad_stream *);
  enum mad_flow (*header_func)(void *, struct mad_header const *);
  enum mad_flow (*filter_func)(void *,
                               struct mad_stream const *, struct mad_frame *);
  enum mad_flow (*output_func)(void *,
                               struct mad_header const *, struct mad_pcm *);
  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
  enum mad_flow (*message_func)(void *, void *, unsigned int *);
 };
 void mad_decoder_init(struct mad_decoder *, void *,
                      enum mad_flow (*)(void *, struct mad_stream *),
                      enum mad_flow (*)(void *, struct mad_header const *),
                      enum mad_flow (*)(void *,
                                        struct mad_stream const *,
                                        struct mad_frame *),
                      enum mad_flow (*)(void *,
                                        struct mad_header const *,
                                        struct mad_pcm *),
                      enum mad_flow (*)(void *,
                                        struct mad_stream *,
                                        struct mad_frame *),
                      enum mad_flow (*)(void *, void *, unsigned int *));
 int mad_decoder_finish(struct mad_decoder *);
 # define mad_decoder_options(decoder, opts)  \
    ((void) ((decoder)->options = (opts)))
 int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
 int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/fixed.c b/core/multimedia/opieplayer/libmad/fixed.c
index af1e87e..e71418a 100644
--- a/core/multimedia/opieplayer/libmad/fixed.c
+++ b/core/multimedia/opieplayer/libmad/fixed.c
@@ -1,37 +1,81 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include "fixed.h"
 /*
         * NAME:fixed->abs()
         * DESCRIPTION:return absolute value of a fixed-point number
 */
 mad_fixed_t mad_f_abs(mad_fixed_t x)
 {
  return x < 0 ? -x : x;
 }
+/*
+         * NAME:fixed->div()
+         * DESCRIPTION:perform division using fixed-point math
+ */
+mad_fixed_t mad_f_div(mad_fixed_t x, mad_fixed_t y)
+{
+  mad_fixed_t q, r;
+  unsigned int bits;
+  q = mad_f_abs(x / y);
+  if (x < 0) {
+    x = -x;
+    y = -y;
+  }
+  r = x % y;
+  if (y < 0) {
+    x = -x;
+    y = -y;
+  }
+  if (q > mad_f_intpart(MAD_F_MAX) &&
+      !(q == -mad_f_intpart(MAD_F_MIN) && r == 0 && (x < 0) != (y < 0)))
+    return 0;
+  for (bits = MAD_F_FRACBITS; bits && r; --bits) {
+    q <<= 1, r <<= 1;
+    if (r >= y)
+      r -= y, ++q;
+  }
+  /* round */
+  if (2 * r >= y)
+    ++q;
+  /* fix sign */
+  if ((x < 0) != (y < 0))
+    q = -q;
+  return q << bits;
+}
diff --git a/core/multimedia/opieplayer/libmad/fixed.h b/core/multimedia/opieplayer/libmad/fixed.h
index c9b98ca..baa7dc5 100644
--- a/core/multimedia/opieplayer/libmad/fixed.h
+++ b/core/multimedia/opieplayer/libmad/fixed.h
@@ -1,476 +1,499 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_FIXED_H
 # define LIBMAD_FIXED_H
 # if SIZEOF_INT >= 4
 typedef   signed int mad_fixed_t;
 typedef   signed int mad_fixed64hi_t;
 typedef unsigned int mad_fixed64lo_t;
 # else
 typedef   signed long mad_fixed_t;
 typedef   signed long mad_fixed64hi_t;
 typedef unsigned long mad_fixed64lo_t;
 # endif
 # if defined(_MSC_VER)
 #  define mad_fixed64_t  signed __int64
 # elif 1 || defined(__GNUC__)
 #  define mad_fixed64_t  signed long long
 # endif
 # if defined(FPM_FLOAT)
 typedef double mad_sample_t;
 # else
 typedef mad_fixed_t mad_sample_t;
 # endif
 /*
 * Fixed-point format: 0xABBBBBBB
 * A == whole part      (sign + 3 bits)
 * B == fractional part (28 bits)
 *
 * Values are signed two's complement, so the effective range is:
 * 0x80000000 to 0x7fffffff
 *       -8.0 to +7.9999999962747097015380859375
 *
 * The smallest representable value is:
 * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
 *
 * 28 bits of fractional accuracy represent about
 * 8.6 digits of decimal accuracy.
 *
 * Fixed-point numbers can be added or subtracted as normal
 * integers, but multiplication requires shifting the 64-bit result
 * from 56 fractional bits back to 28 (and rounding.)
 *
 * Changing the definition of MAD_F_FRACBITS is only partially
 * supported, and must be done with care.
 */
        # define MAD_F_FRACBITS         28
 # if MAD_F_FRACBITS == 28
        #  define MAD_F(x)      ((mad_fixed_t) (x##L))
 # else
 #  if MAD_F_FRACBITS < 28
 #   warning "MAD_F_FRACBITS < 28"
        #   define MAD_F(x)     ((mad_fixed_t)  \
                                 (((x##L) +  \
                                   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
                                  (28 - MAD_F_FRACBITS)))
 #  elif MAD_F_FRACBITS > 28
 #   error "MAD_F_FRACBITS > 28 not currently supported"
        #   define MAD_F(x)     ((mad_fixed_t)  \
                                 ((x##L) << (MAD_F_FRACBITS - 28)))
 #  endif
 # endif
        # define MAD_F_MIN      ((mad_fixed_t) -0x80000000L)
        # define MAD_F_MAX      ((mad_fixed_t) +0x7fffffffL)
        # define MAD_F_ONE      MAD_F(0x10000000)
        # define mad_f_tofixed(x)((mad_fixed_t)  \
                                 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
        # define mad_f_todouble(x)((double)  \
                                 ((x) / (double) (1L << MAD_F_FRACBITS)))
        # define mad_f_intpart(x)((x) >> MAD_F_FRACBITS)
        # define mad_f_fracpart(x)((x) & ((1L << MAD_F_FRACBITS) - 1))
                                /* (x should be positive) */
        # define mad_f_fromint(x)((x) << MAD_F_FRACBITS)
        # define mad_f_add(x, y)((x) + (y))
        # define mad_f_sub(x, y)((x) - (y))
 # if defined(FPM_FLOAT)
 #  error "FPM_FLOAT not yet supported"
 #  undef MAD_F
        #  define MAD_F(x)      mad_f_todouble(x)
        #  define mad_f_mul(x, y)((x) * (y))
 #  define mad_f_scale64
 #  undef ASO_ZEROCHECK
 # elif defined(FPM_64BIT)
 /*
 * This version should be the most accurate if 64-bit types are supported by
 * the compiler, although it may not be the most efficient.
 */
 #  if defined(OPT_ACCURACY)
 #   define mad_f_mul(x, y)  \
    ((mad_fixed_t)  \
     ((((mad_fixed64_t) (x) * (y)) +  \
       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
 #  else
 #   define mad_f_mul(x, y)  \
    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
 #  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- Intel --------------------------------------------------------------- */
 # elif defined(FPM_INTEL)
 #  if defined(_MSC_VER)
 #   pragma warning(push)
 #   pragma warning(disable: 4035)  /* no return value */
 static __forceinline
 mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
 {
  enum {
    fracbits = MAD_F_FRACBITS
  };
  __asm {
    mov eax, x
    imul y
    shrd eax, edx, fracbits
  }
  /* implicit return of eax */
 }
 #   pragma warning(pop)
        #   define mad_f_mul    mad_f_mul_inline
 #   define mad_f_scale64
 #  else
 /*
 * This Intel version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
 #   define MAD_F_MLX(hi, lo, x, y)  \
    asm ("imull %3"  \
         : "=a" (lo), "=d" (hi)  \
         : "%a" (x), "rm" (y)  \
         : "cc")
 #   if defined(OPT_ACCURACY)
 /*
 * This gives best accuracy but is not very fast.
 */
 #    define MAD_F_MLA(hi, lo, x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
       asm ("addl %2,%0\n\t"  \
            "adcl %3,%1"  \
            : "=rm" (lo), "=rm" (hi)  \
            : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
            : "cc");  \
    })
 #   endif  /* OPT_ACCURACY */
 #   if defined(OPT_ACCURACY)
 /*
 * Surprisingly, this is faster than SHRD followed by ADC.
 */
 #    define mad_f_scale64(hi, lo)  \
    ({ mad_fixed64hi_t __hi_;  \
       mad_fixed64lo_t __lo_;  \
       mad_fixed_t __result;  \
       asm ("addl %4,%2\n\t"  \
            "adcl %5,%3"  \
            : "=rm" (__lo_), "=rm" (__hi_)  \
            : "0" (lo), "1" (hi),  \
              "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
            : "cc");  \
       asm ("shrdl %3,%2,%1"  \
            : "=rm" (__result)  \
            : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
+#   elif defined(OPT_INTEL)
+/*
+ * Alternate Intel scaling that may or may not perform better.
+ */
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("shrl %3,%1\n\t"  \
+            "shll %4,%2\n\t"  \
+            "orl %2,%1"  \
+            : "=rm" (__result)  \
+            : "0" (lo), "r" (hi),  \
+              "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
+            : "cc");  \
+       __result;  \
+    })
 #   else
 #    define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
       asm ("shrdl %3,%2,%1"  \
            : "=rm" (__result)  \
            : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
 #   endif  /* OPT_ACCURACY */
 #   define MAD_F_SCALEBITS  MAD_F_FRACBITS
 #  endif
 /* --- ARM ----------------------------------------------------------------- */
 # elif defined(FPM_ARM)
 /* 
 * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
 * least significant bit is properly rounded at no CPU cycle cost!
 */
 # if 1
 /*
- * There's a bug somewhere, possibly in the compiler, that sometimes makes
+ * This is faster than the default implementation via MAD_F_MLX() and
- * this necessary instead of the default implementation via MAD_F_MLX and
+ * mad_f_scale64().
- * mad_f_scale64. It may be related to the use (or lack) of
- * -finline-functions and/or -fstrength-reduce.
- *
- * This is also apparently faster than MAD_F_MLX/mad_f_scale64.
 */
 #  define mad_f_mul(x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       mad_fixed_t __result;  \
               asm ("smull%0, %1, %3, %4\n\t"  \
                    "movs%0, %0, lsr %5\n\t"  \
                    "adc%2, %0, %1, lsl %6"  \
            : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
            : "%r" (x), "r" (y),  \
              "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
 # endif
 #  define MAD_F_MLX(hi, lo, x, y)  \
            asm ("smull%0, %1, %2, %3"  \
         : "=&r" (lo), "=&r" (hi)  \
         : "%r" (x), "r" (y))
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("smlal%0, %1, %2, %3"  \
         : "+r" (lo), "+r" (hi)  \
         : "%r" (x), "r" (y))
 #  define MAD_F_MLN(hi, lo)  \
            asm ("rsbs%0, %2, #0\n\t"  \
                 "rsc%1, %3, #0"  \
         : "=r" (lo), "=r" (hi)  \
         : "0" (lo), "1" (hi)  \
         : "cc")
 #  define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
               asm ("movs%0, %1, lsr %3\n\t"  \
                    "adc%0, %0, %2, lsl %4"  \
-            : "=r" (__result)  \
+            : "=&r" (__result)  \
            : "r" (lo), "r" (hi),  \
              "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- MIPS ---------------------------------------------------------------- */
 # elif defined(FPM_MIPS)
 /*
 * This MIPS version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
            asm ("mult%2,%3"  \
         : "=l" (lo), "=h" (hi)  \
         : "%r" (x), "r" (y))
 # if defined(HAVE_MADD_ASM)
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("madd%2,%3"  \
         : "+l" (lo), "+h" (hi)  \
         : "%r" (x), "r" (y))
 # elif defined(HAVE_MADD16_ASM)
 /*
 * This loses significant accuracy due to the 16-bit integer limit in the
 * multiply/accumulate instruction.
 */
 #  define MAD_F_ML0(hi, lo, x, y)  \
            asm ("mult%2,%3"  \
         : "=l" (lo), "=h" (hi)  \
         : "%r" ((x) >> 12), "r" ((y) >> 16))
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("madd16%2,%3"  \
         : "+l" (lo), "+h" (hi)  \
         : "%r" ((x) >> 12), "r" ((y) >> 16))
 #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
 # endif
 # if defined(OPT_SPEED)
 #  define mad_f_scale64(hi, lo)  \
    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 # endif
 /* --- SPARC --------------------------------------------------------------- */
 # elif defined(FPM_SPARC)
 /*
 * This SPARC V8 version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
    asm ("smul %2, %3, %0\n\t"  \
         "rd %%y, %1"  \
         : "=r" (lo), "=r" (hi)  \
         : "%r" (x), "rI" (y))
 /* --- PowerPC ------------------------------------------------------------- */
 # elif defined(FPM_PPC)
 /*
- * This PowerPC version is tuned for the 4xx embedded processors. It is
+ * This PowerPC version is fast and accurate; the disposition of the least
- * effectively a tuned version of FPM_64BIT. It is a little faster and just
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- * as accurate. The disposition of the least significant bit depends on
- * OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mulhw %1, %2, %3\n\t"  \
+    do {  \
-         "mullw %0, %2, %3"  \
+      asm ("mullw %0,%1,%2"  \
-         : "=&r" (lo), "=&r" (hi)  \
+           : "=r" (lo)  \
-         : "%r" (x), "r" (y))
+           : "%r" (x), "r" (y));  \
+      asm ("mulhw %0,%1,%2"  \
+           : "=r" (hi)  \
+           : "%r" (x), "r" (y));  \
+    }  \
+    while (0)
-#  define MAD_F_MLA(hi, lo, x, y)  \
+#  if defined(OPT_ACCURACY)
+/*
+ * This gives best accuracy but is not very fast.
+ */
+#   define MAD_F_MLA(hi, lo, x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0, %2, %3\n\t"  \
+       asm ("addc %0,%2,%3\n\t"  \
-            "adde %1, %4, %5"  \
+            "adde %1,%4,%5"  \
            : "=r" (lo), "=r" (hi)  \
-            : "%r" (__lo), "0" (lo), "%r" (__hi), "1" (hi));  \
+            : "%r" (lo), "r" (__lo),  \
+              "%r" (hi), "r" (__hi)  \
+            : "xer");  \
    })
+#  endif
 #  if defined(OPT_ACCURACY)
 /*
- * This is accurate and ~2 - 2.5 times slower than the unrounded version.
+ * This is slower than the truncating version below it.
- *
- * The __volatile__ improves the generated code by another 5% (fewer spills
- * to memory); eventually they should be removed.
 */
 #   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
+    ({ mad_fixed_t __result, __round;  \
-       mad_fixed64hi_t __hi_;  \
+       asm ("rotrwi %0,%1,%2"  \
-       mad_fixed64lo_t __lo_;  \
+            : "=r" (__result)  \
-       asm __volatile__ ("addc %0, %2, %4\n\t"  \
+            : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-                         "addze %1, %3"  \
+       asm ("extrwi %0,%1,1,0"  \
-            : "=r" (__lo_), "=r" (__hi_)  \
+            : "=r" (__round)  \
-            : "r" (lo), "r" (hi), "r" (1 << (MAD_F_SCALEBITS - 1)));  \
+            : "r" (__result));  \
-       asm __volatile__ ("rlwinm %0, %2,32-%3,0,%3-1\n\t"  \
+       asm ("insrwi %0,%1,%2,0"  \
-                         "rlwimi %0, %1,32-%3,%3,31"  \
+            : "+r" (__result)  \
-            : "=&r" (__result)  \
+            : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-            : "r" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS));  \
+       asm ("add %0,%1,%2"  \
-            __result;  \
+            : "=r" (__result)  \
+            : "%r" (__result), "r" (__round));  \
+       __result;  \
    })
 #  else
 #   define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
-       asm ("rlwinm %0, %2,32-%3,0,%3-1\n\t"  \
+       asm ("rotrwi %0,%1,%2"  \
-            "rlwimi %0, %1,32-%3,%3,31"  \
            : "=r" (__result)  \
-            : "r" (lo), "r" (hi), "I" (MAD_F_SCALEBITS));  \
+            : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-            __result;  \
+       asm ("insrwi %0,%1,%2,0"  \
+            : "+r" (__result)  \
+            : "r" (hi), "i" (MAD_F_SCALEBITS));  \
+       __result;  \
    })
-#  endif  /* OPT_ACCURACY */
+#  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- Default ------------------------------------------------------------- */
 # elif defined(FPM_DEFAULT)
 /*
 * This version is the most portable but it loses significant accuracy.
 * Furthermore, accuracy is biased against the second argument, so care
 * should be taken when ordering operands.
 *
 * The scale factors are constant as this is not used with SSO.
 *
 * Pre-rounding is required to stay within the limits of compliance.
 */
 #  if defined(OPT_SPEED)
        #   define mad_f_mul(x, y)(((x) >> 12) * ((y) >> 16))
 #  else
        #   define mad_f_mul(x, y)((((x) + (1L << 11)) >> 12) *  \
                                 (((y) + (1L << 15)) >> 16))
 #  endif
 /* ------------------------------------------------------------------------- */
 # else
 #  error "no FPM selected"
 # endif
 /* default implementations */
 # if !defined(mad_f_mul)
 #  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
+    ({ register mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
+       register mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
       mad_f_scale64(__hi, __lo);  \
    })
 # endif
 # if !defined(MAD_F_MLA)
        #  define MAD_F_ML0(hi, lo, x, y)((lo)  = mad_f_mul((x), (y)))
        #  define MAD_F_MLA(hi, lo, x, y)((lo) += mad_f_mul((x), (y)))
        #  define MAD_F_MLN(hi, lo)     ((lo)  = -(lo))
        #  define MAD_F_MLZ(hi, lo)     ((void) (hi), (mad_fixed_t) (lo))
 # endif
 # if !defined(MAD_F_ML0)
        #  define MAD_F_ML0(hi, lo, x, y)MAD_F_MLX((hi), (lo), (x), (y))
 # endif
 # if !defined(MAD_F_MLN)
        #  define MAD_F_MLN(hi, lo)     ((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
 # endif
 # if !defined(MAD_F_MLZ)
        #  define MAD_F_MLZ(hi, lo)     mad_f_scale64((hi), (lo))
 # endif
 # if !defined(mad_f_scale64)
 #  if defined(OPT_ACCURACY)
 #   define mad_f_scale64(hi, lo)  \
    ((((mad_fixed_t)  \
       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
        ((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
 #  else
 #   define mad_f_scale64(hi, lo)  \
    ((mad_fixed_t)  \
     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
      ((lo) >> MAD_F_SCALEBITS)))
 #  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 # endif
-/* miscellaneous C routines */
+/* C routines */
 mad_fixed_t mad_f_abs(mad_fixed_t);
+mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/frame.c b/core/multimedia/opieplayer/libmad/frame.c
index bf15e7f..3aacb56 100644
--- a/core/multimedia/opieplayer/libmad/frame.c
+++ b/core/multimedia/opieplayer/libmad/frame.c
@@ -1,499 +1,503 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include <stdlib.h>
 # include "bit.h"
 # include "stream.h"
 # include "frame.h"
 # include "timer.h"
 # include "layer12.h"
 # include "layer3.h"
 static
 unsigned long const bitrate_table[5][15] = {
  /* MPEG-1 */
  { 0,  32000,  64000,  96000, 128000, 160000, 192000, 224000,  /* Layer I   */
       256000, 288000, 320000, 352000, 384000, 416000, 448000 },
  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer II  */
       128000, 160000, 192000, 224000, 256000, 320000, 384000 },
  { 0,  32000,  40000,  48000,  56000,  64000,  80000,  96000,  /* Layer III */
       112000, 128000, 160000, 192000, 224000, 256000, 320000 },
  /* MPEG-2 LSF */
  { 0,  32000,  48000,  56000,  64000,  80000,  96000, 112000,  /* Layer I   */
       128000, 144000, 160000, 176000, 192000, 224000, 256000 },
  { 0,   8000,  16000,  24000,  32000,  40000,  48000,  56000,  /* Layers    */
        64000,  80000,  96000, 112000, 128000, 144000, 160000 } /* II & III  */
 };
 static
 unsigned int const samplerate_table[3] = { 44100, 48000, 32000 };
 static
 int (*const decoder_table[3])(struct mad_stream *, struct mad_frame *) = {
  mad_layer_I,
  mad_layer_II,
  mad_layer_III
 };
 /*
         * NAME:header->init()
         * DESCRIPTION:initialize header struct
 */
 void mad_header_init(struct mad_header *header)
 {
  header->layer          = 0;
  header->mode           = 0;
  header->mode_extension = 0;
  header->emphasis       = 0;
  header->bitrate        = 0;
  header->samplerate     = 0;
  header->crc_check      = 0;
  header->crc_target     = 0;
  header->flags          = 0;
  header->private_bits   = 0;
  header->duration       = mad_timer_zero;
 }
 /*
         * NAME:frame->init()
         * DESCRIPTION:initialize frame struct
 */
 void mad_frame_init(struct mad_frame *frame)
 {
  mad_header_init(&frame->header);
  frame->options = 0;
  frame->overlap = 0;
  mad_frame_mute(frame);
 }
 /*
         * NAME:frame->finish()
         * DESCRIPTION:deallocate any dynamic memory associated with frame
 */
 void mad_frame_finish(struct mad_frame *frame)
 {
  mad_header_finish(&frame->header);
  if (frame->overlap) {
    free(frame->overlap);
    frame->overlap = 0;
  }
 }
 /*
         * NAME:decode_header()
         * DESCRIPTION:read header data and following CRC word
 */
 static
 int decode_header(struct mad_header *header, struct mad_stream *stream)
 {
  unsigned int index;
  header->flags        = 0;
  header->private_bits = 0;
  /* header() */
  /* syncword */
  mad_bit_skip(&stream->ptr, 11);
  /* MPEG 2.5 indicator (really part of syncword) */
  if (mad_bit_read(&stream->ptr, 1) == 0)
    header->flags |= MAD_FLAG_MPEG_2_5_EXT;
  /* ID */
  if (mad_bit_read(&stream->ptr, 1) == 0)
    header->flags |= MAD_FLAG_LSF_EXT;
  else if (header->flags & MAD_FLAG_MPEG_2_5_EXT) {
    stream->error = MAD_ERROR_LOSTSYNC;
    return -1;
  }
  /* layer */
  header->layer = 4 - mad_bit_read(&stream->ptr, 2);
  if (header->layer == 4) {
    stream->error = MAD_ERROR_BADLAYER;
    return -1;
  }
  /* protection_bit */
  if (mad_bit_read(&stream->ptr, 1) == 0) {
    header->flags    |= MAD_FLAG_PROTECTION;
    header->crc_check = mad_bit_crc(stream->ptr, 16, 0xffff);
  }
  /* bitrate_index */
  index = mad_bit_read(&stream->ptr, 4);
  if (index == 15) {
    stream->error = MAD_ERROR_BADBITRATE;
    return -1;
  }
  if (header->flags & MAD_FLAG_LSF_EXT)
    header->bitrate = bitrate_table[3 + (header->layer >> 1)][index];
  else
    header->bitrate = bitrate_table[header->layer - 1][index];
  /* sampling_frequency */
  index = mad_bit_read(&stream->ptr, 2);
  if (index == 3) {
    stream->error = MAD_ERROR_BADSAMPLERATE;
    return -1;
  }
  header->samplerate = samplerate_table[index];
  if (header->flags & MAD_FLAG_LSF_EXT) {
    header->samplerate /= 2;
    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
      header->samplerate /= 2;
  }
  /* padding_bit */
  if (mad_bit_read(&stream->ptr, 1))
    header->flags |= MAD_FLAG_PADDING;
  /* private_bit */
  if (mad_bit_read(&stream->ptr, 1))
    header->private_bits |= MAD_PRIVATE_HEADER;
  /* mode */
  header->mode = 3 - mad_bit_read(&stream->ptr, 2);
  /* mode_extension */
  header->mode_extension = mad_bit_read(&stream->ptr, 2);
  /* copyright */
  if (mad_bit_read(&stream->ptr, 1))
    header->flags |= MAD_FLAG_COPYRIGHT;
  /* original/copy */
  if (mad_bit_read(&stream->ptr, 1))
    header->flags |= MAD_FLAG_ORIGINAL;
  /* emphasis */
  header->emphasis = mad_bit_read(&stream->ptr, 2);
-  if (header->emphasis == 2) {
+# if defined(OPT_STRICT)
+  /*
+   * ISO/IEC 11172-3 says this is a reserved emphasis value, but
+   * streams exist which use it anyway. Since the value is not important
+   * to the decoder proper, we allow it unless OPT_STRICT is defined.
+   */
+  if (header->emphasis == MAD_EMPHASIS_RESERVED) {
    stream->error = MAD_ERROR_BADEMPHASIS;
    return -1;
  }
+# endif
  /* error_check() */
  /* crc_check */
  if (header->flags & MAD_FLAG_PROTECTION)
    header->crc_target = mad_bit_read(&stream->ptr, 16);
  return 0;
 }
 /*
         * NAME:free_bitrate()
         * DESCRIPTION:attempt to discover the bitstream's free bitrate
 */
 static
 int free_bitrate(struct mad_stream *stream, struct mad_header const *header)
 {
  struct mad_bitptr keep_ptr;
  unsigned long rate = 0;
  unsigned int pad_slot, slots_per_frame;
  unsigned char const *ptr = 0;
  keep_ptr = stream->ptr;
  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
  slots_per_frame = (header->layer == MAD_LAYER_III &&
                     (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
  while (mad_stream_sync(stream) == 0) {
    struct mad_stream peek_stream;
    struct mad_header peek_header;
    peek_stream = *stream;
    peek_header = *header;
    if (decode_header(&peek_header, &peek_stream) == 0 &&
        peek_header.layer == header->layer &&
        peek_header.samplerate == header->samplerate) {
      unsigned int N;
      ptr = mad_bit_nextbyte(&stream->ptr);
      N = ptr - stream->this_frame;
      if (header->layer == MAD_LAYER_I) {
        rate = (unsigned long) header->samplerate *
          (N - 4 * pad_slot + 4) / 48 / 1000;
      }
      else {
        rate = (unsigned long) header->samplerate *
          (N - pad_slot + 1) / slots_per_frame / 1000;
      }
      if (rate >= 8)
        break;
    }
    mad_bit_skip(&stream->ptr, 8);
  }
  stream->ptr = keep_ptr;
  if (rate < 8 || (header->layer == MAD_LAYER_III && rate > 640)) {
    stream->error = MAD_ERROR_LOSTSYNC;
    return -1;
  }
  stream->freerate = rate * 1000;
-# if 0 && defined(DEBUG)
-  fprintf(stderr, "free bitrate == %lu\n", stream->freerate);
-# endif
  return 0;
 }
 /*
         * NAME:header->decode()
         * DESCRIPTION:read the next frame header from the stream
 */
 int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
 {
  register unsigned char const *ptr, *end;
  unsigned int pad_slot, N;
  ptr = stream->next_frame;
  end = stream->bufend;
  if (ptr == 0) {
    stream->error = MAD_ERROR_BUFPTR;
    goto fail;
  }
  /* stream skip */
  if (stream->skiplen) {
    if (!stream->sync)
      ptr = stream->this_frame;
    if (end - ptr < stream->skiplen) {
      stream->skiplen   -= end - ptr;
      stream->next_frame = end;
      stream->error = MAD_ERROR_BUFLEN;
      goto fail;
    }
    ptr += stream->skiplen;
    stream->skiplen = 0;
    stream->sync = 1;
  }
 sync:
  /* synchronize */
  if (stream->sync) {
    if (end - ptr < MAD_BUFFER_GUARD) {
      stream->next_frame = ptr;
      stream->error = MAD_ERROR_BUFLEN;
      goto fail;
    }
    else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
      /* mark point where frame sync word was expected */
      stream->this_frame = ptr;
      stream->next_frame = ptr + 1;
      stream->error = MAD_ERROR_LOSTSYNC;
      goto fail;
    }
  }
  else {
    mad_bit_init(&stream->ptr, ptr);
    if (mad_stream_sync(stream) == -1) {
      if (end - stream->next_frame >= MAD_BUFFER_GUARD)
        stream->next_frame = end - MAD_BUFFER_GUARD;
      stream->error = MAD_ERROR_BUFLEN;
      goto fail;
    }
    ptr = mad_bit_nextbyte(&stream->ptr);
  }
  /* begin processing */
  stream->this_frame = ptr;
  stream->next_frame = ptr + 1;  /* possibly bogus sync word */
  mad_bit_init(&stream->ptr, stream->this_frame);
  if (decode_header(header, stream) == -1)
    goto fail;
  /* calculate frame duration */
  mad_timer_set(&header->duration, 0,
                32 * MAD_NSBSAMPLES(header), header->samplerate);
  /* calculate free bit rate */
  if (header->bitrate == 0) {
-    if ((stream->freerate == 0 || !stream->sync) &&
+    if ((stream->freerate == 0 || !stream->sync ||
+         (header->layer == MAD_LAYER_III && stream->freerate > 640000)) &&
        free_bitrate(stream, header) == -1)
      goto fail;
    header->bitrate = stream->freerate;
    header->flags  |= MAD_FLAG_FREEFORMAT;
  }
  /* calculate beginning of next frame */
  pad_slot = (header->flags & MAD_FLAG_PADDING) ? 1 : 0;
  if (header->layer == MAD_LAYER_I)
    N = ((12 * header->bitrate / header->samplerate) + pad_slot) * 4;
  else {
    unsigned int slots_per_frame;
    slots_per_frame = (header->layer == MAD_LAYER_III &&
                       (header->flags & MAD_FLAG_LSF_EXT)) ? 72 : 144;
    N = (slots_per_frame * header->bitrate / header->samplerate) + pad_slot;
  }
  /* verify there is enough data left in buffer to decode this frame */
  if (N + MAD_BUFFER_GUARD > end - stream->this_frame) {
    stream->next_frame = stream->this_frame;
    stream->error = MAD_ERROR_BUFLEN;
    goto fail;
  }
  stream->next_frame = stream->this_frame + N;
  if (!stream->sync) {
    /* check that a valid frame header follows this frame */
    ptr = stream->next_frame;
    if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
      ptr = stream->next_frame = stream->this_frame + 1;
      goto sync;
    }
    stream->sync = 1;
  }
  header->flags |= MAD_FLAG_INCOMPLETE;
  return 0;
 fail:
  stream->sync = 0;
  return -1;
 }
 /*
         * NAME:frame->decode()
         * DESCRIPTION:decode a single frame from a bitstream
 */
 int mad_frame_decode(struct mad_frame *frame, struct mad_stream *stream)
 {
  frame->options = stream->options;
  /* header() */
  /* error_check() */
  if (!(frame->header.flags & MAD_FLAG_INCOMPLETE) &&
      mad_header_decode(&frame->header, stream) == -1)
    goto fail;
  /* audio_data() */
  frame->header.flags &= ~MAD_FLAG_INCOMPLETE;
  if (decoder_table[frame->header.layer - 1](stream, frame) == -1) {
    if (!MAD_RECOVERABLE(stream->error))
      stream->next_frame = stream->this_frame;
    goto fail;
  }
  /* ancillary_data() */
  if (frame->header.layer != MAD_LAYER_III) {
    struct mad_bitptr next_frame;
    mad_bit_init(&next_frame, stream->next_frame);
    stream->anc_ptr    = stream->ptr;
    stream->anc_bitlen = mad_bit_length(&stream->ptr, &next_frame);
    mad_bit_finish(&next_frame);
  }
  return 0;
 fail:
  stream->anc_bitlen = 0;
  return -1;
 }
 /*
         * NAME:frame->mute()
         * DESCRIPTION:zero all subband values so the frame becomes silent
 */
 void mad_frame_mute(struct mad_frame *frame)
 {
  unsigned int s, sb;
  for (s = 0; s < 36; ++s) {
    for (sb = 0; sb < 32; ++sb) {
      frame->sbsample[0][s][sb] =
      frame->sbsample[1][s][sb] = 0;
    }
  }
  if (frame->overlap) {
    for (s = 0; s < 18; ++s) {
      for (sb = 0; sb < 32; ++sb) {
        (*frame->overlap)[0][sb][s] =
        (*frame->overlap)[1][sb][s] = 0;
      }
    }
  }
 }
diff --git a/core/multimedia/opieplayer/libmad/frame.h b/core/multimedia/opieplayer/libmad/frame.h
index 3b8e454..dce573d 100644
--- a/core/multimedia/opieplayer/libmad/frame.h
+++ b/core/multimedia/opieplayer/libmad/frame.h
@@ -1,117 +1,118 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_FRAME_H
 # define LIBMAD_FRAME_H
 # include "fixed.h"
 # include "timer.h"
 # include "stream.h"
 enum mad_layer {
          MAD_LAYER_I   = 1,            /* Layer I */
          MAD_LAYER_II  = 2,            /* Layer II */
          MAD_LAYER_III = 3             /* Layer III */
 };
 enum mad_mode {
          MAD_MODE_SINGLE_CHANNEL = 0,  /* single channel */
          MAD_MODE_DUAL_CHANNEL           = 1,  /* dual channel */
          MAD_MODE_JOINT_STEREO           = 2,  /* joint (MS/intensity) stereo */
          MAD_MODE_STEREO         = 3   /* normal LR stereo */
 };
 enum mad_emphasis {
          MAD_EMPHASIS_NONE       = 0,  /* no emphasis */
          MAD_EMPHASIS_50_15_US           = 1,  /* 50/15 microseconds emphasis */
-          MAD_EMPHASIS_CCITT_J_17 = 3   /* CCITT J.17 emphasis */
+          MAD_EMPHASIS_CCITT_J_17 = 3,  /* CCITT J.17 emphasis */
+          MAD_EMPHASIS_RESERVED   = 2   /* unknown emphasis */
 };
 struct mad_header {
          enum mad_layer layer;                 /* audio layer (1, 2, or 3) */
          enum mad_mode mode;           /* channel mode (see above) */
          int mode_extension;           /* additional mode info */
          enum mad_emphasis emphasis;   /* de-emphasis to use (see above) */
          unsigned long bitrate;        /* stream bitrate (bps) */
          unsigned int samplerate;      /* sampling frequency (Hz) */
          unsigned short crc_check;     /* frame CRC accumulator */
          unsigned short crc_target;    /* final target CRC checksum */
          int flags;                    /* flags (see below) */
          int private_bits;             /* private bits (see below) */
          mad_timer_t duration;                 /* audio playing time of frame */
 };
 struct mad_frame {
          struct mad_header header;     /* MPEG audio header */
          int options;                  /* decoding options (from stream) */
          mad_fixed_t sbsample[2][36][32];/* synthesis subband filter samples */
          mad_fixed_t (*overlap)[2][32][18];/* Layer III block overlap data */
 };
        # define MAD_NCHANNELS(header)  ((header)->mode ? 2 : 1)
 # define MAD_NSBSAMPLES(header)  \
  ((header)->layer == MAD_LAYER_I ? 12 :  \
   (((header)->layer == MAD_LAYER_III &&  \
     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
 enum {
          MAD_FLAG_NPRIVATE_III         = 0x0007,/* number of Layer III private bits */
          MAD_FLAG_INCOMPLETE   = 0x0008,/* header but not data is decoded */
          MAD_FLAG_PROTECTION   = 0x0010,/* frame has CRC protection */
          MAD_FLAG_COPYRIGHT    = 0x0020,/* frame is copyright */
          MAD_FLAG_ORIGINAL     = 0x0040,/* frame is original (else copy) */
          MAD_FLAG_PADDING      = 0x0080,/* frame has additional slot */
          MAD_FLAG_I_STEREO     = 0x0100,/* uses intensity joint stereo */
          MAD_FLAG_MS_STEREO    = 0x0200,/* uses middle/side joint stereo */
          MAD_FLAG_FREEFORMAT   = 0x0400,/* uses free format bitrate */
          MAD_FLAG_LSF_EXT      = 0x1000,/* lower sampling freq. extension */
          MAD_FLAG_MC_EXT       = 0x2000,/* multichannel audio extension */
          MAD_FLAG_MPEG_2_5_EXT         = 0x4000/* MPEG 2.5 (unofficial) extension */
 };
 enum {
          MAD_PRIVATE_HEADER    = 0x0100,/* header private bit */
          MAD_PRIVATE_III       = 0x001f/* Layer III private bits (up to 5) */
 };
 void mad_header_init(struct mad_header *);
 # define mad_header_finish(header)  /* nothing */
 int mad_header_decode(struct mad_header *, struct mad_stream *);
 void mad_frame_init(struct mad_frame *);
 void mad_frame_finish(struct mad_frame *);
 int mad_frame_decode(struct mad_frame *, struct mad_stream *);
 void mad_frame_mute(struct mad_frame *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/huffman.c b/core/multimedia/opieplayer/libmad/huffman.c
index 5ea6547..684409e 100644
--- a/core/multimedia/opieplayer/libmad/huffman.c
+++ b/core/multimedia/opieplayer/libmad/huffman.c
@@ -1,1138 +1,1149 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include "huffman.h"
 /*
 * These are the Huffman code words for Layer III.
 * The data for these tables are derived from Table B.7 of ISO/IEC 11172-3.
 *
 * These tables support decoding up to 4 Huffman code bits at a time.
 */
-# if defined(__GNUC__)
+# if defined(__GNUC__) ||  \
-        #  define PTR(offs, bits){ ptr:   { 0, bits, offs       } }
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
-        #  define V(v, w, x, y, hlen){ value: { 1, hlen, v, w, x, y } }
+        #  define PTR(offs, bits){ .ptr   = { 0, bits, offs       } }
+        #  define V(v, w, x, y, hlen){ .value = { 1, hlen, v, w, x, y } }
 # else
        #  define PTR(offs, bits){ { 0, bits, offs } }
-        #  define V(v, w, x, y, hlen){ { 1, hlen, (v << 0) | (w << 1) |  \
+#  if defined(WORDS_BIGENDIAN)
-                                             (x << 2) | (y << 3) } }
+        #   define V(v, w, x, y, hlen){ { 1, hlen, (v << 11) | (w << 10) |  \
+                                             (x <<  9) | (y <<  8) } }
+#  else
+        #   define V(v, w, x, y, hlen){ { 1, hlen, (v <<  0) | (w <<  1) |  \
+                                             (x <<  2) | (y <<  3) } }
+#  endif
 # endif
 static
 union huffquad const hufftabA[] = {
  /* 0000 */ PTR(16, 2),
  /* 0001 */ PTR(20, 2),
  /* 0010 */ PTR(24, 1),
  /* 0011 */ PTR(26, 1),
  /* 0100 */ V(0, 0, 1, 0, 4),
  /* 0101 */ V(0, 0, 0, 1, 4),
  /* 0110 */ V(0, 1, 0, 0, 4),
  /* 0111 */ V(1, 0, 0, 0, 4),
  /* 1000 */ V(0, 0, 0, 0, 1),
  /* 1001 */ V(0, 0, 0, 0, 1),
  /* 1010 */ V(0, 0, 0, 0, 1),
  /* 1011 */ V(0, 0, 0, 0, 1),
  /* 1100 */ V(0, 0, 0, 0, 1),
  /* 1101 */ V(0, 0, 0, 0, 1),
  /* 1110 */ V(0, 0, 0, 0, 1),
  /* 1111 */ V(0, 0, 0, 0, 1),
  /* 0000 ... */
          /* 00   */ V(1, 0, 1, 1, 2),/* 16 */
  /* 01   */ V(1, 1, 1, 1, 2),
  /* 10   */ V(1, 1, 0, 1, 2),
  /* 11   */ V(1, 1, 1, 0, 2),
  /* 0001 ... */
          /* 00   */ V(0, 1, 1, 1, 2),/* 20 */
  /* 01   */ V(0, 1, 0, 1, 2),
  /* 10   */ V(1, 0, 0, 1, 1),
  /* 11   */ V(1, 0, 0, 1, 1),
  /* 0010 ... */
          /* 0    */ V(0, 1, 1, 0, 1),/* 24 */
  /* 1    */ V(0, 0, 1, 1, 1),
  /* 0011 ... */
          /* 0    */ V(1, 0, 1, 0, 1),/* 26 */
  /* 1    */ V(1, 1, 0, 0, 1)
 };
 static
 union huffquad const hufftabB[] = {
  /* 0000 */ V(1, 1, 1, 1, 4),
  /* 0001 */ V(1, 1, 1, 0, 4),
  /* 0010 */ V(1, 1, 0, 1, 4),
  /* 0011 */ V(1, 1, 0, 0, 4),
  /* 0100 */ V(1, 0, 1, 1, 4),
  /* 0101 */ V(1, 0, 1, 0, 4),
  /* 0110 */ V(1, 0, 0, 1, 4),
  /* 0111 */ V(1, 0, 0, 0, 4),
  /* 1000 */ V(0, 1, 1, 1, 4),
  /* 1001 */ V(0, 1, 1, 0, 4),
  /* 1010 */ V(0, 1, 0, 1, 4),
  /* 1011 */ V(0, 1, 0, 0, 4),
  /* 1100 */ V(0, 0, 1, 1, 4),
  /* 1101 */ V(0, 0, 1, 0, 4),
  /* 1110 */ V(0, 0, 0, 1, 4),
  /* 1111 */ V(0, 0, 0, 0, 4)
 };
 # undef V
 # undef PTR
-# if defined(__GNUC__)
+# if defined(__GNUC__) ||  \
-        #  define PTR(offs, bits){ ptr:   { 0, bits, offs } }
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901)
-        #  define V(x, y, hlen)         { value: { 1, hlen, x, y } }
+        #  define PTR(offs, bits){ .ptr   = { 0, bits, offs } }
+        #  define V(x, y, hlen)         { .value = { 1, hlen, x, y } }
 # else
        #  define PTR(offs, bits){ { 0, bits, offs } }
-        #  define V(x, y, hlen)         { { 1, hlen, (x << 0) | (y << 4) } }
+#  if defined(WORDS_BIGENDIAN)
+        #   define V(x, y, hlen){ { 1, hlen, (x << 8) | (y << 4) } }
+#  else
+        #   define V(x, y, hlen){ { 1, hlen, (x << 0) | (y << 4) } }
+#  endif
 # endif
 static
 union huffpair const hufftab0[] = {
  /*      */ V(0, 0, 0)
 };
 static
 union huffpair const hufftab1[] = {
  /* 000  */ V(1, 1, 3),
  /* 001  */ V(0, 1, 3),
  /* 010  */ V(1, 0, 2),
  /* 011  */ V(1, 0, 2),
  /* 100  */ V(0, 0, 1),
  /* 101  */ V(0, 0, 1),
  /* 110  */ V(0, 0, 1),
  /* 111  */ V(0, 0, 1)
 };
 static
 union huffpair const hufftab2[] = {
  /* 000  */ PTR(8, 3),
  /* 001  */ V(1, 1, 3),
  /* 010  */ V(0, 1, 3),
  /* 011  */ V(1, 0, 3),
  /* 100  */ V(0, 0, 1),
  /* 101  */ V(0, 0, 1),
  /* 110  */ V(0, 0, 1),
  /* 111  */ V(0, 0, 1),
  /* 000 ... */
          /* 000  */ V(2, 2, 3),/* 8 */
  /* 001  */ V(0, 2, 3),
  /* 010  */ V(1, 2, 2),
  /* 011  */ V(1, 2, 2),
  /* 100  */ V(2, 1, 2),
  /* 101  */ V(2, 1, 2),
  /* 110  */ V(2, 0, 2),
  /* 111  */ V(2, 0, 2)
 };
 static
 union huffpair const hufftab3[] = {
  /* 000  */ PTR(8, 3),
  /* 001  */ V(1, 0, 3),
  /* 010  */ V(1, 1, 2),
  /* 011  */ V(1, 1, 2),
  /* 100  */ V(0, 1, 2),
  /* 101  */ V(0, 1, 2),
  /* 110  */ V(0, 0, 2),
  /* 111  */ V(0, 0, 2),
  /* 000 ... */
          /* 000  */ V(2, 2, 3),/* 8 */
  /* 001  */ V(0, 2, 3),
  /* 010  */ V(1, 2, 2),
  /* 011  */ V(1, 2, 2),
  /* 100  */ V(2, 1, 2),
  /* 101  */ V(2, 1, 2),
  /* 110  */ V(2, 0, 2),
  /* 111  */ V(2, 0, 2)
 };
 static
 union huffpair const hufftab5[] = {
  /* 000  */ PTR(8, 4),
  /* 001  */ V(1, 1, 3),
  /* 010  */ V(0, 1, 3),
  /* 011  */ V(1, 0, 3),
  /* 100  */ V(0, 0, 1),
  /* 101  */ V(0, 0, 1),
  /* 110  */ V(0, 0, 1),
  /* 111  */ V(0, 0, 1),
  /* 000 ... */
          /* 0000 */ PTR(24, 1),/* 8 */
  /* 0001 */ V(3, 2, 4),
  /* 0010 */ V(3, 1, 3),
  /* 0011 */ V(3, 1, 3),
  /* 0100 */ V(1, 3, 4),
  /* 0101 */ V(0, 3, 4),
  /* 0110 */ V(3, 0, 4),
  /* 0111 */ V(2, 2, 4),
  /* 1000 */ V(1, 2, 3),
  /* 1001 */ V(1, 2, 3),
  /* 1010 */ V(2, 1, 3),
  /* 1011 */ V(2, 1, 3),
  /* 1100 */ V(0, 2, 3),
  /* 1101 */ V(0, 2, 3),
  /* 1110 */ V(2, 0, 3),
  /* 1111 */ V(2, 0, 3),
  /* 000 0000 ... */
          /* 0    */ V(3, 3, 1),/* 24 */
  /* 1    */ V(2, 3, 1)
 };
 static
 union huffpair const hufftab6[] = {
  /* 0000 */ PTR(16, 3),
  /* 0001 */ PTR(24, 1),
  /* 0010 */ PTR(26, 1),
  /* 0011 */ V(1, 2, 4),
  /* 0100 */ V(2, 1, 4),
  /* 0101 */ V(2, 0, 4),
  /* 0110 */ V(0, 1, 3),
  /* 0111 */ V(0, 1, 3),
  /* 1000 */ V(1, 1, 2),
  /* 1001 */ V(1, 1, 2),
  /* 1010 */ V(1, 1, 2),
  /* 1011 */ V(1, 1, 2),
  /* 1100 */ V(1, 0, 3),
  /* 1101 */ V(1, 0, 3),
  /* 1110 */ V(0, 0, 3),
  /* 1111 */ V(0, 0, 3),
  /* 0000 ... */
          /* 000  */ V(3, 3, 3),/* 16 */
  /* 001  */ V(0, 3, 3),
  /* 010  */ V(2, 3, 2),
  /* 011  */ V(2, 3, 2),
  /* 100  */ V(3, 2, 2),
  /* 101  */ V(3, 2, 2),
  /* 110  */ V(3, 0, 2),
  /* 111  */ V(3, 0, 2),
  /* 0001 ... */
          /* 0    */ V(1, 3, 1),/* 24 */
  /* 1    */ V(3, 1, 1),
  /* 0010 ... */
          /* 0    */ V(2, 2, 1),/* 26 */
  /* 1    */ V(0, 2, 1)
 };
 static
 union huffpair const hufftab7[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ PTR(48, 2),
  /* 0011 */ V(1, 1, 4),
  /* 0100 */ V(0, 1, 3),
  /* 0101 */ V(0, 1, 3),
  /* 0110 */ V(1, 0, 3),
  /* 0111 */ V(1, 0, 3),
  /* 1000 */ V(0, 0, 1),
  /* 1001 */ V(0, 0, 1),
  /* 1010 */ V(0, 0, 1),
  /* 1011 */ V(0, 0, 1),
  /* 1100 */ V(0, 0, 1),
  /* 1101 */ V(0, 0, 1),
  /* 1110 */ V(0, 0, 1),
  /* 1111 */ V(0, 0, 1),
  /* 0000 ... */
          /* 0000 */ PTR(52, 2),/* 16 */
  /* 0001 */ PTR(56, 1),
  /* 0010 */ PTR(58, 1),
  /* 0011 */ V(1, 5, 4),
  /* 0100 */ V(5, 1, 4),
  /* 0101 */ PTR(60, 1),
  /* 0110 */ V(5, 0, 4),
  /* 0111 */ PTR(62, 1),
  /* 1000 */ V(2, 4, 4),
  /* 1001 */ V(4, 2, 4),
  /* 1010 */ V(1, 4, 3),
  /* 1011 */ V(1, 4, 3),
  /* 1100 */ V(4, 1, 3),
  /* 1101 */ V(4, 1, 3),
  /* 1110 */ V(4, 0, 3),
  /* 1111 */ V(4, 0, 3),
  /* 0001 ... */
          /* 0000 */ V(0, 4, 4),/* 32 */
  /* 0001 */ V(2, 3, 4),
  /* 0010 */ V(3, 2, 4),
  /* 0011 */ V(0, 3, 4),
  /* 0100 */ V(1, 3, 3),
  /* 0101 */ V(1, 3, 3),
  /* 0110 */ V(3, 1, 3),
  /* 0111 */ V(3, 1, 3),
  /* 1000 */ V(3, 0, 3),
  /* 1001 */ V(3, 0, 3),
  /* 1010 */ V(2, 2, 3),
  /* 1011 */ V(2, 2, 3),
  /* 1100 */ V(1, 2, 2),
  /* 1101 */ V(1, 2, 2),
  /* 1110 */ V(1, 2, 2),
  /* 1111 */ V(1, 2, 2),
  /* 0010 ... */
          /* 00   */ V(2, 1, 1),/* 48 */
  /* 01   */ V(2, 1, 1),
  /* 10   */ V(0, 2, 2),
  /* 11   */ V(2, 0, 2),
  /* 0000 0000 ... */
          /* 00   */ V(5, 5, 2),/* 52 */
  /* 01   */ V(4, 5, 2),
  /* 10   */ V(5, 4, 2),
  /* 11   */ V(5, 3, 2),
  /* 0000 0001 ... */
          /* 0    */ V(3, 5, 1),/* 56 */
  /* 1    */ V(4, 4, 1),
  /* 0000 0010 ... */
          /* 0    */ V(2, 5, 1),/* 58 */
  /* 1    */ V(5, 2, 1),
  /* 0000 0101 ... */
          /* 0    */ V(0, 5, 1),/* 60 */
  /* 1    */ V(3, 4, 1),
  /* 0000 0111 ... */
          /* 0    */ V(4, 3, 1),/* 62 */
  /* 1    */ V(3, 3, 1)
 };
 # if 0
 /* this version saves 8 entries (16 bytes) at the expense of
   an extra lookup in 4 out of 36 cases */
 static
 union huffpair const hufftab8[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 2),
  /* 0010 */ V(1, 2, 4),
  /* 0011 */ V(2, 1, 4),
  /* 0100 */ V(1, 1, 2),
  /* 0101 */ V(1, 1, 2),
  /* 0110 */ V(1, 1, 2),
  /* 0111 */ V(1, 1, 2),
  /* 1000 */ V(0, 1, 3),
  /* 1001 */ V(0, 1, 3),
  /* 1010 */ V(1, 0, 3),
  /* 1011 */ V(1, 0, 3),
  /* 1100 */ V(0, 0, 2),
  /* 1101 */ V(0, 0, 2),
  /* 1110 */ V(0, 0, 2),
  /* 1111 */ V(0, 0, 2),
  /* 0000 ... */
          /* 0000 */ PTR(36, 3),/* 16 */
  /* 0001 */ PTR(44, 2),
  /* 0010 */ PTR(48, 1),
  /* 0011 */ V(1, 5, 4),
  /* 0100 */ V(5, 1, 4),
  /* 0101 */ PTR(50, 1),
  /* 0110 */ PTR(52, 1),
  /* 0111 */ V(2, 4, 4),
  /* 1000 */ V(4, 2, 4),
  /* 1001 */ V(1, 4, 4),
  /* 1010 */ V(4, 1, 3),
  /* 1011 */ V(4, 1, 3),
  /* 1100 */ V(0, 4, 4),
  /* 1101 */ V(4, 0, 4),
  /* 1110 */ V(2, 3, 4),
  /* 1111 */ V(3, 2, 4),
  /* 0001 ... */
          /* 00   */ PTR(54, 2),/* 32 */
  /* 01   */ V(2, 2, 2),
  /* 10   */ V(0, 2, 2),
  /* 11   */ V(2, 0, 2),
  /* 0000 0000 ... */
          /* 000  */ V(5, 5, 3),/* 36 */
  /* 001  */ V(5, 4, 3),
  /* 010  */ V(4, 5, 2),
  /* 011  */ V(4, 5, 2),
  /* 100  */ V(5, 3, 1),
  /* 101  */ V(5, 3, 1),
  /* 110  */ V(5, 3, 1),
  /* 111  */ V(5, 3, 1),
  /* 0000 0001 ... */
          /* 00   */ V(3, 5, 2),/* 44 */
  /* 01   */ V(4, 4, 2),
  /* 10   */ V(2, 5, 1),
  /* 11   */ V(2, 5, 1),
  /* 0000 0010 ... */
          /* 0    */ V(5, 2, 1),/* 48 */
  /* 1    */ V(0, 5, 1),
  /* 0000 0101 ... */
          /* 0    */ V(3, 4, 1),/* 50 */
  /* 1    */ V(4, 3, 1),
  /* 0000 0110 ... */
          /* 0    */ V(5, 0, 1),/* 52 */
  /* 1    */ V(3, 3, 1),
  /* 0001 00 ... */
          /* 00   */ V(1, 3, 2),/* 54 */
  /* 01   */ V(3, 1, 2),
  /* 10   */ V(0, 3, 2),
  /* 11   */ V(3, 0, 2),
 };
 # else
 static
 union huffpair const hufftab8[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ V(1, 2, 4),
  /* 0011 */ V(2, 1, 4),
  /* 0100 */ V(1, 1, 2),
  /* 0101 */ V(1, 1, 2),
  /* 0110 */ V(1, 1, 2),
  /* 0111 */ V(1, 1, 2),
  /* 1000 */ V(0, 1, 3),
  /* 1001 */ V(0, 1, 3),
  /* 1010 */ V(1, 0, 3),
  /* 1011 */ V(1, 0, 3),
  /* 1100 */ V(0, 0, 2),
  /* 1101 */ V(0, 0, 2),
  /* 1110 */ V(0, 0, 2),
  /* 1111 */ V(0, 0, 2),
  /* 0000 ... */
          /* 0000 */ PTR(48, 3),/* 16 */
  /* 0001 */ PTR(56, 2),
  /* 0010 */ PTR(60, 1),
  /* 0011 */ V(1, 5, 4),
  /* 0100 */ V(5, 1, 4),
  /* 0101 */ PTR(62, 1),
  /* 0110 */ PTR(64, 1),
  /* 0111 */ V(2, 4, 4),
  /* 1000 */ V(4, 2, 4),
  /* 1001 */ V(1, 4, 4),
  /* 1010 */ V(4, 1, 3),
  /* 1011 */ V(4, 1, 3),
  /* 1100 */ V(0, 4, 4),
  /* 1101 */ V(4, 0, 4),
  /* 1110 */ V(2, 3, 4),
  /* 1111 */ V(3, 2, 4),
  /* 0001 ... */
          /* 0000 */ V(1, 3, 4),/* 32 */
  /* 0001 */ V(3, 1, 4),
  /* 0010 */ V(0, 3, 4),
  /* 0011 */ V(3, 0, 4),
  /* 0100 */ V(2, 2, 2),
  /* 0101 */ V(2, 2, 2),
  /* 0110 */ V(2, 2, 2),
  /* 0111 */ V(2, 2, 2),
  /* 1000 */ V(0, 2, 2),
  /* 1001 */ V(0, 2, 2),
  /* 1010 */ V(0, 2, 2),
  /* 1011 */ V(0, 2, 2),
  /* 1100 */ V(2, 0, 2),
  /* 1101 */ V(2, 0, 2),
  /* 1110 */ V(2, 0, 2),
  /* 1111 */ V(2, 0, 2),
  /* 0000 0000 ... */
          /* 000  */ V(5, 5, 3),/* 48 */
  /* 001  */ V(5, 4, 3),
  /* 010  */ V(4, 5, 2),
  /* 011  */ V(4, 5, 2),
  /* 100  */ V(5, 3, 1),
  /* 101  */ V(5, 3, 1),
  /* 110  */ V(5, 3, 1),
  /* 111  */ V(5, 3, 1),
  /* 0000 0001 ... */
          /* 00   */ V(3, 5, 2),/* 56 */
  /* 01   */ V(4, 4, 2),
  /* 10   */ V(2, 5, 1),
  /* 11   */ V(2, 5, 1),
  /* 0000 0010 ... */
          /* 0    */ V(5, 2, 1),/* 60 */
  /* 1    */ V(0, 5, 1),
  /* 0000 0101 ... */
          /* 0    */ V(3, 4, 1),/* 62 */
  /* 1    */ V(4, 3, 1),
  /* 0000 0110 ... */
          /* 0    */ V(5, 0, 1),/* 64 */
  /* 1    */ V(3, 3, 1)
 };
 # endif
 static
 union huffpair const hufftab9[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 3),
  /* 0010 */ PTR(40, 2),
  /* 0011 */ PTR(44, 2),
  /* 0100 */ PTR(48, 1),
  /* 0101 */ V(1, 2, 4),
  /* 0110 */ V(2, 1, 4),
  /* 0111 */ V(2, 0, 4),
  /* 1000 */ V(1, 1, 3),
  /* 1001 */ V(1, 1, 3),
  /* 1010 */ V(0, 1, 3),
  /* 1011 */ V(0, 1, 3),
  /* 1100 */ V(1, 0, 3),
  /* 1101 */ V(1, 0, 3),
  /* 1110 */ V(0, 0, 3),
  /* 1111 */ V(0, 0, 3),
  /* 0000 ... */
          /* 0000 */ PTR(50, 1),/* 16 */
  /* 0001 */ V(3, 5, 4),
  /* 0010 */ V(5, 3, 4),
  /* 0011 */ PTR(52, 1),
  /* 0100 */ V(4, 4, 4),
  /* 0101 */ V(2, 5, 4),
  /* 0110 */ V(5, 2, 4),
  /* 0111 */ V(1, 5, 4),
  /* 1000 */ V(5, 1, 3),
  /* 1001 */ V(5, 1, 3),
  /* 1010 */ V(3, 4, 3),
  /* 1011 */ V(3, 4, 3),
  /* 1100 */ V(4, 3, 3),
  /* 1101 */ V(4, 3, 3),
  /* 1110 */ V(5, 0, 4),
  /* 1111 */ V(0, 4, 4),
  /* 0001 ... */
          /* 000  */ V(2, 4, 3),/* 32 */
  /* 001  */ V(4, 2, 3),
  /* 010  */ V(3, 3, 3),
  /* 011  */ V(4, 0, 3),
  /* 100  */ V(1, 4, 2),
  /* 101  */ V(1, 4, 2),
  /* 110  */ V(4, 1, 2),
  /* 111  */ V(4, 1, 2),
  /* 0010 ... */
          /* 00   */ V(2, 3, 2),/* 40 */
  /* 01   */ V(3, 2, 2),
  /* 10   */ V(1, 3, 1),
  /* 11   */ V(1, 3, 1),
  /* 0011 ... */
          /* 00   */ V(3, 1, 1),/* 44 */
  /* 01   */ V(3, 1, 1),
  /* 10   */ V(0, 3, 2),
  /* 11   */ V(3, 0, 2),
  /* 0100 ... */
          /* 0    */ V(2, 2, 1),/* 48 */
  /* 1    */ V(0, 2, 1),
  /* 0000 0000 ... */
          /* 0    */ V(5, 5, 1),/* 50 */
  /* 1    */ V(4, 5, 1),
  /* 0000 0011 ... */
          /* 0    */ V(5, 4, 1),/* 52 */
  /* 1    */ V(0, 5, 1)
 };
 static
 union huffpair const hufftab10[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ PTR(48, 2),
  /* 0011 */ V(1, 1, 4),
  /* 0100 */ V(0, 1, 3),
  /* 0101 */ V(0, 1, 3),
  /* 0110 */ V(1, 0, 3),
  /* 0111 */ V(1, 0, 3),
  /* 1000 */ V(0, 0, 1),
  /* 1001 */ V(0, 0, 1),
  /* 1010 */ V(0, 0, 1),
  /* 1011 */ V(0, 0, 1),
  /* 1100 */ V(0, 0, 1),
  /* 1101 */ V(0, 0, 1),
  /* 1110 */ V(0, 0, 1),
  /* 1111 */ V(0, 0, 1),
  /* 0000 ... */
          /* 0000 */ PTR(52, 3),/* 16 */
  /* 0001 */ PTR(60, 2),
  /* 0010 */ PTR(64, 3),
  /* 0011 */ PTR(72, 1),
  /* 0100 */ PTR(74, 2),
  /* 0101 */ PTR(78, 2),
  /* 0110 */ PTR(82, 2),
  /* 0111 */ V(1, 7, 4),
  /* 1000 */ V(7, 1, 4),
  /* 1001 */ PTR(86, 1),
  /* 1010 */ PTR(88, 2),
  /* 1011 */ PTR(92, 2),
  /* 1100 */ V(1, 6, 4),
  /* 1101 */ V(6, 1, 4),
  /* 1110 */ V(6, 0, 4),
  /* 1111 */ PTR(96, 1),
  /* 0001 ... */
          /* 0000 */ PTR(98, 1),/* 32 */
  /* 0001 */ PTR(100, 1),
  /* 0010 */ V(1, 4, 4),
  /* 0011 */ V(4, 1, 4),
  /* 0100 */ V(4, 0, 4),
  /* 0101 */ V(2, 3, 4),
  /* 0110 */ V(3, 2, 4),
  /* 0111 */ V(0, 3, 4),
  /* 1000 */ V(1, 3, 3),
  /* 1001 */ V(1, 3, 3),
  /* 1010 */ V(3, 1, 3),
  /* 1011 */ V(3, 1, 3),
  /* 1100 */ V(3, 0, 3),
  /* 1101 */ V(3, 0, 3),
  /* 1110 */ V(2, 2, 3),
  /* 1111 */ V(2, 2, 3),
  /* 0010 ... */
          /* 00   */ V(1, 2, 2),/* 48 */
  /* 01   */ V(2, 1, 2),
  /* 10   */ V(0, 2, 2),
  /* 11   */ V(2, 0, 2),
  /* 0000 0000 ... */
          /* 000  */ V(7, 7, 3),/* 52 */
  /* 001  */ V(6, 7, 3),
  /* 010  */ V(7, 6, 3),
  /* 011  */ V(5, 7, 3),
  /* 100  */ V(7, 5, 3),
  /* 101  */ V(6, 6, 3),
  /* 110  */ V(4, 7, 2),
  /* 111  */ V(4, 7, 2),
  /* 0000 0001 ... */
          /* 00   */ V(7, 4, 2),/* 60 */
  /* 01   */ V(5, 6, 2),
  /* 10   */ V(6, 5, 2),
  /* 11   */ V(3, 7, 2),
  /* 0000 0010 ... */
          /* 000  */ V(7, 3, 2),/* 64 */
  /* 001  */ V(7, 3, 2),
  /* 010  */ V(4, 6, 2),
  /* 011  */ V(4, 6, 2),
  /* 100  */ V(5, 5, 3),
  /* 101  */ V(5, 4, 3),
  /* 110  */ V(6, 3, 2),
  /* 111  */ V(6, 3, 2),
  /* 0000 0011 ... */
          /* 0    */ V(2, 7, 1),/* 72 */
  /* 1    */ V(7, 2, 1),
  /* 0000 0100 ... */
          /* 00   */ V(6, 4, 2),/* 74 */
  /* 01   */ V(0, 7, 2),
  /* 10   */ V(7, 0, 1),
  /* 11   */ V(7, 0, 1),
  /* 0000 0101 ... */
          /* 00   */ V(6, 2, 1),/* 78 */
  /* 01   */ V(6, 2, 1),
  /* 10   */ V(4, 5, 2),
  /* 11   */ V(3, 5, 2),
  /* 0000 0110 ... */
          /* 00   */ V(0, 6, 1),/* 82 */
  /* 01   */ V(0, 6, 1),
  /* 10   */ V(5, 3, 2),
  /* 11   */ V(4, 4, 2),
  /* 0000 1001 ... */
          /* 0    */ V(3, 6, 1),/* 86 */
  /* 1    */ V(2, 6, 1),
  /* 0000 1010 ... */
          /* 00   */ V(2, 5, 2),/* 88 */
  /* 01   */ V(5, 2, 2),
  /* 10   */ V(1, 5, 1),
  /* 11   */ V(1, 5, 1),
  /* 0000 1011 ... */
          /* 00   */ V(5, 1, 1),/* 92 */
  /* 01   */ V(5, 1, 1),
  /* 10   */ V(3, 4, 2),
  /* 11   */ V(4, 3, 2),
  /* 0000 1111 ... */
          /* 0    */ V(0, 5, 1),/* 96 */
  /* 1    */ V(5, 0, 1),
  /* 0001 0000 ... */
          /* 0    */ V(2, 4, 1),/* 98 */
  /* 1    */ V(4, 2, 1),
  /* 0001 0001 ... */
          /* 0    */ V(3, 3, 1),/* 100 */
  /* 1    */ V(0, 4, 1)
 };
 static
 union huffpair const hufftab11[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ PTR(48, 4),
  /* 0011 */ PTR(64, 3),
  /* 0100 */ V(1, 2, 4),
  /* 0101 */ PTR(72, 1),
  /* 0110 */ V(1, 1, 3),
  /* 0111 */ V(1, 1, 3),
  /* 1000 */ V(0, 1, 3),
  /* 1001 */ V(0, 1, 3),
  /* 1010 */ V(1, 0, 3),
  /* 1011 */ V(1, 0, 3),
  /* 1100 */ V(0, 0, 2),
  /* 1101 */ V(0, 0, 2),
  /* 1110 */ V(0, 0, 2),
  /* 1111 */ V(0, 0, 2),
  /* 0000 ... */
          /* 0000 */ PTR(74, 2),/* 16 */
  /* 0001 */ PTR(78, 3),
  /* 0010 */ PTR(86, 2),
  /* 0011 */ PTR(90, 1),
  /* 0100 */ PTR(92, 2),
  /* 0101 */ V(2, 7, 4),
  /* 0110 */ V(7, 2, 4),
  /* 0111 */ PTR(96, 1),
  /* 1000 */ V(7, 1, 3),
  /* 1001 */ V(7, 1, 3),
  /* 1010 */ V(1, 7, 4),
  /* 1011 */ V(7, 0, 4),
  /* 1100 */ V(3, 6, 4),
  /* 1101 */ V(6, 3, 4),
  /* 1110 */ V(6, 0, 4),
  /* 1111 */ PTR(98, 1),
  /* 0001 ... */
          /* 0000 */ PTR(100, 1),/* 32 */
  /* 0001 */ V(1, 5, 4),
  /* 0010 */ V(6, 2, 3),
  /* 0011 */ V(6, 2, 3),
  /* 0100 */ V(2, 6, 4),
  /* 0101 */ V(0, 6, 4),
  /* 0110 */ V(1, 6, 3),
  /* 0111 */ V(1, 6, 3),
  /* 1000 */ V(6, 1, 3),
  /* 1001 */ V(6, 1, 3),
  /* 1010 */ V(5, 1, 4),
  /* 1011 */ V(3, 4, 4),
  /* 1100 */ V(5, 0, 4),
  /* 1101 */ PTR(102, 1),
  /* 1110 */ V(2, 4, 4),
  /* 1111 */ V(4, 2, 4),
  /* 0010 ... */
          /* 0000 */ V(1, 4, 4),/* 48 */
  /* 0001 */ V(4, 1, 4),
  /* 0010 */ V(0, 4, 4),
  /* 0011 */ V(4, 0, 4),
  /* 0100 */ V(2, 3, 3),
  /* 0101 */ V(2, 3, 3),
  /* 0110 */ V(3, 2, 3),
  /* 0111 */ V(3, 2, 3),
  /* 1000 */ V(1, 3, 2),
  /* 1001 */ V(1, 3, 2),
  /* 1010 */ V(1, 3, 2),
  /* 1011 */ V(1, 3, 2),
  /* 1100 */ V(3, 1, 2),
  /* 1101 */ V(3, 1, 2),
  /* 1110 */ V(3, 1, 2),
  /* 1111 */ V(3, 1, 2),
  /* 0011 ... */
          /* 000  */ V(0, 3, 3),/* 64 */
  /* 001  */ V(3, 0, 3),
  /* 010  */ V(2, 2, 2),
  /* 011  */ V(2, 2, 2),
  /* 100  */ V(2, 1, 1),
  /* 101  */ V(2, 1, 1),
  /* 110  */ V(2, 1, 1),
  /* 111  */ V(2, 1, 1),
  /* 0101 ... */
          /* 0    */ V(0, 2, 1),/* 72 */
  /* 1    */ V(2, 0, 1),
  /* 0000 0000 ... */
          /* 00   */ V(7, 7, 2),/* 74 */
  /* 01   */ V(6, 7, 2),
  /* 10   */ V(7, 6, 2),
  /* 11   */ V(7, 5, 2),
  /* 0000 0001 ... */
          /* 000  */ V(6, 6, 2),/* 78 */
  /* 001  */ V(6, 6, 2),
  /* 010  */ V(4, 7, 2),
  /* 011  */ V(4, 7, 2),
  /* 100  */ V(7, 4, 2),
  /* 101  */ V(7, 4, 2),
  /* 110  */ V(5, 7, 3),
  /* 111  */ V(5, 5, 3),
  /* 0000 0010 ... */
          /* 00   */ V(5, 6, 2),/* 86 */
  /* 01   */ V(6, 5, 2),
  /* 10   */ V(3, 7, 1),
  /* 11   */ V(3, 7, 1),
  /* 0000 0011 ... */
          /* 0    */ V(7, 3, 1),/* 90 */
  /* 1    */ V(4, 6, 1),
  /* 0000 0100 ... */
          /* 00   */ V(4, 5, 2),/* 92 */
  /* 01   */ V(5, 4, 2),
  /* 10   */ V(3, 5, 2),
  /* 11   */ V(5, 3, 2),
  /* 0000 0111 ... */
          /* 0    */ V(6, 4, 1),/* 96 */
  /* 1    */ V(0, 7, 1),
  /* 0000 1111 ... */
          /* 0    */ V(4, 4, 1),/* 98 */
  /* 1    */ V(2, 5, 1),
  /* 0001 0000 ... */
          /* 0    */ V(5, 2, 1),/* 100 */
  /* 1    */ V(0, 5, 1),
  /* 0001 1101 ... */
          /* 0    */ V(4, 3, 1),/* 102 */
  /* 1    */ V(3, 3, 1)
 };
 static
 union huffpair const hufftab12[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ PTR(48, 4),
  /* 0011 */ PTR(64, 2),
  /* 0100 */ PTR(68, 3),
  /* 0101 */ PTR(76, 1),
  /* 0110 */ V(1, 2, 4),
  /* 0111 */ V(2, 1, 4),
  /* 1000 */ PTR(78, 1),
  /* 1001 */ V(0, 0, 4),
  /* 1010 */ V(1, 1, 3),
  /* 1011 */ V(1, 1, 3),
  /* 1100 */ V(0, 1, 3),
  /* 1101 */ V(0, 1, 3),
  /* 1110 */ V(1, 0, 3),
  /* 1111 */ V(1, 0, 3),
  /* 0000 ... */
          /* 0000 */ PTR(80, 2),/* 16 */
  /* 0001 */ PTR(84, 1),
  /* 0010 */ PTR(86, 1),
  /* 0011 */ PTR(88, 1),
  /* 0100 */ V(5, 6, 4),
  /* 0101 */ V(3, 7, 4),
  /* 0110 */ PTR(90, 1),
  /* 0111 */ V(2, 7, 4),
  /* 1000 */ V(7, 2, 4),
  /* 1001 */ V(4, 6, 4),
  /* 1010 */ V(6, 4, 4),
  /* 1011 */ V(1, 7, 4),
  /* 1100 */ V(7, 1, 4),
  /* 1101 */ PTR(92, 1),
  /* 1110 */ V(3, 6, 4),
  /* 1111 */ V(6, 3, 4),
  /* 0001 ... */
          /* 0000 */ V(4, 5, 4),/* 32 */
  /* 0001 */ V(5, 4, 4),
  /* 0010 */ V(4, 4, 4),
  /* 0011 */ PTR(94, 1),
  /* 0100 */ V(2, 6, 3),
  /* 0101 */ V(2, 6, 3),
  /* 0110 */ V(6, 2, 3),
  /* 0111 */ V(6, 2, 3),
  /* 1000 */ V(6, 1, 3),
  /* 1001 */ V(6, 1, 3),
  /* 1010 */ V(1, 6, 4),
  /* 1011 */ V(6, 0, 4),
  /* 1100 */ V(3, 5, 4),
  /* 1101 */ V(5, 3, 4),
  /* 1110 */ V(2, 5, 4),
  /* 1111 */ V(5, 2, 4),
  /* 0010 ... */
          /* 0000 */ V(1, 5, 3),/* 48 */
  /* 0001 */ V(1, 5, 3),
  /* 0010 */ V(5, 1, 3),
  /* 0011 */ V(5, 1, 3),
  /* 0100 */ V(3, 4, 3),
  /* 0101 */ V(3, 4, 3),
  /* 0110 */ V(4, 3, 3),
  /* 0111 */ V(4, 3, 3),
  /* 1000 */ V(5, 0, 4),
  /* 1001 */ V(0, 4, 4),
  /* 1010 */ V(2, 4, 3),
  /* 1011 */ V(2, 4, 3),
  /* 1100 */ V(4, 2, 3),
  /* 1101 */ V(4, 2, 3),
  /* 1110 */ V(1, 4, 3),
  /* 1111 */ V(1, 4, 3),
  /* 0011 ... */
          /* 00   */ V(3, 3, 2),/* 64 */
  /* 01   */ V(4, 1, 2),
  /* 10   */ V(2, 3, 2),
  /* 11   */ V(3, 2, 2),
  /* 0100 ... */
          /* 000  */ V(4, 0, 3),/* 68 */
  /* 001  */ V(0, 3, 3),
  /* 010  */ V(3, 0, 2),
  /* 011  */ V(3, 0, 2),
  /* 100  */ V(1, 3, 1),
  /* 101  */ V(1, 3, 1),
  /* 110  */ V(1, 3, 1),
  /* 111  */ V(1, 3, 1),
  /* 0101 ... */
          /* 0    */ V(3, 1, 1),/* 76 */
  /* 1    */ V(2, 2, 1),
  /* 1000 ... */
          /* 0    */ V(0, 2, 1),/* 78 */
  /* 1    */ V(2, 0, 1),
  /* 0000 0000 ... */
          /* 00   */ V(7, 7, 2),/* 80 */
  /* 01   */ V(6, 7, 2),
  /* 10   */ V(7, 6, 1),
  /* 11   */ V(7, 6, 1),
  /* 0000 0001 ... */
          /* 0    */ V(5, 7, 1),/* 84 */
  /* 1    */ V(7, 5, 1),
  /* 0000 0010 ... */
          /* 0    */ V(6, 6, 1),/* 86 */
  /* 1    */ V(4, 7, 1),
  /* 0000 0011 ... */
          /* 0    */ V(7, 4, 1),/* 88 */
  /* 1    */ V(6, 5, 1),
  /* 0000 0110 ... */
          /* 0    */ V(7, 3, 1),/* 90 */
  /* 1    */ V(5, 5, 1),
  /* 0000 1101 ... */
          /* 0    */ V(0, 7, 1),/* 92 */
  /* 1    */ V(7, 0, 1),
  /* 0001 0011 ... */
          /* 0    */ V(0, 6, 1),/* 94 */
  /* 1    */ V(0, 5, 1)
 };
 static
 union huffpair const hufftab13[] = {
  /* 0000 */ PTR(16, 4),
  /* 0001 */ PTR(32, 4),
  /* 0010 */ PTR(48, 4),
  /* 0011 */ PTR(64, 2),
  /* 0100 */ V(1, 1, 4),
  /* 0101 */ V(0, 1, 4),
  /* 0110 */ V(1, 0, 3),
  /* 0111 */ V(1, 0, 3),
  /* 1000 */ V(0, 0, 1),
  /* 1001 */ V(0, 0, 1),
  /* 1010 */ V(0, 0, 1),
  /* 1011 */ V(0, 0, 1),
  /* 1100 */ V(0, 0, 1),
  /* 1101 */ V(0, 0, 1),
  /* 1110 */ V(0, 0, 1),
  /* 1111 */ V(0, 0, 1),
  /* 0000 ... */
          /* 0000 */ PTR(68, 4),/* 16 */
  /* 0001 */ PTR(84, 4),
  /* 0010 */ PTR(100, 4),
  /* 0011 */ PTR(116, 4),
  /* 0100 */ PTR(132, 4),
  /* 0101 */ PTR(148, 4),
  /* 0110 */ PTR(164, 3),
  /* 0111 */ PTR(172, 3),
  /* 1000 */ PTR(180, 3),
  /* 1001 */ PTR(188, 3),
  /* 1010 */ PTR(196, 3),
  /* 1011 */ PTR(204, 3),
  /* 1100 */ PTR(212, 1),
  /* 1101 */ PTR(214, 2),
  /* 1110 */ PTR(218, 3),
  /* 1111 */ PTR(226, 1),
  /* 0001 ... */
          /* 0000 */ PTR(228, 2),/* 32 */
  /* 0001 */ PTR(232, 2),
  /* 0010 */ PTR(236, 2),
  /* 0011 */ PTR(240, 2),
  /* 0100 */ V(8, 1, 4),
  /* 0101 */ PTR(244, 1),
  /* 0110 */ PTR(246, 1),
  /* 0111 */ PTR(248, 1),
  /* 1000 */ PTR(250, 2),
  /* 1001 */ PTR(254, 1),
  /* 1010 */ V(1, 5, 4),
  /* 1011 */ V(5, 1, 4),
  /* 1100 */ PTR(256, 1),
  /* 1101 */ PTR(258, 1),
  /* 1110 */ PTR(260, 1),
  /* 1111 */ V(1, 4, 4),
  /* 0010 ... */
          /* 0000 */ V(4, 1, 3),/* 48 */
  /* 0001 */ V(4, 1, 3),
  /* 0010 */ V(0, 4, 4),
  /* 0011 */ V(4, 0, 4),
  /* 0100 */ V(2, 3, 4),
  /* 0101 */ V(3, 2, 4),
  /* 0110 */ V(1, 3, 3),
  /* 0111 */ V(1, 3, 3),
  /* 1000 */ V(3, 1, 3),
  /* 1001 */ V(3, 1, 3),
  /* 1010 */ V(0, 3, 3),
  /* 1011 */ V(0, 3, 3),
  /* 1100 */ V(3, 0, 3),
  /* 1101 */ V(3, 0, 3),
  /* 1110 */ V(2, 2, 3),
  /* 1111 */ V(2, 2, 3),
  /* 0011 ... */
          /* 00   */ V(1, 2, 2),/* 64 */
  /* 01   */ V(2, 1, 2),
  /* 10   */ V(0, 2, 2),
  /* 11   */ V(2, 0, 2),
  /* 0000 0000 ... */
          /* 0000 */ PTR(262, 4),/* 68 */
  /* 0001 */ PTR(278, 4),
  /* 0010 */ PTR(294, 4),
  /* 0011 */ PTR(310, 3),
  /* 0100 */ PTR(318, 2),
  /* 0101 */ PTR(322, 2),
  /* 0110 */ PTR(326, 3),
  /* 0111 */ PTR(334, 2),
  /* 1000 */ PTR(338, 1),
  /* 1001 */ PTR(340, 2),
  /* 1010 */ PTR(344, 2),
  /* 1011 */ PTR(348, 2),
  /* 1100 */ PTR(352, 2),
  /* 1101 */ PTR(356, 2),
  /* 1110 */ V(1, 15, 4),
  /* 1111 */ V(15, 1, 4),
  /* 0000 0001 ... */
          /* 0000 */ V(15, 0, 4),/* 84 */
  /* 0001 */ PTR(360, 1),
  /* 0010 */ PTR(362, 1),
  /* 0011 */ PTR(364, 1),
  /* 0100 */ V(14, 2, 4),
  /* 0101 */ PTR(366, 1),
  /* 0110 */ V(1, 14, 4),
  /* 0111 */ V(14, 1, 4),
  /* 1000 */ PTR(368, 1),
  /* 1001 */ PTR(370, 1),
  /* 1010 */ PTR(372, 1),
  /* 1011 */ PTR(374, 1),
  /* 1100 */ PTR(376, 1),
  /* 1101 */ PTR(378, 1),
  /* 1110 */ V(12, 6, 4),
  /* 1111 */ V(3, 13, 4),
  /* 0000 0010 ... */
          /* 0000 */ PTR(380, 1),/* 100 */
  /* 0001 */ V(2, 13, 4),
  /* 0010 */ V(13, 2, 4),
  /* 0011 */ V(1, 13, 4),
  /* 0100 */ V(11, 7, 4),
  /* 0101 */ PTR(382, 1),
  /* 0110 */ PTR(384, 1),
  /* 0111 */ V(12, 3, 4),
  /* 1000 */ PTR(386, 1),
  /* 1001 */ V(4, 11, 4),
  /* 1010 */ V(13, 1, 3),
  /* 1011 */ V(13, 1, 3),
  /* 1100 */ V(0, 13, 4),
  /* 1101 */ V(13, 0, 4),
  /* 1110 */ V(8, 10, 4),
  /* 1111 */ V(10, 8, 4),
  /* 0000 0011 ... */
          /* 0000 */ V(4, 12, 4),/* 116 */
  /* 0001 */ V(12, 4, 4),
  /* 0010 */ V(6, 11, 4),
  /* 0011 */ V(11, 6, 4),
  /* 0100 */ V(3, 12, 3),
  /* 0101 */ V(3, 12, 3),
  /* 0110 */ V(2, 12, 3),
  /* 0111 */ V(2, 12, 3),
  /* 1000 */ V(12, 2, 3),
  /* 1001 */ V(12, 2, 3),
  /* 1010 */ V(5, 11, 3),
  /* 1011 */ V(5, 11, 3),
  /* 1100 */ V(11, 5, 4),
  /* 1101 */ V(8, 9, 4),
  /* 1110 */ V(1, 12, 3),
  /* 1111 */ V(1, 12, 3),
  /* 0000 0100 ... */
          /* 0000 */ V(12, 1, 3),/* 132 */
  /* 0001 */ V(12, 1, 3),
  /* 0010 */ V(9, 8, 4),
  /* 0011 */ V(0, 12, 4),
  /* 0100 */ V(12, 0, 3),
  /* 0101 */ V(12, 0, 3),
  /* 0110 */ V(11, 4, 4),
  /* 0111 */ V(6, 10, 4),
  /* 1000 */ V(10, 6, 4),
  /* 1001 */ V(7, 9, 4),
  /* 1010 */ V(3, 11, 3),
  /* 1011 */ V(3, 11, 3),
  /* 1100 */ V(11, 3, 3),
diff --git a/core/multimedia/opieplayer/libmad/huffman.h b/core/multimedia/opieplayer/libmad/huffman.h
index d051949..e4c1b35 100644
--- a/core/multimedia/opieplayer/libmad/huffman.h
+++ b/core/multimedia/opieplayer/libmad/huffman.h
@@ -1,66 +1,66 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_HUFFMAN_H
 # define LIBMAD_HUFFMAN_H
 union huffquad {
  struct {
    unsigned short final  :  1;
    unsigned short bits   :  3;
    unsigned short offset : 12;
  } ptr;
  struct {
    unsigned short final  :  1;
    unsigned short hlen   :  3;
    unsigned short v      :  1;
    unsigned short w      :  1;
    unsigned short x      :  1;
    unsigned short y      :  1;
  } value;
  unsigned short final    :  1;
 };
 union huffpair {
  struct {
    unsigned short final  :  1;
    unsigned short bits   :  3;
    unsigned short offset : 12;
  } ptr;
  struct {
    unsigned short final  :  1;
    unsigned short hlen   :  3;
    unsigned short x      :  4;
    unsigned short y      :  4;
  } value;
  unsigned short final    :  1;
 };
 struct hufftable {
  union huffpair const *table;
  unsigned short linbits;
  unsigned short startbits;
 };
 extern union huffquad const *const mad_huff_quad_table[2];
 extern struct hufftable const mad_huff_pair_table[32];
 # endif
diff --git a/core/multimedia/opieplayer/libmad/imdct_s.dat b/core/multimedia/opieplayer/libmad/imdct_s.dat
index ed70446..e2d91a0 100644
--- a/core/multimedia/opieplayer/libmad/imdct_s.dat
+++ b/core/multimedia/opieplayer/libmad/imdct_s.dat
@@ -1,62 +1,62 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
  /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,
              -MAD_F(0x0ec835e8) /* -0.923879533 */,
              -MAD_F(0x0216a2a2) /* -0.130526192 */,
               MAD_F(0x0fdcf549) /*  0.991444861 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
              -MAD_F(0x0cb19346) /* -0.793353340 */ },
  /*  6 */  { -MAD_F(0x0cb19346) /* -0.793353340 */,
               MAD_F(0x061f78aa) /*  0.382683432 */,
               MAD_F(0x0fdcf549) /*  0.991444861 */,
               MAD_F(0x0216a2a2) /*  0.130526192 */,
              -MAD_F(0x0ec835e8) /* -0.923879533 */,
              -MAD_F(0x09bd7ca0) /* -0.608761429 */ },
  /*  1 */  {  MAD_F(0x061f78aa) /*  0.382683432 */,
              -MAD_F(0x0ec835e8) /* -0.923879533 */,
               MAD_F(0x0ec835e8) /*  0.923879533 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
               MAD_F(0x0ec835e8) /*  0.923879533 */ },
  /*  7 */  { -MAD_F(0x0ec835e8) /* -0.923879533 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
               MAD_F(0x061f78aa) /*  0.382683432 */,
               MAD_F(0x0ec835e8) /*  0.923879533 */,
               MAD_F(0x0ec835e8) /*  0.923879533 */,
               MAD_F(0x061f78aa) /*  0.382683432 */ },
  /*  2 */  {  MAD_F(0x0216a2a2) /*  0.130526192 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
               MAD_F(0x09bd7ca0) /*  0.608761429 */,
              -MAD_F(0x0cb19346) /* -0.793353340 */,
               MAD_F(0x0ec835e8) /*  0.923879533 */,
              -MAD_F(0x0fdcf549) /* -0.991444861 */ },
  /*  8 */  { -MAD_F(0x0fdcf549) /* -0.991444861 */,
              -MAD_F(0x0ec835e8) /* -0.923879533 */,
              -MAD_F(0x0cb19346) /* -0.793353340 */,
              -MAD_F(0x09bd7ca0) /* -0.608761429 */,
              -MAD_F(0x061f78aa) /* -0.382683432 */,
              -MAD_F(0x0216a2a2) /* -0.130526192 */ }
diff --git a/core/multimedia/opieplayer/libmad/layer12.c b/core/multimedia/opieplayer/libmad/layer12.c
index d291174..512b6a5 100644
--- a/core/multimedia/opieplayer/libmad/layer12.c
+++ b/core/multimedia/opieplayer/libmad/layer12.c
@@ -1,496 +1,534 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # ifdef HAVE_LIMITS_H
 #  include <limits.h>
 # else
 #  define CHAR_BIT  8
 # endif
 # include "fixed.h"
 # include "bit.h"
 # include "stream.h"
 # include "frame.h"
 # include "layer12.h"
 /*
 * scalefactor table
 * used in both Layer I and Layer II decoding
 */
 static
-mad_fixed_t const sf_table[63] = {
+mad_fixed_t const sf_table[64] = {
 # include "sf_table.dat"
 };
 /* --- Layer I ------------------------------------------------------------- */
 /* linear scaling table */
 static
 mad_fixed_t const linear_table[14] = {
  MAD_F(0x15555555),  /* 2^2  / (2^2  - 1) == 1.33333333333333 */
  MAD_F(0x12492492),  /* 2^3  / (2^3  - 1) == 1.14285714285714 */
  MAD_F(0x11111111),  /* 2^4  / (2^4  - 1) == 1.06666666666667 */
  MAD_F(0x10842108),  /* 2^5  / (2^5  - 1) == 1.03225806451613 */
  MAD_F(0x10410410),  /* 2^6  / (2^6  - 1) == 1.01587301587302 */
  MAD_F(0x10204081),  /* 2^7  / (2^7  - 1) == 1.00787401574803 */
  MAD_F(0x10101010),  /* 2^8  / (2^8  - 1) == 1.00392156862745 */
  MAD_F(0x10080402),  /* 2^9  / (2^9  - 1) == 1.00195694716243 */
  MAD_F(0x10040100),  /* 2^10 / (2^10 - 1) == 1.00097751710655 */
  MAD_F(0x10020040),  /* 2^11 / (2^11 - 1) == 1.00048851978505 */
  MAD_F(0x10010010),  /* 2^12 / (2^12 - 1) == 1.00024420024420 */
  MAD_F(0x10008004),  /* 2^13 / (2^13 - 1) == 1.00012208521548 */
  MAD_F(0x10004001),  /* 2^14 / (2^14 - 1) == 1.00006103888177 */
  MAD_F(0x10002000)   /* 2^15 / (2^15 - 1) == 1.00003051850948 */
 };
 /*
         * NAME:I_sample()
         * DESCRIPTION:decode one requantized Layer I sample from a bitstream
 */
 static
 mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb)
 {
  mad_fixed_t sample;
  sample = mad_bit_read(ptr, nb);
  /* invert most significant bit, extend sign, then scale to fixed format */
  sample ^= 1 << (nb - 1);
  sample |= -(sample & (1 << (nb - 1)));
  sample <<= MAD_F_FRACBITS - (nb - 1);
  /* requantize the sample */
  /* s'' = (2^nb / (2^nb - 1)) * (s''' + 2^(-nb + 1)) */
  sample += MAD_F_ONE >> (nb - 1);
  return mad_f_mul(sample, linear_table[nb - 2]);
  /* s' = factor * s'' */
  /* (to be performed by caller) */
 }
 /*
         * NAME:layer->I()
         * DESCRIPTION:decode a single Layer I frame
 */
 int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
 {
  struct mad_header *header = &frame->header;
  unsigned int nch, bound, ch, s, sb, nb;
  unsigned char allocation[2][32], scalefactor[2][32];
  nch = MAD_NCHANNELS(header);
  bound = 32;
  if (header->mode == MAD_MODE_JOINT_STEREO) {
    header->flags |= MAD_FLAG_I_STEREO;
    bound = 4 + header->mode_extension * 4;
  }
  /* check CRC word */
  if (header->flags & MAD_FLAG_PROTECTION) {
    header->crc_check =
      mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
                  header->crc_check);
    if (header->crc_check != header->crc_target &&
        !(frame->options & MAD_OPTION_IGNORECRC)) {
      stream->error = MAD_ERROR_BADCRC;
      return -1;
    }
  }
  /* decode bit allocations */
  for (sb = 0; sb < bound; ++sb) {
    for (ch = 0; ch < nch; ++ch) {
      nb = mad_bit_read(&stream->ptr, 4);
      if (nb == 15) {
        stream->error = MAD_ERROR_BADBITALLOC;
        return -1;
      }
      allocation[ch][sb] = nb ? nb + 1 : 0;
    }
  }
  for (sb = bound; sb < 32; ++sb) {
    nb = mad_bit_read(&stream->ptr, 4);
    if (nb == 15) {
      stream->error = MAD_ERROR_BADBITALLOC;
      return -1;
    }
    allocation[0][sb] =
    allocation[1][sb] = nb ? nb + 1 : 0;
  }
  /* decode scalefactors */
  for (sb = 0; sb < 32; ++sb) {
    for (ch = 0; ch < nch; ++ch) {
      if (allocation[ch][sb]) {
        scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
+# if defined(OPT_STRICT)
+        /*
+         * Scalefactor index 63 does not appear in Table B.1 of
+         * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
+         * so we only reject it if OPT_STRICT is defined.
+         */
        if (scalefactor[ch][sb] == 63) {
          stream->error = MAD_ERROR_BADSCALEFACTOR;
          return -1;
        }
+# endif
      }
    }
  }
  /* decode samples */
  for (s = 0; s < 12; ++s) {
    for (sb = 0; sb < bound; ++sb) {
      for (ch = 0; ch < nch; ++ch) {
        nb = allocation[ch][sb];
        frame->sbsample[ch][s][sb] = nb ?
          mad_f_mul(I_sample(&stream->ptr, nb),
                    sf_table[scalefactor[ch][sb]]) : 0;
      }
    }
    for (sb = bound; sb < 32; ++sb) {
      if ((nb = allocation[0][sb])) {
        mad_fixed_t sample;
        sample = I_sample(&stream->ptr, nb);
        for (ch = 0; ch < nch; ++ch) {
          frame->sbsample[ch][s][sb] =
            mad_f_mul(sample, sf_table[scalefactor[ch][sb]]);
        }
      }
      else {
        for (ch = 0; ch < nch; ++ch)
          frame->sbsample[ch][s][sb] = 0;
      }
    }
  }
  return 0;
 }
 /* --- Layer II ------------------------------------------------------------ */
 /* possible quantization per subband table */
 static
 struct {
  unsigned int sblimit;
  unsigned char const offsets[30];
 } const sbquant_table[5] = {
  /* ISO/IEC 11172-3 Table B.2a */
          { 27, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,/* 0 */
          3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0 } },
  /* ISO/IEC 11172-3 Table B.2b */
          { 30, { 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3,/* 1 */
          3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0 } },
  /* ISO/IEC 11172-3 Table B.2c */
          {  8, { 5, 5, 2, 2, 2, 2, 2, 2 } },                   /* 2 */
  /* ISO/IEC 11172-3 Table B.2d */
          { 12, { 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } },       /* 3 */
  /* ISO/IEC 13818-3 Table B.1 */
          { 30, { 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1,/* 4 */
          1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } }
 };
 /* bit allocation table */
 static
 struct {
  unsigned short nbal;
  unsigned short offset;
 } const bitalloc_table[8] = {
  { 2, 0 },  /* 0 */
  { 2, 3 },  /* 1 */
  { 3, 3 },  /* 2 */
  { 3, 1 },  /* 3 */
  { 4, 2 },  /* 4 */
  { 4, 3 },  /* 5 */
  { 4, 4 },  /* 6 */
  { 4, 5 }   /* 7 */
 };
 /* offsets into quantization class table */
 static
 unsigned char const offset_table[6][15] = {
  { 0, 1, 16                                             },  /* 0 */
  { 0, 1,  2, 3, 4, 5, 16                                },  /* 1 */
  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 14 },  /* 2 */
  { 0, 1,  3, 4, 5, 6,  7, 8,  9, 10, 11, 12, 13, 14, 15 },  /* 3 */
  { 0, 1,  2, 3, 4, 5,  6, 7,  8,  9, 10, 11, 12, 13, 16 },  /* 4 */
  { 0, 2,  4, 5, 6, 7,  8, 9, 10, 11, 12, 13, 14, 15, 16 }   /* 5 */
 };
 /* quantization class table */
 static
 struct quantclass {
  unsigned short nlevels;
  unsigned char group;
  unsigned char bits;
  mad_fixed_t C;
  mad_fixed_t D;
 } const qc_table[17] = {
 # include "qc_table.dat"
 };
 /*
         * NAME:II_samples()
         * DESCRIPTION:decode three requantized Layer II samples from a bitstream
 */
 static
 void II_samples(struct mad_bitptr *ptr,
                struct quantclass const *quantclass,
                mad_fixed_t output[3])
 {
  unsigned int nb, s, sample[3];
  if ((nb = quantclass->group)) {
    unsigned int c, nlevels;
    /* degrouping */
    c = mad_bit_read(ptr, quantclass->bits);
    nlevels = quantclass->nlevels;
    for (s = 0; s < 3; ++s) {
      sample[s] = c % nlevels;
      c /= nlevels;
    }
  }
  else {
    nb = quantclass->bits;
    for (s = 0; s < 3; ++s)
      sample[s] = mad_bit_read(ptr, nb);
  }
  for (s = 0; s < 3; ++s) {
    mad_fixed_t requantized;
    /* invert most significant bit, extend sign, then scale to fixed format */
    requantized  = sample[s] ^ (1 << (nb - 1));
    requantized |= -(requantized & (1 << (nb - 1)));
    requantized <<= MAD_F_FRACBITS - (nb - 1);
    /* requantize the sample */
    /* s'' = C * (s''' + D) */
    output[s] = mad_f_mul(requantized + quantclass->D, quantclass->C);
    /* s' = factor * s'' */
    /* (to be performed by caller) */
  }
 }
 /*
         * NAME:layer->II()
         * DESCRIPTION:decode a single Layer II frame
 */
 int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 {
  struct mad_header *header = &frame->header;
  struct mad_bitptr start;
  unsigned int index, sblimit, nbal, nch, bound, gr, ch, s, sb;
  unsigned char const *offsets;
  unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
  mad_fixed_t samples[3];
  nch = MAD_NCHANNELS(header);
  if (header->flags & MAD_FLAG_LSF_EXT)
    index = 4;
+  else if (header->flags & MAD_FLAG_FREEFORMAT)
+    goto freeformat;
  else {
-    switch (nch == 2 ? header->bitrate / 2 : header->bitrate) {
+    unsigned long bitrate_per_channel;
-    case 32000:
-    case 48000:
+    bitrate_per_channel = header->bitrate;
-      index = (header->samplerate == 32000) ? 3 : 2;
+    if (nch == 2) {
-      break;
+      bitrate_per_channel /= 2;
+# if defined(OPT_STRICT)
+      /*
+       * ISO/IEC 11172-3 allows only single channel mode for 32, 48, 56, and
+       * 80 kbps bitrates in Layer II, but some encoders ignore this
+       * restriction. We enforce it if OPT_STRICT is defined.
+       */
+      if (bitrate_per_channel <= 28000 || bitrate_per_channel == 40000) {
+        stream->error = MAD_ERROR_BADMODE;
+        return -1;
+      }
+# endif
+    }
+    else {  /* nch == 1 */
+      if (bitrate_per_channel > 192000) {
+        /*
+         * ISO/IEC 11172-3 does not allow single channel mode for 224, 256,
+         * 320, or 384 kbps bitrates in Layer II.
+         */
+        stream->error = MAD_ERROR_BADMODE;
+        return -1;
+      }
+    }
-    case 56000:
+    if (bitrate_per_channel <= 48000)
-    case 64000:
+      index = (header->samplerate == 32000) ? 3 : 2;
-    case 80000:
+    else if (bitrate_per_channel <= 80000)
      index = 0;
-      break;
+    else {
+    freeformat:
-    default:
      index = (header->samplerate == 48000) ? 0 : 1;
    }
  }
  sblimit = sbquant_table[index].sblimit;
  offsets = sbquant_table[index].offsets;
  bound = 32;
  if (header->mode == MAD_MODE_JOINT_STEREO) {
    header->flags |= MAD_FLAG_I_STEREO;
    bound = 4 + header->mode_extension * 4;
  }
  if (bound > sblimit)
    bound = sblimit;
  start = stream->ptr;
  /* decode bit allocations */
  for (sb = 0; sb < bound; ++sb) {
    nbal = bitalloc_table[offsets[sb]].nbal;
    for (ch = 0; ch < nch; ++ch)
      allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
  }
  for (sb = bound; sb < sblimit; ++sb) {
    nbal = bitalloc_table[offsets[sb]].nbal;
    allocation[0][sb] =
    allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
  }
  /* decode scalefactor selection info */
  for (sb = 0; sb < sblimit; ++sb) {
    for (ch = 0; ch < nch; ++ch) {
      if (allocation[ch][sb])
        scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
    }
  }
  /* check CRC word */
  if (header->flags & MAD_FLAG_PROTECTION) {
    header->crc_check =
      mad_bit_crc(start, mad_bit_length(&start, &stream->ptr),
                  header->crc_check);
    if (header->crc_check != header->crc_target &&
        !(frame->options & MAD_OPTION_IGNORECRC)) {
      stream->error = MAD_ERROR_BADCRC;
      return -1;
    }
  }
  /* decode scalefactors */
  for (sb = 0; sb < sblimit; ++sb) {
    for (ch = 0; ch < nch; ++ch) {
      if (allocation[ch][sb]) {
        scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
        switch (scfsi[ch][sb]) {
        case 2:
          scalefactor[ch][sb][2] =
          scalefactor[ch][sb][1] =
          scalefactor[ch][sb][0];
          break;
        case 0:
          scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
          /* fall through */
        case 1:
        case 3:
          scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
        }
        if (scfsi[ch][sb] & 1)
          scalefactor[ch][sb][1] = scalefactor[ch][sb][scfsi[ch][sb] - 1];
+# if defined(OPT_STRICT)
+        /*
+         * Scalefactor index 63 does not appear in Table B.1 of
+         * ISO/IEC 11172-3. Nonetheless, other implementations accept it,
+         * so we only reject it if OPT_STRICT is defined.
+         */
        if (scalefactor[ch][sb][0] == 63 ||
            scalefactor[ch][sb][1] == 63 ||
            scalefactor[ch][sb][2] == 63) {
          stream->error = MAD_ERROR_BADSCALEFACTOR;
          return -1;
        }
+# endif
      }
    }
  }
  /* decode samples */
  for (gr = 0; gr < 12; ++gr) {
    for (sb = 0; sb < bound; ++sb) {
      for (ch = 0; ch < nch; ++ch) {
        if ((index = allocation[ch][sb])) {
          index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
          II_samples(&stream->ptr, &qc_table[index], samples);
          for (s = 0; s < 3; ++s) {
            frame->sbsample[ch][3 * gr + s][sb] =
              mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
          }
        }
        else {
          for (s = 0; s < 3; ++s)
            frame->sbsample[ch][3 * gr + s][sb] = 0;
        }
      }
    }
    for (sb = bound; sb < sblimit; ++sb) {
      if ((index = allocation[0][sb])) {
        index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
        II_samples(&stream->ptr, &qc_table[index], samples);
        for (ch = 0; ch < nch; ++ch) {
          for (s = 0; s < 3; ++s) {
            frame->sbsample[ch][3 * gr + s][sb] =
              mad_f_mul(samples[s], sf_table[scalefactor[ch][sb][gr / 4]]);
          }
        }
      }
      else {
        for (ch = 0; ch < nch; ++ch) {
          for (s = 0; s < 3; ++s)
            frame->sbsample[ch][3 * gr + s][sb] = 0;
        }
      }
    }
    for (ch = 0; ch < nch; ++ch) {
      for (s = 0; s < 3; ++s) {
        for (sb = sblimit; sb < 32; ++sb)
          frame->sbsample[ch][3 * gr + s][sb] = 0;
      }
    }
  }
  return 0;
 }
diff --git a/core/multimedia/opieplayer/libmad/layer12.h b/core/multimedia/opieplayer/libmad/layer12.h
index c673726..3fe6bd8 100644
--- a/core/multimedia/opieplayer/libmad/layer12.h
+++ b/core/multimedia/opieplayer/libmad/layer12.h
@@ -1,31 +1,31 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_LAYER12_H
 # define LIBMAD_LAYER12_H
 # include "stream.h"
 # include "frame.h"
 int mad_layer_I(struct mad_stream *, struct mad_frame *);
 int mad_layer_II(struct mad_stream *, struct mad_frame *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/layer3.c b/core/multimedia/opieplayer/libmad/layer3.c
index 03f13fe..3c5dd9e 100644
--- a/core/multimedia/opieplayer/libmad/layer3.c
+++ b/core/multimedia/opieplayer/libmad/layer3.c
@@ -1,2502 +1,2698 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include <stdlib.h>
 # include <string.h>
 # ifdef HAVE_ASSERT_H
 #  include <assert.h>
 # endif
 # ifdef HAVE_LIMITS_H
 #  include <limits.h>
 # else
 #  define CHAR_BIT  8
 # endif
 # include "fixed.h"
 # include "bit.h"
 # include "stream.h"
 # include "frame.h"
 # include "huffman.h"
 # include "layer3.h"
 /* --- Layer III ----------------------------------------------------------- */
 enum {
  count1table_select = 0x01,
  scalefac_scale     = 0x02,
          preflag     = 0x04,
  mixed_block_flag   = 0x08
 };
 enum {
  I_STEREO  = 0x1,
  MS_STEREO = 0x2
 };
 struct sideinfo {
  unsigned int main_data_begin;
  unsigned int private_bits;
  unsigned char scfsi[2];
  struct granule {
    struct channel {
      /* from side info */
      unsigned short part2_3_length;
      unsigned short big_values;
      unsigned short global_gain;
      unsigned short scalefac_compress;
      unsigned char flags;
      unsigned char block_type;
      unsigned char table_select[3];
      unsigned char subblock_gain[3];
      unsigned char region0_count;
      unsigned char region1_count;
      /* from main_data */
              unsigned char scalefac[39];/* scalefac_l and/or scalefac_s */
    } ch[2];
  } gr[2];
 };
 /*
 * scalefactor bit lengths
 * derived from section 2.4.2.7 of ISO/IEC 11172-3
 */
 static
 struct {
  unsigned char slen1;
  unsigned char slen2;
 } const sflen_table[16] = {
  { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 },
  { 3, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
  { 2, 1 }, { 2, 2 }, { 2, 3 }, { 3, 1 },
  { 3, 2 }, { 3, 3 }, { 4, 2 }, { 4, 3 }
 };
 /*
 * number of LSF scalefactor band values
 * derived from section 2.4.3.2 of ISO/IEC 13818-3
 */
 static
 unsigned char const nsfb_table[6][3][4] = {
  { {  6,  5,  5, 5 },
    {  9,  9,  9, 9 },
    {  6,  9,  9, 9 } },
  { {  6,  5,  7, 3 },
    {  9,  9, 12, 6 },
    {  6,  9, 12, 6 } },
  { { 11, 10,  0, 0 },
    { 18, 18,  0, 0 },
    { 15, 18,  0, 0 } },
  { {  7,  7,  7, 0 },
    { 12, 12, 12, 0 },
    {  6, 15, 12, 0 } },
  { {  6,  6,  6, 3 },
    { 12,  9,  9, 6 },
    {  6, 12,  9, 6 } },
  { {  8,  8,  5, 0 },
    { 15, 12,  9, 0 },
    {  6, 18,  9, 0 } }
 };
 /*
 * MPEG-1 scalefactor band widths
 * derived from Table B.8 of ISO/IEC 11172-3
 */
 static
 unsigned char const sfb_48000_long[] = {
   4,  4,  4,  4,  4,  4,  6,  6,  6,   8,  10,
  12, 16, 18, 22, 28, 34, 40, 46, 54,  54, 192
 };
 static
 unsigned char const sfb_44100_long[] = {
   4,  4,  4,  4,  4,  4,  6,  6,  8,   8,  10,
  12, 16, 20, 24, 28, 34, 42, 50, 54,  76, 158
 };
 static
 unsigned char const sfb_32000_long[] = {
   4,  4,  4,  4,  4,  4,  6,  6,  8,  10,  12,
  16, 20, 24, 30, 38, 46, 56, 68, 84, 102,  26
 };
 static
 unsigned char const sfb_48000_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
   6,  6,  6,  6,  6, 10, 10, 10, 12, 12, 12, 14, 14,
  14, 16, 16, 16, 20, 20, 20, 26, 26, 26, 66, 66, 66
 };
 static
 unsigned char const sfb_44100_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
   6,  6,  8,  8,  8, 10, 10, 10, 12, 12, 12, 14, 14,
  14, 18, 18, 18, 22, 22, 22, 30, 30, 30, 56, 56, 56
 };
 static
 unsigned char const sfb_32000_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,
   6,  6,  8,  8,  8, 12, 12, 12, 16, 16, 16, 20, 20,
  20, 26, 26, 26, 34, 34, 34, 42, 42, 42, 12, 12, 12
 };
 static
 unsigned char const sfb_48000_mixed[] = {
  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
  /* short */  4,  4,  4,  6,  6,  6,  6,  6,  6, 10,
              10, 10, 12, 12, 12, 14, 14, 14, 16, 16,
              16, 20, 20, 20, 26, 26, 26, 66, 66, 66
 };
 static
 unsigned char const sfb_44100_mixed[] = {
  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 10,
              10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
              18, 22, 22, 22, 30, 30, 30, 56, 56, 56
 };
 static
 unsigned char const sfb_32000_mixed[] = {
  /* long */   4,  4,  4,  4,  4,  4,  6,  6,
  /* short */  4,  4,  4,  6,  6,  6,  8,  8,  8, 12,
              12, 12, 16, 16, 16, 20, 20, 20, 26, 26,
              26, 34, 34, 34, 42, 42, 42, 12, 12, 12
 };
 /*
 * MPEG-2 scalefactor band widths
 * derived from Table B.2 of ISO/IEC 13818-3
 */
 static
 unsigned char const sfb_24000_long[] = {
   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
  18, 22, 26, 32, 38, 46, 54, 62, 70,  76,  36
 };
 static
 unsigned char const sfb_22050_long[] = {
   6,  6,  6,  6,  6,  6,  8, 10, 12,  14,  16,
  20, 24, 28, 32, 38, 46, 52, 60, 68,  58,  54
 };
 # define sfb_16000_long  sfb_22050_long
 static
 unsigned char const sfb_24000_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
  18, 24, 24, 24, 32, 32, 32, 44, 44, 44, 12, 12, 12
 };
 static
 unsigned char const sfb_22050_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  6,
   6,  6,  8,  8,  8, 10, 10, 10, 14, 14, 14, 18, 18,
  18, 26, 26, 26, 32, 32, 32, 42, 42, 42, 18, 18, 18
 };
 static
 unsigned char const sfb_16000_short[] = {
   4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  6,  6,  8,
   8,  8, 10, 10, 10, 12, 12, 12, 14, 14, 14, 18, 18,
  18, 24, 24, 24, 30, 30, 30, 40, 40, 40, 18, 18, 18
 };
 static
 unsigned char const sfb_24000_mixed[] = {
  /* long */   6,  6,  6,  6,  6,  6,
  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
              24, 32, 32, 32, 44, 44, 44, 12, 12, 12
 };
 static
 unsigned char const sfb_22050_mixed[] = {
  /* long */   6,  6,  6,  6,  6,  6,
  /* short */  6,  6,  6,  6,  6,  6,  8,  8,  8, 10,
              10, 10, 14, 14, 14, 18, 18, 18, 26, 26,
              26, 32, 32, 32, 42, 42, 42, 18, 18, 18
 };
 static
 unsigned char const sfb_16000_mixed[] = {
  /* long */   6,  6,  6,  6,  6,  6,
  /* short */  6,  6,  6,  8,  8,  8, 10, 10, 10, 12,
              12, 12, 14, 14, 14, 18, 18, 18, 24, 24,
              24, 30, 30, 30, 40, 40, 40, 18, 18, 18
 };
 /*
 * MPEG 2.5 scalefactor band widths
 * derived from public sources
 */
 # define sfb_12000_long  sfb_16000_long
 # define sfb_11025_long  sfb_12000_long
 static
 unsigned char const sfb_8000_long[] = {
  12, 12, 12, 12, 12, 12, 16, 20, 24,  28,  32,
  40, 48, 56, 64, 76, 90,  2,  2,  2,   2,   2
 };
 # define sfb_12000_short  sfb_16000_short
 # define sfb_11025_short  sfb_12000_short
 static
 unsigned char const sfb_8000_short[] = {
   8,  8,  8,  8,  8,  8,  8,  8,  8, 12, 12, 12, 16,
  16, 16, 20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36,
  36,  2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
 };
 # define sfb_12000_mixed  sfb_16000_mixed
 # define sfb_11025_mixed  sfb_12000_mixed
-/* the 8000 Hz short block scalefactor bands do not break after the first 36
+/* the 8000 Hz short block scalefactor bands do not break after
-   frequency lines, so this is probably wrong */
+   the first 36 frequency lines, so this is probably wrong */
 static
 unsigned char const sfb_8000_mixed[] = {
  /* long */  12, 12, 12,
  /* short */  4,  4,  4,  8,  8,  8, 12, 12, 12, 16, 16, 16,
              20, 20, 20, 24, 24, 24, 28, 28, 28, 36, 36, 36,
               2,  2,  2,  2,  2,  2,  2,  2,  2, 26, 26, 26
 };
 static
 struct {
  unsigned char const *l;
  unsigned char const *s;
  unsigned char const *m;
 } const sfbwidth_table[9] = {
  { sfb_48000_long, sfb_48000_short, sfb_48000_mixed },
  { sfb_44100_long, sfb_44100_short, sfb_44100_mixed },
  { sfb_32000_long, sfb_32000_short, sfb_32000_mixed },
  { sfb_24000_long, sfb_24000_short, sfb_24000_mixed },
  { sfb_22050_long, sfb_22050_short, sfb_22050_mixed },
  { sfb_16000_long, sfb_16000_short, sfb_16000_mixed },
  { sfb_12000_long, sfb_12000_short, sfb_12000_mixed },
  { sfb_11025_long, sfb_11025_short, sfb_11025_mixed },
  {  sfb_8000_long,  sfb_8000_short,  sfb_8000_mixed }
 };
 /*
 * scalefactor band preemphasis (used only when preflag is set)
 * derived from Table B.6 of ISO/IEC 11172-3
 */
 static
 unsigned char const pretab[22] = {
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 2, 0
 };
 /*
 * table for requantization
 *
 * rq_table[x].mantissa * 2^(rq_table[x].exponent) = x^(4/3)
 */
 static
 struct fixedfloat {
  unsigned long mantissa  : 27;
  unsigned short exponent :  5;
 } const rq_table[8207] = {
 # include "rq_table.dat"
 };
 /*
 * fractional powers of two
 * used for requantization and joint stereo decoding
 *
 * root_table[3 + x] = 2^(x/4)
 */
 static
 mad_fixed_t const root_table[7] = {
  MAD_F(0x09837f05) /* 2^(-3/4) == 0.59460355750136 */,
  MAD_F(0x0b504f33) /* 2^(-2/4) == 0.70710678118655 */,
  MAD_F(0x0d744fcd) /* 2^(-1/4) == 0.84089641525371 */,
  MAD_F(0x10000000) /* 2^( 0/4) == 1.00000000000000 */,
  MAD_F(0x1306fe0a) /* 2^(+1/4) == 1.18920711500272 */,
  MAD_F(0x16a09e66) /* 2^(+2/4) == 1.41421356237310 */,
  MAD_F(0x1ae89f99) /* 2^(+3/4) == 1.68179283050743 */
 };
 /*
 * coefficients for aliasing reduction
 * derived from Table B.9 of ISO/IEC 11172-3
 *
 *  c[]  = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037 }
 * cs[i] =    1 / sqrt(1 + c[i]^2)
 * ca[i] = c[i] / sqrt(1 + c[i]^2)
 */
 static
 mad_fixed_t const cs[8] = {
  +MAD_F(0x0db84a81) /* +0.857492926 */, +MAD_F(0x0e1b9d7f) /* +0.881741997 */,
  +MAD_F(0x0f31adcf) /* +0.949628649 */, +MAD_F(0x0fbba815) /* +0.983314592 */,
  +MAD_F(0x0feda417) /* +0.995517816 */, +MAD_F(0x0ffc8fc8) /* +0.999160558 */,
  +MAD_F(0x0fff964c) /* +0.999899195 */, +MAD_F(0x0ffff8d3) /* +0.999993155 */
 };
 static
 mad_fixed_t const ca[8] = {
  -MAD_F(0x083b5fe7) /* -0.514495755 */, -MAD_F(0x078c36d2) /* -0.471731969 */,
  -MAD_F(0x05039814) /* -0.313377454 */, -MAD_F(0x02e91dd1) /* -0.181913200 */,
  -MAD_F(0x0183603a) /* -0.094574193 */, -MAD_F(0x00a7cb87) /* -0.040965583 */,
  -MAD_F(0x003a2847) /* -0.014198569 */, -MAD_F(0x000f27b4) /* -0.003699975 */
 };
 /*
 * IMDCT coefficients for short blocks
 * derived from section 2.4.3.4.10.2 of ISO/IEC 11172-3
 *
- * imdct_s[i/even][k] = cos((PI / 24) * (2 * (i / 2) + 7) * (2 * k + 1))
+ * imdct_s[i/even][k] = cos((PI / 24) * (2 *       (i / 2) + 7) * (2 * k + 1))
 * imdct_s[i /odd][k] = cos((PI / 24) * (2 * (6 + (i-1)/2) + 7) * (2 * k + 1))
 */
 static
 mad_fixed_t const imdct_s[6][6] = {
 # include "imdct_s.dat"
 };
 # if !defined(ASO_IMDCT)
 /*
 * windowing coefficients for long blocks
 * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
 *
 * window_l[i] = sin((PI / 36) * (i + 1/2))
 */
 static
 mad_fixed_t const window_l[36] = {
  MAD_F(0x00b2aa3e) /* 0.043619387 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
  MAD_F(0x03768962) /* 0.216439614 */, MAD_F(0x04cfb0e2) /* 0.300705800 */,
  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x07635284) /* 0.461748613 */,
  MAD_F(0x0898c779) /* 0.537299608 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
  MAD_F(0x0acf37ad) /* 0.675590208 */, MAD_F(0x0bcbe352) /* 0.737277337 */,
  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x0d7e8807) /* 0.843391446 */,
  MAD_F(0x0e313245) /* 0.887010833 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
  MAD_F(0x0f426cb5) /* 0.953716951 */, MAD_F(0x0f9ee890) /* 0.976296007 */,
  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ffc19fd) /* 0.999048222 */,
  MAD_F(0x0ffc19fd) /* 0.999048222 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
  MAD_F(0x0f9ee890) /* 0.976296007 */, MAD_F(0x0f426cb5) /* 0.953716951 */,
  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0e313245) /* 0.887010833 */,
  MAD_F(0x0d7e8807) /* 0.843391446 */, MAD_F(0x0cb19346) /* 0.793353340 */,
  MAD_F(0x0bcbe352) /* 0.737277337 */, MAD_F(0x0acf37ad) /* 0.675590208 */,
  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0898c779) /* 0.537299608 */,
  MAD_F(0x07635284) /* 0.461748613 */, MAD_F(0x061f78aa) /* 0.382683432 */,
  MAD_F(0x04cfb0e2) /* 0.300705800 */, MAD_F(0x03768962) /* 0.216439614 */,
  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x00b2aa3e) /* 0.043619387 */,
 };
 # endif  /* ASO_IMDCT */
 /*
 * windowing coefficients for short blocks
 * derived from section 2.4.3.4.10.3 of ISO/IEC 11172-3
 *
 * window_s[i] = sin((PI / 12) * (i + 1/2))
 */
 static
 mad_fixed_t const window_s[12] = {
  MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x061f78aa) /* 0.382683432 */,
  MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0cb19346) /* 0.793353340 */,
  MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
  MAD_F(0x0fdcf549) /* 0.991444861 */, MAD_F(0x0ec835e8) /* 0.923879533 */,
  MAD_F(0x0cb19346) /* 0.793353340 */, MAD_F(0x09bd7ca0) /* 0.608761429 */,
  MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
 };
 /*
 * coefficients for intensity stereo processing
 * derived from section 2.4.3.4.9.3 of ISO/IEC 11172-3
 *
 * is_ratio[i] = tan(i * (PI / 12))
 * is_table[i] = is_ratio[i] / (1 + is_ratio[i])
 */
 static
 mad_fixed_t const is_table[7] = {
  MAD_F(0x00000000) /* 0.000000000 */,
  MAD_F(0x0361962f) /* 0.211324865 */,
  MAD_F(0x05db3d74) /* 0.366025404 */,
  MAD_F(0x08000000) /* 0.500000000 */,
  MAD_F(0x0a24c28c) /* 0.633974596 */,
  MAD_F(0x0c9e69d1) /* 0.788675135 */,
  MAD_F(0x10000000) /* 1.000000000 */
 };
 /*
 * coefficients for LSF intensity stereo processing
 * derived from section 2.4.3.2 of ISO/IEC 13818-3
 *
 * is_lsf_table[0][i] = (1 / sqrt(sqrt(2)))^(i + 1)
- * is_lsf_table[1][i] = (1 / sqrt(2))^(i + 1)
+ * is_lsf_table[1][i] = (1 /      sqrt(2)) ^(i + 1)
 */
 static
 mad_fixed_t const is_lsf_table[2][15] = {
  {
    MAD_F(0x0d744fcd) /* 0.840896415 */,
    MAD_F(0x0b504f33) /* 0.707106781 */,
    MAD_F(0x09837f05) /* 0.594603558 */,
    MAD_F(0x08000000) /* 0.500000000 */,
    MAD_F(0x06ba27e6) /* 0.420448208 */,
    MAD_F(0x05a8279a) /* 0.353553391 */,
    MAD_F(0x04c1bf83) /* 0.297301779 */,
    MAD_F(0x04000000) /* 0.250000000 */,
    MAD_F(0x035d13f3) /* 0.210224104 */,
    MAD_F(0x02d413cd) /* 0.176776695 */,
    MAD_F(0x0260dfc1) /* 0.148650889 */,
    MAD_F(0x02000000) /* 0.125000000 */,
    MAD_F(0x01ae89fa) /* 0.105112052 */,
    MAD_F(0x016a09e6) /* 0.088388348 */,
    MAD_F(0x01306fe1) /* 0.074325445 */
  }, {
    MAD_F(0x0b504f33) /* 0.707106781 */,
    MAD_F(0x08000000) /* 0.500000000 */,
    MAD_F(0x05a8279a) /* 0.353553391 */,
    MAD_F(0x04000000) /* 0.250000000 */,
    MAD_F(0x02d413cd) /* 0.176776695 */,
    MAD_F(0x02000000) /* 0.125000000 */,
    MAD_F(0x016a09e6) /* 0.088388348 */,
    MAD_F(0x01000000) /* 0.062500000 */,
    MAD_F(0x00b504f3) /* 0.044194174 */,
    MAD_F(0x00800000) /* 0.031250000 */,
    MAD_F(0x005a827a) /* 0.022097087 */,
    MAD_F(0x00400000) /* 0.015625000 */,
    MAD_F(0x002d413d) /* 0.011048543 */,
    MAD_F(0x00200000) /* 0.007812500 */,
    MAD_F(0x0016a09e) /* 0.005524272 */
  }
 };
 /*
         * NAME:III_sideinfo()
         * DESCRIPTION:decode frame side information from a bitstream
 */
 static
 enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
                            int lsf, struct sideinfo *si,
                            unsigned int *data_bitlen,
                            unsigned int *priv_bitlen)
 {
  unsigned int ngr, gr, ch, i;
  enum mad_error result = MAD_ERROR_NONE;
  *data_bitlen = 0;
  *priv_bitlen = lsf ? ((nch == 1) ? 1 : 2) : ((nch == 1) ? 5 : 3);
  si->main_data_begin = mad_bit_read(ptr, lsf ? 8 : 9);
  si->private_bits    = mad_bit_read(ptr, *priv_bitlen);
  ngr = 1;
  if (!lsf) {
    ngr = 2;
    for (ch = 0; ch < nch; ++ch)
      si->scfsi[ch] = mad_bit_read(ptr, 4);
  }
  for (gr = 0; gr < ngr; ++gr) {
    struct granule *granule = &si->gr[gr];
    for (ch = 0; ch < nch; ++ch) {
      struct channel *channel = &granule->ch[ch];
      channel->part2_3_length    = mad_bit_read(ptr, 12);
      channel->big_values        = mad_bit_read(ptr, 9);
      channel->global_gain       = mad_bit_read(ptr, 8);
      channel->scalefac_compress = mad_bit_read(ptr, lsf ? 9 : 4);
      *data_bitlen += channel->part2_3_length;
      if (channel->big_values > 288 && result == 0)
        result = MAD_ERROR_BADBIGVALUES;
      channel->flags = 0;
      /* window_switching_flag */
      if (mad_bit_read(ptr, 1)) {
        channel->block_type = mad_bit_read(ptr, 2);
        if (channel->block_type == 0 && result == 0)
          result = MAD_ERROR_BADBLOCKTYPE;
        if (!lsf && channel->block_type == 2 && si->scfsi[ch] && result == 0)
          result = MAD_ERROR_BADSCFSI;
        channel->region0_count = 7;
        channel->region1_count = 36;
        if (mad_bit_read(ptr, 1))
          channel->flags |= mixed_block_flag;
        else if (channel->block_type == 2)
          channel->region0_count = 8;
        for (i = 0; i < 2; ++i)
          channel->table_select[i] = mad_bit_read(ptr, 5);
 # if defined(DEBUG)
        channel->table_select[2] = 4;  /* not used */
 # endif
        for (i = 0; i < 3; ++i)
          channel->subblock_gain[i] = mad_bit_read(ptr, 3);
      }
      else {
        channel->block_type = 0;
        for (i = 0; i < 3; ++i)
          channel->table_select[i] = mad_bit_read(ptr, 5);
        channel->region0_count = mad_bit_read(ptr, 4);
        channel->region1_count = mad_bit_read(ptr, 3);
      }
      /* [preflag,] scalefac_scale, count1table_select */
      channel->flags |= mad_bit_read(ptr, lsf ? 2 : 3);
    }
  }
  return result;
 }
 /*
         * NAME:III_scalefactors_lsf()
         * DESCRIPTION:decode channel scalefactors for LSF from a bitstream
 */
 static
 unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
                                  struct channel *channel,
                                  struct channel *gr1ch, int mode_extension)
 {
  struct mad_bitptr start;
  unsigned int scalefac_compress, index, slen[4], part, n, i;
  unsigned char const *nsfb;
  start = *ptr;
  scalefac_compress = channel->scalefac_compress;
  index = (channel->block_type == 2) ?
    ((channel->flags & mixed_block_flag) ? 2 : 1) : 0;
  if (!((mode_extension & I_STEREO) && gr1ch)) {
    if (scalefac_compress < 400) {
      slen[0] = (scalefac_compress >> 4) / 5;
      slen[1] = (scalefac_compress >> 4) % 5;
      slen[2] = (scalefac_compress % 16) >> 2;
      slen[3] =  scalefac_compress %  4;
      nsfb = nsfb_table[0][index];
    }
    else if (scalefac_compress < 500) {
      scalefac_compress -= 400;
      slen[0] = (scalefac_compress >> 2) / 5;
      slen[1] = (scalefac_compress >> 2) % 5;
      slen[2] =  scalefac_compress %  4;
      slen[3] = 0;
      nsfb = nsfb_table[1][index];
    }
    else {
      scalefac_compress -= 500;
      slen[0] = scalefac_compress / 3;
      slen[1] = scalefac_compress % 3;
      slen[2] = 0;
      slen[3] = 0;
      channel->flags |= preflag;
      nsfb = nsfb_table[2][index];
    }
    n = 0;
    for (part = 0; part < 4; ++part) {
      for (i = 0; i < nsfb[part]; ++i)
        channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
    }
    while (n < 39)
      channel->scalefac[n++] = 0;
  }
  else {  /* (mode_extension & I_STEREO) && gr1ch (i.e. ch == 1) */
    scalefac_compress >>= 1;
    if (scalefac_compress < 180) {
      slen[0] =  scalefac_compress / 36;
      slen[1] = (scalefac_compress % 36) / 6;
      slen[2] = (scalefac_compress % 36) % 6;
      slen[3] = 0;
      nsfb = nsfb_table[3][index];
    }
    else if (scalefac_compress < 244) {
      scalefac_compress -= 180;
      slen[0] = (scalefac_compress % 64) >> 4;
      slen[1] = (scalefac_compress % 16) >> 2;
      slen[2] =  scalefac_compress %  4;
      slen[3] = 0;
      nsfb = nsfb_table[4][index];
    }
    else {
      scalefac_compress -= 244;
      slen[0] = scalefac_compress / 3;
      slen[1] = scalefac_compress % 3;
      slen[2] = 0;
      slen[3] = 0;
      nsfb = nsfb_table[5][index];
    }
    n = 0;
    for (part = 0; part < 4; ++part) {
      unsigned int max, is_pos;
      max = (1 << slen[part]) - 1;
      for (i = 0; i < nsfb[part]; ++i) {
        is_pos = mad_bit_read(ptr, slen[part]);
        channel->scalefac[n] = is_pos;
        gr1ch->scalefac[n++] = (is_pos == max);
      }
    }
    while (n < 39) {
      channel->scalefac[n] = 0;
      gr1ch->scalefac[n++] = 0;  /* apparently not illegal */
    }
  }
  return mad_bit_length(&start, ptr);
 }
 /*
         * NAME:III_scalefactors()
         * DESCRIPTION:decode channel scalefactors of one granule from a bitstream
 */
 static
 unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
                              struct channel const *gr0ch, unsigned int scfsi)
 {
  struct mad_bitptr start;
  unsigned int slen1, slen2, sfbi;
  start = *ptr;
  slen1 = sflen_table[channel->scalefac_compress].slen1;
  slen2 = sflen_table[channel->scalefac_compress].slen2;
  if (channel->block_type == 2) {
    unsigned int nsfb;
    sfbi = 0;
    nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
    while (nsfb--)
      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
    nsfb = 6 * 3;
    while (nsfb--)
      channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
    nsfb = 1 * 3;
    while (nsfb--)
      channel->scalefac[sfbi++] = 0;
  }
  else {  /* channel->block_type != 2 */
    if (scfsi & 0x8) {
      for (sfbi = 0; sfbi < 6; ++sfbi)
        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
    }
    else {
      for (sfbi = 0; sfbi < 6; ++sfbi)
        channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
    }
    if (scfsi & 0x4) {
      for (sfbi = 6; sfbi < 11; ++sfbi)
        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
    }
    else {
      for (sfbi = 6; sfbi < 11; ++sfbi)
        channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
    }
    if (scfsi & 0x2) {
      for (sfbi = 11; sfbi < 16; ++sfbi)
        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
    }
    else {
      for (sfbi = 11; sfbi < 16; ++sfbi)
        channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
    }
    if (scfsi & 0x1) {
      for (sfbi = 16; sfbi < 21; ++sfbi)
        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
    }
    else {
      for (sfbi = 16; sfbi < 21; ++sfbi)
        channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
    }
    channel->scalefac[21] = 0;
  }
  return mad_bit_length(&start, ptr);
 }
 /*
 * 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
 */
 static
 void III_exponents(struct channel const *channel,
                   unsigned char const *sfbwidth, signed int exponents[39])
 {
  signed int gain;
  unsigned int scalefac_multiplier, sfbi;
  gain = (signed int) channel->global_gain - 210;
  scalefac_multiplier = (channel->flags & scalefac_scale) ? 2 : 1;
  if (channel->block_type == 2) {
    unsigned int l;
    signed int gain0, gain1, gain2;
    sfbi = l = 0;
    if (channel->flags & mixed_block_flag) {
      unsigned int premask;
      premask = (channel->flags & preflag) ? ~0 : 0;
      /* long block subbands 0-1 */
      while (l < 36) {
        exponents[sfbi] = gain -
          (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) <<
                        scalefac_multiplier);
        l += sfbwidth[sfbi++];
      }
    }
    /* this is probably wrong for 8000 Hz short/mixed blocks */
    gain0 = gain - 8 * (signed int) channel->subblock_gain[0];
    gain1 = gain - 8 * (signed int) channel->subblock_gain[1];
    gain2 = gain - 8 * (signed int) channel->subblock_gain[2];
    while (l < 576) {
      exponents[sfbi + 0] = gain0 -
        (signed int) (channel->scalefac[sfbi + 0] << scalefac_multiplier);
      exponents[sfbi + 1] = gain1 -
        (signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier);
      exponents[sfbi + 2] = gain2 -
        (signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier);
      l    += 3 * sfbwidth[sfbi];
      sfbi += 3;
    }
  }
  else {  /* channel->block_type != 2 */
    if (channel->flags & preflag) {
      for (sfbi = 0; sfbi < 22; ++sfbi) {
        exponents[sfbi] = gain -
          (signed int) ((channel->scalefac[sfbi] + pretab[sfbi]) <<
                        scalefac_multiplier);
      }
    }
    else {
      for (sfbi = 0; sfbi < 22; ++sfbi) {
        exponents[sfbi] = gain -
          (signed int) (channel->scalefac[sfbi] << scalefac_multiplier);
      }
    }
  }
 }
 /*
         * NAME:III_requantize()
         * DESCRIPTION:requantize one (positive) value
 */
 static
 mad_fixed_t III_requantize(unsigned int value, signed int exp)
 {
  mad_fixed_t requantized;
  signed int frac;
  struct fixedfloat const *power;
  frac = exp % 4;  /* assumes sign(frac) == sign(exp) */
  exp /= 4;
  power = &rq_table[value];
  requantized = power->mantissa;
  exp += power->exponent;
  if (exp < 0) {
    if (-exp >= sizeof(mad_fixed_t) * CHAR_BIT) {
      /* underflow */
      requantized = 0;
    }
    else {
      requantized += 1L << (-exp - 1);
      requantized >>= -exp;
    }
  }
  else {
    if (exp >= 5) {
      /* overflow */
 # if defined(DEBUG)
      fprintf(stderr, "requantize overflow (%f * 2^%d)\n",
              mad_f_todouble(requantized), exp);
 # endif
      requantized = MAD_F_MAX;
    }
    else
      requantized <<= exp;
  }
  return frac ? mad_f_mul(requantized, root_table[3 + frac]) : requantized;
 }
 /* we must take care that sz >= bits and sz < sizeof(long) lest bits == 0 */
        # define MASK(cache, sz, bits)\
    (((cache) >> ((sz) - (bits))) & ((1 << (bits)) - 1))
 # define MASK1BIT(cache, sz)  \
    ((cache) & (1 << ((sz) - 1)))
 /*
         * NAME:III_huffdecode()
         * DESCRIPTION:decode Huffman code words of one channel of one granule
 */
 static
 enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
                              struct channel *channel,
                              unsigned char const *sfbwidth,
                              unsigned int part2_length)
 {
  signed int exponents[39], exp;
  signed int const *expptr;
  struct mad_bitptr peek;
  signed int bits_left, cachesz;
  register mad_fixed_t *xrptr;
  mad_fixed_t const *sfbound;
  register unsigned long bitcache;
  bits_left = (signed) channel->part2_3_length - (signed) part2_length;
  if (bits_left < 0)
    return MAD_ERROR_BADPART3LEN;
  III_exponents(channel, sfbwidth, exponents);
  peek = *ptr;
  mad_bit_skip(ptr, bits_left);
  /* align bit reads to byte boundaries */
  cachesz  = mad_bit_bitsleft(&peek);
  cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
  bitcache   = mad_bit_read(&peek, cachesz);
  bits_left -= cachesz;
  xrptr = &xr[0];
  /* big_values */
  {
    unsigned int region, rcount;
    struct hufftable const *entry;
    union huffpair const *table;
    unsigned int linbits, startbits, big_values, reqhits;
    mad_fixed_t reqcache[16];
    sfbound = xrptr + *sfbwidth++;
    rcount  = channel->region0_count + 1;
    entry     = &mad_huff_pair_table[channel->table_select[region = 0]];
    table     = entry->table;
    linbits   = entry->linbits;
    startbits = entry->startbits;
    if (table == 0)
      return MAD_ERROR_BADHUFFTABLE;
    expptr  = &exponents[0];
    exp     = *expptr++;
    reqhits = 0;
    big_values = channel->big_values;
    while (big_values-- && cachesz + bits_left > 0) {
      union huffpair const *pair;
      unsigned int clumpsz, value;
      register mad_fixed_t requantized;
      if (xrptr == sfbound) {
        sfbound += *sfbwidth++;
        /* change table if region boundary */
        if (--rcount == 0) {
          if (region == 0)
            rcount = channel->region1_count + 1;
          else
            rcount = 0;  /* all remaining */
          entry     = &mad_huff_pair_table[channel->table_select[++region]];
          table     = entry->table;
          linbits   = entry->linbits;
          startbits = entry->startbits;
          if (table == 0)
            return MAD_ERROR_BADHUFFTABLE;
        }
        if (exp != *expptr) {
          exp = *expptr;
          reqhits = 0;
        }
        ++expptr;
      }
      if (cachesz < 21) {
        unsigned int bits;
        bits       = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
        bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
        cachesz   += bits;
        bits_left -= bits;
      }
      /* hcod (0..19) */
      clumpsz = startbits;
      pair    = &table[MASK(bitcache, cachesz, clumpsz)];
      while (!pair->final) {
        cachesz -= clumpsz;
        clumpsz = pair->ptr.bits;
        pair    = &table[pair->ptr.offset + MASK(bitcache, cachesz, clumpsz)];
      }
      cachesz -= pair->value.hlen;
      if (linbits) {
        /* x (0..14) */
        value = pair->value.x;
        switch (value) {
        case 0:
          xrptr[0] = 0;
          break;
        case 15:
          if (cachesz < linbits + 2) {
            bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
            cachesz   += 16;
            bits_left -= 16;
          }
          value += MASK(bitcache, cachesz, linbits);
          cachesz -= linbits;
          requantized = III_requantize(value, exp);
          goto x_final;
        default:
          if (reqhits & (1 << value))
            requantized = reqcache[value];
          else {
            reqhits |= (1 << value);
            requantized = reqcache[value] = III_requantize(value, exp);
          }
        x_final:
          xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
            -requantized : requantized;
        }
        /* y (0..14) */
        value = pair->value.y;
        switch (value) {
        case 0:
          xrptr[1] = 0;
          break;
        case 15:
          if (cachesz < linbits + 1) {
            bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
            cachesz   += 16;
            bits_left -= 16;
          }
          value += MASK(bitcache, cachesz, linbits);
          cachesz -= linbits;
          requantized = III_requantize(value, exp);
          goto y_final;
        default:
          if (reqhits & (1 << value))
            requantized = reqcache[value];
          else {
            reqhits |= (1 << value);
            requantized = reqcache[value] = III_requantize(value, exp);
          }
        y_final:
          xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
            -requantized : requantized;
        }
      }
      else {
        /* x (0..1) */
        value = pair->value.x;
        if (value == 0)
          xrptr[0] = 0;
        else {
          if (reqhits & (1 << value))
            requantized = reqcache[value];
          else {
            reqhits |= (1 << value);
            requantized = reqcache[value] = III_requantize(value, exp);
          }
          xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
            -requantized : requantized;
        }
        /* y (0..1) */
        value = pair->value.y;
        if (value == 0)
          xrptr[1] = 0;
        else {
          if (reqhits & (1 << value))
            requantized = reqcache[value];
          else {
            reqhits |= (1 << value);
            requantized = reqcache[value] = III_requantize(value, exp);
          }
          xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
            -requantized : requantized;
        }
      }
      xrptr += 2;
    }
  }
  if (cachesz + bits_left < 0)
    return MAD_ERROR_BADHUFFDATA;  /* big_values overrun */
  /* count1 */
  {
    union huffquad const *table;
    register mad_fixed_t requantized;
    table = mad_huff_quad_table[channel->flags & count1table_select];
    requantized = III_requantize(1, exp);
    while (cachesz + bits_left > 0 && xrptr <= &xr[572]) {
      union huffquad const *quad;
      /* hcod (1..6) */
      if (cachesz < 10) {
        bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
        cachesz   += 16;
        bits_left -= 16;
      }
      quad = &table[MASK(bitcache, cachesz, 4)];
      /* quad tables guaranteed to have at most one extra lookup */
      if (!quad->final) {
        cachesz -= 4;
        quad = &table[quad->ptr.offset +
                      MASK(bitcache, cachesz, quad->ptr.bits)];
      }
      cachesz -= quad->value.hlen;
      if (xrptr == sfbound) {
        sfbound += *sfbwidth++;
        if (exp != *expptr) {
          exp = *expptr;
          requantized = III_requantize(1, exp);
        }
        ++expptr;
      }
      /* v (0..1) */
      xrptr[0] = quad->value.v ?
        (MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
      /* w (0..1) */
      xrptr[1] = quad->value.w ?
        (MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
      xrptr += 2;
      if (xrptr == sfbound) {
        sfbound += *sfbwidth++;
        if (exp != *expptr) {
          exp = *expptr;
          requantized = III_requantize(1, exp);
        }
        ++expptr;
      }
      /* x (0..1) */
      xrptr[0] = quad->value.x ?
        (MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
      /* y (0..1) */
      xrptr[1] = quad->value.y ?
        (MASK1BIT(bitcache, cachesz--) ? -requantized : requantized) : 0;
      xrptr += 2;
    }
    if (cachesz + bits_left < 0) {
 # if 0 && defined(DEBUG)
      fprintf(stderr, "huffman count1 overrun (%d bits)\n",
              -(cachesz + bits_left));
 # endif
      /* technically the bitstream is misformatted, but apparently
         some encoders are just a bit sloppy with stuffing bits */
      xrptr -= 4;
    }
  }
  assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT);
 # if 0 && defined(DEBUG)
  if (bits_left < 0)
    fprintf(stderr, "read %d bits too many\n", -bits_left);
  else if (cachesz + bits_left > 0)
    fprintf(stderr, "%d stuffing bits\n", cachesz + bits_left);
 # endif
  /* rzero */
  while (xrptr < &xr[576]) {
    xrptr[0] = 0;
    xrptr[1] = 0;
    xrptr += 2;
  }
  return MAD_ERROR_NONE;
 }
 # undef MASK
 # undef MASK1BIT
 /*
         * NAME:III_reorder()
         * DESCRIPTION:reorder frequency lines of a short block into subband order
 */
 static
 void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
                 unsigned char const sfbwidth[39])
 {
  mad_fixed_t tmp[32][3][6];
  unsigned int sb, l, f, w, sbw[3], sw[3];
  /* this is probably wrong for 8000 Hz mixed blocks */
  sb = 0;
  if (channel->flags & mixed_block_flag) {
    sb = 2;
    l = 0;
    while (l < 36)
      l += *sfbwidth++;
  }
  for (w = 0; w < 3; ++w) {
    sbw[w] = sb;
    sw[w]  = 0;
  }
  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];
    if (sw[w] == 6) {
      sw[w] = 0;
      ++sbw[w];
    }
  }
  memcpy(&xr[18 * sb], &tmp[sb], (576 - 18 * sb) * sizeof(mad_fixed_t));
 }
 /*
         * NAME:III_stereo()
         * DESCRIPTION:perform joint stereo processing on a granule
 */
 static
 enum mad_error III_stereo(mad_fixed_t xr[2][576],
                          struct granule const *granule,
                          struct mad_header *header,
                          unsigned char const *sfbwidth)
 {
  short modes[39];
  unsigned int sfbi, l, n, i;
  if (granule->ch[0].block_type !=
      granule->ch[1].block_type ||
      (granule->ch[0].flags & mixed_block_flag) !=
      (granule->ch[1].flags & mixed_block_flag))
    return MAD_ERROR_BADSTEREO;
  for (i = 0; i < 39; ++i)
    modes[i] = header->mode_extension;
  /* intensity stereo */
  if (header->mode_extension & I_STEREO) {
    struct channel const *right_ch = &granule->ch[1];
    mad_fixed_t const *right_xr = xr[1];
    unsigned int is_pos;
    header->flags |= MAD_FLAG_I_STEREO;
    /* first determine which scalefactor bands are to be processed */
    if (right_ch->block_type == 2) {
      unsigned int lower, start, max, bound[3], w;
      lower = start = max = bound[0] = bound[1] = bound[2] = 0;
      sfbi = l = 0;
      if (right_ch->flags & mixed_block_flag) {
        while (l < 36) {
          n = sfbwidth[sfbi++];
          for (i = 0; i < n; ++i) {
            if (right_xr[i]) {
              lower = sfbi;
              break;
            }
          }
          right_xr += n;
          l += n;
        }
        start = sfbi;
      }
      w = 0;
      while (l < 576) {
        n = sfbwidth[sfbi++];
        for (i = 0; i < n; ++i) {
          if (right_xr[i]) {
            max = bound[w] = sfbi;
            break;
          }
        }
        right_xr += n;
        l += n;
        w = (w + 1) % 3;
      }
      if (max)
        lower = start;
      /* long blocks */
      for (i = 0; i < lower; ++i)
        modes[i] = header->mode_extension & ~I_STEREO;
      /* short blocks */
      w = 0;
      for (i = start; i < max; ++i) {
        if (i < bound[w])
          modes[i] = header->mode_extension & ~I_STEREO;
        w = (w + 1) % 3;
      }
    }
    else {  /* right_ch->block_type != 2 */
      unsigned int bound;
      bound = 0;
      for (sfbi = l = 0; l < 576; l += n) {
        n = sfbwidth[sfbi++];
        for (i = 0; i < n; ++i) {
          if (right_xr[i]) {
            bound = sfbi;
            break;
          }
        }
        right_xr += n;
      }
      for (i = 0; i < bound; ++i)
        modes[i] = header->mode_extension & ~I_STEREO;
    }
    /* now do the actual processing */
    if (header->flags & MAD_FLAG_LSF_EXT) {
      unsigned char const *illegal_pos = granule[1].ch[1].scalefac;
      mad_fixed_t const *lsf_scale;
      /* intensity_scale */
      lsf_scale = is_lsf_table[right_ch->scalefac_compress & 0x1];
      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
        n = sfbwidth[sfbi];
        if (!(modes[sfbi] & I_STEREO))
          continue;
        if (illegal_pos[sfbi]) {
          modes[sfbi] &= ~I_STEREO;
          continue;
        }
        is_pos = right_ch->scalefac[sfbi];
        for (i = 0; i < n; ++i) {
          register mad_fixed_t left;
          left = xr[0][l + i];
          if (is_pos == 0)
            xr[1][l + i] = left;
          else {
            register mad_fixed_t opposite;
            opposite = mad_f_mul(left, lsf_scale[(is_pos - 1) / 2]);
            if (is_pos & 1) {
              xr[0][l + i] = opposite;
              xr[1][l + i] = left;
            }
            else
              xr[1][l + i] = opposite;
          }
        }
      }
    }
    else {  /* !(header->flags & MAD_FLAG_LSF_EXT) */
      for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
        n = sfbwidth[sfbi];
        if (!(modes[sfbi] & I_STEREO))
          continue;
        is_pos = right_ch->scalefac[sfbi];
        if (is_pos >= 7) {  /* illegal intensity position */
          modes[sfbi] &= ~I_STEREO;
          continue;
        }
        for (i = 0; i < n; ++i) {
          register mad_fixed_t left;
          left = xr[0][l + i];
          xr[0][l + i] = mad_f_mul(left, is_table[    is_pos]);
          xr[1][l + i] = mad_f_mul(left, is_table[6 - is_pos]);
        }
      }
    }
  }
  /* middle/side stereo */
  if (header->mode_extension & MS_STEREO) {
    register mad_fixed_t invsqrt2;
    header->flags |= MAD_FLAG_MS_STEREO;
    invsqrt2 = root_table[3 + -2];
    for (sfbi = l = 0; l < 576; ++sfbi, l += n) {
      n = sfbwidth[sfbi];
      if (modes[sfbi] != MS_STEREO)
        continue;
      for (i = 0; i < n; ++i) {
        register mad_fixed_t m, s;
        m = xr[0][l + i];
        s = xr[1][l + i];
        xr[0][l + i] = mad_f_mul(m + s, invsqrt2);  /* l = (m + s) / sqrt(2) */
        xr[1][l + i] = mad_f_mul(m - s, invsqrt2);  /* r = (m - s) / sqrt(2) */
      }
    }
  }
  return MAD_ERROR_NONE;
 }
 /*
         * NAME:III_aliasreduce()
         * DESCRIPTION:perform frequency line alias reduction
 */
 static
 void III_aliasreduce(mad_fixed_t xr[576], int lines)
 {
  mad_fixed_t const *bound;
  int i;
  bound = &xr[lines];
  for (xr += 18; xr < bound; xr += 18) {
    for (i = 0; i < 8; ++i) {
      register mad_fixed_t a, b;
      register mad_fixed64hi_t hi;
      register mad_fixed64lo_t lo;
      a = xr[-1 - i];
      b = xr[     i];
 # if defined(ASO_ZEROCHECK)
      if (a | b) {
 # endif
        MAD_F_ML0(hi, lo,  a, cs[i]);
        MAD_F_MLA(hi, lo, -b, ca[i]);
        xr[-1 - i] = MAD_F_MLZ(hi, lo);
        MAD_F_ML0(hi, lo,  b, cs[i]);
        MAD_F_MLA(hi, lo,  a, ca[i]);
        xr[     i] = MAD_F_MLZ(hi, lo);
 # if defined(ASO_ZEROCHECK)
      }
 # endif
    }
  }
 }
 # if defined(ASO_IMDCT)
 void III_imdct_l(mad_fixed_t const [18], mad_fixed_t [36], unsigned int);
 # else
+#  if 1
+static
+void fastsdct(mad_fixed_t const x[9], mad_fixed_t y[18])
+{
+  mad_fixed_t a0,  a1,  a2,  a3,  a4,  a5,  a6,  a7,  a8,  a9,  a10, a11, a12;
+  mad_fixed_t a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25;
+  mad_fixed_t m0,  m1,  m2,  m3,  m4,  m5,  m6,  m7;
+  enum {
+    c0 =  MAD_F(0x1f838b8d),  /* 2 * cos( 1 * PI / 18) */
+    c1 =  MAD_F(0x1bb67ae8),  /* 2 * cos( 3 * PI / 18) */
+    c2 =  MAD_F(0x18836fa3),  /* 2 * cos( 4 * PI / 18) */
+    c3 =  MAD_F(0x1491b752),  /* 2 * cos( 5 * PI / 18) */
+    c4 =  MAD_F(0x0af1d43a),  /* 2 * cos( 7 * PI / 18) */
+    c5 =  MAD_F(0x058e86a0),  /* 2 * cos( 8 * PI / 18) */
+    c6 = -MAD_F(0x1e11f642)   /* 2 * cos(16 * PI / 18) */
+  };
+  a0 = x[3] + x[5];
+  a1 = x[3] - x[5];
+  a2 = x[6] + x[2];
+  a3 = x[6] - x[2];
+  a4 = x[1] + x[7];
+  a5 = x[1] - x[7];
+  a6 = x[8] + x[0];
+  a7 = x[8] - x[0];
+  a8  = a0  + a2;
+  a9  = a0  - a2;
+  a10 = a0  - a6;
+  a11 = a2  - a6;
+  a12 = a8  + a6;
+  a13 = a1  - a3;
+  a14 = a13 + a7;
+  a15 = a3  + a7;
+  a16 = a1  - a7;
+  a17 = a1  + a3;
+  m0 = mad_f_mul(a17, -c3);
+  m1 = mad_f_mul(a16, -c0);
+  m2 = mad_f_mul(a15, -c4);
+  m3 = mad_f_mul(a14, -c1);
+  m4 = mad_f_mul(a5,  -c1);
+  m5 = mad_f_mul(a11, -c6);
+  m6 = mad_f_mul(a10, -c5);
+  m7 = mad_f_mul(a9,  -c2);
+  a18 =     x[4] + a4;
+  a19 = 2 * x[4] - a4;
+  a20 = a19 + m5;
+  a21 = a19 - m5;
+  a22 = a19 + m6;
+  a23 = m4  + m2;
+  a24 = m4  - m2;
+  a25 = m4  + m1;
+  /* output to every other slot for convenience */
+  y[ 0] = a18 + a12;
+  y[ 2] = m0  - a25;
+  y[ 4] = m7  - a20;
+  y[ 6] = m3;
+  y[ 8] = a21 - m6;
+  y[10] = a24 - m1;
+  y[12] = a12 - 2 * a18;
+  y[14] = a23 + m0;
+  y[16] = a22 + m7;
+}
+static inline
+void sdctII(mad_fixed_t const x[18], mad_fixed_t X[18])
+{
+  mad_fixed_t tmp[9];
+  int i;
+  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (2 * 18)) */
+  static mad_fixed_t const scale[9] = {
+    MAD_F(0x1fe0d3b4), MAD_F(0x1ee8dd47), MAD_F(0x1d007930),
+    MAD_F(0x1a367e59), MAD_F(0x16a09e66), MAD_F(0x125abcf8),
+    MAD_F(0x0d8616bc), MAD_F(0x08483ee1), MAD_F(0x02c9fad7)
+  };
+  /* divide the 18-point SDCT-II into two 9-point SDCT-IIs */
+  /* even input butterfly */
+  for (i = 0; i < 9; i += 3) {
+    tmp[i + 0] = x[i + 0] + x[18 - (i + 0) - 1];
+    tmp[i + 1] = x[i + 1] + x[18 - (i + 1) - 1];
+    tmp[i + 2] = x[i + 2] + x[18 - (i + 2) - 1];
+  }
+  fastsdct(tmp, &X[0]);
+  /* odd input butterfly and scaling */
+  for (i = 0; i < 9; i += 3) {
+    tmp[i + 0] = mad_f_mul(x[i + 0] - x[18 - (i + 0) - 1], scale[i + 0]);
+    tmp[i + 1] = mad_f_mul(x[i + 1] - x[18 - (i + 1) - 1], scale[i + 1]);
+    tmp[i + 2] = mad_f_mul(x[i + 2] - x[18 - (i + 2) - 1], scale[i + 2]);
+  }
+  fastsdct(tmp, &X[1]);
+  /* output accumulation */
+  for (i = 3; i < 18; i += 8) {
+    X[i + 0] -= X[(i + 0) - 2];
+    X[i + 2] -= X[(i + 2) - 2];
+    X[i + 4] -= X[(i + 4) - 2];
+    X[i + 6] -= X[(i + 6) - 2];
+  }
+}
+static inline
+void dctIV(mad_fixed_t const y[18], mad_fixed_t X[18])
+{
+  mad_fixed_t tmp[18];
+  int i;
+  /* scale[i] = 2 * cos(PI * (2 * i + 1) / (4 * 18)) */
+  static mad_fixed_t const scale[18] = {
+    MAD_F(0x1ff833fa), MAD_F(0x1fb9ea93), MAD_F(0x1f3dd120),
+    MAD_F(0x1e84d969), MAD_F(0x1d906bcf), MAD_F(0x1c62648b),
+    MAD_F(0x1afd100f), MAD_F(0x1963268b), MAD_F(0x1797c6a4),
+    MAD_F(0x159e6f5b), MAD_F(0x137af940), MAD_F(0x11318ef3),
+    MAD_F(0x0ec6a507), MAD_F(0x0c3ef153), MAD_F(0x099f61c5),
+    MAD_F(0x06ed12c5), MAD_F(0x042d4544), MAD_F(0x0165547c)
+  };
+  /* scaling */
+  for (i = 0; i < 18; i += 3) {
+    tmp[i + 0] = mad_f_mul(y[i + 0], scale[i + 0]);
+    tmp[i + 1] = mad_f_mul(y[i + 1], scale[i + 1]);
+    tmp[i + 2] = mad_f_mul(y[i + 2], scale[i + 2]);
+  }
+  /* SDCT-II */
+  sdctII(tmp, X);
+  /* scale reduction and output accumulation */
+  X[0] /= 2;
+  for (i = 1; i < 17; i += 4) {
+    X[i + 0] = X[i + 0] / 2 - X[(i + 0) - 1];
+    X[i + 1] = X[i + 1] / 2 - X[(i + 1) - 1];
+    X[i + 2] = X[i + 2] / 2 - X[(i + 2) - 1];
+    X[i + 3] = X[i + 3] / 2 - X[(i + 3) - 1];
+  }
+  X[17] = X[17] / 2 - X[16];
+}
+/*
+         * NAME:imdct36
+         * DESCRIPTION:perform X[18]->x[36] IMDCT using Szu-Wei Lee's fast algorithm
+ */
+static inline
+void imdct36(mad_fixed_t const x[18], mad_fixed_t y[36])
+{
+  mad_fixed_t tmp[18];
+  int i;
+  /* DCT-IV */
+  dctIV(x, tmp);
+  /* convert 18-point DCT-IV to 36-point IMDCT */
+  for (i =  0; i <  9; i += 3) {
+    y[i + 0] =  tmp[9 + (i + 0)];
+    y[i + 1] =  tmp[9 + (i + 1)];
+    y[i + 2] =  tmp[9 + (i + 2)];
+  }
+  for (i =  9; i < 27; i += 3) {
+    y[i + 0] = -tmp[36 - (9 + (i + 0)) - 1];
+    y[i + 1] = -tmp[36 - (9 + (i + 1)) - 1];
+    y[i + 2] = -tmp[36 - (9 + (i + 2)) - 1];
+  }
+  for (i = 27; i < 36; i += 3) {
+    y[i + 0] = -tmp[(i + 0) - 27];
+    y[i + 1] = -tmp[(i + 1) - 27];
+    y[i + 2] = -tmp[(i + 2) - 27];
+  }
+}
+#  else
 /*
         * NAME:imdct36
         * DESCRIPTION:perform X[18]->x[36] IMDCT
 */
 static inline
 void imdct36(mad_fixed_t const X[18], mad_fixed_t x[36])
 {
  mad_fixed_t t0, t1, t2,  t3,  t4,  t5,  t6,  t7;
  mad_fixed_t t8, t9, t10, t11, t12, t13, t14, t15;
  register mad_fixed64hi_t hi;
  register mad_fixed64lo_t lo;
  MAD_F_ML0(hi, lo, X[4],  MAD_F(0x0ec835e8));
  MAD_F_MLA(hi, lo, X[13], MAD_F(0x061f78aa));
  t6 = MAD_F_MLZ(hi, lo);
  MAD_F_MLA(hi, lo, (t14 = X[1] - X[10]), -MAD_F(0x061f78aa));
  MAD_F_MLA(hi, lo, (t15 = X[7] + X[16]), -MAD_F(0x0ec835e8));
  t0 = MAD_F_MLZ(hi, lo);
  MAD_F_MLA(hi, lo, (t8  = X[0] - X[11] - X[12]),  MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, (t9  = X[2] - X[9]  - X[14]),  MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, (t10 = X[3] - X[8]  - X[15]), -MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, (t11 = X[5] - X[6]  - X[17]), -MAD_F(0x0fdcf549));
  x[7]  = MAD_F_MLZ(hi, lo);
  x[10] = -x[7];
  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, t9,   MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, t11, -MAD_F(0x09bd7ca0));
  x[19] = x[34] = MAD_F_MLZ(hi, lo) - t0;
  t12 = X[0] - X[3] + X[8] - X[11] - X[12] + X[15];
  t13 = X[2] + X[5] - X[6] - X[9]  - X[14] - X[17];
  MAD_F_ML0(hi, lo, t12, -MAD_F(0x0ec835e8));
  MAD_F_MLA(hi, lo, t13,  MAD_F(0x061f78aa));
  x[22] = x[31] = MAD_F_MLZ(hi, lo) + t0;
  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0cb19346));
  t1 = MAD_F_MLZ(hi, lo) + t6;
  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0f9ee890));
  x[6]  = MAD_F_MLZ(hi, lo) + t1;
  x[11] = -x[6];
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x04cfb0e2));
  x[23] = x[30] = MAD_F_MLZ(hi, lo) + t1;
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0acf37ad));
  x[18] = x[35] = MAD_F_MLZ(hi, lo) - t1;
  MAD_F_ML0(hi, lo, X[4],   MAD_F(0x061f78aa));
  MAD_F_MLA(hi, lo, X[13], -MAD_F(0x0ec835e8));
  t7 = MAD_F_MLZ(hi, lo);
  MAD_F_MLA(hi, lo, X[1],  -MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, X[7],   MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x09bd7ca0));
  t2 = MAD_F_MLZ(hi, lo);
  MAD_F_MLA(hi, lo, X[0],   MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0f426cb5));
  x[5]  = MAD_F_MLZ(hi, lo);
  x[12] = -x[5];
  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0bcbe352));
  x[0]  = MAD_F_MLZ(hi, lo) + t2;
  x[17] = -x[0];
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x03768962));
  x[24] = x[29] = MAD_F_MLZ(hi, lo) + t2;
  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, X[10],  MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, X[16],  MAD_F(0x0fdcf549));
  t3 = MAD_F_MLZ(hi, lo) + t7;
  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0ffc19fd));
  x[8] = MAD_F_MLZ(hi, lo) + t3;
  x[9] = -x[8];
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x07635284));
  x[21] = x[32] = MAD_F_MLZ(hi, lo) + t3;
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0898c779));
  x[20] = x[33] = MAD_F_MLZ(hi, lo) - t3;
  MAD_F_ML0(hi, lo, t14, -MAD_F(0x0ec835e8));
  MAD_F_MLA(hi, lo, t15,  MAD_F(0x061f78aa));
  t4 = MAD_F_MLZ(hi, lo) - t7;
  MAD_F_ML0(hi, lo, t12, MAD_F(0x061f78aa));
  MAD_F_MLA(hi, lo, t13, MAD_F(0x0ec835e8));
  x[4]  = MAD_F_MLZ(hi, lo) + t4;
  x[13] = -x[4];
  MAD_F_ML0(hi, lo, t8,   MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0216a2a2));
  MAD_F_MLA(hi, lo, t10,  MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0cb19346));
  x[1]  = MAD_F_MLZ(hi, lo) + t4;
  x[16] = -x[1];
  MAD_F_ML0(hi, lo, t8,  -MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, t9,  -MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, t10, -MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, t11, -MAD_F(0x0216a2a2));
  x[25] = x[28] = MAD_F_MLZ(hi, lo) + t4;
  MAD_F_ML0(hi, lo, X[1],  -MAD_F(0x0fdcf549));
  MAD_F_MLA(hi, lo, X[7],  -MAD_F(0x0cb19346));
  MAD_F_MLA(hi, lo, X[10], -MAD_F(0x09bd7ca0));
  MAD_F_MLA(hi, lo, X[16], -MAD_F(0x0216a2a2));
  t5 = MAD_F_MLZ(hi, lo) - t6;
  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[6],   MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[9],   MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[12],  MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[15],  MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x0d7e8807));
  x[2]  = MAD_F_MLZ(hi, lo) + t5;
  x[15] = -x[2];
  MAD_F_ML0(hi, lo, X[0],   MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[2],   MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[3],   MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[5],   MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x00b2aa3e));
  MAD_F_MLA(hi, lo, X[8],   MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[11],  MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[14],  MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[17],  MAD_F(0x0e313245));
  x[3]  = MAD_F_MLZ(hi, lo) + t5;
  x[14] = -x[3];
  MAD_F_ML0(hi, lo, X[0],  -MAD_F(0x0ffc19fd));
  MAD_F_MLA(hi, lo, X[2],  -MAD_F(0x0f9ee890));
  MAD_F_MLA(hi, lo, X[3],  -MAD_F(0x0f426cb5));
  MAD_F_MLA(hi, lo, X[5],  -MAD_F(0x0e313245));
  MAD_F_MLA(hi, lo, X[6],  -MAD_F(0x0d7e8807));
  MAD_F_MLA(hi, lo, X[8],  -MAD_F(0x0bcbe352));
  MAD_F_MLA(hi, lo, X[9],  -MAD_F(0x0acf37ad));
  MAD_F_MLA(hi, lo, X[11], -MAD_F(0x0898c779));
  MAD_F_MLA(hi, lo, X[12], -MAD_F(0x07635284));
  MAD_F_MLA(hi, lo, X[14], -MAD_F(0x04cfb0e2));
  MAD_F_MLA(hi, lo, X[15], -MAD_F(0x03768962));
  MAD_F_MLA(hi, lo, X[17], -MAD_F(0x00b2aa3e));
  x[26] = x[27] = MAD_F_MLZ(hi, lo) + t5;
 }
+#  endif
 /*
         * NAME:III_imdct_l()
         * DESCRIPTION:perform IMDCT and windowing for long blocks
 */
 static
 void III_imdct_l(mad_fixed_t const X[18], mad_fixed_t z[36],
                 unsigned int block_type)
 {
  unsigned int i;
  /* IMDCT */
  imdct36(X, z);
  /* windowing */
  switch (block_type) {
  case 0:  /* normal window */
 # if defined(ASO_INTERLEAVE1)
    {
      register mad_fixed_t tmp1, tmp2;
      tmp1 = window_l[0];
      tmp2 = window_l[1];
      for (i = 0; i < 34; i += 2) {
        z[i + 0] = mad_f_mul(z[i + 0], tmp1);
        tmp1 = window_l[i + 2];
        z[i + 1] = mad_f_mul(z[i + 1], tmp2);
        tmp2 = window_l[i + 3];
      }
      z[34] = mad_f_mul(z[34], tmp1);
      z[35] = mad_f_mul(z[35], tmp2);
    }
 # elif defined(ASO_INTERLEAVE2)
    {
      register mad_fixed_t tmp1, tmp2;
      tmp1 = z[0];
      tmp2 = window_l[0];
      for (i = 0; i < 35; ++i) {
        z[i] = mad_f_mul(tmp1, tmp2);
        tmp1 = z[i + 1];
        tmp2 = window_l[i + 1];
      }
      z[35] = mad_f_mul(tmp1, tmp2);
    }
 # elif 1
    for (i = 0; i < 36; i += 4) {
      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
      z[i + 3] = mad_f_mul(z[i + 3], window_l[i + 3]);
    }
 # else
    for (i =  0; i < 36; ++i) z[i] = mad_f_mul(z[i], window_l[i]);
 # endif
    break;
  case 1:  /* start block */
-    for (i =  0; i < 18; ++i) z[i] = mad_f_mul(z[i], window_l[i]);
+    for (i =  0; i < 18; i += 3) {
+      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
+      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
+      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
+    }
    /*  (i = 18; i < 24; ++i) z[i] unchanged */
    for (i = 24; i < 30; ++i) z[i] = mad_f_mul(z[i], window_s[i - 18]);
    for (i = 30; i < 36; ++i) z[i] = 0;
    break;
  case 3:  /* stop block */
    for (i =  0; i <  6; ++i) z[i] = 0;
    for (i =  6; i < 12; ++i) z[i] = mad_f_mul(z[i], window_s[i - 6]);
    /*  (i = 12; i < 18; ++i) z[i] unchanged */
-    for (i = 18; i < 36; ++i) z[i] = mad_f_mul(z[i], window_l[i]);
+    for (i = 18; i < 36; i += 3) {
+      z[i + 0] = mad_f_mul(z[i + 0], window_l[i + 0]);
+      z[i + 1] = mad_f_mul(z[i + 1], window_l[i + 1]);
+      z[i + 2] = mad_f_mul(z[i + 2], window_l[i + 2]);
+    }
    break;
  }
 }
 # endif  /* ASO_IMDCT */
 /*
         * NAME:III_imdct_s()
         * DESCRIPTION:perform IMDCT and windowing for short blocks
 */
 static
 void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36])
 {
  mad_fixed_t y[36], *yptr;
  mad_fixed_t const *wptr;
  int w, i;
  register mad_fixed64hi_t hi;
  register mad_fixed64lo_t lo;
  /* IMDCT */
  yptr = &y[0];
  for (w = 0; w < 3; ++w) {
    register mad_fixed_t const (*s)[6];
    s = imdct_s;
    for (i = 0; i < 3; ++i) {
      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
      yptr[i + 0] = MAD_F_MLZ(hi, lo);
      yptr[5 - i] = -yptr[i + 0];
      ++s;
      MAD_F_ML0(hi, lo, X[0], (*s)[0]);
      MAD_F_MLA(hi, lo, X[1], (*s)[1]);
      MAD_F_MLA(hi, lo, X[2], (*s)[2]);
      MAD_F_MLA(hi, lo, X[3], (*s)[3]);
      MAD_F_MLA(hi, lo, X[4], (*s)[4]);
      MAD_F_MLA(hi, lo, X[5], (*s)[5]);
      yptr[ i + 6] = MAD_F_MLZ(hi, lo);
      yptr[11 - i] = yptr[i + 6];
      ++s;
    }
    yptr += 12;
    X    += 6;
  }
  /* windowing, overlapping and concatenation */
  yptr = &y[0];
  wptr = &window_s[0];
  for (i = 0; i < 6; ++i) {
    z[i +  0] = 0;
    z[i +  6] = mad_f_mul(yptr[ 0 + 0], wptr[0]);
    MAD_F_ML0(hi, lo, yptr[ 0 + 6], wptr[6]);
    MAD_F_MLA(hi, lo, yptr[12 + 0], wptr[0]);
    z[i + 12] = MAD_F_MLZ(hi, lo);
    MAD_F_ML0(hi, lo, yptr[12 + 6], wptr[6]);
    MAD_F_MLA(hi, lo, yptr[24 + 0], wptr[0]);
    z[i + 18] = MAD_F_MLZ(hi, lo);
    z[i + 24] = mad_f_mul(yptr[24 + 6], wptr[6]);
    z[i + 30] = 0;
    ++yptr;
    ++wptr;
  }
 }
 /*
         * NAME:III_overlap()
         * DESCRIPTION:perform overlap-add of windowed IMDCT outputs
 */
 static
 void III_overlap(mad_fixed_t const output[36], mad_fixed_t overlap[18],
                 mad_fixed_t sample[18][32], unsigned int sb)
 {
  unsigned int i;
 # if defined(ASO_INTERLEAVE2)
  {
    register mad_fixed_t tmp1, tmp2;
    tmp1 = overlap[0];
    tmp2 = overlap[1];
    for (i = 0; i < 16; i += 2) {
-      sample[i + 0][sb] = output[i + 0] + tmp1;
+      sample[i + 0][sb] = output[i + 0 +  0] + tmp1;
      overlap[i + 0]    = output[i + 0 + 18];
      tmp1 = overlap[i + 2];
-      sample[i + 1][sb] = output[i + 1] + tmp2;
+      sample[i + 1][sb] = output[i + 1 +  0] + tmp2;
      overlap[i + 1]    = output[i + 1 + 18];
      tmp2 = overlap[i + 3];
    }
-    sample[16][sb] = output[16] + tmp1;
+    sample[16][sb] = output[16 +  0] + tmp1;
    overlap[16]    = output[16 + 18];
-    sample[17][sb] = output[17] + tmp2;
+    sample[17][sb] = output[17 +  0] + tmp2;
    overlap[17]    = output[17 + 18];
  }
 # elif 0
  for (i = 0; i < 18; i += 2) {
-    sample[i + 0][sb] = output[i + 0] + overlap[i + 0];
+    sample[i + 0][sb] = output[i + 0 +  0] + overlap[i + 0];
    overlap[i + 0]    = output[i + 0 + 18];
-    sample[i + 1][sb] = output[i + 1] + overlap[i + 1];
+    sample[i + 1][sb] = output[i + 1 +  0] + overlap[i + 1];
    overlap[i + 1]    = output[i + 1 + 18];
  }
 # else
  for (i = 0; i < 18; ++i) {
-    sample[i][sb] = output[i] + overlap[i];
+    sample[i][sb] = output[i +  0] + overlap[i];
    overlap[i]    = output[i + 18];
  }
 # endif
 }
 /*
         * NAME:III_overlap_z()
         * DESCRIPTION:perform "overlap-add" of zero IMDCT outputs
 */
 static inline
 void III_overlap_z(mad_fixed_t overlap[18],
                   mad_fixed_t sample[18][32], unsigned int sb)
 {
  unsigned int i;
 # if defined(ASO_INTERLEAVE2)
  {
    register mad_fixed_t tmp1, tmp2;
    tmp1 = overlap[0];
    tmp2 = overlap[1];
    for (i = 0; i < 16; i += 2) {
      sample[i + 0][sb] = tmp1;
      overlap[i + 0]    = 0;
      tmp1 = overlap[i + 2];
      sample[i + 1][sb] = tmp2;
      overlap[i + 1]    = 0;
      tmp2 = overlap[i + 3];
    }
    sample[16][sb] = tmp1;
    overlap[16]    = 0;
    sample[17][sb] = tmp2;
    overlap[17]    = 0;
  }
 # else
  for (i = 0; i < 18; ++i) {
    sample[i][sb] = overlap[i];
    overlap[i]    = 0;
  }
 # endif
 }
 /*
         * NAME:III_freqinver()
         * DESCRIPTION:perform subband frequency inversion for odd sample lines
 */
 static
 void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
 {
  unsigned int i;
 # if 1 || defined(ASO_INTERLEAVE1) || defined(ASO_INTERLEAVE2)
  {
    register mad_fixed_t tmp1, tmp2;
    tmp1 = sample[1][sb];
    tmp2 = sample[3][sb];
    for (i = 1; i < 13; i += 4) {
      sample[i + 0][sb] = -tmp1;
      tmp1 = sample[i + 4][sb];
      sample[i + 2][sb] = -tmp2;
      tmp2 = sample[i + 6][sb];
    }
    sample[13][sb] = -tmp1;
    tmp1 = sample[17][sb];
    sample[15][sb] = -tmp2;
    sample[17][sb] = -tmp1;
  }
 # else
  for (i = 1; i < 18; i += 2)
    sample[i][sb] = -sample[i][sb];
 # endif
 }
 /*
         * NAME:III_decode()
         * DESCRIPTION:decode frame main_data
 */
 static
 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;
  unsigned int sfreqi, ngr, gr;
  {
    unsigned int sfreq;
    sfreq = header->samplerate;
    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
      sfreq *= 2;
    /* 48000 => 0, 44100 => 1, 32000 => 2,
       24000 => 3, 22050 => 4, 16000 => 5 */
    sfreqi = ((sfreq >>  7) & 0x000f) +
             ((sfreq >> 15) & 0x0001) - 8;
    if (header->flags & MAD_FLAG_MPEG_2_5_EXT)
      sfreqi += 3;
  }
  /* scalefactors, Huffman decoding, requantization */
  ngr = (header->flags & MAD_FLAG_LSF_EXT) ? 1 : 2;
  for (gr = 0; gr < ngr; ++gr) {
    struct granule *granule = &si->gr[gr];
    unsigned char const *sfbwidth[2];
    mad_fixed_t xr[2][576];
    unsigned int ch;
    enum mad_error error;
    for (ch = 0; ch < nch; ++ch) {
      struct channel *channel = &granule->ch[ch];
      unsigned int part2_length;
      sfbwidth[ch] = sfbwidth_table[sfreqi].l;
      if (channel->block_type == 2) {
        sfbwidth[ch] = (channel->flags & mixed_block_flag) ?
          sfbwidth_table[sfreqi].m : sfbwidth_table[sfreqi].s;
      }
      if (header->flags & MAD_FLAG_LSF_EXT) {
        part2_length = III_scalefactors_lsf(ptr, channel,
                                            ch == 0 ? 0 : &si->gr[1].ch[1],
                                            header->mode_extension);
      }
      else {
        part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
                                        gr == 0 ? 0 : si->scfsi[ch]);
      }
      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
      if (error)
        return error;
    }
    /* joint stereo processing */
    if (header->mode == MAD_MODE_JOINT_STEREO && header->mode_extension) {
      error = III_stereo(xr, granule, header, sfbwidth[0]);
      if (error)
        return error;
    }
    /* reordering, alias reduction, IMDCT, overlap-add, frequency inversion */
    for (ch = 0; ch < nch; ++ch) {
      struct channel const *channel = &granule->ch[ch];
      mad_fixed_t (*sample)[32] = &frame->sbsample[ch][18 * gr];
      unsigned int sb, l, i, sblimit;
      mad_fixed_t output[36];
      if (channel->block_type == 2) {
        III_reorder(xr[ch], channel, sfbwidth[ch]);
 # if !defined(OPT_STRICT)
        /*
         * According to ISO/IEC 11172-3, "Alias reduction is not applied for
         * granules with block_type == 2 (short block)." However, other
         * sources suggest alias reduction should indeed be performed on the
         * lower two subbands of mixed blocks. Most other implementations do
         * this, so by default we will too.
         */
        if (channel->flags & mixed_block_flag)
          III_aliasreduce(xr[ch], 36);
 # endif
      }
      else
        III_aliasreduce(xr[ch], 576);
      l = 0;
      /* subbands 0-1 */
      if (channel->block_type != 2 || (channel->flags & mixed_block_flag)) {
        unsigned int block_type;
        block_type = channel->block_type;
        if (channel->flags & mixed_block_flag)
          block_type = 0;
        /* long blocks */
        for (sb = 0; sb < 2; ++sb, l += 18) {
          III_imdct_l(&xr[ch][l], output, block_type);
          III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
        }
      }
      else {
        /* short blocks */
        for (sb = 0; sb < 2; ++sb, l += 18) {
          III_imdct_s(&xr[ch][l], output);
          III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
        }
      }
      III_freqinver(sample, 1);
      /* (nonzero) subbands 2-31 */
      i = 576;
      while (i > 36 && xr[ch][i - 1] == 0)
        --i;
      sblimit = 32 - (576 - i) / 18;
      if (channel->block_type != 2) {
        /* long blocks */
        for (sb = 2; sb < sblimit; ++sb, l += 18) {
          III_imdct_l(&xr[ch][l], output, channel->block_type);
          III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
          if (sb & 1)
            III_freqinver(sample, sb);
        }
      }
      else {
        /* short blocks */
        for (sb = 2; sb < sblimit; ++sb, l += 18) {
          III_imdct_s(&xr[ch][l], output);
          III_overlap(output, (*frame->overlap)[ch][sb], sample, sb);
          if (sb & 1)
            III_freqinver(sample, sb);
        }
      }
      /* remaining (zero) subbands */
      for (sb = sblimit; sb < 32; ++sb) {
        III_overlap_z((*frame->overlap)[ch][sb], sample, sb);
        if (sb & 1)
          III_freqinver(sample, sb);
      }
    }
  }
  return MAD_ERROR_NONE;
 }
 /*
         * NAME:layer->III()
         * DESCRIPTION:decode a single Layer III frame
 */
 int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
 {
  struct mad_header *header = &frame->header;
  unsigned int nch, priv_bitlen, next_md_begin = 0;
  unsigned int si_len, data_bitlen, md_len;
  unsigned int frame_space, frame_used, frame_free;
  struct mad_bitptr ptr;
  struct sideinfo si;
  enum mad_error error;
  int result = 0;
  /* allocate Layer III dynamic structures */
  if (stream->main_data == 0) {
    stream->main_data = malloc(MAD_BUFFER_MDLEN);
    if (stream->main_data == 0) {
      stream->error = MAD_ERROR_NOMEM;
      return -1;
    }
  }
  if (frame->overlap == 0) {
    frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t));
    if (frame->overlap == 0) {
      stream->error = MAD_ERROR_NOMEM;
      return -1;
    }
  }
  nch = MAD_NCHANNELS(header);
  si_len = (header->flags & MAD_FLAG_LSF_EXT) ?
    (nch == 1 ? 9 : 17) : (nch == 1 ? 17 : 32);
  /* check frame sanity */
  if (stream->next_frame - mad_bit_nextbyte(&stream->ptr) <
      (signed int) si_len) {
    stream->error = MAD_ERROR_BADFRAMELEN;
    stream->md_len = 0;
    return -1;
  }
  /* check CRC word */
  if (header->flags & MAD_FLAG_PROTECTION) {
    header->crc_check =
      mad_bit_crc(stream->ptr, si_len * CHAR_BIT, header->crc_check);
    if (header->crc_check != header->crc_target &&
        !(frame->options & MAD_OPTION_IGNORECRC)) {
      stream->error = MAD_ERROR_BADCRC;
      result = -1;
    }
  }
  /* decode frame side information */
  error = III_sideinfo(&stream->ptr, nch, header->flags & MAD_FLAG_LSF_EXT,
                       &si, &data_bitlen, &priv_bitlen);
  if (error && result == 0) {
    stream->error = error;
    result = -1;
  }
  header->flags        |= priv_bitlen;
  header->private_bits |= si.private_bits;
  /* find main_data of next frame */
  {
    struct mad_bitptr peek;
    unsigned long header;
    mad_bit_init(&peek, stream->next_frame);
    header = mad_bit_read(&peek, 32);
    if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
      if (!(header & 0x00010000L))  /* protection_bit */
        mad_bit_skip(&peek, 16);  /* crc_check */
      next_md_begin =
        mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
    }
    mad_bit_finish(&peek);
  }
  /* find main_data of this frame */
  frame_space = stream->next_frame - mad_bit_nextbyte(&stream->ptr);
  if (next_md_begin > si.main_data_begin + frame_space)
    next_md_begin = 0;
  md_len = si.main_data_begin + frame_space - next_md_begin;
  frame_used = 0;
  if (si.main_data_begin == 0) {
    ptr = stream->ptr;
    stream->md_len = 0;
    frame_used = md_len;
  }
  else {
    if (si.main_data_begin > stream->md_len) {
      if (result == 0) {
        stream->error = MAD_ERROR_BADDATAPTR;
        result = -1;
      }
    }
    else {
      mad_bit_init(&ptr,
                   *stream->main_data + stream->md_len - si.main_data_begin);
      if (md_len > si.main_data_begin) {
        assert(stream->md_len + md_len -
               si.main_data_begin <= MAD_BUFFER_MDLEN);
        memcpy(*stream->main_data + stream->md_len,
               mad_bit_nextbyte(&stream->ptr),
               frame_used = md_len - si.main_data_begin);
        stream->md_len += frame_used;
      }
    }
  }
  frame_free = frame_space - frame_used;
  /* decode main_data */
  if (result == 0) {
    error = III_decode(&ptr, frame, &si, nch);
    if (error) {
      stream->error = error;
      result = -1;
    }
-  }
-  /* designate ancillary bits */
+    /* designate ancillary bits */
-  stream->anc_ptr    = ptr;
+    stream->anc_ptr    = ptr;
-  stream->anc_bitlen = md_len * CHAR_BIT - data_bitlen;
+    stream->anc_bitlen = md_len * CHAR_BIT - data_bitlen;
+  }
 # if 0 && defined(DEBUG)
  fprintf(stderr,
          "main_data_begin:%u, md_len:%u, frame_free:%u, "
          "data_bitlen:%u, anc_bitlen: %u\n",
          si.main_data_begin, md_len, frame_free,
          data_bitlen, stream->anc_bitlen);
 # endif
  /* preload main_data buffer with up to 511 bytes for next frame(s) */
  if (frame_free >= next_md_begin) {
    memcpy(*stream->main_data,
           stream->next_frame - next_md_begin, next_md_begin);
    stream->md_len = next_md_begin;
  }
  else {
    if (md_len < si.main_data_begin) {
      unsigned int extra;
      extra = si.main_data_begin - md_len;
      if (extra + frame_free > next_md_begin)
        extra = next_md_begin - frame_free;
      if (extra < stream->md_len) {
        memmove(*stream->main_data,
                *stream->main_data + stream->md_len - extra, extra);
        stream->md_len = extra;
      }
    }
    else
      stream->md_len = 0;
    memcpy(*stream->main_data + stream->md_len,
           stream->next_frame - frame_free, frame_free);
    stream->md_len += frame_free;
  }
  return result;
 }
diff --git a/core/multimedia/opieplayer/libmad/layer3.h b/core/multimedia/opieplayer/libmad/layer3.h
index c1a5c69..1594803 100644
--- a/core/multimedia/opieplayer/libmad/layer3.h
+++ b/core/multimedia/opieplayer/libmad/layer3.h
@@ -1,30 +1,30 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_LAYER3_H
 # define LIBMAD_LAYER3_H
 # include "stream.h"
 # include "frame.h"
 int mad_layer_III(struct mad_stream *, struct mad_frame *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 46af87f..7c41a8f 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,53 +1,44 @@
+QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
+                $(if $(CONFIG_TARGET_64BIT),-DFPM_64BIT) \
+                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
+                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
+QMAKE_CXXFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
+                $(if $(CONFIG_TARGET_64BIT),-DFPM_64BIT) \
+                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
+                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
        TEMPLATE = lib
-        CONFIG   +=  qt warn_on 
+        CONFIG   +=  qt warn_on release
        HEADERS   = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
                layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
        SOURCES   = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
                layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
        TARGET   = madplugin
        DESTDIR   = $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ..
+DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lm
 VERSION   =   1.0.0
-include( $(OPIEDIR)/include.pro )
+TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
-        
+         ../../../../i18n/nl/libmadplugin.ts \
-DEFINES += FPM_INTEL
+         ../../../../i18n/da/libmadplugin.ts \
+         ../../../../i18n/xx/libmadplugin.ts \
-system(echo $QMAKESPEC | grep -s sharp) {
+         ../../../../i18n/en/libmadplugin.ts \
-        DEFINES -= FPM_INTEL
+         ../../../../i18n/es/libmadplugin.ts \
-        DEFINES += FPM_ARM
+         ../../../../i18n/fr/libmadplugin.ts \
-}
+         ../../../../i18n/hu/libmadplugin.ts \
+         ../../../../i18n/ja/libmadplugin.ts \
-system(echo $QMAKESPEC | grep -s ipaq) {
+         ../../../../i18n/ko/libmadplugin.ts \
-        DEFINES -= FPM_INTEL
+         ../../../../i18n/no/libmadplugin.ts \
-        DEFINES += FPM_ARM
+         ../../../../i18n/pl/libmadplugin.ts \
-}
+         ../../../../i18n/pt/libmadplugin.ts \
+         ../../../../i18n/pt_BR/libmadplugin.ts \
-system(echo $QMAKESPEC | grep -s mipsel) {
+         ../../../../i18n/sl/libmadplugin.ts \
-        DEFINES -= FPM_INTEL
+         ../../../../i18n/zh_CN/libmadplugin.ts \
-        DEFINES += FPM_MIPS
+         ../../../../i18n/zh_TW/libmadplugin.ts
-}
-system(echo $QMAKESPEC | grep -s ramses) {
-        DEFINES -= FPM_INTEL
+include ( $(OPIEDIR)/include.pro )
-        DEFINES += FPM_ARM
-}
-system(echo $QMAKESPEC | grep -s arm) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-system(echo $QMAKESPEC | grep -s simpad) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-system(echo $QMAKESPEC | grep -s yopy) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
diff --git a/core/multimedia/opieplayer/libmad/libmad_global.h b/core/multimedia/opieplayer/libmad/libmad_global.h
index 2c9c713..a3417b4 100644
--- a/core/multimedia/opieplayer/libmad/libmad_global.h
+++ b/core/multimedia/opieplayer/libmad/libmad_global.h
@@ -1,58 +1,58 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_GLOBAL_H
 # define LIBMAD_GLOBAL_H
 /* conditional debugging */
 # if defined(DEBUG) && defined(NDEBUG)
 #  error "cannot define both DEBUG and NDEBUG"
 # endif
 # if defined(DEBUG)
 #  include <stdio.h>
 # endif
 /* conditional features */
 # if defined(OPT_SPEED) && defined(OPT_ACCURACY)
 #  error "cannot optimize for both speed and accuracy"
 # endif
 # if defined(OPT_SPEED) && !defined(OPT_SSO)
-#  define OPT_SSO 1
+#  define OPT_SSO
 # endif
 # if defined(HAVE_UNISTD_H) && defined(HAVE_WAITPID) &&  \
    defined(HAVE_FCNTL) && defined(HAVE_PIPE) && defined(HAVE_FORK)
 #  define USE_ASYNC
 # endif
 # if !defined(HAVE_ASSERT_H)
 #  if defined(NDEBUG)
        #   define assert(x)/* nothing */
 #  else
        #   define assert(x)do { if (!(x)) abort(); } while (0)
 #  endif
 # endif
 # endif
diff --git a/core/multimedia/opieplayer/libmad/libmad_version.h b/core/multimedia/opieplayer/libmad/libmad_version.h
index 9e684a7..d40e425 100644
--- a/core/multimedia/opieplayer/libmad/libmad_version.h
+++ b/core/multimedia/opieplayer/libmad/libmad_version.h
@@ -1,47 +1,47 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_VERSION_H
 # define LIBMAD_VERSION_H
        # define MAD_VERSION_MAJOR0
-        # define MAD_VERSION_MINOR14
+        # define MAD_VERSION_MINOR15
-        # define MAD_VERSION_PATCH2
+        # define MAD_VERSION_PATCH1
        # define MAD_VERSION_EXTRA" (beta)"
        # define MAD_VERSION_STRINGIZE(str)#str
        # define MAD_VERSION_STRING(num)MAD_VERSION_STRINGIZE(num)
        # define MAD_VERSION    MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
                                MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
                                MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
                                MAD_VERSION_EXTRA
-        # define MAD_PUBLISHYEAR"2000-2001"
+        # define MAD_PUBLISHYEAR"2000-2004"
-        # define MAD_AUTHOR     "Robert Leslie"
+        # define MAD_AUTHOR     "Underbit Technologies, Inc."
-        # define MAD_EMAIL      "rob@mars.org"
+        # define MAD_EMAIL      "info@underbit.com"
 extern char const mad_version[];
 extern char const mad_copyright[];
 extern char const mad_author[];
 extern char const mad_build[];
 # endif
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 7438a45..1989b4a 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -1,873 +1,869 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // largly modified by Maximilian Reiss <max.reiss@gmx.de>
-#include "libmadplugin.h"
-/* OPIE */
-#include <qpe/config.h>
-#include <opie2/odebug.h>
-/* QT */
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-/* STD */
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <time.h>
 #include <locale.h>
 #include <math.h>
 #include <assert.h>
+#include <qapplication.h>
+#include <qmessagebox.h>
+#include <qregexp.h>
+#include <qpe/config.h>
 // for network handling
 #include <netinet/in.h>
 #include <netdb.h>
 #include <linux/limits.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 //#define HAVE_MMAP
 #if defined(HAVE_MMAP)
 #   include <sys/mman.h>
 #endif
+#include "libmadplugin.h"
 extern "C" {
 #include "mad.h"
 }
 #define MPEG_BUFFER_SIZE    65536
 //#define MPEG_BUFFER_SIZE    32768 //16384 // 8192
 //#define debugMsg(a)     qDebug(a)
 #define debugMsg(a)
 class Input {
 public:
    char const *path;
    int fd;
 #if defined(HAVE_MMAP)
    void *fdm;
 #endif
    unsigned long fileLength;
   unsigned char *data;
    unsigned long length;
    int eof;
 };
 class Output {
 public:
    mad_fixed_t attenuate;
    struct filter *filters;
    unsigned int channels_in;
    unsigned int channels_out;
    unsigned int speed_in;
    unsigned int speed_out;
    const char *path;
 };
 # if defined(HAVE_MMAP)
 static void *map_file(int fd, unsigned long *length)
 {
  void *fdm;
  *length += MAD_BUFFER_GUARD;
  fdm = mmap(0, *length, PROT_READ, MAP_SHARED, fd, 0);
  if (fdm == MAP_FAILED)
    return 0;
 # if defined(HAVE_MADVISE)
  madvise(fdm, *length, MADV_SEQUENTIAL);
 # endif
  return fdm;
 }
 static int unmap_file(void *fdm, unsigned long length)
 {
  if (munmap(fdm, length) == -1)
    return -1;
  return 0;
 }
 # endif
 static inline QString tr( const char *str ) {
    // Apparently this is okay from a plugin as it runs in the process space of the owner of the plugin
    return qApp->translate( "OpiePlayer", str, "libmad strings for mp3 file info" );
 }
 class LibMadPluginData {
 public:
    Input input;
    Output output;
    int bad_last_frame;
    struct mad_stream stream;
    struct mad_frame frame;
    struct mad_synth synth;
    bool flush;
 };
 LibMadPlugin::LibMadPlugin() {
    d = new LibMadPluginData;
    d->input.fd = 0;
 #if defined(HAVE_MMAP)
    d->input.fdm = 0;
 #endif
    d->input.data = 0;
    d->flush = TRUE;
    info = tr( "No Song Open" );
 }
 LibMadPlugin::~LibMadPlugin() {
    close();
    delete d;
 }
 bool LibMadPlugin::isFileSupported( const QString& path ) {
    debugMsg( "LibMadPlugin::isFileSupported" );
    // Mpeg file extensions
    //  "mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3"
    // Other media extensions
    //  "wav","mid","mod","s3m","ogg","avi","mov","sid"
    char *ext = strrchr( path.latin1(), '.' );
    // Test file extension
    if ( ext ) {
        if ( strncasecmp(ext, ".mp2", 4) == 0 )
            return TRUE;
        if ( strncasecmp(ext, ".mp3", 4) == 0 )
            return TRUE;
    }
    // UGLY - just for fast testing
    if ( path.left(4) == "http") {
        return TRUE;
    }
   return FALSE;
 }
 int LibMadPlugin::is_address_multicast(unsigned long address) {
    if ((address & 255) >= 224 && (address & 255) <= 239)
        return (1);
    return (0);
 }
 int LibMadPlugin::udp_open(char *address, int port) {
    int enable = 1L;
    struct sockaddr_in stAddr;
    struct sockaddr_in stLclAddr;
    struct ip_mreq stMreq;
    struct hostent *host;
    int sock;
    stAddr.sin_family = AF_INET;
    stAddr.sin_port = htons(port);
    if ((host = gethostbyname(address)) == NULL) {
        return (0);
    }
    stAddr.sin_addr = *((struct in_addr *)host->h_addr_list[0]);
    /* Create a UDP socket */
    if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
        return (0);
    }
    /* Allow multiple instance of the client to share the same address and port */
    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&enable, sizeof(unsigned long int)) < 0) {
        return (0);
    }
    /* If the address is multicast, register to the multicast group */
    if (is_address_multicast(stAddr.sin_addr.s_addr)) {
        /* Bind the socket to port */
        stLclAddr.sin_family = AF_INET;
        stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
        stLclAddr.sin_port = stAddr.sin_port;
        if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) {
            return (0);
        }
        /* Register to a multicast address */
        stMreq.imr_multiaddr.s_addr = stAddr.sin_addr.s_addr;
        stMreq.imr_interface.s_addr = INADDR_ANY;
        if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&stMreq, sizeof(stMreq)) < 0) {
            return (0);
        }
    } else {
        /* Bind the socket to port */
        stLclAddr.sin_family = AF_INET;
        stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
        stLclAddr.sin_port = htons(0);
        if (bind(sock, (struct sockaddr *)&stLclAddr, sizeof(stLclAddr)) < 0) {
            return (0);
        }
    }
    return (sock);
 }
 int LibMadPlugin::tcp_open(char *address, int port) {
    struct sockaddr_in stAddr;
    struct hostent *host;
    int sock;
    struct linger l;
    memset(&stAddr, 0, sizeof(stAddr));
    stAddr.sin_family = AF_INET;
    stAddr.sin_port = htons(port);
    if ((host = gethostbyname(address)) == NULL) {
        return (0);
    }
    stAddr.sin_addr = *((struct in_addr *)host->h_addr_list[0]);
    if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
        return (0);
    }
    l.l_onoff = 1;
    l.l_linger = 5;
    if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l)) < 0) {
        return (0);
    }
    if (connect(sock, (struct sockaddr *)&stAddr, sizeof(stAddr)) < 0) {
        return (0);
    }
    return (sock);
 }
 /**
 * Read a http line header.
 * This function read character by character.
 * @param tcp_sock the socket use to read the stream
 * @param buf a buffer to receive the data
 * @param size size of the buffer
 * @return the size of the stream read or -1 if an error occured
 */
 int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) {
    int offset = 0;
    do {
        if (::read(tcp_sock, buf + offset, 1) < 0)
            return -1;
        if (buf[offset] != '\r')    /* Strip \r from answer */
            offset++;
    } while (offset < size - 1 && buf[offset - 1] != '\n');
    buf[offset] = 0;
    return offset;
 }
 int LibMadPlugin::http_open(const QString& path ) {
    char *host;
    int port;
    char *request;
    int tcp_sock;
    char http_request[PATH_MAX];
    char filename[PATH_MAX];
    //char c;
    char *arg =strdup(path.latin1());
    /* Check for URL syntax */
    if (strncmp(arg, "http://", strlen("http://"))) {
        return (0);
    }
    /* Parse URL */
    port = 80;
    host = arg + strlen("http://");
    if ((request = strchr(host, '/')) == NULL) {
        return (0);
    }
    *request++ = 0;
    if (strchr(host, ':') != NULL) { /* port is specified */
        port = atoi(strchr(host, ':') + 1);
        *strchr(host, ':') = 0;
    }
    /* Open a TCP socket */
    if (!(tcp_sock = tcp_open(host, port))) {
        perror("http_open");
        return (0);
    }
    snprintf(filename, sizeof(filename) - strlen(host) - 75, "%s", request);
    /* Send HTTP GET request */
    /* Please don't use a Agent know by shoutcast (Lynx, Mozilla) seems to be reconized and print
     * a html page and not the stream */
    snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n"
    /*  "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */
        "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host);
    send(tcp_sock, http_request, strlen(http_request), 0);
    /* Parse server reply */
 #if 0
    do
        read(tcp_sock, &c, sizeof(char));
    while (c != ' ');
    read(tcp_sock, http_request, 4 * sizeof(char));
    http_request[4] = 0;
    if (strcmp(http_request, "200 "))     {
        fprintf(stderr, "http_open: ");
        do {
            read(tcp_sock, &c, sizeof(char));
            fprintf(stderr, "%c", c);
        } while (c != '\r');
        fprintf(stderr, "\n");
        return (0);
    }
 #endif
    QString name;
    QString genre;
    QString bitrate;
    QString url;
    QString message = tr("Info: ");
    do {
        int len;
        len = http_read_line(tcp_sock, http_request, sizeof(http_request));
        if (len == -1) {
-           //            odebug << "http_open: "+ QString(strerror(errno)) +"\n" << oendl;
+           //            qDebug( "http_open: "+ QString(strerror(errno)) +"\n");
            return 0;
        }
        if (QString(http_request).left(9) == "Location:") {
            /* redirect */
            ::close(tcp_sock);
            http_request[strlen(http_request) - 1] = '\0';
            return http_open(&http_request[10]);
        }
        if (QString(http_request).left(4) == "ICY ") {
            /* This is shoutcast/icecast streaming */
            if (strncmp(http_request + 4, "200 ", 4)) {
-               //                odebug << "http_open: " + QString(http_request) + "\n" << oendl;
+               //                qDebug("http_open: " + QString(http_request) + "\n");
                return 0;
            }
        } else if (QString(http_request).left(4) == "icy-") {
            /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */
            if ( QString( http_request ).left( 8 ) == "icy-name" ) {
                name = tr("Name: ") + QString(http_request).mid(9, (QString(http_request).length())- 9 );
            } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) {
                genre = tr("Genre: ") + QString(http_request).mid(10, (QString(http_request).length())-10 );
            } else if ( QString( http_request ).left( 6 ) == "icy-br" ) {
                bitrate = tr("Bitrate: ") + QString(http_request).mid(7, (QString(http_request).length())- 7 );
            } else if ( QString( http_request ).left( 7 ) == "icy-url" ) {
                url = tr("URL: ") + QString(http_request).mid(8, (QString(http_request).length())- 8 );
            }  else if ( QString( http_request ).left( 10 ) == "icy-notice" ) {
                message += QString(http_request).mid(11, QString(http_request).length()-11 ) ;
            }
        }
    } while (strcmp(http_request, "\n") != 0);
    info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
-    //    odebug << "Stream info: " + info << oendl;
+    //    qDebug("Stream info: " + info);
    return (tcp_sock);
 }
 bool LibMadPlugin::open( const QString& path ) {
    debugMsg( "LibMadPlugin::open" );
    Config cfg("OpiePlayer");
    cfg.setGroup("Options");
    bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
-    //    odebug << "buffer size is " << bufferSize << "" << oendl;
+    //    qDebug("buffer size is %d", bufferSize);
    d->bad_last_frame = 0;
    d->flush = TRUE;
    info = QString( "" );
-    //odebug << "Opening " << path << "" << oendl;
+    //qDebug( "Opening %s", path.latin1() );
    if (path.left( 4 ) == "http" ) {
        // in case of any error we get 0 here
        if ( !(http_open(path) == 0) ) {
            d->input.fd = http_open(path);
        } else {
            return FALSE;
        }
    } else {
        d->input.path = path.latin1();
        d->input.fd = ::open( d->input.path, O_RDONLY );
        // thats a better place, since it should only seek for ID3 tags on mp3 files, not streams
        printID3Tags();
    }
    if (d->input.fd == -1) {
-       //        odebug << "error opening " << d->input.path << "" << oendl;
+       //        qDebug("error opening %s", d->input.path );
        return FALSE;
    }
    struct stat stat;
    if (fstat(d->input.fd, &stat) == -1) {
-       //    odebug << "error calling fstat" << oendl;  return FALSE;
+       //    qDebug("error calling fstat"); return FALSE;
    }
    if (S_ISREG(stat.st_mode) && stat.st_size > 0)
  d->input.fileLength = stat.st_size;
    else
  d->input.fileLength = 0;
+    
 #if defined(HAVE_MMAP)
    if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
        d->input.length = stat.st_size;
        d->input.fdm = map_file(d->input.fd, &d->input.length);
        if (d->input.fdm == 0) {
-           //            odebug << "error mmapping file" << oendl;  return FALSE;
+           //            qDebug("error mmapping file"); return FALSE;
        }
        d->input.data = (unsigned char *)d->input.fdm;
    }
 #endif
    if (d->input.data == 0) {
        d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
        if (d->input.data == 0) {
-           //            odebug << "error allocating input buffer" << oendl;
+           //            qDebug("error allocating input buffer");
            return FALSE;
        }
        d->input.length = 0;
    }
    d->input.eof = 0;
    mad_stream_init(&d->stream);
    mad_frame_init(&d->frame);
    mad_synth_init(&d->synth);
    return TRUE;
 }
 bool LibMadPlugin::close() {
    debugMsg( "LibMadPlugin::close" );
    int result = TRUE;
    mad_synth_finish(&d->synth);
    mad_frame_finish(&d->frame);
    mad_stream_finish(&d->stream);
 #if defined(HAVE_MMAP)
    if (d->input.fdm) {
        if (unmap_file(d->input.fdm, d->input.length) == -1) {
-           //            odebug << "error munmapping file" << oendl;
+           //            qDebug("error munmapping file");
            result = FALSE;
        }
        d->input.fdm  = 0;
        d->input.data = 0;
    }
 #endif
    if (d->input.data) {
        free(d->input.data);
        d->input.data = 0;
    }
    if (::close(d->input.fd) == -1) {
-       //        odebug << "error closing file " << d->input.path << "" << oendl;
+       //        qDebug("error closing file %s", d->input.path);
        result = FALSE;
    }
    d->input.fd = 0;
    return result;
 }
 bool LibMadPlugin::isOpen() {
    debugMsg( "LibMadPlugin::isOpen" );
    return ( d->input.fd != 0 );
 }
 int LibMadPlugin::audioStreams() {
    debugMsg( "LibMadPlugin::audioStreams" );
    return 1;
 }
 int LibMadPlugin::audioChannels( int ) {
    debugMsg( "LibMadPlugin::audioChannels" );
 /*
  long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-  odebug << "LibMadPlugin::audioChannels: " << d->frame.header.mode > 0 ? 2 : 1 << "" << oendl;
+  qDebug( "LibMadPlugin::audioChannels: %i", d->frame.header.mode > 0 ? 2 : 1 );
  return d->frame.header.mode > 0 ? 2 : 1;
 */
    return 2;
 }
 int LibMadPlugin::audioFrequency( int ) {
    debugMsg( "LibMadPlugin::audioFrequency" );
    long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-    //    odebug << "LibMadPlugin::audioFrequency: " << d->frame.header.samplerate << "" << oendl;
+    //    qDebug( "LibMadPlugin::audioFrequency: %i", d->frame.header.samplerate );
    return d->frame.header.samplerate;
 }
 int LibMadPlugin::audioSamples( int ) {
   debugMsg( "LibMadPlugin::audioSamples" );
   long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
   mad_header_decode( (struct mad_header *)&d->frame.header, &d->stream );
 /*
-  odebug << "LibMadPlugin::audioSamples: " <<  d->frame.header.duration.seconds << "*" << d->frame.header.samplerate << oendl;
+  qDebug( "LibMadPlugin::audioSamples: %i*%i", d->frame.header.duration.seconds,
+  d->frame.header.samplerate );
  return d->frame.header.duration.seconds * d->frame.header.samplerate;
 */
   if ( d->frame.header.bitrate == 0 )
      return 0;
   int samples = (d->input.fileLength / (d->frame.header.bitrate/8)) * d->frame.header.samplerate;
-   //   odebug << "LibMadPlugin::audioSamples: " << (int)d->input.fileLength
+   //   qDebug( "LibMadPlugin::audioSamples: %i * %i * 8 / %i", (int)d->input.fileLength,
-   //          << " * " << (int)d->frame.header.samplerate << " * 8 / " << (int)d->frame.header.bitrate << oendl;
+   //           (int)d->frame.header.samplerate, (int)d->frame.header.bitrate ); 
-   //   odebug << "LibMadPlugin::audioSamples: " << samples << "" << oendl;
+   //   qDebug( "LibMadPlugin::audioSamples: %i", samples );
   return samples;
 //    return 10000000;
 }
 bool LibMadPlugin::audioSetSample( long, int ) {
    debugMsg( "LibMadPlugin::audioSetSample" );
 //     long totalSamples = audioSamples(0);
 //     if ( totalSamples <= 1 )
 //   return FALSE;
 //     // Seek to requested position
-//     odebug << "seek pos: " << (int)((double)pos * d->input.fileLength / totalSamples) << "" << oendl;
+//     qDebug( "seek pos: %i", (int)((double)pos * d->input.fileLength / totalSamples) );
 //     ::lseek( d->input.fd, (long)((double)pos * d->input.fileLength / totalSamples), SEEK_SET );
 //     mad_stream_sync(&d->stream);
 //     mad_stream_init(&d->stream);
 //     mad_frame_init(&d->frame);
 //     mad_synth_init(&d->synth);
 //     return TRUE;
    debugMsg( "LibMadPlugin::audioSetSample" );
    return FALSE;
 }
 long LibMadPlugin::audioGetSample( int ) {
    debugMsg( "LibMadPlugin::audioGetSample" );
    return 0;
 }
 /*
 bool LibMadPlugin::audioReadSamples( short *, int, long, int ) {
 debugMsg( "LibMadPlugin::audioReadSamples" );
 return FALSE;
 }
 bool LibMadPlugin::audioReReadSamples( short *, int, long, int ) {
 debugMsg( "LibMadPlugin::audioReReadSamples" );
    return FALSE;
    }
 */
 bool LibMadPlugin::read() {
    debugMsg( "LibMadPlugin::read" );
    int len;
      if (d->input.eof)
  return FALSE;
 #if defined(HAVE_MMAP)
      if (d->input.fdm) {
          unsigned long skip = 0;
          if (d->stream.next_frame) {
              struct stat stat;
              if (fstat(d->input.fd, &stat) == -1)
                  return FALSE;
              if (stat.st_size + MAD_BUFFER_GUARD <= (signed)d->input.length)
                  return FALSE;
              // file size changed; update memory map
              skip = d->stream.next_frame - d->input.data;
              if (unmap_file(d->input.fdm, d->input.length) == -1) {
                  d->input.fdm  = 0;
                  d->input.data = 0;
                  return FALSE;
              }
              d->input.length = stat.st_size;
              d->input.fdm = map_file(d->input.fd, &d->input.length);
              if (d->input.fdm == 0) {
                  d->input.data = 0;
                  return FALSE;
              }
              d->input.data = (unsigned char *)d->input.fdm;
          }
          mad_stream_buffer(&d->stream, d->input.data + skip, d->input.length - skip);
      } else
 #endif
      {
          if (d->stream.next_frame) {
              memmove(d->input.data, d->stream.next_frame,
                      d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
          }
          do {
              len = ::read(d->input.fd, d->input.data + d->input.length, bufferSize /* MPEG_BUFFER_SIZE*/ - d->input.length);
          }
          while (len == -1 && errno == EINTR);
          if (len == -1) {
-             //              odebug << "error reading audio" << oendl;
+             //              qDebug("error reading audio");
              return FALSE;
          }
          else if (len == 0) {
              d->input.eof = 1;
              assert(bufferSize /*MPEG_BUFFER_SIZE*/ - d->input.length >= MAD_BUFFER_GUARD);
              while (len < MAD_BUFFER_GUARD)
                  d->input.data[d->input.length + len++] = 0;
          }
          mad_stream_buffer(&d->stream, d->input.data, d->input.length += len);
      }
      return TRUE;
 }
 static mad_fixed_t left_err, right_err;
 static const int bits = 16;
 static const int shift = MAD_F_FRACBITS + 1 - bits;
 inline long audio_linear_dither( mad_fixed_t sample, mad_fixed_t& error ) {
    sample += error;
    mad_fixed_t quantized = (sample >= MAD_F_ONE) ? MAD_F_ONE - 1 : ( (sample < -MAD_F_ONE) ? -MAD_F_ONE : sample );
    quantized &= ~((1L << shift) - 1);
    error = sample - quantized;
    return quantized >> shift;
 }
 inline void audio_pcm( short *data, unsigned int nsamples, mad_fixed_t *left, mad_fixed_t *right ) {
    if ( right ) {
        while (nsamples--) {
            data[0] = audio_linear_dither( *left++,  left_err );
            data[1] = audio_linear_dither( *right++, right_err );
            data += 2;
        }
    } else {
        while (nsamples--) {
            data[0] = data[1] = audio_linear_dither( *left++,  left_err );
            data += 2;
        }
    }
 }
 bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
    debugMsg( "LibMadPlugin::decode" );
    static int buffered = 0;
    static mad_fixed_t buffer[2][65536 * 2];
    int offset = buffered;
    samplesMade = 0;
    static int maxBuffered = 8000; // 65536;
    if ( samples > maxBuffered ) {
        samples = maxBuffered;
    }
    if ( d->flush ) {
        buffered = 0;
        offset = 0;
        d->flush = FALSE;
    }
    while ( buffered < maxBuffered ) {
        while (mad_frame_decode(&d->frame, &d->stream) == -1) {
            if (!MAD_RECOVERABLE(d->stream.error)) {
                debugMsg( "feed me" );
                return FALSE; // Feed me
            }
            if ( d->stream.error == MAD_ERROR_BADCRC ) {
                mad_frame_mute(&d->frame);
-                //                odebug << "error decoding, bad crc" << oendl;
+                //                qDebug( "error decoding, bad crc" );
            }
        }
        mad_synth_frame(&d->synth, &d->frame);
        int decodedSamples = d->synth.pcm.length;
        memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) );
        if ( d->synth.pcm.channels == 2 )
            memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) );
        offset += decodedSamples;
        buffered += decodedSamples;
    }
 //qApp->processEvents();
    audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 );
 //    audio_pcm( output, samples, buffer[1], buffer[0] );
 //    audio_pcm( output, samples, buffer[0], buffer[1] );
    samplesMade = samples;
    memmove( buffer[0], &(buffer[0][samples]), (buffered - samples) * sizeof(mad_fixed_t) );
    if ( d->synth.pcm.channels == 2 ) {
        memmove( buffer[1], &(buffer[1][samples]), (buffered - samples) * sizeof(mad_fixed_t) );
    }
    buffered -= samples;
    return TRUE;
 }
 /*bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) {
 */
 bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long samples, long& samplesMade, int ) {
    debugMsg( "LibMadPlugin::audioReadStereoSamples" );
    static bool needInput = TRUE;
    if ( samples == 0 )
        return FALSE;
    do {
        if ( needInput )
            if ( !read() ) {
                return FALSE;
            }
        needInput = FALSE;
        if ( decode( output, samples, samplesMade ) )
            return TRUE;
        else
            needInput = TRUE;
    }
    while ( ( samplesMade < samples ) && ( !d->input.eof ) );
    return FALSE;
 }
 double LibMadPlugin::getTime() {
    debugMsg( "LibMadPlugin::getTime" );
    return 0.0;
 }
 void LibMadPlugin::printID3Tags() {
-   //    odebug << "LibMadPlugin::printID3Tags" << oendl;
+   //    qDebug( "LibMadPlugin::printID3Tags" );
    char id3v1[128 + 1];
    if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) {
-       //        odebug << "error seeking to id3 tags" << oendl;
+       //        qDebug( "error seeking to id3 tags" );
        return;
    }
    if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) {
-       //        odebug << "error reading in id3 tags" << oendl;
+       //        qDebug( "error reading in id3 tags" );
        return;
    }
    if ( ::strncmp( (const char *)id3v1, "TAG", 3 ) != 0 ) {
        debugMsg( "sorry, no id3 tags" );
    } else {
        int len[5] = { 30, 30, 30, 4, 30 };
        QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
        char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
-        //        odebug << "ID3 tags in file:" << oendl;
+        //        qDebug( "ID3 tags in file:" );
        info = "";
        for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
            char push = *ptr2;
            *ptr2 = '\0';
            char *ptr3 = ptr2;
            while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--;
            char push2 = *ptr3; *ptr3 = '\0';
            if ( strcmp( ptr, "" ) ) {
                if( ((QString)ptr).find("  ") == -1) // don't add anything that has blanks
                info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
            }
-//             odebug << info.latin1() << oendl;
+//             qDebug( info.latin1() );
            *ptr3 = push2;
            *ptr2 = push;
        }
        if (id3v1[126] == 0 && id3v1[127] != 0)
            info += tr( ", Track: " ) + id3v1[127];
    }
    if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
-       //        odebug << "error seeking back to beginning" << oendl;
+       //        qDebug( "error seeking back to beginning" );
        return;
    }
 }
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
index b3e01e5..67779e8 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
@@ -1,72 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "libmadplugin.h"
 #include "libmadpluginimpl.h"
 LibMadPluginImpl::LibMadPluginImpl()
    : libmadplugin(0), ref(0)
 {
 }
 LibMadPluginImpl::~LibMadPluginImpl()
 {
    if ( libmadplugin )
  delete libmadplugin;
 }
 MediaPlayerDecoder *LibMadPluginImpl::decoder()
 {
    if ( !libmadplugin )
  libmadplugin = new LibMadPlugin;
    return libmadplugin;
 }
 MediaPlayerEncoder *LibMadPluginImpl::encoder()
 {
    return NULL;
 }
 #ifndef QT_NO_COMPONENT
 QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin )  )
  *iface = this, (*iface)->addRef();
-    else
-        return QS_FALSE;
    return QS_OK;
 }
 Q_EXPORT_INTERFACE()
 {
    Q_CREATE_INSTANCE( LibMadPluginImpl )
 }
 #endif
diff --git a/core/multimedia/opieplayer/libmad/mad.h b/core/multimedia/opieplayer/libmad/mad.h
index 9db9da3..9ef6cc8 100644
--- a/core/multimedia/opieplayer/libmad/mad.h
+++ b/core/multimedia/opieplayer/libmad/mad.h
@@ -1,830 +1,964 @@
 /*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting the author: Robert Leslie <rob@mars.org>
+ * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
 */
+# ifdef __cplusplus
+extern "C" {
+# endif
+# define FPM_INTEL
 # define SIZEOF_INT 4
 # define SIZEOF_LONG 4
 # define SIZEOF_LONG_LONG 8
-/* Id: version.h,v 1.16 2001/04/05 04:57:11 rob Exp */
+/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
 # ifndef LIBMAD_VERSION_H
 # define LIBMAD_VERSION_H
        # define MAD_VERSION_MAJOR0
-        # define MAD_VERSION_MINOR13
+        # define MAD_VERSION_MINOR15
-        # define MAD_VERSION_PATCH0
+        # define MAD_VERSION_PATCH1
        # define MAD_VERSION_EXTRA" (beta)"
        # define MAD_VERSION_STRINGIZE(str)#str
        # define MAD_VERSION_STRING(num)MAD_VERSION_STRINGIZE(num)
        # define MAD_VERSION    MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
                                MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
                                MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
                                MAD_VERSION_EXTRA
-        # define MAD_PUBLISHYEAR"2000-2001"
+        # define MAD_PUBLISHYEAR"2000-2004"
-        # define MAD_AUTHOR     "Robert Leslie"
+        # define MAD_AUTHOR     "Underbit Technologies, Inc."
-        # define MAD_EMAIL      "rob@mars.org"
+        # define MAD_EMAIL      "info@underbit.com"
 extern char const mad_version[];
 extern char const mad_copyright[];
 extern char const mad_author[];
 extern char const mad_build[];
 # endif
-/* Id: fixed.h,v 1.23 2001/04/05 04:57:11 rob Exp */
+/* Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp */
 # ifndef LIBMAD_FIXED_H
 # define LIBMAD_FIXED_H
 # if SIZEOF_INT >= 4
 typedef   signed int mad_fixed_t;
 typedef   signed int mad_fixed64hi_t;
 typedef unsigned int mad_fixed64lo_t;
 # else
 typedef   signed long mad_fixed_t;
 typedef   signed long mad_fixed64hi_t;
 typedef unsigned long mad_fixed64lo_t;
 # endif
+# if defined(_MSC_VER)
+#  define mad_fixed64_t  signed __int64
+# elif 1 || defined(__GNUC__)
+#  define mad_fixed64_t  signed long long
+# endif
+# if defined(FPM_FLOAT)
+typedef double mad_sample_t;
+# else
+typedef mad_fixed_t mad_sample_t;
+# endif
 /*
 * Fixed-point format: 0xABBBBBBB
 * A == whole part      (sign + 3 bits)
 * B == fractional part (28 bits)
 *
 * Values are signed two's complement, so the effective range is:
 * 0x80000000 to 0x7fffffff
 *       -8.0 to +7.9999999962747097015380859375
 *
 * The smallest representable value is:
 * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
 *
 * 28 bits of fractional accuracy represent about
 * 8.6 digits of decimal accuracy.
 *
 * Fixed-point numbers can be added or subtracted as normal
 * integers, but multiplication requires shifting the 64-bit result
 * from 56 fractional bits back to 28 (and rounding.)
 *
 * Changing the definition of MAD_F_FRACBITS is only partially
 * supported, and must be done with care.
 */
        # define MAD_F_FRACBITS         28
 # if MAD_F_FRACBITS == 28
        #  define MAD_F(x)      ((mad_fixed_t) (x##L))
 # else
 #  if MAD_F_FRACBITS < 28
 #   warning "MAD_F_FRACBITS < 28"
        #   define MAD_F(x)     ((mad_fixed_t)  \
                                 (((x##L) +  \
                                   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
                                  (28 - MAD_F_FRACBITS)))
 #  elif MAD_F_FRACBITS > 28
 #   error "MAD_F_FRACBITS > 28 not currently supported"
        #   define MAD_F(x)     ((mad_fixed_t)  \
                                 ((x##L) << (MAD_F_FRACBITS - 28)))
 #  endif
 # endif
        # define MAD_F_MIN      ((mad_fixed_t) -0x80000000L)
        # define MAD_F_MAX      ((mad_fixed_t) +0x7fffffffL)
        # define MAD_F_ONE      MAD_F(0x10000000)
        # define mad_f_tofixed(x)((mad_fixed_t)  \
                                 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
        # define mad_f_todouble(x)((double)  \
                                 ((x) / (double) (1L << MAD_F_FRACBITS)))
        # define mad_f_intpart(x)((x) >> MAD_F_FRACBITS)
        # define mad_f_fracpart(x)((x) & ((1L << MAD_F_FRACBITS) - 1))
                                /* (x should be positive) */
        # define mad_f_fromint(x)((x) << MAD_F_FRACBITS)
        # define mad_f_add(x, y)((x) + (y))
        # define mad_f_sub(x, y)((x) - (y))
-# if defined(FPM_64BIT)
+# if defined(FPM_FLOAT)
+#  error "FPM_FLOAT not yet supported"
+#  undef MAD_F
+        #  define MAD_F(x)      mad_f_todouble(x)
+        #  define mad_f_mul(x, y)((x) * (y))
+#  define mad_f_scale64
+#  undef ASO_ZEROCHECK
+# elif defined(FPM_64BIT)
 /*
- * This version should be the most accurate if 64-bit (long long) types are
+ * This version should be the most accurate if 64-bit types are supported by
- * supported by the compiler, although it may not be the most efficient.
+ * the compiler, although it may not be the most efficient.
 */
 #  if defined(OPT_ACCURACY)
 #   define mad_f_mul(x, y)  \
    ((mad_fixed_t)  \
-     ((((signed long long) (x) * (y)) +  \
+     ((((mad_fixed64_t) (x) * (y)) +  \
       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
 #  else
 #   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((signed long long) (x) * (y)) >> MAD_F_SCALEBITS))
+    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
 #  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- Intel --------------------------------------------------------------- */
 # elif defined(FPM_INTEL)
+#  if defined(_MSC_VER)
+#   pragma warning(push)
+#   pragma warning(disable: 4035)  /* no return value */
+static __forceinline
+mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
+{
+  enum {
+    fracbits = MAD_F_FRACBITS
+  };
+  __asm {
+    mov eax, x
+    imul y
+    shrd eax, edx, fracbits
+  }
+  /* implicit return of eax */
+}
+#   pragma warning(pop)
+        #   define mad_f_mul    mad_f_mul_inline
+#   define mad_f_scale64
+#  else
 /*
 * This Intel version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
-#  define MAD_F_MLX(hi, lo, x, y)  \
+#   define MAD_F_MLX(hi, lo, x, y)  \
    asm ("imull %3"  \
         : "=a" (lo), "=d" (hi)  \
         : "%a" (x), "rm" (y)  \
         : "cc")
-#  if defined(OPT_ACCURACY)
+#   if defined(OPT_ACCURACY)
 /*
 * This gives best accuracy but is not very fast.
 */
-#   define MAD_F_MLA(hi, lo, x, y)  \
+#    define MAD_F_MLA(hi, lo, x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
       asm ("addl %2,%0\n\t"  \
            "adcl %3,%1"  \
            : "=rm" (lo), "=rm" (hi)  \
            : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
            : "cc");  \
    })
-#  endif  /* OPT_ACCURACY */
+#   endif  /* OPT_ACCURACY */
-#  if defined(OPT_ACCURACY)
+#   if defined(OPT_ACCURACY)
 /*
 * Surprisingly, this is faster than SHRD followed by ADC.
 */
-#   define mad_f_scale64(hi, lo)  \
+#    define mad_f_scale64(hi, lo)  \
    ({ mad_fixed64hi_t __hi_;  \
       mad_fixed64lo_t __lo_;  \
       mad_fixed_t __result;  \
       asm ("addl %4,%2\n\t"  \
            "adcl %5,%3"  \
            : "=rm" (__lo_), "=rm" (__hi_)  \
            : "0" (lo), "1" (hi),  \
              "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
            : "cc");  \
       asm ("shrdl %3,%2,%1"  \
            : "=rm" (__result)  \
            : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
-#  else
+#   elif defined(OPT_INTEL)
-#   define mad_f_scale64(hi, lo)  \
+/*
+ * Alternate Intel scaling that may or may not perform better.
+ */
+#    define mad_f_scale64(hi, lo)  \
+    ({ mad_fixed_t __result;  \
+       asm ("shrl %3,%1\n\t"  \
+            "shll %4,%2\n\t"  \
+            "orl %2,%1"  \
+            : "=rm" (__result)  \
+            : "0" (lo), "r" (hi),  \
+              "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
+            : "cc");  \
+       __result;  \
+    })
+#   else
+#    define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
       asm ("shrdl %3,%2,%1"  \
            : "=rm" (__result)  \
            : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
-#  endif  /* OPT_ACCURACY */
+#   endif  /* OPT_ACCURACY */
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
+#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
+#  endif
 /* --- ARM ----------------------------------------------------------------- */
 # elif defined(FPM_ARM)
 /* 
 * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
 * least significant bit is properly rounded at no CPU cycle cost!
 */
 # if 1
 /*
- * There's a bug somewhere, possibly in the compiler, that sometimes makes
+ * This is faster than the default implementation via MAD_F_MLX() and
- * this necessary instead of the default implementation via MAD_F_MLX and
+ * mad_f_scale64().
- * mad_f_scale64. It may be related to the use (or lack) of
- * -finline-functions and/or -fstrength-reduce.
- *
- * This is also apparently faster than MAD_F_MLX/mad_f_scale64.
 */
 #  define mad_f_mul(x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       mad_fixed_t __result;  \
               asm ("smull%0, %1, %3, %4\n\t"  \
                    "movs%0, %0, lsr %5\n\t"  \
                    "adc%2, %0, %1, lsl %6"  \
            : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
            : "%r" (x), "r" (y),  \
              "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
 # endif
 #  define MAD_F_MLX(hi, lo, x, y)  \
            asm ("smull%0, %1, %2, %3"  \
         : "=&r" (lo), "=&r" (hi)  \
         : "%r" (x), "r" (y))
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("smlal%0, %1, %2, %3"  \
         : "+r" (lo), "+r" (hi)  \
         : "%r" (x), "r" (y))
+#  define MAD_F_MLN(hi, lo)  \
+            asm ("rsbs%0, %2, #0\n\t"  \
+                 "rsc%1, %3, #0"  \
+         : "=r" (lo), "=r" (hi)  \
+         : "0" (lo), "1" (hi)  \
+         : "cc")
 #  define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
               asm ("movs%0, %1, lsr %3\n\t"  \
                    "adc%0, %0, %2, lsl %4"  \
-            : "=r" (__result)  \
+            : "=&r" (__result)  \
            : "r" (lo), "r" (hi),  \
              "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
            : "cc");  \
       __result;  \
    })
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- MIPS ---------------------------------------------------------------- */
 # elif defined(FPM_MIPS)
 /*
 * This MIPS version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
            asm ("mult%2,%3"  \
         : "=l" (lo), "=h" (hi)  \
         : "%r" (x), "r" (y))
 # if defined(HAVE_MADD_ASM)
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("madd%2,%3"  \
         : "+l" (lo), "+h" (hi)  \
         : "%r" (x), "r" (y))
 # elif defined(HAVE_MADD16_ASM)
 /*
 * This loses significant accuracy due to the 16-bit integer limit in the
 * multiply/accumulate instruction.
 */
 #  define MAD_F_ML0(hi, lo, x, y)  \
            asm ("mult%2,%3"  \
         : "=l" (lo), "=h" (hi)  \
         : "%r" ((x) >> 12), "r" ((y) >> 16))
 #  define MAD_F_MLA(hi, lo, x, y)  \
            asm ("madd16%2,%3"  \
         : "+l" (lo), "+h" (hi)  \
         : "%r" ((x) >> 12), "r" ((y) >> 16))
 #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
 # endif
 # if defined(OPT_SPEED)
 #  define mad_f_scale64(hi, lo)  \
    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 # endif
 /* --- SPARC --------------------------------------------------------------- */
 # elif defined(FPM_SPARC)
 /*
 * This SPARC V8 version is fast and accurate; the disposition of the least
 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
    asm ("smul %2, %3, %0\n\t"  \
         "rd %%y, %1"  \
         : "=r" (lo), "=r" (hi)  \
         : "%r" (x), "rI" (y))
 /* --- PowerPC ------------------------------------------------------------- */
 # elif defined(FPM_PPC)
 /*
- * This PowerPC version is tuned for the 4xx embedded processors. It is
+ * This PowerPC version is fast and accurate; the disposition of the least
- * effectively a tuned version of FPM_64BIT. It is a little faster and just
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- * as accurate. The disposition of the least significant bit depends on
- * OPT_ACCURACY via mad_f_scale64().
 */
 #  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mulhw %1, %2, %3\n\t"  \
+    do {  \
-         "mullw %0, %2, %3"  \
+      asm ("mullw %0,%1,%2"  \
-         : "=&r" (lo), "=&r" (hi)  \
+           : "=r" (lo)  \
-         : "%r" (x), "r" (y))
+           : "%r" (x), "r" (y));  \
+      asm ("mulhw %0,%1,%2"  \
+           : "=r" (hi)  \
+           : "%r" (x), "r" (y));  \
+    }  \
+    while (0)
-#  define MAD_F_MLA(hi, lo, x, y)  \
+#  if defined(OPT_ACCURACY)
+/*
+ * This gives best accuracy but is not very fast.
+ */
+#   define MAD_F_MLA(hi, lo, x, y)  \
    ({ mad_fixed64hi_t __hi;  \
       mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0, %2, %3\n\t"  \
+       asm ("addc %0,%2,%3\n\t"  \
-            "adde %1, %4, %5"  \
+            "adde %1,%4,%5"  \
            : "=r" (lo), "=r" (hi)  \
-            : "%r" (__lo), "0" (lo), "%r" (__hi), "1" (hi));  \
+            : "%r" (lo), "r" (__lo),  \
+              "%r" (hi), "r" (__hi)  \
+            : "xer");  \
    })
+#  endif
 #  if defined(OPT_ACCURACY)
 /*
- * This is accurate and ~2 - 2.5 times slower than the unrounded version.
+ * This is slower than the truncating version below it.
- *
- * The __volatile__ improves the generated code by another 5% (fewer spills
- * to memory); eventually they should be removed.
 */
 #   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
+    ({ mad_fixed_t __result, __round;  \
-       mad_fixed64hi_t __hi_;  \
+       asm ("rotrwi %0,%1,%2"  \
-       mad_fixed64lo_t __lo_;  \
+            : "=r" (__result)  \
-       asm __volatile__ ("addc %0, %2, %4\n\t"  \
+            : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-                         "addze %1, %3"  \
+       asm ("extrwi %0,%1,1,0"  \
-            : "=r" (__lo_), "=r" (__hi_)  \
+            : "=r" (__round)  \
-            : "r" (lo), "r" (hi), "r" (1 << (MAD_F_SCALEBITS - 1)));  \
+            : "r" (__result));  \
-       asm __volatile__ ("rlwinm %0, %2,32-%3,0,%3-1\n\t"  \
+       asm ("insrwi %0,%1,%2,0"  \
-                         "rlwimi %0, %1,32-%3,%3,31"  \
+            : "+r" (__result)  \
-            : "=&r" (__result)  \
+            : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-            : "r" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS));  \
+       asm ("add %0,%1,%2"  \
-            __result;  \
+            : "=r" (__result)  \
+            : "%r" (__result), "r" (__round));  \
+       __result;  \
    })
 #  else
 #   define mad_f_scale64(hi, lo)  \
    ({ mad_fixed_t __result;  \
-       asm ("rlwinm %0, %2,32-%3,0,%3-1\n\t"  \
+       asm ("rotrwi %0,%1,%2"  \
-            "rlwimi %0, %1,32-%3,%3,31"  \
            : "=r" (__result)  \
-            : "r" (lo), "r" (hi), "I" (MAD_F_SCALEBITS));  \
+            : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-            __result;  \
+       asm ("insrwi %0,%1,%2,0"  \
+            : "+r" (__result)  \
+            : "r" (hi), "i" (MAD_F_SCALEBITS));  \
+       __result;  \
    })
-#  endif  /* OPT_ACCURACY */
+#  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 /* --- Default ------------------------------------------------------------- */
 # elif defined(FPM_DEFAULT)
 /*
 * This version is the most portable but it loses significant accuracy.
 * Furthermore, accuracy is biased against the second argument, so care
 * should be taken when ordering operands.
 *
 * The scale factors are constant as this is not used with SSO.
 *
 * Pre-rounding is required to stay within the limits of compliance.
 */
-        #  define mad_f_mul(x, y)((((x) + (1L << 11)) >> 12) *  \
+#  if defined(OPT_SPEED)
+        #   define mad_f_mul(x, y)(((x) >> 12) * ((y) >> 16))
+#  else
+        #   define mad_f_mul(x, y)((((x) + (1L << 11)) >> 12) *  \
                                 (((y) + (1L << 15)) >> 16))
+#  endif
 /* ------------------------------------------------------------------------- */
 # else
 #  error "no FPM selected"
 # endif
 /* default implementations */
 # if !defined(mad_f_mul)
 #  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
+    ({ register mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
+       register mad_fixed64lo_t __lo;  \
       MAD_F_MLX(__hi, __lo, (x), (y));  \
       mad_f_scale64(__hi, __lo);  \
    })
 # endif
 # if !defined(MAD_F_MLA)
        #  define MAD_F_ML0(hi, lo, x, y)((lo)  = mad_f_mul((x), (y)))
        #  define MAD_F_MLA(hi, lo, x, y)((lo) += mad_f_mul((x), (y)))
+        #  define MAD_F_MLN(hi, lo)     ((lo)  = -(lo))
        #  define MAD_F_MLZ(hi, lo)     ((void) (hi), (mad_fixed_t) (lo))
 # endif
 # if !defined(MAD_F_ML0)
        #  define MAD_F_ML0(hi, lo, x, y)MAD_F_MLX((hi), (lo), (x), (y))
 # endif
+# if !defined(MAD_F_MLN)
+        #  define MAD_F_MLN(hi, lo)     ((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
+# endif
 # if !defined(MAD_F_MLZ)
        #  define MAD_F_MLZ(hi, lo)     mad_f_scale64((hi), (lo))
 # endif
 # if !defined(mad_f_scale64)
 #  if defined(OPT_ACCURACY)
 #   define mad_f_scale64(hi, lo)  \
    ((((mad_fixed_t)  \
       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
        ((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
 #  else
 #   define mad_f_scale64(hi, lo)  \
    ((mad_fixed_t)  \
     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
      ((lo) >> MAD_F_SCALEBITS)))
 #  endif
 #  define MAD_F_SCALEBITS  MAD_F_FRACBITS
 # endif
-/* miscellaneous C routines */
+/* C routines */
 mad_fixed_t mad_f_abs(mad_fixed_t);
+mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
 # endif
-/* Id: bit.h,v 1.7 2001/04/05 04:57:11 rob Exp */
+/* Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp */
 # ifndef LIBMAD_BIT_H
 # define LIBMAD_BIT_H
 struct mad_bitptr {
  unsigned char const *byte;
  unsigned short cache;
  unsigned short left;
 };
 void mad_bit_init(struct mad_bitptr *, unsigned char const *);
        # define mad_bit_finish(bitptr)         /* nothing */
 unsigned int mad_bit_length(struct mad_bitptr const *,
                            struct mad_bitptr const *);
 # define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
 unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
 void mad_bit_skip(struct mad_bitptr *, unsigned int);
 unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
 void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
 unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
 # endif
-/* Id: timer.h,v 1.10 2001/04/05 04:57:11 rob Exp */
+/* Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp */
 # ifndef LIBMAD_TIMER_H
 # define LIBMAD_TIMER_H
 typedef struct {
          signed long seconds;  /* whole seconds */
          unsigned long fraction;/* 1/MAD_TIMER_RESOLUTION seconds */
 } mad_timer_t;
 extern mad_timer_t const mad_timer_zero;
        # define MAD_TIMER_RESOLUTION352800000UL
 enum mad_units {
          MAD_UNITS_HOURS =    -2,
          MAD_UNITS_MINUTES =    -1,
          MAD_UNITS_SECONDS =     0,
  /* metric units */
          MAD_UNITS_DECISECONDS =    10,
  MAD_UNITS_CENTISECONDS =   100,
  MAD_UNITS_MILLISECONDS =  1000,
  /* audio sample units */
          MAD_UNITS_8000_HZ =  8000,
          MAD_UNITS_11025_HZ = 11025,
          MAD_UNITS_12000_HZ = 12000,
          MAD_UNITS_16000_HZ = 16000,
          MAD_UNITS_22050_HZ = 22050,
          MAD_UNITS_24000_HZ = 24000,
          MAD_UNITS_32000_HZ = 32000,
          MAD_UNITS_44100_HZ = 44100,
          MAD_UNITS_48000_HZ = 48000,
  /* video frame/field units */
          MAD_UNITS_24_FPS =    24,
          MAD_UNITS_25_FPS =    25,
          MAD_UNITS_30_FPS =    30,
          MAD_UNITS_48_FPS =    48,
          MAD_UNITS_50_FPS =    50,
          MAD_UNITS_60_FPS =    60,
  /* CD audio frames */
          MAD_UNITS_75_FPS =    75,
  /* video drop-frame units */
          MAD_UNITS_23_976_FPS =   -24,
          MAD_UNITS_24_975_FPS =   -25,
          MAD_UNITS_29_97_FPS =   -30,
          MAD_UNITS_47_952_FPS =   -48,
          MAD_UNITS_49_95_FPS =   -50,
          MAD_UNITS_59_94_FPS =   -60
 };
-        # define mad_timer_reset(timer)(*(timer) = mad_timer_zero)
+        # define mad_timer_reset(timer)((void) (*(timer) = mad_timer_zero))
 int mad_timer_compare(mad_timer_t, mad_timer_t);
        # define mad_timer_sign(timer)mad_timer_compare((timer), mad_timer_zero)
 void mad_timer_negate(mad_timer_t *);
 mad_timer_t mad_timer_abs(mad_timer_t);
 void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
 void mad_timer_add(mad_timer_t *, mad_timer_t);
 void mad_timer_multiply(mad_timer_t *, signed long);
 signed long mad_timer_count(mad_timer_t, enum mad_units);
 unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
 void mad_timer_string(mad_timer_t, char *, char const *,
                      enum mad_units, enum mad_units, unsigned long);
 # endif
-/* Id: stream.h,v 1.12 2001/04/10 05:18:21 rob Exp */
+/* Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp */
 # ifndef LIBMAD_STREAM_H
 # define LIBMAD_STREAM_H
        # define MAD_BUFFER_GUARD8
        # define MAD_BUFFER_MDLEN(511 + 2048 + MAD_BUFFER_GUARD)
 enum mad_error {
+          MAD_ERROR_NONE           = 0x0000,/* no error */
          MAD_ERROR_BUFLEN         = 0x0001,/* input buffer too small (or EOF) */
          MAD_ERROR_BUFPTR         = 0x0002,/* invalid (null) buffer pointer */
          MAD_ERROR_NOMEM          = 0x0031,/* not enough memory */
          MAD_ERROR_LOSTSYNC       = 0x0101,/* lost synchronization */
          MAD_ERROR_BADLAYER       = 0x0102,/* reserved header layer value */
          MAD_ERROR_BADBITRATE     = 0x0103,/* forbidden bitrate value */
          MAD_ERROR_BADSAMPLERATE  = 0x0104,/* reserved sample frequency value */
          MAD_ERROR_BADEMPHASIS            = 0x0105,/* reserved emphasis value */
          MAD_ERROR_BADCRC         = 0x0201,/* CRC check failed */
          MAD_ERROR_BADBITALLOC            = 0x0211,/* forbidden bit allocation value */
          MAD_ERROR_BADSCALEFACTOR = 0x0221,/* bad scalefactor index */
+          MAD_ERROR_BADMODE        = 0x0222,/* bad bitrate/mode combination */
          MAD_ERROR_BADFRAMELEN            = 0x0231,/* bad frame length */
          MAD_ERROR_BADBIGVALUES   = 0x0232,/* bad big_values count */
          MAD_ERROR_BADBLOCKTYPE   = 0x0233,/* reserved block_type */
          MAD_ERROR_BADSCFSI       = 0x0234,/* bad scalefactor selection info */
          MAD_ERROR_BADDATAPTR     = 0x0235,/* bad main_data_begin pointer */
          MAD_ERROR_BADPART3LEN            = 0x0236,/* bad audio data length */
          MAD_ERROR_BADHUFFTABLE   = 0x0237,/* bad Huffman table select */
          MAD_ERROR_BADHUFFDATA            = 0x0238,/* Huffman data overrun */
          MAD_ERROR_BADSTEREO      = 0x0239/* incompatible block_type for JS */
 };
        # define MAD_RECOVERABLE(error)((error) & 0xff00)
 struct mad_stream {
          unsigned char const *buffer;  /* input bitstream buffer */
          unsigned char const *bufend;  /* end of buffer */
          unsigned long skiplen;        /* bytes to skip before next frame */
          int sync;                     /* stream sync found */
          unsigned long freerate;       /* free bitrate (fixed) */
          unsigned char const *this_frame;/* start of current frame */
          unsigned char const *next_frame;/* start of next frame */
          struct mad_bitptr ptr;        /* current processing bit pointer */
          struct mad_bitptr anc_ptr;    /* ancillary bits pointer */
          unsigned int anc_bitlen;      /* number of ancillary bits */
  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
                                        /* Layer III main_data() */
          unsigned int md_len;          /* bytes in main_data */
          int options;                  /* decoding options (see below) */
          enum mad_error error;                 /* error code (see above) */
 };
 enum {
          MAD_OPTION_IGNORECRC      = 0x0001,/* ignore CRC errors */
-          MAD_OPTION_HALFSAMPLERATE = 0x0002,/* generate PCM at 1/2 sample rate */
+          MAD_OPTION_HALFSAMPLERATE = 0x0002/* generate PCM at 1/2 sample rate */
 # if 0  /* not yet implemented */
          MAD_OPTION_LEFTCHANNEL    = 0x0010,/* decode left channel only */
          MAD_OPTION_RIGHTCHANNEL   = 0x0020,/* decode right channel only */
-          MAD_OPTION_SINGLECHANNEL  = 0x0030,/* combine channels */
+          MAD_OPTION_SINGLECHANNEL  = 0x0030/* combine channels */
 # endif
 };
 void mad_stream_init(struct mad_stream *);
 void mad_stream_finish(struct mad_stream *);
-# define mad_stream_options(stream, opts)  ((stream)->options = (opts))
+# define mad_stream_options(stream, opts)  \
+    ((void) ((stream)->options = (opts)))
 void mad_stream_buffer(struct mad_stream *,
                       unsigned char const *, unsigned long);
 void mad_stream_skip(struct mad_stream *, unsigned long);
 int mad_stream_sync(struct mad_stream *);
+char const *mad_stream_errorstr(struct mad_stream const *);
 # endif
-/* Id: frame.h,v 1.13 2001/04/05 04:57:11 rob Exp */
+/* Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp */
 # ifndef LIBMAD_FRAME_H
 # define LIBMAD_FRAME_H
 enum mad_layer {
          MAD_LAYER_I   = 1,            /* Layer I */
          MAD_LAYER_II  = 2,            /* Layer II */
          MAD_LAYER_III = 3             /* Layer III */
 };
 enum mad_mode {
          MAD_MODE_SINGLE_CHANNEL = 0,  /* single channel */
          MAD_MODE_DUAL_CHANNEL           = 1,  /* dual channel */
          MAD_MODE_JOINT_STEREO           = 2,  /* joint (MS/intensity) stereo */
          MAD_MODE_STEREO         = 3   /* normal LR stereo */
 };
 enum mad_emphasis {
          MAD_EMPHASIS_NONE       = 0,  /* no emphasis */
          MAD_EMPHASIS_50_15_US           = 1,  /* 50/15 microseconds emphasis */
-          MAD_EMPHASIS_CCITT_J_17 = 3   /* CCITT J.17 emphasis */
+          MAD_EMPHASIS_CCITT_J_17 = 3,  /* CCITT J.17 emphasis */
+          MAD_EMPHASIS_RESERVED   = 2   /* unknown emphasis */
 };
-struct mad_frame {
+struct mad_header {
-  struct mad_header {
+          enum mad_layer layer;                 /* audio layer (1, 2, or 3) */
-            enum mad_layer layer;       /* audio layer (1, 2, or 3) */
+          enum mad_mode mode;           /* channel mode (see above) */
-            enum mad_mode mode;                 /* channel mode (see above) */
+          int mode_extension;           /* additional mode info */
-            int mode_extension;                 /* additional mode info */
+          enum mad_emphasis emphasis;   /* de-emphasis to use (see above) */
-            enum mad_emphasis emphasis;         /* de-emphasis to use (see above) */
+          unsigned long bitrate;        /* stream bitrate (bps) */
+          unsigned int samplerate;      /* sampling frequency (Hz) */
-            unsigned long bitrate;      /* stream bitrate (bps) */
+          unsigned short crc_check;     /* frame CRC accumulator */
-            unsigned int samplerate;    /* sampling frequency (Hz) */
+          unsigned short crc_target;    /* final target CRC checksum */
-            unsigned short crc_check;   /* frame CRC accumulator */
+          int flags;                    /* flags (see below) */
-            unsigned short crc_target;  /* final target CRC checksum */
+          int private_bits;             /* private bits (see below) */
-            int flags;                  /* flags (see below) */
+          mad_timer_t duration;                 /* audio playing time of frame */
-            int private_bits;           /* private bits (see below) */
+};
-            mad_timer_t duration;       /* audio playing time of frame */
+struct mad_frame {
-  } header;
+          struct mad_header header;     /* MPEG audio header */
          int options;                  /* decoding options (from stream) */
          mad_fixed_t sbsample[2][36][32];/* synthesis subband filter samples */
          mad_fixed_t (*overlap)[2][32][18];/* Layer III block overlap data */
 };
        # define MAD_NCHANNELS(header)  ((header)->mode ? 2 : 1)
 # define MAD_NSBSAMPLES(header)  \
  ((header)->layer == MAD_LAYER_I ? 12 :  \
   (((header)->layer == MAD_LAYER_III &&  \
     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
 enum {
-          MAD_FLAG_NPRIVATE_III           = 0x0007,/* number of Layer III private bits */
+          MAD_FLAG_NPRIVATE_III         = 0x0007,/* number of Layer III private bits */
-          MAD_FLAG_INCOMPLETE     = 0x0008,/* header but not data is decoded */
+          MAD_FLAG_INCOMPLETE   = 0x0008,/* header but not data is decoded */
-          MAD_FLAG_PROTECTION     = 0x0010,/* frame has CRC protection */
+          MAD_FLAG_PROTECTION   = 0x0010,/* frame has CRC protection */
-          MAD_FLAG_COPYRIGHT      = 0x0020,/* frame is copyright */
+          MAD_FLAG_COPYRIGHT    = 0x0020,/* frame is copyright */
-          MAD_FLAG_ORIGINAL       = 0x0040,/* frame is original (else copy) */
+          MAD_FLAG_ORIGINAL     = 0x0040,/* frame is original (else copy) */
-          MAD_FLAG_PADDING        = 0x0080,/* frame has additional slot */
+          MAD_FLAG_PADDING      = 0x0080,/* frame has additional slot */
-          MAD_FLAG_I_STEREO       = 0x0100,/* uses intensity joint stereo */
+          MAD_FLAG_I_STEREO     = 0x0100,/* uses intensity joint stereo */
-          MAD_FLAG_MS_STEREO      = 0x0200,/* uses middle/side joint stereo */
+          MAD_FLAG_MS_STEREO    = 0x0200,/* uses middle/side joint stereo */
-          MAD_FLAG_FREEFORMAT     = 0x0400,/* uses free format bitrate */
+          MAD_FLAG_FREEFORMAT   = 0x0400,/* uses free format bitrate */
-          MAD_FLAG_LSF_EXT        = 0x1000,/* lower sampling freq. extension */
+          MAD_FLAG_LSF_EXT      = 0x1000,/* lower sampling freq. extension */
-          MAD_FLAG_MC_EXT         = 0x2000,/* multichannel audio extension */
+          MAD_FLAG_MC_EXT       = 0x2000,/* multichannel audio extension */
-          MAD_FLAG_MPEG_2_5_EXT           = 0x4000/* MPEG 2.5 (unofficial) extension */
+          MAD_FLAG_MPEG_2_5_EXT         = 0x4000/* MPEG 2.5 (unofficial) extension */
 };
 enum {
-          MAD_PRIVATE_HEADER      = 0x0100,/* header private bit */
+          MAD_PRIVATE_HEADER    = 0x0100,/* header private bit */
-          MAD_PRIVATE_III         = 0x001f/* Layer III private bits (up to 5) */
+          MAD_PRIVATE_III       = 0x001f/* Layer III private bits (up to 5) */
 };
 void mad_header_init(struct mad_header *);
 # define mad_header_finish(header)  /* nothing */
 int mad_header_decode(struct mad_header *, struct mad_stream *);
 void mad_frame_init(struct mad_frame *);
 void mad_frame_finish(struct mad_frame *);
 int mad_frame_decode(struct mad_frame *, struct mad_stream *);
 void mad_frame_mute(struct mad_frame *);
 # endif
-/* Id: synth.h,v 1.8 2001/04/05 04:57:11 rob Exp */
+/* Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp */
 # ifndef LIBMAD_SYNTH_H
 # define LIBMAD_SYNTH_H
+struct mad_pcm {
+          unsigned int samplerate;      /* sampling frequency (Hz) */
+          unsigned short channels;      /* number of channels */
+          unsigned short length;        /* number of samples per channel */
+          mad_fixed_t samples[2][1152];         /* PCM output samples [ch][sample] */
+};
 struct mad_synth {
          mad_fixed_t filter[2][2][2][16][8];/* polyphase filterbank outputs */
                                        /* [ch][eo][peo][s][v] */
          unsigned int phase;           /* current processing phase */
-  struct mad_pcm {
+          struct mad_pcm pcm;           /* PCM output */
-            unsigned int samplerate;    /* sampling frequency (Hz) */
+};
-            unsigned short channels;    /* number of channels */
-            unsigned short length;      /* number of samples per channel */
+/* single channel PCM selector */
-            mad_fixed_t samples[2][1152];/* PCM output samples */
+enum {
-  } pcm;
+  MAD_PCM_CHANNEL_SINGLE = 0
+};
+/* dual channel PCM selector */
+enum {
+  MAD_PCM_CHANNEL_DUAL_1 = 0,
+  MAD_PCM_CHANNEL_DUAL_2 = 1
+};
+/* stereo PCM selector */
+enum {
+  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
+  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
 };
 void mad_synth_init(struct mad_synth *);
 # define mad_synth_finish(synth)  /* nothing */
 void mad_synth_mute(struct mad_synth *);
 void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
 # endif
-/* Id: decoder.h,v 1.9 2001/04/05 04:57:11 rob Exp */
+/* Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp */
 # ifndef LIBMAD_DECODER_H
 # define LIBMAD_DECODER_H
 enum mad_decoder_mode {
  MAD_DECODER_MODE_SYNC  = 0,
  MAD_DECODER_MODE_ASYNC
 };
 enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,
+          MAD_FLOW_CONTINUE = 0x0000,/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,
+          MAD_FLOW_STOP     = 0x0010,/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,
+          MAD_FLOW_BREAK    = 0x0011,/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020
+          MAD_FLOW_IGNORE   = 0x0020/* ignore the current frame */
 };
 struct mad_decoder {
  enum mad_decoder_mode mode;
  int options;
  struct {
    long pid;
    int in;
    int out;
  } async;
  struct {
    struct mad_stream stream;
    struct mad_frame frame;
    struct mad_synth synth;
  } *sync;
  void *cb_data;
  enum mad_flow (*input_func)(void *, struct mad_stream *);
  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *, struct mad_frame *);
+  enum mad_flow (*filter_func)(void *,
+                               struct mad_stream const *, struct mad_frame *);
  enum mad_flow (*output_func)(void *,
                               struct mad_header const *, struct mad_pcm *);
  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
  enum mad_flow (*message_func)(void *, void *, unsigned int *);
 };
 void mad_decoder_init(struct mad_decoder *, void *,
                      enum mad_flow (*)(void *, struct mad_stream *),
                      enum mad_flow (*)(void *, struct mad_header const *),
-                      enum mad_flow (*)(void *, struct mad_frame *),
+                      enum mad_flow (*)(void *,
+                                        struct mad_stream const *,
+                                        struct mad_frame *),
                      enum mad_flow (*)(void *,
                                        struct mad_header const *,
                                        struct mad_pcm *),
                      enum mad_flow (*)(void *,
                                        struct mad_stream *,
                                        struct mad_frame *),
                      enum mad_flow (*)(void *, void *, unsigned int *));
 int mad_decoder_finish(struct mad_decoder *);
-# define mad_decoder_options(decoder, opts)  ((decoder)->options = (opts))
+# define mad_decoder_options(decoder, opts)  \
+    ((void) ((decoder)->options = (opts)))
 int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
 int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
 # endif
+# ifdef __cplusplus
+}
+# endif
diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
index 8de5976..15c083f 100644
--- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
+++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control
@@ -1,11 +1,11 @@
 Package: opie-libmadplugin
 Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so
 Priority: optional
-Section: libs
+Section: opie/plugins
-Maintainer: Maximilian Reiss <max.reiss@gmx.de>, L.J. Potter <lpotter@trolltech.com>
+Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
 Depends: task-opie-minimal
 Description: MP3 file plugin using libmad
 Plugin to play MP3 files with the mediaplayer in the Opie environment.
- It also has streaming support (Shoutcast/Icecast).
+ It also hast streaming support (Shoutcast/Icecast).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/libmad/qc_table.dat b/core/multimedia/opieplayer/libmad/qc_table.dat
index 5d9ca96..d28a207 100644
--- a/core/multimedia/opieplayer/libmad/qc_table.dat
+++ b/core/multimedia/opieplayer/libmad/qc_table.dat
@@ -1,77 +1,77 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 /*
 * These are the Layer II classes of quantization.
 * The table is derived from Table B.4 of ISO/IEC 11172-3.
 */
  {     3, 2,  5,
    MAD_F(0x15555555) /* 1.33333333333 => 1.33333333209, e  0.00000000124 */,
    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
  {     5, 3,  7,
    MAD_F(0x1999999a) /* 1.60000000000 => 1.60000000149, e -0.00000000149 */,
    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
  {     7, 0,  3,
    MAD_F(0x12492492) /* 1.14285714286 => 1.14285714179, e  0.00000000107 */,
    MAD_F(0x04000000) /* 0.25000000000 => 0.25000000000, e  0.00000000000 */ },
  {     9, 4, 10,
    MAD_F(0x1c71c71c) /* 1.77777777777 => 1.77777777612, e  0.00000000165 */,
    MAD_F(0x08000000) /* 0.50000000000 => 0.50000000000, e  0.00000000000 */ },
  {    15, 0,  4,
    MAD_F(0x11111111) /* 1.06666666666 => 1.06666666642, e  0.00000000024 */,
    MAD_F(0x02000000) /* 0.12500000000 => 0.12500000000, e  0.00000000000 */ },
  {    31, 0,  5,
    MAD_F(0x10842108) /* 1.03225806452 => 1.03225806355, e  0.00000000097 */,
    MAD_F(0x01000000) /* 0.06250000000 => 0.06250000000, e  0.00000000000 */ },
  {    63, 0,  6,
    MAD_F(0x10410410) /* 1.01587301587 => 1.01587301493, e  0.00000000094 */,
    MAD_F(0x00800000) /* 0.03125000000 => 0.03125000000, e  0.00000000000 */ },
  {   127, 0,  7,
    MAD_F(0x10204081) /* 1.00787401575 => 1.00787401572, e  0.00000000003 */,
    MAD_F(0x00400000) /* 0.01562500000 => 0.01562500000, e  0.00000000000 */ },
  {   255, 0,  8,
    MAD_F(0x10101010) /* 1.00392156863 => 1.00392156839, e  0.00000000024 */,
    MAD_F(0x00200000) /* 0.00781250000 => 0.00781250000, e  0.00000000000 */ },
  {   511, 0,  9,
    MAD_F(0x10080402) /* 1.00195694716 => 1.00195694715, e  0.00000000001 */,
    MAD_F(0x00100000) /* 0.00390625000 => 0.00390625000, e  0.00000000000 */ },
  {  1023, 0, 10,
    MAD_F(0x10040100) /* 1.00097751711 => 1.00097751617, e  0.00000000094 */,
    MAD_F(0x00080000) /* 0.00195312500 => 0.00195312500, e  0.00000000000 */ },
  {  2047, 0, 11,
    MAD_F(0x10020040) /* 1.00048851979 => 1.00048851967, e  0.00000000012 */,
    MAD_F(0x00040000) /* 0.00097656250 => 0.00097656250, e  0.00000000000 */ },
  {  4095, 0, 12,
    MAD_F(0x10010010) /* 1.00024420024 => 1.00024420023, e  0.00000000001 */,
    MAD_F(0x00020000) /* 0.00048828125 => 0.00048828125, e  0.00000000000 */ },
  {  8191, 0, 13,
    MAD_F(0x10008004) /* 1.00012208522 => 1.00012208521, e  0.00000000001 */,
    MAD_F(0x00010000) /* 0.00024414063 => 0.00024414062, e  0.00000000000 */ },
  { 16383, 0, 14,
    MAD_F(0x10004001) /* 1.00006103888 => 1.00006103888, e -0.00000000000 */,
    MAD_F(0x00008000) /* 0.00012207031 => 0.00012207031, e -0.00000000000 */ },
  { 32767, 0, 15,
    MAD_F(0x10002000) /* 1.00003051851 => 1.00003051758, e  0.00000000093 */,
    MAD_F(0x00004000) /* 0.00006103516 => 0.00006103516, e  0.00000000000 */ },
  { 65535, 0, 16,
    MAD_F(0x10001000) /* 1.00001525902 => 1.00001525879, e  0.00000000023 */,
    MAD_F(0x00002000) /* 0.00003051758 => 0.00003051758, e  0.00000000000 */ }
diff --git a/core/multimedia/opieplayer/libmad/rq_table.dat b/core/multimedia/opieplayer/libmad/rq_table.dat
index 803cf04..518a391 100644
--- a/core/multimedia/opieplayer/libmad/rq_table.dat
+++ b/core/multimedia/opieplayer/libmad/rq_table.dat
@@ -1,1027 +1,1027 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 /*
 * This is the lookup table used to compute x^(4/3) for Layer III
 * requantization. To maintain the best possible accuracy, the value is
 * stored as a normalized mantissa with exponent. The requantization
 * algorithm recombines these parts with appropriate scaling.
 */
  /*    0 */  { MAD_F(0x00000000) /* 0.000000000 */,  0 },
  /*    1 */  { MAD_F(0x04000000) /* 0.250000000 */,  2 },
  /*    2 */  { MAD_F(0x050a28be) /* 0.314980262 */,  3 },
  /*    3 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  4 },
  /*    4 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  4 },
  /*    5 */  { MAD_F(0x04466275) /* 0.267183742 */,  5 },
  /*    6 */  { MAD_F(0x05738c72) /* 0.340710111 */,  5 },
  /*    7 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  5 },
  /*    8 */  { MAD_F(0x04000000) /* 0.250000000 */,  6 },
  /*    9 */  { MAD_F(0x04ae20d7) /* 0.292511788 */,  6 },
  /*   10 */  { MAD_F(0x0562d694) /* 0.336630420 */,  6 },
  /*   11 */  { MAD_F(0x061dae96) /* 0.382246578 */,  6 },
  /*   12 */  { MAD_F(0x06de47f4) /* 0.429267841 */,  6 },
  /*   13 */  { MAD_F(0x07a44f7a) /* 0.477614858 */,  6 },
  /*   14 */  { MAD_F(0x0437be65) /* 0.263609310 */,  7 },
  /*   15 */  { MAD_F(0x049fc824) /* 0.289009227 */,  7 },
  /*   16 */  { MAD_F(0x050a28be) /* 0.314980262 */,  7 },
  /*   17 */  { MAD_F(0x0576c6f5) /* 0.341498336 */,  7 },
  /*   18 */  { MAD_F(0x05e58c0b) /* 0.368541759 */,  7 },
  /*   19 */  { MAD_F(0x06566361) /* 0.396090870 */,  7 },
  /*   20 */  { MAD_F(0x06c93a2e) /* 0.424127753 */,  7 },
  /*   21 */  { MAD_F(0x073dff3e) /* 0.452635998 */,  7 },
  /*   22 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */,  7 },
  /*   23 */  { MAD_F(0x04168b05) /* 0.255503674 */,  8 },
  /*   24 */  { MAD_F(0x0453a5cd) /* 0.270421794 */,  8 },
  /*   25 */  { MAD_F(0x04919b6a) /* 0.285548607 */,  8 },
  /*   26 */  { MAD_F(0x04d065fb) /* 0.300878507 */,  8 },
  /*   27 */  { MAD_F(0x05100000) /* 0.316406250 */,  8 },
  /*   28 */  { MAD_F(0x05506451) /* 0.332126919 */,  8 },
  /*   29 */  { MAD_F(0x05918e15) /* 0.348035890 */,  8 },
  /*   30 */  { MAD_F(0x05d378bb) /* 0.364128809 */,  8 },
  /*   31 */  { MAD_F(0x06161ff3) /* 0.380401563 */,  8 },
  /*   32 */  { MAD_F(0x06597fa9) /* 0.396850263 */,  8 },
  /*   33 */  { MAD_F(0x069d9400) /* 0.413471222 */,  8 },
  /*   34 */  { MAD_F(0x06e2594c) /* 0.430260942 */,  8 },
  /*   35 */  { MAD_F(0x0727cc11) /* 0.447216097 */,  8 },
  /*   36 */  { MAD_F(0x076de8fc) /* 0.464333519 */,  8 },
  /*   37 */  { MAD_F(0x07b4ace3) /* 0.481610189 */,  8 },
  /*   38 */  { MAD_F(0x07fc14bf) /* 0.499043224 */,  8 },
  /*   39 */  { MAD_F(0x04220ed7) /* 0.258314934 */,  9 },
  /*   40 */  { MAD_F(0x04466275) /* 0.267183742 */,  9 },
  /*   41 */  { MAD_F(0x046b03e7) /* 0.276126771 */,  9 },
  /*   42 */  { MAD_F(0x048ff1e8) /* 0.285142811 */,  9 },
  /*   43 */  { MAD_F(0x04b52b3f) /* 0.294230696 */,  9 },
  /*   44 */  { MAD_F(0x04daaec0) /* 0.303389310 */,  9 },
  /*   45 */  { MAD_F(0x05007b49) /* 0.312617576 */,  9 },
  /*   46 */  { MAD_F(0x05268fc6) /* 0.321914457 */,  9 },
  /*   47 */  { MAD_F(0x054ceb2a) /* 0.331278957 */,  9 },
  /*   48 */  { MAD_F(0x05738c72) /* 0.340710111 */,  9 },
  /*   49 */  { MAD_F(0x059a72a5) /* 0.350206992 */,  9 },
  /*   50 */  { MAD_F(0x05c19cd3) /* 0.359768701 */,  9 },
  /*   51 */  { MAD_F(0x05e90a12) /* 0.369394372 */,  9 },
  /*   52 */  { MAD_F(0x0610b982) /* 0.379083164 */,  9 },
  /*   53 */  { MAD_F(0x0638aa48) /* 0.388834268 */,  9 },
  /*   54 */  { MAD_F(0x0660db91) /* 0.398646895 */,  9 },
  /*   55 */  { MAD_F(0x06894c90) /* 0.408520284 */,  9 },
  /*   56 */  { MAD_F(0x06b1fc81) /* 0.418453696 */,  9 },
  /*   57 */  { MAD_F(0x06daeaa1) /* 0.428446415 */,  9 },
  /*   58 */  { MAD_F(0x07041636) /* 0.438497744 */,  9 },
  /*   59 */  { MAD_F(0x072d7e8b) /* 0.448607009 */,  9 },
  /*   60 */  { MAD_F(0x075722ef) /* 0.458773552 */,  9 },
  /*   61 */  { MAD_F(0x078102b8) /* 0.468996735 */,  9 },
  /*   62 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */,  9 },
  /*   63 */  { MAD_F(0x07d571e0) /* 0.489610555 */,  9 },
  /*   64 */  { MAD_F(0x04000000) /* 0.250000000 */, 10 },
  /*   65 */  { MAD_F(0x04156381) /* 0.255221850 */, 10 },
  /*   66 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 10 },
  /*   67 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 10 },
  /*   68 */  { MAD_F(0x045635cf) /* 0.271047409 */, 10 },
  /*   69 */  { MAD_F(0x046c083e) /* 0.276375048 */, 10 },
  /*   70 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 10 },
  /*   71 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 10 },
  /*   72 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 10 },
  /*   73 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 10 },
  /*   74 */  { MAD_F(0x04dab524) /* 0.303395408 */, 10 },
  /*   75 */  { MAD_F(0x04f12624) /* 0.308874267 */, 10 },
  /*   76 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 10 },
  /*   77 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 10 },
  /*   78 */  { MAD_F(0x053511cb) /* 0.325456423 */, 10 },
  /*   79 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 10 },
  /*   80 */  { MAD_F(0x0562d694) /* 0.336630420 */, 10 },
  /*   81 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 10 },
  /*   82 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 10 },
  /*   83 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 10 },
  /*   84 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 10 },
  /*   85 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 10 },
  /*   86 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 10 },
  /*   87 */  { MAD_F(0x0606012b) /* 0.376465960 */, 10 },
  /*   88 */  { MAD_F(0x061dae96) /* 0.382246578 */, 10 },
  /*   89 */  { MAD_F(0x06357302) /* 0.388049134 */, 10 },
  /*   90 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 10 },
  /*   91 */  { MAD_F(0x0665402d) /* 0.399719406 */, 10 },
  /*   92 */  { MAD_F(0x067d4896) /* 0.405586801 */, 10 },
  /*   93 */  { MAD_F(0x06956753) /* 0.411475493 */, 10 },
  /*   94 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 10 },
  /*   95 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 10 },
  /*   96 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 10 },
  /*   97 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 10 },
  /*   98 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 10 },
  /*   99 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 10 },
  /*  100 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 10 },
  /*  101 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 10 },
  /*  102 */  { MAD_F(0x07724f64) /* 0.465407744 */, 10 },
  /*  103 */  { MAD_F(0x078b4514) /* 0.471501425 */, 10 },
  /*  104 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 10 },
  /*  105 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 10 },
  /*  106 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 10 },
  /*  107 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 10 },
  /*  108 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 11 },
  /*  109 */  { MAD_F(0x04115aca) /* 0.254236974 */, 11 },
  /*  110 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 11 },
  /*  111 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 11 },
  /*  112 */  { MAD_F(0x0437be65) /* 0.263609310 */, 11 },
  /*  113 */  { MAD_F(0x04449dee) /* 0.266752177 */, 11 },
  /*  114 */  { MAD_F(0x04518733) /* 0.269904329 */, 11 },
  /*  115 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 11 },
  /*  116 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 11 },
  /*  117 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 11 },
  /*  118 */  { MAD_F(0x04858c83) /* 0.282604707 */, 11 },
  /*  119 */  { MAD_F(0x0492a59f) /* 0.285802482 */, 11 },
  /*  120 */  { MAD_F(0x049fc824) /* 0.289009227 */, 11 },
  /*  121 */  { MAD_F(0x04acf402) /* 0.292224893 */, 11 },
  /*  122 */  { MAD_F(0x04ba292e) /* 0.295449429 */, 11 },
  /*  123 */  { MAD_F(0x04c7679a) /* 0.298682788 */, 11 },
  /*  124 */  { MAD_F(0x04d4af3a) /* 0.301924921 */, 11 },
  /*  125 */  { MAD_F(0x04e20000) /* 0.305175781 */, 11 },
  /*  126 */  { MAD_F(0x04ef59e0) /* 0.308435322 */, 11 },
  /*  127 */  { MAD_F(0x04fcbcce) /* 0.311703498 */, 11 },
  /*  128 */  { MAD_F(0x050a28be) /* 0.314980262 */, 11 },
  /*  129 */  { MAD_F(0x05179da4) /* 0.318265572 */, 11 },
  /*  130 */  { MAD_F(0x05251b73) /* 0.321559381 */, 11 },
  /*  131 */  { MAD_F(0x0532a220) /* 0.324861647 */, 11 },
  /*  132 */  { MAD_F(0x054031a0) /* 0.328172327 */, 11 },
  /*  133 */  { MAD_F(0x054dc9e7) /* 0.331491377 */, 11 },
  /*  134 */  { MAD_F(0x055b6ae9) /* 0.334818756 */, 11 },
  /*  135 */  { MAD_F(0x0569149c) /* 0.338154423 */, 11 },
  /*  136 */  { MAD_F(0x0576c6f5) /* 0.341498336 */, 11 },
  /*  137 */  { MAD_F(0x058481e9) /* 0.344850455 */, 11 },
  /*  138 */  { MAD_F(0x0592456d) /* 0.348210741 */, 11 },
  /*  139 */  { MAD_F(0x05a01176) /* 0.351579152 */, 11 },
  /*  140 */  { MAD_F(0x05ade5fa) /* 0.354955651 */, 11 },
  /*  141 */  { MAD_F(0x05bbc2ef) /* 0.358340200 */, 11 },
  /*  142 */  { MAD_F(0x05c9a84a) /* 0.361732758 */, 11 },
  /*  143 */  { MAD_F(0x05d79601) /* 0.365133291 */, 11 },
  /*  144 */  { MAD_F(0x05e58c0b) /* 0.368541759 */, 11 },
  /*  145 */  { MAD_F(0x05f38a5d) /* 0.371958126 */, 11 },
  /*  146 */  { MAD_F(0x060190ee) /* 0.375382356 */, 11 },
  /*  147 */  { MAD_F(0x060f9fb3) /* 0.378814413 */, 11 },
  /*  148 */  { MAD_F(0x061db6a5) /* 0.382254261 */, 11 },
  /*  149 */  { MAD_F(0x062bd5b8) /* 0.385701865 */, 11 },
  /*  150 */  { MAD_F(0x0639fce4) /* 0.389157191 */, 11 },
  /*  151 */  { MAD_F(0x06482c1f) /* 0.392620204 */, 11 },
  /*  152 */  { MAD_F(0x06566361) /* 0.396090870 */, 11 },
  /*  153 */  { MAD_F(0x0664a2a0) /* 0.399569155 */, 11 },
  /*  154 */  { MAD_F(0x0672e9d4) /* 0.403055027 */, 11 },
  /*  155 */  { MAD_F(0x068138f3) /* 0.406548452 */, 11 },
  /*  156 */  { MAD_F(0x068f8ff5) /* 0.410049398 */, 11 },
  /*  157 */  { MAD_F(0x069deed1) /* 0.413557833 */, 11 },
  /*  158 */  { MAD_F(0x06ac557f) /* 0.417073724 */, 11 },
  /*  159 */  { MAD_F(0x06bac3f6) /* 0.420597041 */, 11 },
  /*  160 */  { MAD_F(0x06c93a2e) /* 0.424127753 */, 11 },
  /*  161 */  { MAD_F(0x06d7b81f) /* 0.427665827 */, 11 },
  /*  162 */  { MAD_F(0x06e63dc0) /* 0.431211234 */, 11 },
  /*  163 */  { MAD_F(0x06f4cb09) /* 0.434763944 */, 11 },
  /*  164 */  { MAD_F(0x07035ff3) /* 0.438323927 */, 11 },
  /*  165 */  { MAD_F(0x0711fc75) /* 0.441891153 */, 11 },
  /*  166 */  { MAD_F(0x0720a087) /* 0.445465593 */, 11 },
  /*  167 */  { MAD_F(0x072f4c22) /* 0.449047217 */, 11 },
  /*  168 */  { MAD_F(0x073dff3e) /* 0.452635998 */, 11 },
  /*  169 */  { MAD_F(0x074cb9d3) /* 0.456231906 */, 11 },
  /*  170 */  { MAD_F(0x075b7bdb) /* 0.459834914 */, 11 },
  /*  171 */  { MAD_F(0x076a454c) /* 0.463444993 */, 11 },
  /*  172 */  { MAD_F(0x07791620) /* 0.467062117 */, 11 },
  /*  173 */  { MAD_F(0x0787ee50) /* 0.470686258 */, 11 },
  /*  174 */  { MAD_F(0x0796cdd4) /* 0.474317388 */, 11 },
  /*  175 */  { MAD_F(0x07a5b4a5) /* 0.477955481 */, 11 },
  /*  176 */  { MAD_F(0x07b4a2bc) /* 0.481600510 */, 11 },
  /*  177 */  { MAD_F(0x07c39812) /* 0.485252449 */, 11 },
  /*  178 */  { MAD_F(0x07d294a0) /* 0.488911273 */, 11 },
  /*  179 */  { MAD_F(0x07e1985f) /* 0.492576954 */, 11 },
  /*  180 */  { MAD_F(0x07f0a348) /* 0.496249468 */, 11 },
  /*  181 */  { MAD_F(0x07ffb554) /* 0.499928790 */, 11 },
  /*  182 */  { MAD_F(0x0407673f) /* 0.251807447 */, 12 },
  /*  183 */  { MAD_F(0x040ef75e) /* 0.253653877 */, 12 },
  /*  184 */  { MAD_F(0x04168b05) /* 0.255503674 */, 12 },
  /*  185 */  { MAD_F(0x041e2230) /* 0.257356825 */, 12 },
  /*  186 */  { MAD_F(0x0425bcdd) /* 0.259213318 */, 12 },
  /*  187 */  { MAD_F(0x042d5b07) /* 0.261073141 */, 12 },
  /*  188 */  { MAD_F(0x0434fcad) /* 0.262936282 */, 12 },
  /*  189 */  { MAD_F(0x043ca1c9) /* 0.264802730 */, 12 },
  /*  190 */  { MAD_F(0x04444a5a) /* 0.266672472 */, 12 },
  /*  191 */  { MAD_F(0x044bf65d) /* 0.268545497 */, 12 },
  /*  192 */  { MAD_F(0x0453a5cd) /* 0.270421794 */, 12 },
  /*  193 */  { MAD_F(0x045b58a9) /* 0.272301352 */, 12 },
  /*  194 */  { MAD_F(0x04630eed) /* 0.274184158 */, 12 },
  /*  195 */  { MAD_F(0x046ac896) /* 0.276070203 */, 12 },
  /*  196 */  { MAD_F(0x047285a2) /* 0.277959474 */, 12 },
  /*  197 */  { MAD_F(0x047a460c) /* 0.279851960 */, 12 },
  /*  198 */  { MAD_F(0x048209d3) /* 0.281747652 */, 12 },
  /*  199 */  { MAD_F(0x0489d0f4) /* 0.283646538 */, 12 },
  /*  200 */  { MAD_F(0x04919b6a) /* 0.285548607 */, 12 },
  /*  201 */  { MAD_F(0x04996935) /* 0.287453849 */, 12 },
  /*  202 */  { MAD_F(0x04a13a50) /* 0.289362253 */, 12 },
  /*  203 */  { MAD_F(0x04a90eba) /* 0.291273810 */, 12 },
  /*  204 */  { MAD_F(0x04b0e66e) /* 0.293188507 */, 12 },
  /*  205 */  { MAD_F(0x04b8c16c) /* 0.295106336 */, 12 },
  /*  206 */  { MAD_F(0x04c09faf) /* 0.297027285 */, 12 },
  /*  207 */  { MAD_F(0x04c88135) /* 0.298951346 */, 12 },
  /*  208 */  { MAD_F(0x04d065fb) /* 0.300878507 */, 12 },
  /*  209 */  { MAD_F(0x04d84dff) /* 0.302808759 */, 12 },
  /*  210 */  { MAD_F(0x04e0393e) /* 0.304742092 */, 12 },
  /*  211 */  { MAD_F(0x04e827b6) /* 0.306678497 */, 12 },
  /*  212 */  { MAD_F(0x04f01963) /* 0.308617963 */, 12 },
  /*  213 */  { MAD_F(0x04f80e44) /* 0.310560480 */, 12 },
  /*  214 */  { MAD_F(0x05000655) /* 0.312506041 */, 12 },
  /*  215 */  { MAD_F(0x05080195) /* 0.314454634 */, 12 },
  /*  216 */  { MAD_F(0x05100000) /* 0.316406250 */, 12 },
  /*  217 */  { MAD_F(0x05180194) /* 0.318360880 */, 12 },
  /*  218 */  { MAD_F(0x0520064f) /* 0.320318516 */, 12 },
  /*  219 */  { MAD_F(0x05280e2d) /* 0.322279147 */, 12 },
  /*  220 */  { MAD_F(0x0530192e) /* 0.324242764 */, 12 },
  /*  221 */  { MAD_F(0x0538274e) /* 0.326209359 */, 12 },
  /*  222 */  { MAD_F(0x0540388a) /* 0.328178922 */, 12 },
  /*  223 */  { MAD_F(0x05484ce2) /* 0.330151445 */, 12 },
  /*  224 */  { MAD_F(0x05506451) /* 0.332126919 */, 12 },
  /*  225 */  { MAD_F(0x05587ed5) /* 0.334105334 */, 12 },
  /*  226 */  { MAD_F(0x05609c6e) /* 0.336086683 */, 12 },
  /*  227 */  { MAD_F(0x0568bd17) /* 0.338070956 */, 12 },
  /*  228 */  { MAD_F(0x0570e0cf) /* 0.340058145 */, 12 },
  /*  229 */  { MAD_F(0x05790793) /* 0.342048241 */, 12 },
  /*  230 */  { MAD_F(0x05813162) /* 0.344041237 */, 12 },
  /*  231 */  { MAD_F(0x05895e39) /* 0.346037122 */, 12 },
  /*  232 */  { MAD_F(0x05918e15) /* 0.348035890 */, 12 },
  /*  233 */  { MAD_F(0x0599c0f4) /* 0.350037532 */, 12 },
  /*  234 */  { MAD_F(0x05a1f6d5) /* 0.352042040 */, 12 },
  /*  235 */  { MAD_F(0x05aa2fb5) /* 0.354049405 */, 12 },
  /*  236 */  { MAD_F(0x05b26b92) /* 0.356059619 */, 12 },
  /*  237 */  { MAD_F(0x05baaa69) /* 0.358072674 */, 12 },
  /*  238 */  { MAD_F(0x05c2ec39) /* 0.360088563 */, 12 },
  /*  239 */  { MAD_F(0x05cb3100) /* 0.362107278 */, 12 },
  /*  240 */  { MAD_F(0x05d378bb) /* 0.364128809 */, 12 },
  /*  241 */  { MAD_F(0x05dbc368) /* 0.366153151 */, 12 },
  /*  242 */  { MAD_F(0x05e41105) /* 0.368180294 */, 12 },
  /*  243 */  { MAD_F(0x05ec6190) /* 0.370210231 */, 12 },
  /*  244 */  { MAD_F(0x05f4b507) /* 0.372242955 */, 12 },
  /*  245 */  { MAD_F(0x05fd0b68) /* 0.374278458 */, 12 },
  /*  246 */  { MAD_F(0x060564b1) /* 0.376316732 */, 12 },
  /*  247 */  { MAD_F(0x060dc0e0) /* 0.378357769 */, 12 },
  /*  248 */  { MAD_F(0x06161ff3) /* 0.380401563 */, 12 },
  /*  249 */  { MAD_F(0x061e81e8) /* 0.382448106 */, 12 },
  /*  250 */  { MAD_F(0x0626e6bc) /* 0.384497391 */, 12 },
  /*  251 */  { MAD_F(0x062f4e6f) /* 0.386549409 */, 12 },
  /*  252 */  { MAD_F(0x0637b8fd) /* 0.388604155 */, 12 },
  /*  253 */  { MAD_F(0x06402666) /* 0.390661620 */, 12 },
  /*  254 */  { MAD_F(0x064896a7) /* 0.392721798 */, 12 },
  /*  255 */  { MAD_F(0x065109be) /* 0.394784681 */, 12 },
  /*  256 */  { MAD_F(0x06597fa9) /* 0.396850263 */, 12 },
  /*  257 */  { MAD_F(0x0661f867) /* 0.398918536 */, 12 },
  /*  258 */  { MAD_F(0x066a73f5) /* 0.400989493 */, 12 },
  /*  259 */  { MAD_F(0x0672f252) /* 0.403063128 */, 12 },
  /*  260 */  { MAD_F(0x067b737c) /* 0.405139433 */, 12 },
  /*  261 */  { MAD_F(0x0683f771) /* 0.407218402 */, 12 },
  /*  262 */  { MAD_F(0x068c7e2f) /* 0.409300027 */, 12 },
  /*  263 */  { MAD_F(0x069507b5) /* 0.411384303 */, 12 },
  /*  264 */  { MAD_F(0x069d9400) /* 0.413471222 */, 12 },
  /*  265 */  { MAD_F(0x06a6230f) /* 0.415560778 */, 12 },
  /*  266 */  { MAD_F(0x06aeb4e0) /* 0.417652964 */, 12 },
  /*  267 */  { MAD_F(0x06b74971) /* 0.419747773 */, 12 },
  /*  268 */  { MAD_F(0x06bfe0c0) /* 0.421845199 */, 12 },
  /*  269 */  { MAD_F(0x06c87acc) /* 0.423945235 */, 12 },
  /*  270 */  { MAD_F(0x06d11794) /* 0.426047876 */, 12 },
  /*  271 */  { MAD_F(0x06d9b714) /* 0.428153114 */, 12 },
  /*  272 */  { MAD_F(0x06e2594c) /* 0.430260942 */, 12 },
  /*  273 */  { MAD_F(0x06eafe3a) /* 0.432371356 */, 12 },
  /*  274 */  { MAD_F(0x06f3a5dc) /* 0.434484348 */, 12 },
  /*  275 */  { MAD_F(0x06fc5030) /* 0.436599912 */, 12 },
  /*  276 */  { MAD_F(0x0704fd35) /* 0.438718042 */, 12 },
  /*  277 */  { MAD_F(0x070dacea) /* 0.440838732 */, 12 },
  /*  278 */  { MAD_F(0x07165f4b) /* 0.442961975 */, 12 },
  /*  279 */  { MAD_F(0x071f1459) /* 0.445087765 */, 12 },
  /*  280 */  { MAD_F(0x0727cc11) /* 0.447216097 */, 12 },
  /*  281 */  { MAD_F(0x07308671) /* 0.449346964 */, 12 },
  /*  282 */  { MAD_F(0x07394378) /* 0.451480360 */, 12 },
  /*  283 */  { MAD_F(0x07420325) /* 0.453616280 */, 12 },
  /*  284 */  { MAD_F(0x074ac575) /* 0.455754717 */, 12 },
  /*  285 */  { MAD_F(0x07538a67) /* 0.457895665 */, 12 },
  /*  286 */  { MAD_F(0x075c51fa) /* 0.460039119 */, 12 },
  /*  287 */  { MAD_F(0x07651c2c) /* 0.462185072 */, 12 },
  /*  288 */  { MAD_F(0x076de8fc) /* 0.464333519 */, 12 },
  /*  289 */  { MAD_F(0x0776b867) /* 0.466484455 */, 12 },
  /*  290 */  { MAD_F(0x077f8a6d) /* 0.468637872 */, 12 },
  /*  291 */  { MAD_F(0x07885f0b) /* 0.470793767 */, 12 },
  /*  292 */  { MAD_F(0x07913641) /* 0.472952132 */, 12 },
  /*  293 */  { MAD_F(0x079a100c) /* 0.475112962 */, 12 },
  /*  294 */  { MAD_F(0x07a2ec6c) /* 0.477276252 */, 12 },
  /*  295 */  { MAD_F(0x07abcb5f) /* 0.479441997 */, 12 },
  /*  296 */  { MAD_F(0x07b4ace3) /* 0.481610189 */, 12 },
  /*  297 */  { MAD_F(0x07bd90f6) /* 0.483780825 */, 12 },
  /*  298 */  { MAD_F(0x07c67798) /* 0.485953899 */, 12 },
  /*  299 */  { MAD_F(0x07cf60c7) /* 0.488129404 */, 12 },
  /*  300 */  { MAD_F(0x07d84c81) /* 0.490307336 */, 12 },
  /*  301 */  { MAD_F(0x07e13ac5) /* 0.492487690 */, 12 },
  /*  302 */  { MAD_F(0x07ea2b92) /* 0.494670459 */, 12 },
  /*  303 */  { MAD_F(0x07f31ee6) /* 0.496855639 */, 12 },
  /*  304 */  { MAD_F(0x07fc14bf) /* 0.499043224 */, 12 },
  /*  305 */  { MAD_F(0x0402868e) /* 0.250616605 */, 13 },
  /*  306 */  { MAD_F(0x040703ff) /* 0.251712795 */, 13 },
  /*  307 */  { MAD_F(0x040b82b0) /* 0.252810180 */, 13 },
  /*  308 */  { MAD_F(0x041002a1) /* 0.253908756 */, 13 },
  /*  309 */  { MAD_F(0x041483d1) /* 0.255008523 */, 13 },
  /*  310 */  { MAD_F(0x04190640) /* 0.256109476 */, 13 },
  /*  311 */  { MAD_F(0x041d89ed) /* 0.257211614 */, 13 },
  /*  312 */  { MAD_F(0x04220ed7) /* 0.258314934 */, 13 },
  /*  313 */  { MAD_F(0x042694fe) /* 0.259419433 */, 13 },
  /*  314 */  { MAD_F(0x042b1c60) /* 0.260525110 */, 13 },
  /*  315 */  { MAD_F(0x042fa4fe) /* 0.261631960 */, 13 },
  /*  316 */  { MAD_F(0x04342ed7) /* 0.262739982 */, 13 },
  /*  317 */  { MAD_F(0x0438b9e9) /* 0.263849174 */, 13 },
  /*  318 */  { MAD_F(0x043d4635) /* 0.264959533 */, 13 },
  /*  319 */  { MAD_F(0x0441d3b9) /* 0.266071056 */, 13 },
  /*  320 */  { MAD_F(0x04466275) /* 0.267183742 */, 13 },
  /*  321 */  { MAD_F(0x044af269) /* 0.268297587 */, 13 },
  /*  322 */  { MAD_F(0x044f8393) /* 0.269412589 */, 13 },
  /*  323 */  { MAD_F(0x045415f3) /* 0.270528746 */, 13 },
  /*  324 */  { MAD_F(0x0458a989) /* 0.271646056 */, 13 },
  /*  325 */  { MAD_F(0x045d3e53) /* 0.272764515 */, 13 },
  /*  326 */  { MAD_F(0x0461d451) /* 0.273884123 */, 13 },
  /*  327 */  { MAD_F(0x04666b83) /* 0.275004875 */, 13 },
  /*  328 */  { MAD_F(0x046b03e7) /* 0.276126771 */, 13 },
  /*  329 */  { MAD_F(0x046f9d7e) /* 0.277249808 */, 13 },
  /*  330 */  { MAD_F(0x04743847) /* 0.278373983 */, 13 },
  /*  331 */  { MAD_F(0x0478d440) /* 0.279499294 */, 13 },
  /*  332 */  { MAD_F(0x047d716a) /* 0.280625739 */, 13 },
  /*  333 */  { MAD_F(0x04820fc3) /* 0.281753315 */, 13 },
  /*  334 */  { MAD_F(0x0486af4c) /* 0.282882021 */, 13 },
  /*  335 */  { MAD_F(0x048b5003) /* 0.284011853 */, 13 },
  /*  336 */  { MAD_F(0x048ff1e8) /* 0.285142811 */, 13 },
  /*  337 */  { MAD_F(0x049494fb) /* 0.286274891 */, 13 },
  /*  338 */  { MAD_F(0x0499393a) /* 0.287408091 */, 13 },
  /*  339 */  { MAD_F(0x049ddea5) /* 0.288542409 */, 13 },
  /*  340 */  { MAD_F(0x04a2853c) /* 0.289677844 */, 13 },
  /*  341 */  { MAD_F(0x04a72cfe) /* 0.290814392 */, 13 },
  /*  342 */  { MAD_F(0x04abd5ea) /* 0.291952051 */, 13 },
  /*  343 */  { MAD_F(0x04b08000) /* 0.293090820 */, 13 },
  /*  344 */  { MAD_F(0x04b52b3f) /* 0.294230696 */, 13 },
  /*  345 */  { MAD_F(0x04b9d7a7) /* 0.295371678 */, 13 },
  /*  346 */  { MAD_F(0x04be8537) /* 0.296513762 */, 13 },
  /*  347 */  { MAD_F(0x04c333ee) /* 0.297656947 */, 13 },
  /*  348 */  { MAD_F(0x04c7e3cc) /* 0.298801231 */, 13 },
  /*  349 */  { MAD_F(0x04cc94d1) /* 0.299946611 */, 13 },
  /*  350 */  { MAD_F(0x04d146fb) /* 0.301093085 */, 13 },
  /*  351 */  { MAD_F(0x04d5fa4b) /* 0.302240653 */, 13 },
  /*  352 */  { MAD_F(0x04daaec0) /* 0.303389310 */, 13 },
  /*  353 */  { MAD_F(0x04df6458) /* 0.304539056 */, 13 },
  /*  354 */  { MAD_F(0x04e41b14) /* 0.305689888 */, 13 },
  /*  355 */  { MAD_F(0x04e8d2f3) /* 0.306841804 */, 13 },
  /*  356 */  { MAD_F(0x04ed8bf5) /* 0.307994802 */, 13 },
  /*  357 */  { MAD_F(0x04f24618) /* 0.309148880 */, 13 },
  /*  358 */  { MAD_F(0x04f7015d) /* 0.310304037 */, 13 },
  /*  359 */  { MAD_F(0x04fbbdc3) /* 0.311460269 */, 13 },
  /*  360 */  { MAD_F(0x05007b49) /* 0.312617576 */, 13 },
  /*  361 */  { MAD_F(0x050539ef) /* 0.313775954 */, 13 },
  /*  362 */  { MAD_F(0x0509f9b4) /* 0.314935403 */, 13 },
  /*  363 */  { MAD_F(0x050eba98) /* 0.316095920 */, 13 },
  /*  364 */  { MAD_F(0x05137c9a) /* 0.317257503 */, 13 },
  /*  365 */  { MAD_F(0x05183fba) /* 0.318420150 */, 13 },
  /*  366 */  { MAD_F(0x051d03f7) /* 0.319583859 */, 13 },
  /*  367 */  { MAD_F(0x0521c950) /* 0.320748629 */, 13 },
  /*  368 */  { MAD_F(0x05268fc6) /* 0.321914457 */, 13 },
  /*  369 */  { MAD_F(0x052b5757) /* 0.323081342 */, 13 },
  /*  370 */  { MAD_F(0x05302003) /* 0.324249281 */, 13 },
  /*  371 */  { MAD_F(0x0534e9ca) /* 0.325418273 */, 13 },
  /*  372 */  { MAD_F(0x0539b4ab) /* 0.326588316 */, 13 },
  /*  373 */  { MAD_F(0x053e80a6) /* 0.327759407 */, 13 },
  /*  374 */  { MAD_F(0x05434db9) /* 0.328931546 */, 13 },
  /*  375 */  { MAD_F(0x05481be5) /* 0.330104730 */, 13 },
  /*  376 */  { MAD_F(0x054ceb2a) /* 0.331278957 */, 13 },
  /*  377 */  { MAD_F(0x0551bb85) /* 0.332454225 */, 13 },
  /*  378 */  { MAD_F(0x05568cf8) /* 0.333630533 */, 13 },
  /*  379 */  { MAD_F(0x055b5f81) /* 0.334807879 */, 13 },
  /*  380 */  { MAD_F(0x05603321) /* 0.335986261 */, 13 },
  /*  381 */  { MAD_F(0x056507d6) /* 0.337165677 */, 13 },
  /*  382 */  { MAD_F(0x0569dda0) /* 0.338346125 */, 13 },
  /*  383 */  { MAD_F(0x056eb47f) /* 0.339527604 */, 13 },
  /*  384 */  { MAD_F(0x05738c72) /* 0.340710111 */, 13 },
  /*  385 */  { MAD_F(0x05786578) /* 0.341893646 */, 13 },
  /*  386 */  { MAD_F(0x057d3f92) /* 0.343078205 */, 13 },
  /*  387 */  { MAD_F(0x05821abf) /* 0.344263788 */, 13 },
  /*  388 */  { MAD_F(0x0586f6fd) /* 0.345450393 */, 13 },
  /*  389 */  { MAD_F(0x058bd44e) /* 0.346638017 */, 13 },
  /*  390 */  { MAD_F(0x0590b2b0) /* 0.347826659 */, 13 },
  /*  391 */  { MAD_F(0x05959222) /* 0.349016318 */, 13 },
  /*  392 */  { MAD_F(0x059a72a5) /* 0.350206992 */, 13 },
  /*  393 */  { MAD_F(0x059f5438) /* 0.351398678 */, 13 },
  /*  394 */  { MAD_F(0x05a436da) /* 0.352591376 */, 13 },
  /*  395 */  { MAD_F(0x05a91a8c) /* 0.353785083 */, 13 },
  /*  396 */  { MAD_F(0x05adff4c) /* 0.354979798 */, 13 },
  /*  397 */  { MAD_F(0x05b2e51a) /* 0.356175519 */, 13 },
  /*  398 */  { MAD_F(0x05b7cbf5) /* 0.357372244 */, 13 },
  /*  399 */  { MAD_F(0x05bcb3de) /* 0.358569972 */, 13 },
  /*  400 */  { MAD_F(0x05c19cd3) /* 0.359768701 */, 13 },
  /*  401 */  { MAD_F(0x05c686d5) /* 0.360968429 */, 13 },
  /*  402 */  { MAD_F(0x05cb71e2) /* 0.362169156 */, 13 },
  /*  403 */  { MAD_F(0x05d05dfb) /* 0.363370878 */, 13 },
  /*  404 */  { MAD_F(0x05d54b1f) /* 0.364573594 */, 13 },
  /*  405 */  { MAD_F(0x05da394d) /* 0.365777304 */, 13 },
  /*  406 */  { MAD_F(0x05df2885) /* 0.366982004 */, 13 },
  /*  407 */  { MAD_F(0x05e418c7) /* 0.368187694 */, 13 },
  /*  408 */  { MAD_F(0x05e90a12) /* 0.369394372 */, 13 },
  /*  409 */  { MAD_F(0x05edfc66) /* 0.370602036 */, 13 },
  /*  410 */  { MAD_F(0x05f2efc2) /* 0.371810684 */, 13 },
  /*  411 */  { MAD_F(0x05f7e426) /* 0.373020316 */, 13 },
  /*  412 */  { MAD_F(0x05fcd992) /* 0.374230929 */, 13 },
  /*  413 */  { MAD_F(0x0601d004) /* 0.375442522 */, 13 },
  /*  414 */  { MAD_F(0x0606c77d) /* 0.376655093 */, 13 },
  /*  415 */  { MAD_F(0x060bbffd) /* 0.377868641 */, 13 },
  /*  416 */  { MAD_F(0x0610b982) /* 0.379083164 */, 13 },
  /*  417 */  { MAD_F(0x0615b40c) /* 0.380298661 */, 13 },
  /*  418 */  { MAD_F(0x061aaf9c) /* 0.381515130 */, 13 },
  /*  419 */  { MAD_F(0x061fac2f) /* 0.382732569 */, 13 },
  /*  420 */  { MAD_F(0x0624a9c7) /* 0.383950977 */, 13 },
  /*  421 */  { MAD_F(0x0629a863) /* 0.385170352 */, 13 },
  /*  422 */  { MAD_F(0x062ea802) /* 0.386390694 */, 13 },
  /*  423 */  { MAD_F(0x0633a8a3) /* 0.387611999 */, 13 },
  /*  424 */  { MAD_F(0x0638aa48) /* 0.388834268 */, 13 },
  /*  425 */  { MAD_F(0x063dacee) /* 0.390057497 */, 13 },
  /*  426 */  { MAD_F(0x0642b096) /* 0.391281687 */, 13 },
  /*  427 */  { MAD_F(0x0647b53f) /* 0.392506834 */, 13 },
  /*  428 */  { MAD_F(0x064cbae9) /* 0.393732939 */, 13 },
  /*  429 */  { MAD_F(0x0651c193) /* 0.394959999 */, 13 },
  /*  430 */  { MAD_F(0x0656c93d) /* 0.396188012 */, 13 },
  /*  431 */  { MAD_F(0x065bd1e7) /* 0.397416978 */, 13 },
  /*  432 */  { MAD_F(0x0660db91) /* 0.398646895 */, 13 },
  /*  433 */  { MAD_F(0x0665e639) /* 0.399877761 */, 13 },
  /*  434 */  { MAD_F(0x066af1df) /* 0.401109575 */, 13 },
  /*  435 */  { MAD_F(0x066ffe84) /* 0.402342335 */, 13 },
  /*  436 */  { MAD_F(0x06750c26) /* 0.403576041 */, 13 },
  /*  437 */  { MAD_F(0x067a1ac6) /* 0.404810690 */, 13 },
  /*  438 */  { MAD_F(0x067f2a62) /* 0.406046281 */, 13 },
  /*  439 */  { MAD_F(0x06843afb) /* 0.407282813 */, 13 },
  /*  440 */  { MAD_F(0x06894c90) /* 0.408520284 */, 13 },
  /*  441 */  { MAD_F(0x068e5f21) /* 0.409758693 */, 13 },
  /*  442 */  { MAD_F(0x069372ae) /* 0.410998038 */, 13 },
  /*  443 */  { MAD_F(0x06988735) /* 0.412238319 */, 13 },
  /*  444 */  { MAD_F(0x069d9cb7) /* 0.413479532 */, 13 },
  /*  445 */  { MAD_F(0x06a2b333) /* 0.414721679 */, 13 },
  /*  446 */  { MAD_F(0x06a7caa9) /* 0.415964756 */, 13 },
  /*  447 */  { MAD_F(0x06ace318) /* 0.417208762 */, 13 },
  /*  448 */  { MAD_F(0x06b1fc81) /* 0.418453696 */, 13 },
  /*  449 */  { MAD_F(0x06b716e2) /* 0.419699557 */, 13 },
  /*  450 */  { MAD_F(0x06bc323b) /* 0.420946343 */, 13 },
  /*  451 */  { MAD_F(0x06c14e8d) /* 0.422194054 */, 13 },
  /*  452 */  { MAD_F(0x06c66bd6) /* 0.423442686 */, 13 },
  /*  453 */  { MAD_F(0x06cb8a17) /* 0.424692240 */, 13 },
  /*  454 */  { MAD_F(0x06d0a94e) /* 0.425942714 */, 13 },
  /*  455 */  { MAD_F(0x06d5c97c) /* 0.427194106 */, 13 },
  /*  456 */  { MAD_F(0x06daeaa1) /* 0.428446415 */, 13 },
  /*  457 */  { MAD_F(0x06e00cbb) /* 0.429699640 */, 13 },
  /*  458 */  { MAD_F(0x06e52fca) /* 0.430953779 */, 13 },
  /*  459 */  { MAD_F(0x06ea53cf) /* 0.432208832 */, 13 },
  /*  460 */  { MAD_F(0x06ef78c8) /* 0.433464796 */, 13 },
  /*  461 */  { MAD_F(0x06f49eb6) /* 0.434721671 */, 13 },
  /*  462 */  { MAD_F(0x06f9c597) /* 0.435979455 */, 13 },
  /*  463 */  { MAD_F(0x06feed6d) /* 0.437238146 */, 13 },
  /*  464 */  { MAD_F(0x07041636) /* 0.438497744 */, 13 },
  /*  465 */  { MAD_F(0x07093ff2) /* 0.439758248 */, 13 },
  /*  466 */  { MAD_F(0x070e6aa0) /* 0.441019655 */, 13 },
  /*  467 */  { MAD_F(0x07139641) /* 0.442281965 */, 13 },
  /*  468 */  { MAD_F(0x0718c2d3) /* 0.443545176 */, 13 },
  /*  469 */  { MAD_F(0x071df058) /* 0.444809288 */, 13 },
  /*  470 */  { MAD_F(0x07231ecd) /* 0.446074298 */, 13 },
  /*  471 */  { MAD_F(0x07284e34) /* 0.447340205 */, 13 },
  /*  472 */  { MAD_F(0x072d7e8b) /* 0.448607009 */, 13 },
  /*  473 */  { MAD_F(0x0732afd2) /* 0.449874708 */, 13 },
  /*  474 */  { MAD_F(0x0737e209) /* 0.451143300 */, 13 },
  /*  475 */  { MAD_F(0x073d1530) /* 0.452412785 */, 13 },
  /*  476 */  { MAD_F(0x07424946) /* 0.453683161 */, 13 },
  /*  477 */  { MAD_F(0x07477e4b) /* 0.454954427 */, 13 },
  /*  478 */  { MAD_F(0x074cb43e) /* 0.456226581 */, 13 },
  /*  479 */  { MAD_F(0x0751eb20) /* 0.457499623 */, 13 },
  /*  480 */  { MAD_F(0x075722ef) /* 0.458773552 */, 13 },
  /*  481 */  { MAD_F(0x075c5bac) /* 0.460048365 */, 13 },
  /*  482 */  { MAD_F(0x07619557) /* 0.461324062 */, 13 },
  /*  483 */  { MAD_F(0x0766cfee) /* 0.462600642 */, 13 },
  /*  484 */  { MAD_F(0x076c0b72) /* 0.463878102 */, 13 },
  /*  485 */  { MAD_F(0x077147e2) /* 0.465156443 */, 13 },
  /*  486 */  { MAD_F(0x0776853e) /* 0.466435663 */, 13 },
  /*  487 */  { MAD_F(0x077bc385) /* 0.467715761 */, 13 },
  /*  488 */  { MAD_F(0x078102b8) /* 0.468996735 */, 13 },
  /*  489 */  { MAD_F(0x078642d6) /* 0.470278584 */, 13 },
  /*  490 */  { MAD_F(0x078b83de) /* 0.471561307 */, 13 },
  /*  491 */  { MAD_F(0x0790c5d1) /* 0.472844904 */, 13 },
  /*  492 */  { MAD_F(0x079608ae) /* 0.474129372 */, 13 },
  /*  493 */  { MAD_F(0x079b4c74) /* 0.475414710 */, 13 },
  /*  494 */  { MAD_F(0x07a09124) /* 0.476700918 */, 13 },
  /*  495 */  { MAD_F(0x07a5d6bd) /* 0.477987994 */, 13 },
  /*  496 */  { MAD_F(0x07ab1d3e) /* 0.479275937 */, 13 },
  /*  497 */  { MAD_F(0x07b064a8) /* 0.480564746 */, 13 },
  /*  498 */  { MAD_F(0x07b5acfb) /* 0.481854420 */, 13 },
  /*  499 */  { MAD_F(0x07baf635) /* 0.483144957 */, 13 },
  /*  500 */  { MAD_F(0x07c04056) /* 0.484436356 */, 13 },
  /*  501 */  { MAD_F(0x07c58b5f) /* 0.485728617 */, 13 },
  /*  502 */  { MAD_F(0x07cad74e) /* 0.487021738 */, 13 },
  /*  503 */  { MAD_F(0x07d02424) /* 0.488315717 */, 13 },
  /*  504 */  { MAD_F(0x07d571e0) /* 0.489610555 */, 13 },
  /*  505 */  { MAD_F(0x07dac083) /* 0.490906249 */, 13 },
  /*  506 */  { MAD_F(0x07e0100a) /* 0.492202799 */, 13 },
  /*  507 */  { MAD_F(0x07e56078) /* 0.493500203 */, 13 },
  /*  508 */  { MAD_F(0x07eab1ca) /* 0.494798460 */, 13 },
  /*  509 */  { MAD_F(0x07f00401) /* 0.496097570 */, 13 },
  /*  510 */  { MAD_F(0x07f5571d) /* 0.497397530 */, 13 },
  /*  511 */  { MAD_F(0x07faab1c) /* 0.498698341 */, 13 },
  /*  512 */  { MAD_F(0x04000000) /* 0.250000000 */, 14 },
  /*  513 */  { MAD_F(0x0402aae3) /* 0.250651254 */, 14 },
  /*  514 */  { MAD_F(0x04055638) /* 0.251302930 */, 14 },
  /*  515 */  { MAD_F(0x040801ff) /* 0.251955030 */, 14 },
  /*  516 */  { MAD_F(0x040aae37) /* 0.252607552 */, 14 },
  /*  517 */  { MAD_F(0x040d5ae0) /* 0.253260495 */, 14 },
  /*  518 */  { MAD_F(0x041007fa) /* 0.253913860 */, 14 },
  /*  519 */  { MAD_F(0x0412b586) /* 0.254567645 */, 14 },
  /*  520 */  { MAD_F(0x04156381) /* 0.255221850 */, 14 },
  /*  521 */  { MAD_F(0x041811ee) /* 0.255876475 */, 14 },
  /*  522 */  { MAD_F(0x041ac0cb) /* 0.256531518 */, 14 },
  /*  523 */  { MAD_F(0x041d7018) /* 0.257186980 */, 14 },
  /*  524 */  { MAD_F(0x04201fd5) /* 0.257842860 */, 14 },
  /*  525 */  { MAD_F(0x0422d003) /* 0.258499157 */, 14 },
  /*  526 */  { MAD_F(0x042580a0) /* 0.259155872 */, 14 },
  /*  527 */  { MAD_F(0x042831ad) /* 0.259813002 */, 14 },
  /*  528 */  { MAD_F(0x042ae32a) /* 0.260470548 */, 14 },
  /*  529 */  { MAD_F(0x042d9516) /* 0.261128510 */, 14 },
  /*  530 */  { MAD_F(0x04304772) /* 0.261786886 */, 14 },
  /*  531 */  { MAD_F(0x0432fa3d) /* 0.262445676 */, 14 },
  /*  532 */  { MAD_F(0x0435ad76) /* 0.263104880 */, 14 },
  /*  533 */  { MAD_F(0x0438611f) /* 0.263764497 */, 14 },
  /*  534 */  { MAD_F(0x043b1536) /* 0.264424527 */, 14 },
  /*  535 */  { MAD_F(0x043dc9bc) /* 0.265084969 */, 14 },
  /*  536 */  { MAD_F(0x04407eb1) /* 0.265745823 */, 14 },
  /*  537 */  { MAD_F(0x04433414) /* 0.266407088 */, 14 },
  /*  538 */  { MAD_F(0x0445e9e5) /* 0.267068763 */, 14 },
  /*  539 */  { MAD_F(0x0448a024) /* 0.267730848 */, 14 },
  /*  540 */  { MAD_F(0x044b56d1) /* 0.268393343 */, 14 },
  /*  541 */  { MAD_F(0x044e0dec) /* 0.269056248 */, 14 },
  /*  542 */  { MAD_F(0x0450c575) /* 0.269719560 */, 14 },
  /*  543 */  { MAD_F(0x04537d6b) /* 0.270383281 */, 14 },
  /*  544 */  { MAD_F(0x045635cf) /* 0.271047409 */, 14 },
  /*  545 */  { MAD_F(0x0458ee9f) /* 0.271711944 */, 14 },
  /*  546 */  { MAD_F(0x045ba7dd) /* 0.272376886 */, 14 },
  /*  547 */  { MAD_F(0x045e6188) /* 0.273042234 */, 14 },
  /*  548 */  { MAD_F(0x04611ba0) /* 0.273707988 */, 14 },
  /*  549 */  { MAD_F(0x0463d625) /* 0.274374147 */, 14 },
  /*  550 */  { MAD_F(0x04669116) /* 0.275040710 */, 14 },
  /*  551 */  { MAD_F(0x04694c74) /* 0.275707677 */, 14 },
  /*  552 */  { MAD_F(0x046c083e) /* 0.276375048 */, 14 },
  /*  553 */  { MAD_F(0x046ec474) /* 0.277042822 */, 14 },
  /*  554 */  { MAD_F(0x04718116) /* 0.277710999 */, 14 },
  /*  555 */  { MAD_F(0x04743e25) /* 0.278379578 */, 14 },
  /*  556 */  { MAD_F(0x0476fb9f) /* 0.279048558 */, 14 },
  /*  557 */  { MAD_F(0x0479b984) /* 0.279717940 */, 14 },
  /*  558 */  { MAD_F(0x047c77d6) /* 0.280387722 */, 14 },
  /*  559 */  { MAD_F(0x047f3693) /* 0.281057905 */, 14 },
  /*  560 */  { MAD_F(0x0481f5bb) /* 0.281728487 */, 14 },
  /*  561 */  { MAD_F(0x0484b54e) /* 0.282399469 */, 14 },
  /*  562 */  { MAD_F(0x0487754c) /* 0.283070849 */, 14 },
  /*  563 */  { MAD_F(0x048a35b6) /* 0.283742628 */, 14 },
  /*  564 */  { MAD_F(0x048cf68a) /* 0.284414805 */, 14 },
  /*  565 */  { MAD_F(0x048fb7c8) /* 0.285087379 */, 14 },
  /*  566 */  { MAD_F(0x04927972) /* 0.285760350 */, 14 },
  /*  567 */  { MAD_F(0x04953b85) /* 0.286433717 */, 14 },
  /*  568 */  { MAD_F(0x0497fe03) /* 0.287107481 */, 14 },
  /*  569 */  { MAD_F(0x049ac0eb) /* 0.287781640 */, 14 },
  /*  570 */  { MAD_F(0x049d843e) /* 0.288456194 */, 14 },
  /*  571 */  { MAD_F(0x04a047fa) /* 0.289131142 */, 14 },
  /*  572 */  { MAD_F(0x04a30c20) /* 0.289806485 */, 14 },
  /*  573 */  { MAD_F(0x04a5d0af) /* 0.290482221 */, 14 },
  /*  574 */  { MAD_F(0x04a895a8) /* 0.291158351 */, 14 },
  /*  575 */  { MAD_F(0x04ab5b0b) /* 0.291834873 */, 14 },
  /*  576 */  { MAD_F(0x04ae20d7) /* 0.292511788 */, 14 },
  /*  577 */  { MAD_F(0x04b0e70c) /* 0.293189094 */, 14 },
  /*  578 */  { MAD_F(0x04b3adaa) /* 0.293866792 */, 14 },
  /*  579 */  { MAD_F(0x04b674b1) /* 0.294544881 */, 14 },
  /*  580 */  { MAD_F(0x04b93c21) /* 0.295223360 */, 14 },
  /*  581 */  { MAD_F(0x04bc03fa) /* 0.295902229 */, 14 },
  /*  582 */  { MAD_F(0x04becc3b) /* 0.296581488 */, 14 },
  /*  583 */  { MAD_F(0x04c194e4) /* 0.297261136 */, 14 },
  /*  584 */  { MAD_F(0x04c45df6) /* 0.297941173 */, 14 },
  /*  585 */  { MAD_F(0x04c72771) /* 0.298621598 */, 14 },
  /*  586 */  { MAD_F(0x04c9f153) /* 0.299302411 */, 14 },
  /*  587 */  { MAD_F(0x04ccbb9d) /* 0.299983611 */, 14 },
  /*  588 */  { MAD_F(0x04cf864f) /* 0.300665198 */, 14 },
  /*  589 */  { MAD_F(0x04d25169) /* 0.301347172 */, 14 },
  /*  590 */  { MAD_F(0x04d51ceb) /* 0.302029532 */, 14 },
  /*  591 */  { MAD_F(0x04d7e8d4) /* 0.302712277 */, 14 },
  /*  592 */  { MAD_F(0x04dab524) /* 0.303395408 */, 14 },
  /*  593 */  { MAD_F(0x04dd81dc) /* 0.304078923 */, 14 },
  /*  594 */  { MAD_F(0x04e04efb) /* 0.304762823 */, 14 },
  /*  595 */  { MAD_F(0x04e31c81) /* 0.305447106 */, 14 },
  /*  596 */  { MAD_F(0x04e5ea6e) /* 0.306131773 */, 14 },
  /*  597 */  { MAD_F(0x04e8b8c2) /* 0.306816823 */, 14 },
  /*  598 */  { MAD_F(0x04eb877c) /* 0.307502256 */, 14 },
  /*  599 */  { MAD_F(0x04ee569d) /* 0.308188071 */, 14 },
  /*  600 */  { MAD_F(0x04f12624) /* 0.308874267 */, 14 },
  /*  601 */  { MAD_F(0x04f3f612) /* 0.309560845 */, 14 },
  /*  602 */  { MAD_F(0x04f6c666) /* 0.310247804 */, 14 },
  /*  603 */  { MAD_F(0x04f99721) /* 0.310935143 */, 14 },
  /*  604 */  { MAD_F(0x04fc6841) /* 0.311622862 */, 14 },
  /*  605 */  { MAD_F(0x04ff39c7) /* 0.312310961 */, 14 },
  /*  606 */  { MAD_F(0x05020bb3) /* 0.312999439 */, 14 },
  /*  607 */  { MAD_F(0x0504de05) /* 0.313688296 */, 14 },
  /*  608 */  { MAD_F(0x0507b0bc) /* 0.314377532 */, 14 },
  /*  609 */  { MAD_F(0x050a83d8) /* 0.315067145 */, 14 },
  /*  610 */  { MAD_F(0x050d575b) /* 0.315757136 */, 14 },
  /*  611 */  { MAD_F(0x05102b42) /* 0.316447504 */, 14 },
  /*  612 */  { MAD_F(0x0512ff8e) /* 0.317138249 */, 14 },
  /*  613 */  { MAD_F(0x0515d440) /* 0.317829370 */, 14 },
  /*  614 */  { MAD_F(0x0518a956) /* 0.318520867 */, 14 },
  /*  615 */  { MAD_F(0x051b7ed1) /* 0.319212739 */, 14 },
  /*  616 */  { MAD_F(0x051e54b1) /* 0.319904987 */, 14 },
  /*  617 */  { MAD_F(0x05212af5) /* 0.320597609 */, 14 },
  /*  618 */  { MAD_F(0x0524019e) /* 0.321290606 */, 14 },
  /*  619 */  { MAD_F(0x0526d8ab) /* 0.321983976 */, 14 },
  /*  620 */  { MAD_F(0x0529b01d) /* 0.322677720 */, 14 },
  /*  621 */  { MAD_F(0x052c87f2) /* 0.323371837 */, 14 },
  /*  622 */  { MAD_F(0x052f602c) /* 0.324066327 */, 14 },
  /*  623 */  { MAD_F(0x053238ca) /* 0.324761189 */, 14 },
  /*  624 */  { MAD_F(0x053511cb) /* 0.325456423 */, 14 },
  /*  625 */  { MAD_F(0x0537eb30) /* 0.326152028 */, 14 },
  /*  626 */  { MAD_F(0x053ac4f9) /* 0.326848005 */, 14 },
  /*  627 */  { MAD_F(0x053d9f25) /* 0.327544352 */, 14 },
  /*  628 */  { MAD_F(0x054079b5) /* 0.328241070 */, 14 },
  /*  629 */  { MAD_F(0x054354a8) /* 0.328938157 */, 14 },
  /*  630 */  { MAD_F(0x05462ffe) /* 0.329635614 */, 14 },
  /*  631 */  { MAD_F(0x05490bb7) /* 0.330333440 */, 14 },
  /*  632 */  { MAD_F(0x054be7d4) /* 0.331031635 */, 14 },
  /*  633 */  { MAD_F(0x054ec453) /* 0.331730198 */, 14 },
  /*  634 */  { MAD_F(0x0551a134) /* 0.332429129 */, 14 },
  /*  635 */  { MAD_F(0x05547e79) /* 0.333128427 */, 14 },
  /*  636 */  { MAD_F(0x05575c20) /* 0.333828093 */, 14 },
  /*  637 */  { MAD_F(0x055a3a2a) /* 0.334528126 */, 14 },
  /*  638 */  { MAD_F(0x055d1896) /* 0.335228525 */, 14 },
  /*  639 */  { MAD_F(0x055ff764) /* 0.335929290 */, 14 },
  /*  640 */  { MAD_F(0x0562d694) /* 0.336630420 */, 14 },
  /*  641 */  { MAD_F(0x0565b627) /* 0.337331916 */, 14 },
  /*  642 */  { MAD_F(0x0568961b) /* 0.338033777 */, 14 },
  /*  643 */  { MAD_F(0x056b7671) /* 0.338736002 */, 14 },
  /*  644 */  { MAD_F(0x056e5729) /* 0.339438592 */, 14 },
  /*  645 */  { MAD_F(0x05713843) /* 0.340141545 */, 14 },
  /*  646 */  { MAD_F(0x057419be) /* 0.340844862 */, 14 },
  /*  647 */  { MAD_F(0x0576fb9a) /* 0.341548541 */, 14 },
  /*  648 */  { MAD_F(0x0579ddd8) /* 0.342252584 */, 14 },
  /*  649 */  { MAD_F(0x057cc077) /* 0.342956988 */, 14 },
  /*  650 */  { MAD_F(0x057fa378) /* 0.343661754 */, 14 },
  /*  651 */  { MAD_F(0x058286d9) /* 0.344366882 */, 14 },
  /*  652 */  { MAD_F(0x05856a9b) /* 0.345072371 */, 14 },
  /*  653 */  { MAD_F(0x05884ebe) /* 0.345778221 */, 14 },
  /*  654 */  { MAD_F(0x058b3342) /* 0.346484431 */, 14 },
  /*  655 */  { MAD_F(0x058e1827) /* 0.347191002 */, 14 },
  /*  656 */  { MAD_F(0x0590fd6c) /* 0.347897931 */, 14 },
  /*  657 */  { MAD_F(0x0593e311) /* 0.348605221 */, 14 },
  /*  658 */  { MAD_F(0x0596c917) /* 0.349312869 */, 14 },
  /*  659 */  { MAD_F(0x0599af7d) /* 0.350020876 */, 14 },
  /*  660 */  { MAD_F(0x059c9643) /* 0.350729240 */, 14 },
  /*  661 */  { MAD_F(0x059f7d6a) /* 0.351437963 */, 14 },
  /*  662 */  { MAD_F(0x05a264f0) /* 0.352147044 */, 14 },
  /*  663 */  { MAD_F(0x05a54cd6) /* 0.352856481 */, 14 },
  /*  664 */  { MAD_F(0x05a8351c) /* 0.353566275 */, 14 },
  /*  665 */  { MAD_F(0x05ab1dc2) /* 0.354276426 */, 14 },
  /*  666 */  { MAD_F(0x05ae06c7) /* 0.354986932 */, 14 },
  /*  667 */  { MAD_F(0x05b0f02b) /* 0.355697795 */, 14 },
  /*  668 */  { MAD_F(0x05b3d9f0) /* 0.356409012 */, 14 },
  /*  669 */  { MAD_F(0x05b6c413) /* 0.357120585 */, 14 },
  /*  670 */  { MAD_F(0x05b9ae95) /* 0.357832512 */, 14 },
  /*  671 */  { MAD_F(0x05bc9977) /* 0.358544794 */, 14 },
  /*  672 */  { MAD_F(0x05bf84b8) /* 0.359257429 */, 14 },
  /*  673 */  { MAD_F(0x05c27057) /* 0.359970419 */, 14 },
  /*  674 */  { MAD_F(0x05c55c56) /* 0.360683761 */, 14 },
  /*  675 */  { MAD_F(0x05c848b3) /* 0.361397456 */, 14 },
  /*  676 */  { MAD_F(0x05cb356e) /* 0.362111504 */, 14 },
  /*  677 */  { MAD_F(0x05ce2289) /* 0.362825904 */, 14 },
  /*  678 */  { MAD_F(0x05d11001) /* 0.363540655 */, 14 },
  /*  679 */  { MAD_F(0x05d3fdd8) /* 0.364255759 */, 14 },
  /*  680 */  { MAD_F(0x05d6ec0e) /* 0.364971213 */, 14 },
  /*  681 */  { MAD_F(0x05d9daa1) /* 0.365687018 */, 14 },
  /*  682 */  { MAD_F(0x05dcc993) /* 0.366403174 */, 14 },
  /*  683 */  { MAD_F(0x05dfb8e2) /* 0.367119680 */, 14 },
  /*  684 */  { MAD_F(0x05e2a890) /* 0.367836535 */, 14 },
  /*  685 */  { MAD_F(0x05e5989b) /* 0.368553740 */, 14 },
  /*  686 */  { MAD_F(0x05e88904) /* 0.369271294 */, 14 },
  /*  687 */  { MAD_F(0x05eb79cb) /* 0.369989197 */, 14 },
  /*  688 */  { MAD_F(0x05ee6aef) /* 0.370707448 */, 14 },
  /*  689 */  { MAD_F(0x05f15c70) /* 0.371426047 */, 14 },
  /*  690 */  { MAD_F(0x05f44e4f) /* 0.372144994 */, 14 },
  /*  691 */  { MAD_F(0x05f7408b) /* 0.372864289 */, 14 },
  /*  692 */  { MAD_F(0x05fa3324) /* 0.373583930 */, 14 },
  /*  693 */  { MAD_F(0x05fd261b) /* 0.374303918 */, 14 },
  /*  694 */  { MAD_F(0x0600196e) /* 0.375024253 */, 14 },
  /*  695 */  { MAD_F(0x06030d1e) /* 0.375744934 */, 14 },
  /*  696 */  { MAD_F(0x0606012b) /* 0.376465960 */, 14 },
  /*  697 */  { MAD_F(0x0608f595) /* 0.377187332 */, 14 },
  /*  698 */  { MAD_F(0x060bea5c) /* 0.377909049 */, 14 },
  /*  699 */  { MAD_F(0x060edf7f) /* 0.378631110 */, 14 },
  /*  700 */  { MAD_F(0x0611d4fe) /* 0.379353516 */, 14 },
  /*  701 */  { MAD_F(0x0614cada) /* 0.380076266 */, 14 },
  /*  702 */  { MAD_F(0x0617c112) /* 0.380799360 */, 14 },
  /*  703 */  { MAD_F(0x061ab7a6) /* 0.381522798 */, 14 },
  /*  704 */  { MAD_F(0x061dae96) /* 0.382246578 */, 14 },
  /*  705 */  { MAD_F(0x0620a5e3) /* 0.382970701 */, 14 },
  /*  706 */  { MAD_F(0x06239d8b) /* 0.383695167 */, 14 },
  /*  707 */  { MAD_F(0x0626958f) /* 0.384419975 */, 14 },
  /*  708 */  { MAD_F(0x06298def) /* 0.385145124 */, 14 },
  /*  709 */  { MAD_F(0x062c86aa) /* 0.385870615 */, 14 },
  /*  710 */  { MAD_F(0x062f7fc1) /* 0.386596448 */, 14 },
  /*  711 */  { MAD_F(0x06327934) /* 0.387322621 */, 14 },
  /*  712 */  { MAD_F(0x06357302) /* 0.388049134 */, 14 },
  /*  713 */  { MAD_F(0x06386d2b) /* 0.388775988 */, 14 },
  /*  714 */  { MAD_F(0x063b67b0) /* 0.389503182 */, 14 },
  /*  715 */  { MAD_F(0x063e6290) /* 0.390230715 */, 14 },
  /*  716 */  { MAD_F(0x06415dcb) /* 0.390958588 */, 14 },
  /*  717 */  { MAD_F(0x06445960) /* 0.391686799 */, 14 },
  /*  718 */  { MAD_F(0x06475551) /* 0.392415349 */, 14 },
  /*  719 */  { MAD_F(0x064a519c) /* 0.393144238 */, 14 },
  /*  720 */  { MAD_F(0x064d4e43) /* 0.393873464 */, 14 },
  /*  721 */  { MAD_F(0x06504b44) /* 0.394603028 */, 14 },
  /*  722 */  { MAD_F(0x0653489f) /* 0.395332930 */, 14 },
  /*  723 */  { MAD_F(0x06564655) /* 0.396063168 */, 14 },
  /*  724 */  { MAD_F(0x06594465) /* 0.396793743 */, 14 },
  /*  725 */  { MAD_F(0x065c42d0) /* 0.397524655 */, 14 },
  /*  726 */  { MAD_F(0x065f4195) /* 0.398255903 */, 14 },
  /*  727 */  { MAD_F(0x066240b4) /* 0.398987487 */, 14 },
  /*  728 */  { MAD_F(0x0665402d) /* 0.399719406 */, 14 },
  /*  729 */  { MAD_F(0x06684000) /* 0.400451660 */, 14 },
  /*  730 */  { MAD_F(0x066b402d) /* 0.401184249 */, 14 },
  /*  731 */  { MAD_F(0x066e40b3) /* 0.401917173 */, 14 },
  /*  732 */  { MAD_F(0x06714194) /* 0.402650431 */, 14 },
  /*  733 */  { MAD_F(0x067442ce) /* 0.403384024 */, 14 },
  /*  734 */  { MAD_F(0x06774462) /* 0.404117949 */, 14 },
  /*  735 */  { MAD_F(0x067a464f) /* 0.404852209 */, 14 },
  /*  736 */  { MAD_F(0x067d4896) /* 0.405586801 */, 14 },
  /*  737 */  { MAD_F(0x06804b36) /* 0.406321726 */, 14 },
  /*  738 */  { MAD_F(0x06834e2f) /* 0.407056983 */, 14 },
  /*  739 */  { MAD_F(0x06865181) /* 0.407792573 */, 14 },
  /*  740 */  { MAD_F(0x0689552c) /* 0.408528495 */, 14 },
  /*  741 */  { MAD_F(0x068c5931) /* 0.409264748 */, 14 },
  /*  742 */  { MAD_F(0x068f5d8e) /* 0.410001332 */, 14 },
  /*  743 */  { MAD_F(0x06926245) /* 0.410738247 */, 14 },
  /*  744 */  { MAD_F(0x06956753) /* 0.411475493 */, 14 },
  /*  745 */  { MAD_F(0x06986cbb) /* 0.412213070 */, 14 },
  /*  746 */  { MAD_F(0x069b727b) /* 0.412950976 */, 14 },
  /*  747 */  { MAD_F(0x069e7894) /* 0.413689213 */, 14 },
  /*  748 */  { MAD_F(0x06a17f05) /* 0.414427779 */, 14 },
  /*  749 */  { MAD_F(0x06a485cf) /* 0.415166674 */, 14 },
  /*  750 */  { MAD_F(0x06a78cf1) /* 0.415905897 */, 14 },
  /*  751 */  { MAD_F(0x06aa946b) /* 0.416645450 */, 14 },
  /*  752 */  { MAD_F(0x06ad9c3d) /* 0.417385331 */, 14 },
  /*  753 */  { MAD_F(0x06b0a468) /* 0.418125540 */, 14 },
  /*  754 */  { MAD_F(0x06b3acea) /* 0.418866076 */, 14 },
  /*  755 */  { MAD_F(0x06b6b5c4) /* 0.419606940 */, 14 },
  /*  756 */  { MAD_F(0x06b9bef6) /* 0.420348132 */, 14 },
  /*  757 */  { MAD_F(0x06bcc880) /* 0.421089650 */, 14 },
  /*  758 */  { MAD_F(0x06bfd261) /* 0.421831494 */, 14 },
  /*  759 */  { MAD_F(0x06c2dc9a) /* 0.422573665 */, 14 },
  /*  760 */  { MAD_F(0x06c5e72b) /* 0.423316162 */, 14 },
  /*  761 */  { MAD_F(0x06c8f213) /* 0.424058985 */, 14 },
  /*  762 */  { MAD_F(0x06cbfd52) /* 0.424802133 */, 14 },
  /*  763 */  { MAD_F(0x06cf08e9) /* 0.425545607 */, 14 },
  /*  764 */  { MAD_F(0x06d214d7) /* 0.426289405 */, 14 },
  /*  765 */  { MAD_F(0x06d5211c) /* 0.427033528 */, 14 },
  /*  766 */  { MAD_F(0x06d82db8) /* 0.427777975 */, 14 },
  /*  767 */  { MAD_F(0x06db3aaa) /* 0.428522746 */, 14 },
  /*  768 */  { MAD_F(0x06de47f4) /* 0.429267841 */, 14 },
  /*  769 */  { MAD_F(0x06e15595) /* 0.430013259 */, 14 },
  /*  770 */  { MAD_F(0x06e4638d) /* 0.430759001 */, 14 },
  /*  771 */  { MAD_F(0x06e771db) /* 0.431505065 */, 14 },
  /*  772 */  { MAD_F(0x06ea807f) /* 0.432251452 */, 14 },
  /*  773 */  { MAD_F(0x06ed8f7b) /* 0.432998162 */, 14 },
  /*  774 */  { MAD_F(0x06f09ecc) /* 0.433745193 */, 14 },
  /*  775 */  { MAD_F(0x06f3ae75) /* 0.434492546 */, 14 },
  /*  776 */  { MAD_F(0x06f6be73) /* 0.435240221 */, 14 },
  /*  777 */  { MAD_F(0x06f9cec8) /* 0.435988217 */, 14 },
  /*  778 */  { MAD_F(0x06fcdf72) /* 0.436736534 */, 14 },
  /*  779 */  { MAD_F(0x06fff073) /* 0.437485172 */, 14 },
  /*  780 */  { MAD_F(0x070301ca) /* 0.438234130 */, 14 },
  /*  781 */  { MAD_F(0x07061377) /* 0.438983408 */, 14 },
  /*  782 */  { MAD_F(0x0709257a) /* 0.439733006 */, 14 },
  /*  783 */  { MAD_F(0x070c37d2) /* 0.440482924 */, 14 },
  /*  784 */  { MAD_F(0x070f4a80) /* 0.441233161 */, 14 },
  /*  785 */  { MAD_F(0x07125d84) /* 0.441983717 */, 14 },
  /*  786 */  { MAD_F(0x071570de) /* 0.442734592 */, 14 },
  /*  787 */  { MAD_F(0x0718848d) /* 0.443485785 */, 14 },
  /*  788 */  { MAD_F(0x071b9891) /* 0.444237296 */, 14 },
  /*  789 */  { MAD_F(0x071eaceb) /* 0.444989126 */, 14 },
  /*  790 */  { MAD_F(0x0721c19a) /* 0.445741273 */, 14 },
  /*  791 */  { MAD_F(0x0724d69e) /* 0.446493738 */, 14 },
  /*  792 */  { MAD_F(0x0727ebf7) /* 0.447246519 */, 14 },
  /*  793 */  { MAD_F(0x072b01a6) /* 0.447999618 */, 14 },
  /*  794 */  { MAD_F(0x072e17a9) /* 0.448753033 */, 14 },
  /*  795 */  { MAD_F(0x07312e01) /* 0.449506765 */, 14 },
  /*  796 */  { MAD_F(0x073444ae) /* 0.450260813 */, 14 },
  /*  797 */  { MAD_F(0x07375bb0) /* 0.451015176 */, 14 },
  /*  798 */  { MAD_F(0x073a7307) /* 0.451769856 */, 14 },
  /*  799 */  { MAD_F(0x073d8ab2) /* 0.452524850 */, 14 },
  /*  800 */  { MAD_F(0x0740a2b2) /* 0.453280160 */, 14 },
  /*  801 */  { MAD_F(0x0743bb06) /* 0.454035784 */, 14 },
  /*  802 */  { MAD_F(0x0746d3af) /* 0.454791723 */, 14 },
  /*  803 */  { MAD_F(0x0749ecac) /* 0.455547976 */, 14 },
  /*  804 */  { MAD_F(0x074d05fe) /* 0.456304543 */, 14 },
  /*  805 */  { MAD_F(0x07501fa3) /* 0.457061423 */, 14 },
  /*  806 */  { MAD_F(0x0753399d) /* 0.457818618 */, 14 },
  /*  807 */  { MAD_F(0x075653eb) /* 0.458576125 */, 14 },
  /*  808 */  { MAD_F(0x07596e8d) /* 0.459333946 */, 14 },
  /*  809 */  { MAD_F(0x075c8983) /* 0.460092079 */, 14 },
  /*  810 */  { MAD_F(0x075fa4cc) /* 0.460850524 */, 14 },
  /*  811 */  { MAD_F(0x0762c06a) /* 0.461609282 */, 14 },
  /*  812 */  { MAD_F(0x0765dc5b) /* 0.462368352 */, 14 },
  /*  813 */  { MAD_F(0x0768f8a0) /* 0.463127733 */, 14 },
  /*  814 */  { MAD_F(0x076c1538) /* 0.463887426 */, 14 },
  /*  815 */  { MAD_F(0x076f3224) /* 0.464647430 */, 14 },
  /*  816 */  { MAD_F(0x07724f64) /* 0.465407744 */, 14 },
  /*  817 */  { MAD_F(0x07756cf7) /* 0.466168370 */, 14 },
  /*  818 */  { MAD_F(0x07788add) /* 0.466929306 */, 14 },
  /*  819 */  { MAD_F(0x077ba916) /* 0.467690552 */, 14 },
  /*  820 */  { MAD_F(0x077ec7a3) /* 0.468452108 */, 14 },
  /*  821 */  { MAD_F(0x0781e683) /* 0.469213973 */, 14 },
  /*  822 */  { MAD_F(0x078505b5) /* 0.469976148 */, 14 },
  /*  823 */  { MAD_F(0x0788253b) /* 0.470738632 */, 14 },
  /*  824 */  { MAD_F(0x078b4514) /* 0.471501425 */, 14 },
  /*  825 */  { MAD_F(0x078e653f) /* 0.472264527 */, 14 },
  /*  826 */  { MAD_F(0x079185be) /* 0.473027937 */, 14 },
  /*  827 */  { MAD_F(0x0794a68f) /* 0.473791655 */, 14 },
  /*  828 */  { MAD_F(0x0797c7b2) /* 0.474555681 */, 14 },
  /*  829 */  { MAD_F(0x079ae929) /* 0.475320014 */, 14 },
  /*  830 */  { MAD_F(0x079e0af1) /* 0.476084655 */, 14 },
  /*  831 */  { MAD_F(0x07a12d0c) /* 0.476849603 */, 14 },
  /*  832 */  { MAD_F(0x07a44f7a) /* 0.477614858 */, 14 },
  /*  833 */  { MAD_F(0x07a7723a) /* 0.478380420 */, 14 },
  /*  834 */  { MAD_F(0x07aa954c) /* 0.479146288 */, 14 },
  /*  835 */  { MAD_F(0x07adb8b0) /* 0.479912463 */, 14 },
  /*  836 */  { MAD_F(0x07b0dc67) /* 0.480678943 */, 14 },
  /*  837 */  { MAD_F(0x07b4006f) /* 0.481445729 */, 14 },
  /*  838 */  { MAD_F(0x07b724ca) /* 0.482212820 */, 14 },
  /*  839 */  { MAD_F(0x07ba4976) /* 0.482980216 */, 14 },
  /*  840 */  { MAD_F(0x07bd6e75) /* 0.483747918 */, 14 },
  /*  841 */  { MAD_F(0x07c093c5) /* 0.484515924 */, 14 },
  /*  842 */  { MAD_F(0x07c3b967) /* 0.485284235 */, 14 },
  /*  843 */  { MAD_F(0x07c6df5a) /* 0.486052849 */, 14 },
  /*  844 */  { MAD_F(0x07ca059f) /* 0.486821768 */, 14 },
  /*  845 */  { MAD_F(0x07cd2c36) /* 0.487590991 */, 14 },
  /*  846 */  { MAD_F(0x07d0531e) /* 0.488360517 */, 14 },
  /*  847 */  { MAD_F(0x07d37a57) /* 0.489130346 */, 14 },
  /*  848 */  { MAD_F(0x07d6a1e2) /* 0.489900479 */, 14 },
  /*  849 */  { MAD_F(0x07d9c9be) /* 0.490670914 */, 14 },
  /*  850 */  { MAD_F(0x07dcf1ec) /* 0.491441651 */, 14 },
  /*  851 */  { MAD_F(0x07e01a6a) /* 0.492212691 */, 14 },
  /*  852 */  { MAD_F(0x07e3433a) /* 0.492984033 */, 14 },
  /*  853 */  { MAD_F(0x07e66c5a) /* 0.493755677 */, 14 },
  /*  854 */  { MAD_F(0x07e995cc) /* 0.494527623 */, 14 },
  /*  855 */  { MAD_F(0x07ecbf8e) /* 0.495299870 */, 14 },
  /*  856 */  { MAD_F(0x07efe9a1) /* 0.496072418 */, 14 },
  /*  857 */  { MAD_F(0x07f31405) /* 0.496845266 */, 14 },
  /*  858 */  { MAD_F(0x07f63eba) /* 0.497618416 */, 14 },
  /*  859 */  { MAD_F(0x07f969c0) /* 0.498391866 */, 14 },
  /*  860 */  { MAD_F(0x07fc9516) /* 0.499165616 */, 14 },
  /*  861 */  { MAD_F(0x07ffc0bc) /* 0.499939666 */, 14 },
  /*  862 */  { MAD_F(0x04017659) /* 0.250357008 */, 15 },
  /*  863 */  { MAD_F(0x04030c7d) /* 0.250744333 */, 15 },
  /*  864 */  { MAD_F(0x0404a2c9) /* 0.251131807 */, 15 },
  /*  865 */  { MAD_F(0x0406393d) /* 0.251519431 */, 15 },
  /*  866 */  { MAD_F(0x0407cfd9) /* 0.251907204 */, 15 },
  /*  867 */  { MAD_F(0x0409669d) /* 0.252295127 */, 15 },
  /*  868 */  { MAD_F(0x040afd89) /* 0.252683198 */, 15 },
  /*  869 */  { MAD_F(0x040c949e) /* 0.253071419 */, 15 },
  /*  870 */  { MAD_F(0x040e2bda) /* 0.253459789 */, 15 },
  /*  871 */  { MAD_F(0x040fc33e) /* 0.253848307 */, 15 },
  /*  872 */  { MAD_F(0x04115aca) /* 0.254236974 */, 15 },
  /*  873 */  { MAD_F(0x0412f27e) /* 0.254625790 */, 15 },
  /*  874 */  { MAD_F(0x04148a5a) /* 0.255014755 */, 15 },
  /*  875 */  { MAD_F(0x0416225d) /* 0.255403867 */, 15 },
  /*  876 */  { MAD_F(0x0417ba89) /* 0.255793128 */, 15 },
  /*  877 */  { MAD_F(0x041952dc) /* 0.256182537 */, 15 },
  /*  878 */  { MAD_F(0x041aeb57) /* 0.256572095 */, 15 },
  /*  879 */  { MAD_F(0x041c83fa) /* 0.256961800 */, 15 },
  /*  880 */  { MAD_F(0x041e1cc4) /* 0.257351652 */, 15 },
  /*  881 */  { MAD_F(0x041fb5b6) /* 0.257741653 */, 15 },
  /*  882 */  { MAD_F(0x04214ed0) /* 0.258131801 */, 15 },
  /*  883 */  { MAD_F(0x0422e811) /* 0.258522097 */, 15 },
  /*  884 */  { MAD_F(0x04248179) /* 0.258912540 */, 15 },
  /*  885 */  { MAD_F(0x04261b0a) /* 0.259303130 */, 15 },
  /*  886 */  { MAD_F(0x0427b4c2) /* 0.259693868 */, 15 },
  /*  887 */  { MAD_F(0x04294ea1) /* 0.260084752 */, 15 },
  /*  888 */  { MAD_F(0x042ae8a7) /* 0.260475783 */, 15 },
  /*  889 */  { MAD_F(0x042c82d6) /* 0.260866961 */, 15 },
  /*  890 */  { MAD_F(0x042e1d2b) /* 0.261258286 */, 15 },
  /*  891 */  { MAD_F(0x042fb7a8) /* 0.261649758 */, 15 },
  /*  892 */  { MAD_F(0x0431524c) /* 0.262041376 */, 15 },
  /*  893 */  { MAD_F(0x0432ed17) /* 0.262433140 */, 15 },
  /*  894 */  { MAD_F(0x0434880a) /* 0.262825051 */, 15 },
  /*  895 */  { MAD_F(0x04362324) /* 0.263217107 */, 15 },
  /*  896 */  { MAD_F(0x0437be65) /* 0.263609310 */, 15 },
  /*  897 */  { MAD_F(0x043959cd) /* 0.264001659 */, 15 },
  /*  898 */  { MAD_F(0x043af55d) /* 0.264394153 */, 15 },
  /*  899 */  { MAD_F(0x043c9113) /* 0.264786794 */, 15 },
  /*  900 */  { MAD_F(0x043e2cf1) /* 0.265179580 */, 15 },
  /*  901 */  { MAD_F(0x043fc8f6) /* 0.265572511 */, 15 },
  /*  902 */  { MAD_F(0x04416522) /* 0.265965588 */, 15 },
  /*  903 */  { MAD_F(0x04430174) /* 0.266358810 */, 15 },
  /*  904 */  { MAD_F(0x04449dee) /* 0.266752177 */, 15 },
  /*  905 */  { MAD_F(0x04463a8f) /* 0.267145689 */, 15 },
  /*  906 */  { MAD_F(0x0447d756) /* 0.267539347 */, 15 },
  /*  907 */  { MAD_F(0x04497445) /* 0.267933149 */, 15 },
  /*  908 */  { MAD_F(0x044b115a) /* 0.268327096 */, 15 },
  /*  909 */  { MAD_F(0x044cae96) /* 0.268721187 */, 15 },
  /*  910 */  { MAD_F(0x044e4bf9) /* 0.269115423 */, 15 },
  /*  911 */  { MAD_F(0x044fe983) /* 0.269509804 */, 15 },
  /*  912 */  { MAD_F(0x04518733) /* 0.269904329 */, 15 },
  /*  913 */  { MAD_F(0x0453250a) /* 0.270298998 */, 15 },
  /*  914 */  { MAD_F(0x0454c308) /* 0.270693811 */, 15 },
  /*  915 */  { MAD_F(0x0456612d) /* 0.271088768 */, 15 },
  /*  916 */  { MAD_F(0x0457ff78) /* 0.271483869 */, 15 },
  /*  917 */  { MAD_F(0x04599dea) /* 0.271879114 */, 15 },
  /*  918 */  { MAD_F(0x045b3c82) /* 0.272274503 */, 15 },
  /*  919 */  { MAD_F(0x045cdb41) /* 0.272670035 */, 15 },
  /*  920 */  { MAD_F(0x045e7a26) /* 0.273065710 */, 15 },
  /*  921 */  { MAD_F(0x04601932) /* 0.273461530 */, 15 },
  /*  922 */  { MAD_F(0x0461b864) /* 0.273857492 */, 15 },
  /*  923 */  { MAD_F(0x046357bd) /* 0.274253597 */, 15 },
  /*  924 */  { MAD_F(0x0464f73c) /* 0.274649846 */, 15 },
  /*  925 */  { MAD_F(0x046696e2) /* 0.275046238 */, 15 },
  /*  926 */  { MAD_F(0x046836ae) /* 0.275442772 */, 15 },
  /*  927 */  { MAD_F(0x0469d6a0) /* 0.275839449 */, 15 },
  /*  928 */  { MAD_F(0x046b76b9) /* 0.276236269 */, 15 },
  /*  929 */  { MAD_F(0x046d16f7) /* 0.276633232 */, 15 },
  /*  930 */  { MAD_F(0x046eb75c) /* 0.277030337 */, 15 },
  /*  931 */  { MAD_F(0x047057e8) /* 0.277427584 */, 15 },
  /*  932 */  { MAD_F(0x0471f899) /* 0.277824973 */, 15 },
  /*  933 */  { MAD_F(0x04739971) /* 0.278222505 */, 15 },
  /*  934 */  { MAD_F(0x04753a6f) /* 0.278620179 */, 15 },
  /*  935 */  { MAD_F(0x0476db92) /* 0.279017995 */, 15 },
  /*  936 */  { MAD_F(0x04787cdc) /* 0.279415952 */, 15 },
  /*  937 */  { MAD_F(0x047a1e4c) /* 0.279814051 */, 15 },
  /*  938 */  { MAD_F(0x047bbfe2) /* 0.280212292 */, 15 },
  /*  939 */  { MAD_F(0x047d619e) /* 0.280610675 */, 15 },
  /*  940 */  { MAD_F(0x047f0380) /* 0.281009199 */, 15 },
diff --git a/core/multimedia/opieplayer/libmad/sf_table.dat b/core/multimedia/opieplayer/libmad/sf_table.dat
index bc368af..de084d9 100644
--- a/core/multimedia/opieplayer/libmad/sf_table.dat
+++ b/core/multimedia/opieplayer/libmad/sf_table.dat
@@ -1,100 +1,106 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 /*
 * These are the scalefactor values for Layer I and Layer II.
 * The values are from Table B.1 of ISO/IEC 11172-3.
 *
 * There is some error introduced by the 32-bit fixed-point representation;
 * the amount of error is shown. For 16-bit PCM output, this shouldn't be
 * too much of a problem.
+ *
+ * Strictly speaking, Table B.1 has only 63 entries (0-62), thus a strict
+ * interpretation of ISO/IEC 11172-3 would suggest that a scalefactor index of
+ * 63 is invalid. However, for better compatibility with current practices, we
+ * add a 64th entry.
 */
  MAD_F(0x20000000),  /* 2.000000000000 => 2.000000000000, e  0.000000000000 */
  MAD_F(0x1965fea5),  /* 1.587401051968 => 1.587401051074, e  0.000000000894 */
  MAD_F(0x1428a2fa),  /* 1.259921049895 => 1.259921051562, e -0.000000001667 */
  MAD_F(0x10000000),  /* 1.000000000000 => 1.000000000000, e  0.000000000000 */
  MAD_F(0x0cb2ff53),  /* 0.793700525984 => 0.793700527400, e -0.000000001416 */
  MAD_F(0x0a14517d),  /* 0.629960524947 => 0.629960525781, e -0.000000000833 */
  MAD_F(0x08000000),  /* 0.500000000000 => 0.500000000000, e  0.000000000000 */
  MAD_F(0x06597fa9),  /* 0.396850262992 => 0.396850261837, e  0.000000001155 */
  MAD_F(0x050a28be),  /* 0.314980262474 => 0.314980261028, e  0.000000001446 */
  MAD_F(0x04000000),  /* 0.250000000000 => 0.250000000000, e  0.000000000000 */
  MAD_F(0x032cbfd5),  /* 0.198425131496 => 0.198425132781, e -0.000000001285 */
  MAD_F(0x0285145f),  /* 0.157490131237 => 0.157490130514, e  0.000000000723 */
  MAD_F(0x02000000),  /* 0.125000000000 => 0.125000000000, e  0.000000000000 */
  MAD_F(0x01965fea),  /* 0.099212565748 => 0.099212564528, e  0.000000001220 */
  MAD_F(0x01428a30),  /* 0.078745065618 => 0.078745067120, e -0.000000001501 */
  MAD_F(0x01000000),  /* 0.062500000000 => 0.062500000000, e  0.000000000000 */
  MAD_F(0x00cb2ff5),  /* 0.049606282874 => 0.049606282264, e  0.000000000610 */
  MAD_F(0x00a14518),  /* 0.039372532809 => 0.039372533560, e -0.000000000751 */
  MAD_F(0x00800000),  /* 0.031250000000 => 0.031250000000, e  0.000000000000 */
  MAD_F(0x006597fb),  /* 0.024803141437 => 0.024803142995, e -0.000000001558 */
  MAD_F(0x0050a28c),  /* 0.019686266405 => 0.019686266780, e -0.000000000375 */
  MAD_F(0x00400000),  /* 0.015625000000 => 0.015625000000, e  0.000000000000 */
  MAD_F(0x0032cbfd),  /* 0.012401570719 => 0.012401569635, e  0.000000001084 */
  MAD_F(0x00285146),  /* 0.009843133202 => 0.009843133390, e -0.000000000188 */
  MAD_F(0x00200000),  /* 0.007812500000 => 0.007812500000, e  0.000000000000 */
  MAD_F(0x001965ff),  /* 0.006200785359 => 0.006200786680, e -0.000000001321 */
  MAD_F(0x001428a3),  /* 0.004921566601 => 0.004921566695, e -0.000000000094 */
  MAD_F(0x00100000),  /* 0.003906250000 => 0.003906250000, e  0.000000000000 */
  MAD_F(0x000cb2ff),  /* 0.003100392680 => 0.003100391477, e  0.000000001202 */
  MAD_F(0x000a1451),  /* 0.002460783301 => 0.002460781485, e  0.000000001816 */
  MAD_F(0x00080000),  /* 0.001953125000 => 0.001953125000, e  0.000000000000 */
  MAD_F(0x00065980),  /* 0.001550196340 => 0.001550197601, e -0.000000001262 */
  MAD_F(0x00050a29),  /* 0.001230391650 => 0.001230392605, e -0.000000000955 */
  MAD_F(0x00040000),  /* 0.000976562500 => 0.000976562500, e  0.000000000000 */
  MAD_F(0x00032cc0),  /* 0.000775098170 => 0.000775098801, e -0.000000000631 */
  MAD_F(0x00028514),  /* 0.000615195825 => 0.000615194440, e  0.000000001385 */
  MAD_F(0x00020000),  /* 0.000488281250 => 0.000488281250, e  0.000000000000 */
  MAD_F(0x00019660),  /* 0.000387549085 => 0.000387549400, e -0.000000000315 */
  MAD_F(0x0001428a),  /* 0.000307597913 => 0.000307597220, e  0.000000000693 */
  MAD_F(0x00010000),  /* 0.000244140625 => 0.000244140625, e  0.000000000000 */
  MAD_F(0x0000cb30),  /* 0.000193774542 => 0.000193774700, e -0.000000000158 */
  MAD_F(0x0000a145),  /* 0.000153798956 => 0.000153798610, e  0.000000000346 */
  MAD_F(0x00008000),  /* 0.000122070313 => 0.000122070313, e  0.000000000000 */
  MAD_F(0x00006598),  /* 0.000096887271 => 0.000096887350, e -0.000000000079 */
  MAD_F(0x000050a3),  /* 0.000076899478 => 0.000076901168, e -0.000000001689 */
  MAD_F(0x00004000),  /* 0.000061035156 => 0.000061035156, e  0.000000000000 */
  MAD_F(0x000032cc),  /* 0.000048443636 => 0.000048443675, e -0.000000000039 */
  MAD_F(0x00002851),  /* 0.000038449739 => 0.000038448721, e  0.000000001018 */
  MAD_F(0x00002000),  /* 0.000030517578 => 0.000030517578, e  0.000000000000 */
  MAD_F(0x00001966),  /* 0.000024221818 => 0.000024221838, e -0.000000000020 */
  MAD_F(0x00001429),  /* 0.000019224870 => 0.000019226223, e -0.000000001354 */
  MAD_F(0x00001000),  /* 0.000015258789 => 0.000015258789, e -0.000000000000 */
  MAD_F(0x00000cb3),  /* 0.000012110909 => 0.000012110919, e -0.000000000010 */
  MAD_F(0x00000a14),  /* 0.000009612435 => 0.000009611249, e  0.000000001186 */
  MAD_F(0x00000800),  /* 0.000007629395 => 0.000007629395, e -0.000000000000 */
  MAD_F(0x00000659),  /* 0.000006055454 => 0.000006053597, e  0.000000001858 */
  MAD_F(0x0000050a),  /* 0.000004806217 => 0.000004805624, e  0.000000000593 */
  MAD_F(0x00000400),  /* 0.000003814697 => 0.000003814697, e  0.000000000000 */
  MAD_F(0x0000032d),  /* 0.000003027727 => 0.000003028661, e -0.000000000934 */
  MAD_F(0x00000285),  /* 0.000002403109 => 0.000002402812, e  0.000000000296 */
  MAD_F(0x00000200),  /* 0.000001907349 => 0.000001907349, e -0.000000000000 */
  MAD_F(0x00000196),  /* 0.000001513864 => 0.000001512468, e  0.000000001396 */
-  MAD_F(0x00000143)   /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
+  MAD_F(0x00000143),  /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
+  MAD_F(0x00000000)   /* this compatibility entry is not part of Table B.1 */
diff --git a/core/multimedia/opieplayer/libmad/stream.c b/core/multimedia/opieplayer/libmad/stream.c
index 4374de7..a63d67b 100644
--- a/core/multimedia/opieplayer/libmad/stream.c
+++ b/core/multimedia/opieplayer/libmad/stream.c
@@ -1,160 +1,161 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include <stdlib.h>
 # include "bit.h"
 # include "stream.h"
 /*
         * NAME:stream->init()
         * DESCRIPTION:initialize stream struct
 */
 void mad_stream_init(struct mad_stream *stream)
 {
  stream->buffer     = 0;
  stream->bufend     = 0;
  stream->skiplen    = 0;
  stream->sync       = 0;
  stream->freerate   = 0;
  stream->this_frame = 0;
  stream->next_frame = 0;
  mad_bit_init(&stream->ptr, 0);
  mad_bit_init(&stream->anc_ptr, 0);
  stream->anc_bitlen = 0;
  stream->main_data  = 0;
  stream->md_len     = 0;
  stream->options    = 0;
  stream->error      = MAD_ERROR_NONE;
 }
 /*
         * NAME:stream->finish()
         * DESCRIPTION:deallocate any dynamic memory associated with stream
 */
 void mad_stream_finish(struct mad_stream *stream)
 {
  if (stream->main_data) {
    free(stream->main_data);
    stream->main_data = 0;
  }
  mad_bit_finish(&stream->anc_ptr);
  mad_bit_finish(&stream->ptr);
 }
 /*
         * NAME:stream->buffer()
         * DESCRIPTION:set stream buffer pointers
 */
 void mad_stream_buffer(struct mad_stream *stream,
                       unsigned char const *buffer, unsigned long length)
 {
  stream->buffer = buffer;
  stream->bufend = buffer + length;
  stream->this_frame = buffer;
  stream->next_frame = buffer;
  stream->sync = 1;
  mad_bit_init(&stream->ptr, buffer);
 }
 /*
         * NAME:stream->skip()
         * DESCRIPTION:arrange to skip bytes before the next frame
 */
 void mad_stream_skip(struct mad_stream *stream, unsigned long length)
 {
  stream->skiplen += length;
 }
 /*
         * NAME:stream->sync()
         * DESCRIPTION:locate the next stream sync word
 */
 int mad_stream_sync(struct mad_stream *stream)
 {
  register unsigned char const *ptr, *end;
  ptr = mad_bit_nextbyte(&stream->ptr);
  end = stream->bufend;
  while (ptr < end - 1 &&
         !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0))
    ++ptr;
  if (end - ptr < MAD_BUFFER_GUARD)
    return -1;
  mad_bit_init(&stream->ptr, ptr);
  return 0;
 }
 /*
         * NAME:stream->errorstr()
         * DESCRIPTION:return a string description of the current error condition
 */
 char const *mad_stream_errorstr(struct mad_stream const *stream)
 {
  switch (stream->error) {
          case MAD_ERROR_NONE:   return "no error";
          case MAD_ERROR_BUFLEN: return "input buffer too small (or EOF)";
          case MAD_ERROR_BUFPTR: return "invalid (null) buffer pointer";
          case MAD_ERROR_NOMEM:          return "not enough memory";
          case MAD_ERROR_LOSTSYNC: return "lost synchronization";
          case MAD_ERROR_BADLAYER: return "reserved header layer value";
          case MAD_ERROR_BADBITRATE: return "forbidden bitrate value";
          case MAD_ERROR_BADSAMPLERATE: return "reserved sample frequency value";
          case MAD_ERROR_BADEMPHASIS: return "reserved emphasis value";
          case MAD_ERROR_BADCRC: return "CRC check failed";
          case MAD_ERROR_BADBITALLOC: return "forbidden bit allocation value";
  case MAD_ERROR_BADSCALEFACTOR: return "bad scalefactor index";
+          case MAD_ERROR_BADMODE: return "bad bitrate/mode combination";
          case MAD_ERROR_BADFRAMELEN: return "bad frame length";
          case MAD_ERROR_BADBIGVALUES: return "bad big_values count";
          case MAD_ERROR_BADBLOCKTYPE: return "reserved block_type";
          case MAD_ERROR_BADSCFSI: return "bad scalefactor selection info";
          case MAD_ERROR_BADDATAPTR: return "bad main_data_begin pointer";
          case MAD_ERROR_BADPART3LEN: return "bad audio data length";
          case MAD_ERROR_BADHUFFTABLE: return "bad Huffman table select";
          case MAD_ERROR_BADHUFFDATA: return "Huffman data overrun";
          case MAD_ERROR_BADSTEREO: return "incompatible block_type for JS";
  }
  return 0;
 }
diff --git a/core/multimedia/opieplayer/libmad/stream.h b/core/multimedia/opieplayer/libmad/stream.h
index 08e6dc5..5fca48f 100644
--- a/core/multimedia/opieplayer/libmad/stream.h
+++ b/core/multimedia/opieplayer/libmad/stream.h
@@ -1,107 +1,108 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_STREAM_H
 # define LIBMAD_STREAM_H
 # include "bit.h"
        # define MAD_BUFFER_GUARD8
        # define MAD_BUFFER_MDLEN(511 + 2048 + MAD_BUFFER_GUARD)
 enum mad_error {
          MAD_ERROR_NONE           = 0x0000,/* no error */
          MAD_ERROR_BUFLEN         = 0x0001,/* input buffer too small (or EOF) */
          MAD_ERROR_BUFPTR         = 0x0002,/* invalid (null) buffer pointer */
          MAD_ERROR_NOMEM          = 0x0031,/* not enough memory */
          MAD_ERROR_LOSTSYNC       = 0x0101,/* lost synchronization */
          MAD_ERROR_BADLAYER       = 0x0102,/* reserved header layer value */
          MAD_ERROR_BADBITRATE     = 0x0103,/* forbidden bitrate value */
          MAD_ERROR_BADSAMPLERATE  = 0x0104,/* reserved sample frequency value */
          MAD_ERROR_BADEMPHASIS            = 0x0105,/* reserved emphasis value */
          MAD_ERROR_BADCRC         = 0x0201,/* CRC check failed */
          MAD_ERROR_BADBITALLOC            = 0x0211,/* forbidden bit allocation value */
          MAD_ERROR_BADSCALEFACTOR = 0x0221,/* bad scalefactor index */
+          MAD_ERROR_BADMODE        = 0x0222,/* bad bitrate/mode combination */
          MAD_ERROR_BADFRAMELEN            = 0x0231,/* bad frame length */
          MAD_ERROR_BADBIGVALUES   = 0x0232,/* bad big_values count */
          MAD_ERROR_BADBLOCKTYPE   = 0x0233,/* reserved block_type */
          MAD_ERROR_BADSCFSI       = 0x0234,/* bad scalefactor selection info */
          MAD_ERROR_BADDATAPTR     = 0x0235,/* bad main_data_begin pointer */
          MAD_ERROR_BADPART3LEN            = 0x0236,/* bad audio data length */
          MAD_ERROR_BADHUFFTABLE   = 0x0237,/* bad Huffman table select */
          MAD_ERROR_BADHUFFDATA            = 0x0238,/* Huffman data overrun */
          MAD_ERROR_BADSTEREO      = 0x0239/* incompatible block_type for JS */
 };
        # define MAD_RECOVERABLE(error)((error) & 0xff00)
 struct mad_stream {
          unsigned char const *buffer;  /* input bitstream buffer */
          unsigned char const *bufend;  /* end of buffer */
          unsigned long skiplen;        /* bytes to skip before next frame */
          int sync;                     /* stream sync found */
          unsigned long freerate;       /* free bitrate (fixed) */
          unsigned char const *this_frame;/* start of current frame */
          unsigned char const *next_frame;/* start of next frame */
          struct mad_bitptr ptr;        /* current processing bit pointer */
          struct mad_bitptr anc_ptr;    /* ancillary bits pointer */
          unsigned int anc_bitlen;      /* number of ancillary bits */
  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
                                        /* Layer III main_data() */
          unsigned int md_len;          /* bytes in main_data */
          int options;                  /* decoding options (see below) */
          enum mad_error error;                 /* error code (see above) */
 };
 enum {
          MAD_OPTION_IGNORECRC      = 0x0001,/* ignore CRC errors */
          MAD_OPTION_HALFSAMPLERATE = 0x0002/* generate PCM at 1/2 sample rate */
 # if 0  /* not yet implemented */
          MAD_OPTION_LEFTCHANNEL    = 0x0010,/* decode left channel only */
          MAD_OPTION_RIGHTCHANNEL   = 0x0020,/* decode right channel only */
          MAD_OPTION_SINGLECHANNEL  = 0x0030/* combine channels */
 # endif
 };
 void mad_stream_init(struct mad_stream *);
 void mad_stream_finish(struct mad_stream *);
 # define mad_stream_options(stream, opts)  \
    ((void) ((stream)->options = (opts)))
 void mad_stream_buffer(struct mad_stream *,
                       unsigned char const *, unsigned long);
 void mad_stream_skip(struct mad_stream *, unsigned long);
 int mad_stream_sync(struct mad_stream *);
 char const *mad_stream_errorstr(struct mad_stream const *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/synth.c b/core/multimedia/opieplayer/libmad/synth.c
index cf3c1d5..881f85a 100644
--- a/core/multimedia/opieplayer/libmad/synth.c
+++ b/core/multimedia/opieplayer/libmad/synth.c
@@ -1,857 +1,857 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include "fixed.h"
 # include "frame.h"
 # include "synth.h"
 /*
         * NAME:synth->init()
         * DESCRIPTION:initialize synth struct
 */
 void mad_synth_init(struct mad_synth *synth)
 {
  mad_synth_mute(synth);
  synth->phase = 0;
  synth->pcm.samplerate = 0;
  synth->pcm.channels   = 0;
  synth->pcm.length     = 0;
 }
 /*
         * NAME:synth->mute()
         * DESCRIPTION:zero all polyphase filterbank values, resetting synthesis
 */
 void mad_synth_mute(struct mad_synth *synth)
 {
  unsigned int ch, s, v;
  for (ch = 0; ch < 2; ++ch) {
    for (s = 0; s < 16; ++s) {
      for (v = 0; v < 8; ++v) {
        synth->filter[ch][0][0][s][v] = synth->filter[ch][0][1][s][v] =
        synth->filter[ch][1][0][s][v] = synth->filter[ch][1][1][s][v] = 0;
      }
    }
  }
 }
 /*
 * An optional optimization called here the Subband Synthesis Optimization
 * (SSO) improves the performance of subband synthesis at the expense of
 * accuracy.
 *
 * The idea is to simplify 32x32->64-bit multiplication to 32x32->32 such
 * that extra scaling and rounding are not necessary. This often allows the
 * compiler to use faster 32-bit multiply-accumulate instructions instead of
 * explicit 64-bit multiply, shift, and add instructions.
 *
 * SSO works like this: a full 32x32->64-bit multiply of two mad_fixed_t
 * values requires the result to be right-shifted 28 bits to be properly
 * scaled to the same fixed-point format. Right shifts can be applied at any
 * time to either operand or to the result, so the optimization involves
 * careful placement of these shifts to minimize the loss of accuracy.
 *
 * First, a 14-bit shift is applied with rounding at compile-time to the D[]
 * table of coefficients for the subband synthesis window. This only loses 2
 * bits of accuracy because the lower 12 bits are always zero. A second
 * 12-bit shift occurs after the DCT calculation. This loses 12 bits of
 * accuracy. Finally, a third 2-bit shift occurs just before the sample is
 * saved in the PCM buffer. 14 + 12 + 2 == 28 bits.
 */
 /* FPM_DEFAULT without OPT_SSO will actually lose accuracy and performance */
 # if defined(FPM_DEFAULT) && !defined(OPT_SSO)
 #  define OPT_SSO
 # endif
 /* second SSO shift, with rounding */
 # if defined(OPT_SSO)
 #  define SHIFT(x)  (((x) + (1L << 11)) >> 12)
 # else
 #  define SHIFT(x)  (x)
 # endif
 /* possible DCT speed optimization */
 # if defined(OPT_SPEED) && defined(MAD_F_MLX)
 #  define OPT_DCTO
 #  define MUL(x, y)  \
    ({ mad_fixed64hi_t hi;  \
       mad_fixed64lo_t lo;  \
       MAD_F_MLX(hi, lo, (x), (y));  \
       hi << (32 - MAD_F_SCALEBITS - 3);  \
    })
 # else
 #  undef OPT_DCTO
 #  define MUL(x, y)  mad_f_mul((x), (y))
 # endif
 /*
         * NAME:dct32()
         * DESCRIPTION:perform fast in[32]->out[32] DCT
 */
 static
 void dct32(mad_fixed_t const in[32], unsigned int slot,
           mad_fixed_t lo[16][8], mad_fixed_t hi[16][8])
 {
  mad_fixed_t t0,   t1,   t2,   t3,   t4,   t5,   t6,   t7;
  mad_fixed_t t8,   t9,   t10,  t11,  t12,  t13,  t14,  t15;
  mad_fixed_t t16,  t17,  t18,  t19,  t20,  t21,  t22,  t23;
  mad_fixed_t t24,  t25,  t26,  t27,  t28,  t29,  t30,  t31;
  mad_fixed_t t32,  t33,  t34,  t35,  t36,  t37,  t38,  t39;
  mad_fixed_t t40,  t41,  t42,  t43,  t44,  t45,  t46,  t47;
  mad_fixed_t t48,  t49,  t50,  t51,  t52,  t53,  t54,  t55;
  mad_fixed_t t56,  t57,  t58,  t59,  t60,  t61,  t62,  t63;
  mad_fixed_t t64,  t65,  t66,  t67,  t68,  t69,  t70,  t71;
  mad_fixed_t t72,  t73,  t74,  t75,  t76,  t77,  t78,  t79;
  mad_fixed_t t80,  t81,  t82,  t83,  t84,  t85,  t86,  t87;
  mad_fixed_t t88,  t89,  t90,  t91,  t92,  t93,  t94,  t95;
  mad_fixed_t t96,  t97,  t98,  t99,  t100, t101, t102, t103;
  mad_fixed_t t104, t105, t106, t107, t108, t109, t110, t111;
  mad_fixed_t t112, t113, t114, t115, t116, t117, t118, t119;
  mad_fixed_t t120, t121, t122, t123, t124, t125, t126, t127;
  mad_fixed_t t128, t129, t130, t131, t132, t133, t134, t135;
  mad_fixed_t t136, t137, t138, t139, t140, t141, t142, t143;
  mad_fixed_t t144, t145, t146, t147, t148, t149, t150, t151;
  mad_fixed_t t152, t153, t154, t155, t156, t157, t158, t159;
  mad_fixed_t t160, t161, t162, t163, t164, t165, t166, t167;
  mad_fixed_t t168, t169, t170, t171, t172, t173, t174, t175;
  mad_fixed_t t176;
  /* costab[i] = cos(PI / (2 * 32) * i) */
 # if defined(OPT_DCTO)
        #  define costab1MAD_F(0x7fd8878e)
        #  define costab2MAD_F(0x7f62368f)
        #  define costab3MAD_F(0x7e9d55fc)
        #  define costab4MAD_F(0x7d8a5f40)
        #  define costab5MAD_F(0x7c29fbee)
        #  define costab6MAD_F(0x7a7d055b)
        #  define costab7MAD_F(0x78848414)
        #  define costab8MAD_F(0x7641af3d)
        #  define costab9MAD_F(0x73b5ebd1)
        #  define costab10MAD_F(0x70e2cbc6)
        #  define costab11MAD_F(0x6dca0d14)
        #  define costab12MAD_F(0x6a6d98a4)
        #  define costab13MAD_F(0x66cf8120)
        #  define costab14MAD_F(0x62f201ac)
        #  define costab15MAD_F(0x5ed77c8a)
        #  define costab16MAD_F(0x5a82799a)
        #  define costab17MAD_F(0x55f5a4d2)
        #  define costab18MAD_F(0x5133cc94)
        #  define costab19MAD_F(0x4c3fdff4)
        #  define costab20MAD_F(0x471cece7)
        #  define costab21MAD_F(0x41ce1e65)
        #  define costab22MAD_F(0x3c56ba70)
        #  define costab23MAD_F(0x36ba2014)
        #  define costab24MAD_F(0x30fbc54d)
        #  define costab25MAD_F(0x2b1f34eb)
        #  define costab26MAD_F(0x25280c5e)
        #  define costab27MAD_F(0x1f19f97b)
        #  define costab28MAD_F(0x18f8b83c)
        #  define costab29MAD_F(0x12c8106f)
        #  define costab30MAD_F(0x0c8bd35e)
        #  define costab31MAD_F(0x0647d97c)
 # else
        #  define costab1MAD_F(0x0ffb10f2)  /* 0.998795456 */
        #  define costab2MAD_F(0x0fec46d2)  /* 0.995184727 */
        #  define costab3MAD_F(0x0fd3aac0)  /* 0.989176510 */
        #  define costab4MAD_F(0x0fb14be8)  /* 0.980785280 */
        #  define costab5MAD_F(0x0f853f7e)  /* 0.970031253 */
        #  define costab6MAD_F(0x0f4fa0ab)  /* 0.956940336 */
        #  define costab7MAD_F(0x0f109082)  /* 0.941544065 */
        #  define costab8MAD_F(0x0ec835e8)  /* 0.923879533 */
        #  define costab9MAD_F(0x0e76bd7a)  /* 0.903989293 */
        #  define costab10MAD_F(0x0e1c5979)  /* 0.881921264 */
        #  define costab11MAD_F(0x0db941a3)  /* 0.857728610 */
        #  define costab12MAD_F(0x0d4db315)  /* 0.831469612 */
        #  define costab13MAD_F(0x0cd9f024)  /* 0.803207531 */
        #  define costab14MAD_F(0x0c5e4036)  /* 0.773010453 */
        #  define costab15MAD_F(0x0bdaef91)  /* 0.740951125 */
        #  define costab16MAD_F(0x0b504f33)  /* 0.707106781 */
        #  define costab17MAD_F(0x0abeb49a)  /* 0.671558955 */
        #  define costab18MAD_F(0x0a267993)  /* 0.634393284 */
        #  define costab19MAD_F(0x0987fbfe)  /* 0.595699304 */
        #  define costab20MAD_F(0x08e39d9d)  /* 0.555570233 */
        #  define costab21MAD_F(0x0839c3cd)  /* 0.514102744 */
        #  define costab22MAD_F(0x078ad74e)  /* 0.471396737 */
        #  define costab23MAD_F(0x06d74402)  /* 0.427555093 */
        #  define costab24MAD_F(0x061f78aa)  /* 0.382683432 */
        #  define costab25MAD_F(0x0563e69d)  /* 0.336889853 */
        #  define costab26MAD_F(0x04a5018c)  /* 0.290284677 */
        #  define costab27MAD_F(0x03e33f2f)  /* 0.242980180 */
        #  define costab28MAD_F(0x031f1708)  /* 0.195090322 */
        #  define costab29MAD_F(0x0259020e)  /* 0.146730474 */
        #  define costab30MAD_F(0x01917a6c)  /* 0.098017140 */
        #  define costab31MAD_F(0x00c8fb30)  /* 0.049067674 */
 # endif
  t0   = in[0]  + in[31];  t16  = MUL(in[0]  - in[31], costab1);
  t1   = in[15] + in[16];  t17  = MUL(in[15] - in[16], costab31);
  t41  = t16 + t17;
  t59  = MUL(t16 - t17, costab2);
  t33  = t0  + t1;
  t50  = MUL(t0  - t1,  costab2);
  t2   = in[7]  + in[24];  t18  = MUL(in[7]  - in[24], costab15);
  t3   = in[8]  + in[23];  t19  = MUL(in[8]  - in[23], costab17);
  t42  = t18 + t19;
  t60  = MUL(t18 - t19, costab30);
  t34  = t2  + t3;
  t51  = MUL(t2  - t3,  costab30);
  t4   = in[3]  + in[28];  t20  = MUL(in[3]  - in[28], costab7);
  t5   = in[12] + in[19];  t21  = MUL(in[12] - in[19], costab25);
  t43  = t20 + t21;
  t61  = MUL(t20 - t21, costab14);
  t35  = t4  + t5;
  t52  = MUL(t4  - t5,  costab14);
  t6   = in[4]  + in[27];  t22  = MUL(in[4]  - in[27], costab9);
  t7   = in[11] + in[20];  t23  = MUL(in[11] - in[20], costab23);
  t44  = t22 + t23;
  t62  = MUL(t22 - t23, costab18);
  t36  = t6  + t7;
  t53  = MUL(t6  - t7,  costab18);
  t8   = in[1]  + in[30];  t24  = MUL(in[1]  - in[30], costab3);
  t9   = in[14] + in[17];  t25  = MUL(in[14] - in[17], costab29);
  t45  = t24 + t25;
  t63  = MUL(t24 - t25, costab6);
  t37  = t8  + t9;
  t54  = MUL(t8  - t9,  costab6);
  t10  = in[6]  + in[25];  t26  = MUL(in[6]  - in[25], costab13);
  t11  = in[9]  + in[22];  t27  = MUL(in[9]  - in[22], costab19);
  t46  = t26 + t27;
  t64  = MUL(t26 - t27, costab26);
  t38  = t10 + t11;
  t55  = MUL(t10 - t11, costab26);
  t12  = in[2]  + in[29];  t28  = MUL(in[2]  - in[29], costab5);
  t13  = in[13] + in[18];  t29  = MUL(in[13] - in[18], costab27);
  t47  = t28 + t29;
  t65  = MUL(t28 - t29, costab10);
  t39  = t12 + t13;
  t56  = MUL(t12 - t13, costab10);
  t14  = in[5]  + in[26];  t30  = MUL(in[5]  - in[26], costab11);
  t15  = in[10] + in[21];  t31  = MUL(in[10] - in[21], costab21);
  t48  = t30 + t31;
  t66  = MUL(t30 - t31, costab22);
  t40  = t14 + t15;
  t57  = MUL(t14 - t15, costab22);
  t69  = t33 + t34;  t89  = MUL(t33 - t34, costab4);
  t70  = t35 + t36;  t90  = MUL(t35 - t36, costab28);
  t71  = t37 + t38;  t91  = MUL(t37 - t38, costab12);
  t72  = t39 + t40;  t92  = MUL(t39 - t40, costab20);
  t73  = t41 + t42;  t94  = MUL(t41 - t42, costab4);
  t74  = t43 + t44;  t95  = MUL(t43 - t44, costab28);
  t75  = t45 + t46;  t96  = MUL(t45 - t46, costab12);
  t76  = t47 + t48;  t97  = MUL(t47 - t48, costab20);
  t78  = t50 + t51;  t100 = MUL(t50 - t51, costab4);
  t79  = t52 + t53;  t101 = MUL(t52 - t53, costab28);
  t80  = t54 + t55;  t102 = MUL(t54 - t55, costab12);
  t81  = t56 + t57;  t103 = MUL(t56 - t57, costab20);
  t83  = t59 + t60;  t106 = MUL(t59 - t60, costab4);
  t84  = t61 + t62;  t107 = MUL(t61 - t62, costab28);
  t85  = t63 + t64;  t108 = MUL(t63 - t64, costab12);
  t86  = t65 + t66;  t109 = MUL(t65 - t66, costab20);
  t113 = t69  + t70;
  t114 = t71  + t72;
  /*  0 */ hi[15][slot] = SHIFT(t113 + t114);
  /* 16 */ lo[ 0][slot] = SHIFT(MUL(t113 - t114, costab16));
  t115 = t73  + t74;
  t116 = t75  + t76;
  t32  = t115 + t116;
  /*  1 */ hi[14][slot] = SHIFT(t32);
  t118 = t78  + t79;
  t119 = t80  + t81;
  t58  = t118 + t119;
  /*  2 */ hi[13][slot] = SHIFT(t58);
  t121 = t83  + t84;
  t122 = t85  + t86;
  t67  = t121 + t122;
  t49  = (t67 * 2) - t32;
  /*  3 */ hi[12][slot] = SHIFT(t49);
  t125 = t89  + t90;
  t126 = t91  + t92;
  t93  = t125 + t126;
  /*  4 */ hi[11][slot] = SHIFT(t93);
  t128 = t94  + t95;
  t129 = t96  + t97;
  t98  = t128 + t129;
  t68  = (t98 * 2) - t49;
  /*  5 */ hi[10][slot] = SHIFT(t68);
  t132 = t100 + t101;
  t133 = t102 + t103;
  t104 = t132 + t133;
  t82  = (t104 * 2) - t58;
  /*  6 */ hi[ 9][slot] = SHIFT(t82);
  t136 = t106 + t107;
  t137 = t108 + t109;
  t110 = t136 + t137;
  t87  = (t110 * 2) - t67;
  t77  = (t87 * 2) - t68;
  /*  7 */ hi[ 8][slot] = SHIFT(t77);
  t141 = MUL(t69 - t70, costab8);
  t142 = MUL(t71 - t72, costab24);
  t143 = t141 + t142;
  /*  8 */ hi[ 7][slot] = SHIFT(t143);
  /* 24 */ lo[ 8][slot] =
             SHIFT((MUL(t141 - t142, costab16) * 2) - t143);
  t144 = MUL(t73 - t74, costab8);
  t145 = MUL(t75 - t76, costab24);
  t146 = t144 + t145;
  t88  = (t146 * 2) - t77;
  /*  9 */ hi[ 6][slot] = SHIFT(t88);
  t148 = MUL(t78 - t79, costab8);
  t149 = MUL(t80 - t81, costab24);
  t150 = t148 + t149;
  t105 = (t150 * 2) - t82;
  /* 10 */ hi[ 5][slot] = SHIFT(t105);
  t152 = MUL(t83 - t84, costab8);
  t153 = MUL(t85 - t86, costab24);
  t154 = t152 + t153;
  t111 = (t154 * 2) - t87;
  t99  = (t111 * 2) - t88;
  /* 11 */ hi[ 4][slot] = SHIFT(t99);
  t157 = MUL(t89 - t90, costab8);
  t158 = MUL(t91 - t92, costab24);
  t159 = t157 + t158;
  t127 = (t159 * 2) - t93;
  /* 12 */ hi[ 3][slot] = SHIFT(t127);
  t160 = (MUL(t125 - t126, costab16) * 2) - t127;
  /* 20 */ lo[ 4][slot] = SHIFT(t160);
  /* 28 */ lo[12][slot] =
             SHIFT((((MUL(t157 - t158, costab16) * 2) - t159) * 2) - t160);
  t161 = MUL(t94 - t95, costab8);
  t162 = MUL(t96 - t97, costab24);
  t163 = t161 + t162;
  t130 = (t163 * 2) - t98;
  t112 = (t130 * 2) - t99;
  /* 13 */ hi[ 2][slot] = SHIFT(t112);
  t164 = (MUL(t128 - t129, costab16) * 2) - t130;
  t166 = MUL(t100 - t101, costab8);
  t167 = MUL(t102 - t103, costab24);
  t168 = t166 + t167;
  t134 = (t168 * 2) - t104;
  t120 = (t134 * 2) - t105;
  /* 14 */ hi[ 1][slot] = SHIFT(t120);
  t135 = (MUL(t118 - t119, costab16) * 2) - t120;
  /* 18 */ lo[ 2][slot] = SHIFT(t135);
  t169 = (MUL(t132 - t133, costab16) * 2) - t134;
  t151 = (t169 * 2) - t135;
  /* 22 */ lo[ 6][slot] = SHIFT(t151);
  t170 = (((MUL(t148 - t149, costab16) * 2) - t150) * 2) - t151;
  /* 26 */ lo[10][slot] = SHIFT(t170);
  /* 30 */ lo[14][slot] =
             SHIFT((((((MUL(t166 - t167, costab16) * 2) -
                       t168) * 2) - t169) * 2) - t170);
  t171 = MUL(t106 - t107, costab8);
  t172 = MUL(t108 - t109, costab24);
  t173 = t171 + t172;
  t138 = (t173 * 2) - t110;
  t123 = (t138 * 2) - t111;
  t139 = (MUL(t121 - t122, costab16) * 2) - t123;
  t117 = (t123 * 2) - t112;
  /* 15 */ hi[ 0][slot] = SHIFT(t117);
  t124 = (MUL(t115 - t116, costab16) * 2) - t117;
  /* 17 */ lo[ 1][slot] = SHIFT(t124);
  t131 = (t139 * 2) - t124;
  /* 19 */ lo[ 3][slot] = SHIFT(t131);
  t140 = (t164 * 2) - t131;
  /* 21 */ lo[ 5][slot] = SHIFT(t140);
  t174 = (MUL(t136 - t137, costab16) * 2) - t138;
  t155 = (t174 * 2) - t139;
  t147 = (t155 * 2) - t140;
  /* 23 */ lo[ 7][slot] = SHIFT(t147);
  t156 = (((MUL(t144 - t145, costab16) * 2) - t146) * 2) - t147;
  /* 25 */ lo[ 9][slot] = SHIFT(t156);
  t175 = (((MUL(t152 - t153, costab16) * 2) - t154) * 2) - t155;
  t165 = (t175 * 2) - t156;
  /* 27 */ lo[11][slot] = SHIFT(t165);
  t176 = (((((MUL(t161 - t162, costab16) * 2) -
             t163) * 2) - t164) * 2) - t165;
  /* 29 */ lo[13][slot] = SHIFT(t176);
  /* 31 */ lo[15][slot] =
             SHIFT((((((((MUL(t171 - t172, costab16) * 2) -
                         t173) * 2) - t174) * 2) - t175) * 2) - t176);
  /*
   * Totals:
   *  80 multiplies
   *  80 additions
   * 119 subtractions
   *  49 shifts (not counting SSO)
   */
 }
 # undef MUL
 # undef SHIFT
 /* third SSO shift and/or D[] optimization preshift */
 # if defined(OPT_SSO)
 #  if MAD_F_FRACBITS != 28
 #   error "MAD_F_FRACBITS must be 28 to use OPT_SSO"
 #  endif
        #  define ML0(hi, lo, x, y)((lo)  = (x) * (y))
        #  define MLA(hi, lo, x, y)((lo) += (x) * (y))
        #  define MLN(hi, lo)   ((lo)  = -(lo))
        #  define MLZ(hi, lo)   ((void) (hi), (mad_fixed_t) (lo))
        #  define SHIFT(x)      ((x) >> 2)
        #  define PRESHIFT(x)   ((MAD_F(x) + (1L << 13)) >> 14)
 # else
        #  define ML0(hi, lo, x, y)MAD_F_ML0((hi), (lo), (x), (y))
        #  define MLA(hi, lo, x, y)MAD_F_MLA((hi), (lo), (x), (y))
        #  define MLN(hi, lo)   MAD_F_MLN((hi), (lo))
        #  define MLZ(hi, lo)   MAD_F_MLZ((hi), (lo))
        #  define SHIFT(x)      (x)
 #  if defined(MAD_F_SCALEBITS)
 #   undef  MAD_F_SCALEBITS
        #   define MAD_F_SCALEBITS(MAD_F_FRACBITS - 12)
        #   define PRESHIFT(x)  (MAD_F(x) >> 12)
 #  else
        #   define PRESHIFT(x)  MAD_F(x)
 #  endif
 # endif
 static
 mad_fixed_t const D[17][32] = {
 # include "D.dat"
 };
 # if defined(ASO_SYNTH)
 void synth_full(struct mad_synth *, struct mad_frame const *,
                unsigned int, unsigned int);
 # else
 /*
         * NAME:synth->full()
         * DESCRIPTION:perform full frequency PCM synthesis
 */
 static
 void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
                unsigned int nch, unsigned int ns)
 {
  unsigned int phase, ch, s, sb, pe, po;
  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
  mad_fixed_t const (*sbsample)[36][32];
  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
  register mad_fixed_t const (*Dptr)[32], *ptr;
  register mad_fixed64hi_t hi;
  register mad_fixed64lo_t lo;
  for (ch = 0; ch < nch; ++ch) {
    sbsample = &frame->sbsample[ch];
    filter   = &synth->filter[ch];
    phase    = synth->phase;
    pcm1     = synth->pcm.samples[ch];
    for (s = 0; s < ns; ++s) {
      dct32((*sbsample)[s], phase >> 1,
            (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
      pe = phase & ~1;
      po = ((phase - 1) & 0xf) | 1;
      /* calculate 32 samples */
      fe = &(*filter)[0][ phase & 1][0];
      fx = &(*filter)[0][~phase & 1][0];
      fo = &(*filter)[1][~phase & 1][0];
      Dptr = &D[0];
      ptr = *Dptr + po;
      ML0(hi, lo, (*fx)[0], ptr[ 0]);
      MLA(hi, lo, (*fx)[1], ptr[14]);
      MLA(hi, lo, (*fx)[2], ptr[12]);
      MLA(hi, lo, (*fx)[3], ptr[10]);
      MLA(hi, lo, (*fx)[4], ptr[ 8]);
      MLA(hi, lo, (*fx)[5], ptr[ 6]);
      MLA(hi, lo, (*fx)[6], ptr[ 4]);
      MLA(hi, lo, (*fx)[7], ptr[ 2]);
      MLN(hi, lo);
      ptr = *Dptr + pe;
      MLA(hi, lo, (*fe)[0], ptr[ 0]);
      MLA(hi, lo, (*fe)[1], ptr[14]);
      MLA(hi, lo, (*fe)[2], ptr[12]);
      MLA(hi, lo, (*fe)[3], ptr[10]);
      MLA(hi, lo, (*fe)[4], ptr[ 8]);
      MLA(hi, lo, (*fe)[5], ptr[ 6]);
      MLA(hi, lo, (*fe)[6], ptr[ 4]);
      MLA(hi, lo, (*fe)[7], ptr[ 2]);
      *pcm1++ = SHIFT(MLZ(hi, lo));
      pcm2 = pcm1 + 30;
      for (sb = 1; sb < 16; ++sb) {
        ++fe;
        ++Dptr;
        /* D[32 - sb][i] == -D[sb][31 - i] */
        ptr = *Dptr + po;
        ML0(hi, lo, (*fo)[0], ptr[ 0]);
        MLA(hi, lo, (*fo)[1], ptr[14]);
        MLA(hi, lo, (*fo)[2], ptr[12]);
        MLA(hi, lo, (*fo)[3], ptr[10]);
        MLA(hi, lo, (*fo)[4], ptr[ 8]);
        MLA(hi, lo, (*fo)[5], ptr[ 6]);
        MLA(hi, lo, (*fo)[6], ptr[ 4]);
        MLA(hi, lo, (*fo)[7], ptr[ 2]);
        MLN(hi, lo);
        ptr = *Dptr + pe;
        MLA(hi, lo, (*fe)[7], ptr[ 2]);
        MLA(hi, lo, (*fe)[6], ptr[ 4]);
        MLA(hi, lo, (*fe)[5], ptr[ 6]);
        MLA(hi, lo, (*fe)[4], ptr[ 8]);
        MLA(hi, lo, (*fe)[3], ptr[10]);
        MLA(hi, lo, (*fe)[2], ptr[12]);
        MLA(hi, lo, (*fe)[1], ptr[14]);
        MLA(hi, lo, (*fe)[0], ptr[ 0]);
        *pcm1++ = SHIFT(MLZ(hi, lo));
        ptr = *Dptr - pe;
        ML0(hi, lo, (*fe)[0], ptr[31 - 16]);
        MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
        MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
        MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
        MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
        MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
        MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
        MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
        ptr = *Dptr - po;
        MLA(hi, lo, (*fo)[7], ptr[31 -  2]);
        MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
        MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
        MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
        MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
        MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
        MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
        MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
        *pcm2-- = SHIFT(MLZ(hi, lo));
        ++fo;
      }
      ++Dptr;
      ptr = *Dptr + po;
      ML0(hi, lo, (*fo)[0], ptr[ 0]);
      MLA(hi, lo, (*fo)[1], ptr[14]);
      MLA(hi, lo, (*fo)[2], ptr[12]);
      MLA(hi, lo, (*fo)[3], ptr[10]);
      MLA(hi, lo, (*fo)[4], ptr[ 8]);
      MLA(hi, lo, (*fo)[5], ptr[ 6]);
      MLA(hi, lo, (*fo)[6], ptr[ 4]);
      MLA(hi, lo, (*fo)[7], ptr[ 2]);
      *pcm1 = SHIFT(-MLZ(hi, lo));
      pcm1 += 16;
      phase = (phase + 1) % 16;
    }
  }
 }
 # endif
 /*
         * NAME:synth->half()
         * DESCRIPTION:perform half frequency PCM synthesis
 */
 static
 void synth_half(struct mad_synth *synth, struct mad_frame const *frame,
                unsigned int nch, unsigned int ns)
 {
  unsigned int phase, ch, s, sb, pe, po;
  mad_fixed_t *pcm1, *pcm2, (*filter)[2][2][16][8];
  mad_fixed_t const (*sbsample)[36][32];
  register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
  register mad_fixed_t const (*Dptr)[32], *ptr;
  register mad_fixed64hi_t hi;
  register mad_fixed64lo_t lo;
  for (ch = 0; ch < nch; ++ch) {
    sbsample = &frame->sbsample[ch];
    filter   = &synth->filter[ch];
    phase    = synth->phase;
    pcm1     = synth->pcm.samples[ch];
    for (s = 0; s < ns; ++s) {
      dct32((*sbsample)[s], phase >> 1,
            (*filter)[0][phase & 1], (*filter)[1][phase & 1]);
      pe = phase & ~1;
      po = ((phase - 1) & 0xf) | 1;
      /* calculate 16 samples */
      fe = &(*filter)[0][ phase & 1][0];
      fx = &(*filter)[0][~phase & 1][0];
      fo = &(*filter)[1][~phase & 1][0];
      Dptr = &D[0];
      ptr = *Dptr + po;
      ML0(hi, lo, (*fx)[0], ptr[ 0]);
      MLA(hi, lo, (*fx)[1], ptr[14]);
      MLA(hi, lo, (*fx)[2], ptr[12]);
      MLA(hi, lo, (*fx)[3], ptr[10]);
      MLA(hi, lo, (*fx)[4], ptr[ 8]);
      MLA(hi, lo, (*fx)[5], ptr[ 6]);
      MLA(hi, lo, (*fx)[6], ptr[ 4]);
      MLA(hi, lo, (*fx)[7], ptr[ 2]);
      MLN(hi, lo);
      ptr = *Dptr + pe;
      MLA(hi, lo, (*fe)[0], ptr[ 0]);
      MLA(hi, lo, (*fe)[1], ptr[14]);
      MLA(hi, lo, (*fe)[2], ptr[12]);
      MLA(hi, lo, (*fe)[3], ptr[10]);
      MLA(hi, lo, (*fe)[4], ptr[ 8]);
      MLA(hi, lo, (*fe)[5], ptr[ 6]);
      MLA(hi, lo, (*fe)[6], ptr[ 4]);
      MLA(hi, lo, (*fe)[7], ptr[ 2]);
      *pcm1++ = SHIFT(MLZ(hi, lo));
      pcm2 = pcm1 + 14;
      for (sb = 1; sb < 16; ++sb) {
        ++fe;
        ++Dptr;
        /* D[32 - sb][i] == -D[sb][31 - i] */
        if (!(sb & 1)) {
          ptr = *Dptr + po;
          ML0(hi, lo, (*fo)[0], ptr[ 0]);
          MLA(hi, lo, (*fo)[1], ptr[14]);
          MLA(hi, lo, (*fo)[2], ptr[12]);
          MLA(hi, lo, (*fo)[3], ptr[10]);
          MLA(hi, lo, (*fo)[4], ptr[ 8]);
          MLA(hi, lo, (*fo)[5], ptr[ 6]);
          MLA(hi, lo, (*fo)[6], ptr[ 4]);
          MLA(hi, lo, (*fo)[7], ptr[ 2]);
          MLN(hi, lo);
          ptr = *Dptr + pe;
          MLA(hi, lo, (*fe)[7], ptr[ 2]);
          MLA(hi, lo, (*fe)[6], ptr[ 4]);
          MLA(hi, lo, (*fe)[5], ptr[ 6]);
          MLA(hi, lo, (*fe)[4], ptr[ 8]);
          MLA(hi, lo, (*fe)[3], ptr[10]);
          MLA(hi, lo, (*fe)[2], ptr[12]);
          MLA(hi, lo, (*fe)[1], ptr[14]);
          MLA(hi, lo, (*fe)[0], ptr[ 0]);
          *pcm1++ = SHIFT(MLZ(hi, lo));
          ptr = *Dptr - po;
          ML0(hi, lo, (*fo)[7], ptr[31 -  2]);
          MLA(hi, lo, (*fo)[6], ptr[31 -  4]);
          MLA(hi, lo, (*fo)[5], ptr[31 -  6]);
          MLA(hi, lo, (*fo)[4], ptr[31 -  8]);
          MLA(hi, lo, (*fo)[3], ptr[31 - 10]);
          MLA(hi, lo, (*fo)[2], ptr[31 - 12]);
          MLA(hi, lo, (*fo)[1], ptr[31 - 14]);
          MLA(hi, lo, (*fo)[0], ptr[31 - 16]);
          ptr = *Dptr - pe;
          MLA(hi, lo, (*fe)[0], ptr[31 - 16]);
          MLA(hi, lo, (*fe)[1], ptr[31 - 14]);
          MLA(hi, lo, (*fe)[2], ptr[31 - 12]);
          MLA(hi, lo, (*fe)[3], ptr[31 - 10]);
          MLA(hi, lo, (*fe)[4], ptr[31 -  8]);
          MLA(hi, lo, (*fe)[5], ptr[31 -  6]);
          MLA(hi, lo, (*fe)[6], ptr[31 -  4]);
          MLA(hi, lo, (*fe)[7], ptr[31 -  2]);
          *pcm2-- = SHIFT(MLZ(hi, lo));
        }
        ++fo;
      }
      ++Dptr;
      ptr = *Dptr + po;
      ML0(hi, lo, (*fo)[0], ptr[ 0]);
      MLA(hi, lo, (*fo)[1], ptr[14]);
      MLA(hi, lo, (*fo)[2], ptr[12]);
      MLA(hi, lo, (*fo)[3], ptr[10]);
      MLA(hi, lo, (*fo)[4], ptr[ 8]);
      MLA(hi, lo, (*fo)[5], ptr[ 6]);
      MLA(hi, lo, (*fo)[6], ptr[ 4]);
      MLA(hi, lo, (*fo)[7], ptr[ 2]);
      *pcm1 = SHIFT(-MLZ(hi, lo));
      pcm1 += 8;
      phase = (phase + 1) % 16;
    }
  }
 }
 /*
         * NAME:synth->frame()
         * DESCRIPTION:perform PCM synthesis of frame subband samples
 */
 void mad_synth_frame(struct mad_synth *synth, struct mad_frame const *frame)
 {
  unsigned int nch, ns;
  void (*synth_frame)(struct mad_synth *, struct mad_frame const *,
                      unsigned int, unsigned int);
  nch = MAD_NCHANNELS(&frame->header);
  ns  = MAD_NSBSAMPLES(&frame->header);
  synth->pcm.samplerate = frame->header.samplerate;
  synth->pcm.channels   = nch;
  synth->pcm.length     = 32 * ns;
  synth_frame = synth_full;
  if (frame->options & MAD_OPTION_HALFSAMPLERATE) {
    synth->pcm.samplerate /= 2;
    synth->pcm.length     /= 2;
    synth_frame = synth_half;
  }
  synth_frame(synth, frame, nch, ns);
  synth->phase = (synth->phase + ns) % 16;
 }
diff --git a/core/multimedia/opieplayer/libmad/synth.h b/core/multimedia/opieplayer/libmad/synth.h
index 2c9d5c8..d284d01 100644
--- a/core/multimedia/opieplayer/libmad/synth.h
+++ b/core/multimedia/opieplayer/libmad/synth.h
@@ -1,69 +1,69 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_SYNTH_H
 # define LIBMAD_SYNTH_H
 # include "fixed.h"
 # include "frame.h"
 struct mad_pcm {
          unsigned int samplerate;      /* sampling frequency (Hz) */
          unsigned short channels;      /* number of channels */
          unsigned short length;        /* number of samples per channel */
          mad_fixed_t samples[2][1152];         /* PCM output samples [ch][sample] */
 };
 struct mad_synth {
          mad_fixed_t filter[2][2][2][16][8];/* polyphase filterbank outputs */
                                        /* [ch][eo][peo][s][v] */
          unsigned int phase;           /* current processing phase */
          struct mad_pcm pcm;           /* PCM output */
 };
 /* single channel PCM selector */
 enum {
  MAD_PCM_CHANNEL_SINGLE = 0
 };
 /* dual channel PCM selector */
 enum {
  MAD_PCM_CHANNEL_DUAL_1 = 0,
  MAD_PCM_CHANNEL_DUAL_2 = 1
 };
 /* stereo PCM selector */
 enum {
  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
 };
 void mad_synth_init(struct mad_synth *);
 # define mad_synth_finish(synth)  /* nothing */
 void mad_synth_mute(struct mad_synth *);
 void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/timer.c b/core/multimedia/opieplayer/libmad/timer.c
index 299fe0b..fa377d0 100644
--- a/core/multimedia/opieplayer/libmad/timer.c
+++ b/core/multimedia/opieplayer/libmad/timer.c
@@ -1,484 +1,485 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include <stdio.h>
 # ifdef HAVE_ASSERT_H
 #  include <assert.h>
 # endif
 # include "timer.h"
 mad_timer_t const mad_timer_zero = { 0, 0 };
 /*
         * NAME:timer->compare()
         * DESCRIPTION:indicate relative order of two timers
 */
 int mad_timer_compare(mad_timer_t timer1, mad_timer_t timer2)
 {
  signed long diff;
  diff = timer1.seconds - timer2.seconds;
  if (diff < 0)
    return -1;
  else if (diff > 0)
    return +1;
  diff = timer1.fraction - timer2.fraction;
  if (diff < 0)
    return -1;
  else if (diff > 0)
    return +1;
  return 0;
 }
 /*
         * NAME:timer->negate()
         * DESCRIPTION:invert the sign of a timer
 */
 void mad_timer_negate(mad_timer_t *timer)
 {
  timer->seconds = -timer->seconds;
  if (timer->fraction) {
    timer->seconds -= 1;
    timer->fraction = MAD_TIMER_RESOLUTION - timer->fraction;
  }
 }
 /*
         * NAME:timer->abs()
         * DESCRIPTION:return the absolute value of a timer
 */
 mad_timer_t mad_timer_abs(mad_timer_t timer)
 {
-  if (mad_timer_sign(timer) < 0)
+  if (timer.seconds < 0)
    mad_timer_negate(&timer);
  return timer;
 }
 /*
         * NAME:reduce_timer()
         * DESCRIPTION:carry timer fraction into seconds
 */
 static
 void reduce_timer(mad_timer_t *timer)
 {
  timer->seconds  += timer->fraction / MAD_TIMER_RESOLUTION;
  timer->fraction %= MAD_TIMER_RESOLUTION;
 }
 /*
         * NAME:gcd()
         * DESCRIPTION:compute greatest common denominator
 */
 static
 unsigned long gcd(unsigned long num1, unsigned long num2)
 {
  unsigned long tmp;
  while (num2) {
    tmp  = num2;
    num2 = num1 % num2;
    num1 = tmp;
  }
  return num1;
 }
 /*
         * NAME:reduce_rational()
         * DESCRIPTION:convert rational expression to lowest terms
 */
 static
 void reduce_rational(unsigned long *numer, unsigned long *denom)
 {
  unsigned long factor;
  factor = gcd(*numer, *denom);
  assert(factor != 0);
  *numer /= factor;
  *denom /= factor;
 }
 /*
         * NAME:scale_rational()
         * DESCRIPTION:solve numer/denom == ?/scale avoiding overflowing
 */
 static
 unsigned long scale_rational(unsigned long numer, unsigned long denom,
                             unsigned long scale)
 {
  reduce_rational(&numer, &denom);
  reduce_rational(&scale, &denom);
  assert(denom != 0);
  if (denom < scale)
    return numer * (scale / denom) + numer * (scale % denom) / denom;
  if (denom < numer)
    return scale * (numer / denom) + scale * (numer % denom) / denom;
  return numer * scale / denom;
 }
 /*
         * NAME:timer->set()
         * DESCRIPTION:set timer to specific (positive) value
 */
 void mad_timer_set(mad_timer_t *timer, unsigned long seconds,
                   unsigned long numer, unsigned long denom)
 {
  timer->seconds = seconds;
  if (numer >= denom && denom > 0) {
    timer->seconds += numer / denom;
    numer %= denom;
  }
  switch (denom) {
  case 0:
  case 1:
    timer->fraction = 0;
    break;
  case MAD_TIMER_RESOLUTION:
    timer->fraction = numer;
    break;
  case 1000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  1000);
    break;
  case 8000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION /  8000);
    break;
  case 11025:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 11025);
    break;
  case 12000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 12000);
    break;
  case 16000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 16000);
    break;
  case 22050:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 22050);
    break;
  case 24000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 24000);
    break;
  case 32000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 32000);
    break;
  case 44100:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 44100);
    break;
  case 48000:
    timer->fraction = numer * (MAD_TIMER_RESOLUTION / 48000);
    break;
  default:
    timer->fraction = scale_rational(numer, denom, MAD_TIMER_RESOLUTION);
    break;
  }
  if (timer->fraction >= MAD_TIMER_RESOLUTION)
    reduce_timer(timer);
 }
 /*
         * NAME:timer->add()
         * DESCRIPTION:add one timer to another
 */
 void mad_timer_add(mad_timer_t *timer, mad_timer_t incr)
 {
  timer->seconds  += incr.seconds;
  timer->fraction += incr.fraction;
  if (timer->fraction >= MAD_TIMER_RESOLUTION)
    reduce_timer(timer);
 }
 /*
         * NAME:timer->multiply()
         * DESCRIPTION:multiply a timer by a scalar value
 */
 void mad_timer_multiply(mad_timer_t *timer, signed long scalar)
 {
  mad_timer_t addend;
  unsigned long factor;
  factor = scalar;
  if (scalar < 0) {
    factor = -scalar;
    mad_timer_negate(timer);
  }
  addend = *timer;
  *timer = mad_timer_zero;
  while (factor) {
    if (factor & 1)
      mad_timer_add(timer, addend);
    mad_timer_add(&addend, addend);
    factor >>= 1;
  }
 }
 /*
         * NAME:timer->count()
         * DESCRIPTION:return timer value in selected units
 */
 signed long mad_timer_count(mad_timer_t timer, enum mad_units units)
 {
  switch (units) {
  case MAD_UNITS_HOURS:
    return timer.seconds / 60 / 60;
  case MAD_UNITS_MINUTES:
    return timer.seconds / 60;
  case MAD_UNITS_SECONDS:
    return timer.seconds;
  case MAD_UNITS_DECISECONDS:
  case MAD_UNITS_CENTISECONDS:
  case MAD_UNITS_MILLISECONDS:
  case MAD_UNITS_8000_HZ:
  case MAD_UNITS_11025_HZ:
  case MAD_UNITS_12000_HZ:
  case MAD_UNITS_16000_HZ:
  case MAD_UNITS_22050_HZ:
  case MAD_UNITS_24000_HZ:
  case MAD_UNITS_32000_HZ:
  case MAD_UNITS_44100_HZ:
  case MAD_UNITS_48000_HZ:
  case MAD_UNITS_24_FPS:
  case MAD_UNITS_25_FPS:
  case MAD_UNITS_30_FPS:
  case MAD_UNITS_48_FPS:
  case MAD_UNITS_50_FPS:
  case MAD_UNITS_60_FPS:
  case MAD_UNITS_75_FPS:
    return timer.seconds * (signed long) units +
      (signed long) scale_rational(timer.fraction, MAD_TIMER_RESOLUTION,
                                   units);
  case MAD_UNITS_23_976_FPS:
  case MAD_UNITS_24_975_FPS:
  case MAD_UNITS_29_97_FPS:
  case MAD_UNITS_47_952_FPS:
  case MAD_UNITS_49_95_FPS:
  case MAD_UNITS_59_94_FPS:
    return (mad_timer_count(timer, -units) + 1) * 1000 / 1001;
  }
  /* unsupported units */
  return 0;
 }
 /*
         * NAME:timer->fraction()
         * DESCRIPTION:return fractional part of timer in arbitrary terms
 */
 unsigned long mad_timer_fraction(mad_timer_t timer, unsigned long denom)
 {
  timer = mad_timer_abs(timer);
  switch (denom) {
  case 0:
-    return MAD_TIMER_RESOLUTION / timer.fraction;
+    return timer.fraction ?
+      MAD_TIMER_RESOLUTION / timer.fraction : MAD_TIMER_RESOLUTION + 1;
  case MAD_TIMER_RESOLUTION:
    return timer.fraction;
  default:
    return scale_rational(timer.fraction, MAD_TIMER_RESOLUTION, denom);
  }
 }
 /*
         * NAME:timer->string()
         * DESCRIPTION:write a string representation of a timer using a template
 */
 void mad_timer_string(mad_timer_t timer,
                      char *dest, char const *format, enum mad_units units,
                      enum mad_units fracunits, unsigned long subparts)
 {
  unsigned long hours, minutes, seconds, sub;
  unsigned int frac;
  timer = mad_timer_abs(timer);
  seconds = timer.seconds;
  frac = sub = 0;
  switch (fracunits) {
  case MAD_UNITS_HOURS:
  case MAD_UNITS_MINUTES:
  case MAD_UNITS_SECONDS:
    break;
  case MAD_UNITS_DECISECONDS:
  case MAD_UNITS_CENTISECONDS:
  case MAD_UNITS_MILLISECONDS:
  case MAD_UNITS_8000_HZ:
  case MAD_UNITS_11025_HZ:
  case MAD_UNITS_12000_HZ:
  case MAD_UNITS_16000_HZ:
  case MAD_UNITS_22050_HZ:
  case MAD_UNITS_24000_HZ:
  case MAD_UNITS_32000_HZ:
  case MAD_UNITS_44100_HZ:
  case MAD_UNITS_48000_HZ:
  case MAD_UNITS_24_FPS:
  case MAD_UNITS_25_FPS:
  case MAD_UNITS_30_FPS:
  case MAD_UNITS_48_FPS:
  case MAD_UNITS_50_FPS:
  case MAD_UNITS_60_FPS:
  case MAD_UNITS_75_FPS:
    {
      unsigned long denom;
      denom = MAD_TIMER_RESOLUTION / fracunits;
      frac = timer.fraction / denom;
      sub  = scale_rational(timer.fraction % denom, denom, subparts);
    }
    break;
  case MAD_UNITS_23_976_FPS:
  case MAD_UNITS_24_975_FPS:
  case MAD_UNITS_29_97_FPS:
  case MAD_UNITS_47_952_FPS:
  case MAD_UNITS_49_95_FPS:
  case MAD_UNITS_59_94_FPS:
    /* drop-frame encoding */
    /* N.B. this is only well-defined for MAD_UNITS_29_97_FPS */
    {
      unsigned long frame, cycle, d, m;
      frame = mad_timer_count(timer, fracunits);
      cycle = -fracunits * 60 * 10 - (10 - 1) * 2;
      d = frame / cycle;
      m = frame % cycle;
      frame += (10 - 1) * 2 * d;
      if (m > 2)
        frame += 2 * ((m - 2) / (cycle / 10));
      frac    = frame % -fracunits;
      seconds = frame / -fracunits;
    }
    break;
  }
  switch (units) {
  case MAD_UNITS_HOURS:
    minutes = seconds / 60;
    hours   = minutes / 60;
    sprintf(dest, format,
            hours,
            (unsigned int) (minutes % 60),
            (unsigned int) (seconds % 60),
            frac, sub);
    break;
  case MAD_UNITS_MINUTES:
    minutes = seconds / 60;
    sprintf(dest, format,
            minutes,
            (unsigned int) (seconds % 60),
            frac, sub);
    break;
  case MAD_UNITS_SECONDS:
    sprintf(dest, format,
            seconds,
            frac, sub);
    break;
  case MAD_UNITS_23_976_FPS:
  case MAD_UNITS_24_975_FPS:
  case MAD_UNITS_29_97_FPS:
  case MAD_UNITS_47_952_FPS:
  case MAD_UNITS_49_95_FPS:
  case MAD_UNITS_59_94_FPS:
    if (fracunits < 0) {
      /* not yet implemented */
      sub = 0;
    }
    /* fall through */
  case MAD_UNITS_DECISECONDS:
  case MAD_UNITS_CENTISECONDS:
  case MAD_UNITS_MILLISECONDS:
  case MAD_UNITS_8000_HZ:
  case MAD_UNITS_11025_HZ:
  case MAD_UNITS_12000_HZ:
  case MAD_UNITS_16000_HZ:
  case MAD_UNITS_22050_HZ:
  case MAD_UNITS_24000_HZ:
  case MAD_UNITS_32000_HZ:
  case MAD_UNITS_44100_HZ:
  case MAD_UNITS_48000_HZ:
  case MAD_UNITS_24_FPS:
  case MAD_UNITS_25_FPS:
  case MAD_UNITS_30_FPS:
  case MAD_UNITS_48_FPS:
  case MAD_UNITS_50_FPS:
  case MAD_UNITS_60_FPS:
  case MAD_UNITS_75_FPS:
    sprintf(dest, format, mad_timer_count(timer, units), sub);
    break;
  }
 }
diff --git a/core/multimedia/opieplayer/libmad/timer.h b/core/multimedia/opieplayer/libmad/timer.h
index f8afb8e..4f2be57 100644
--- a/core/multimedia/opieplayer/libmad/timer.h
+++ b/core/multimedia/opieplayer/libmad/timer.h
@@ -1,100 +1,100 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifndef LIBMAD_TIMER_H
 # define LIBMAD_TIMER_H
 typedef struct {
          signed long seconds;  /* whole seconds */
          unsigned long fraction;/* 1/MAD_TIMER_RESOLUTION seconds */
 } mad_timer_t;
 extern mad_timer_t const mad_timer_zero;
        # define MAD_TIMER_RESOLUTION352800000UL
 enum mad_units {
          MAD_UNITS_HOURS =    -2,
          MAD_UNITS_MINUTES =    -1,
          MAD_UNITS_SECONDS =     0,
  /* metric units */
          MAD_UNITS_DECISECONDS =    10,
  MAD_UNITS_CENTISECONDS =   100,
  MAD_UNITS_MILLISECONDS =  1000,
  /* audio sample units */
          MAD_UNITS_8000_HZ =  8000,
          MAD_UNITS_11025_HZ = 11025,
          MAD_UNITS_12000_HZ = 12000,
          MAD_UNITS_16000_HZ = 16000,
          MAD_UNITS_22050_HZ = 22050,
          MAD_UNITS_24000_HZ = 24000,
          MAD_UNITS_32000_HZ = 32000,
          MAD_UNITS_44100_HZ = 44100,
          MAD_UNITS_48000_HZ = 48000,
  /* video frame/field units */
          MAD_UNITS_24_FPS =    24,
          MAD_UNITS_25_FPS =    25,
          MAD_UNITS_30_FPS =    30,
          MAD_UNITS_48_FPS =    48,
          MAD_UNITS_50_FPS =    50,
          MAD_UNITS_60_FPS =    60,
  /* CD audio frames */
          MAD_UNITS_75_FPS =    75,
  /* video drop-frame units */
          MAD_UNITS_23_976_FPS =   -24,
          MAD_UNITS_24_975_FPS =   -25,
          MAD_UNITS_29_97_FPS =   -30,
          MAD_UNITS_47_952_FPS =   -48,
          MAD_UNITS_49_95_FPS =   -50,
          MAD_UNITS_59_94_FPS =   -60
 };
        # define mad_timer_reset(timer)((void) (*(timer) = mad_timer_zero))
 int mad_timer_compare(mad_timer_t, mad_timer_t);
        # define mad_timer_sign(timer)mad_timer_compare((timer), mad_timer_zero)
 void mad_timer_negate(mad_timer_t *);
 mad_timer_t mad_timer_abs(mad_timer_t);
 void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
 void mad_timer_add(mad_timer_t *, mad_timer_t);
 void mad_timer_multiply(mad_timer_t *, signed long);
 signed long mad_timer_count(mad_timer_t, enum mad_units);
 unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
 void mad_timer_string(mad_timer_t, char *, char const *,
                      enum mad_units, enum mad_units, unsigned long);
 # endif
diff --git a/core/multimedia/opieplayer/libmad/version.c b/core/multimedia/opieplayer/libmad/version.c
index fb126f4..4fbef23 100644
--- a/core/multimedia/opieplayer/libmad/version.c
+++ b/core/multimedia/opieplayer/libmad/version.c
@@ -1,91 +1,91 @@
 /*
 * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * $Id$
 */
 # ifdef HAVE_CONFIG_H
 #  include "libmad_config.h"
 # endif
 # include "libmad_global.h"
 # include "libmad_version.h"
 char const mad_version[]   = "MPEG Audio Decoder " MAD_VERSION;
 char const mad_copyright[] = "Copyright (C) " MAD_PUBLISHYEAR " " MAD_AUTHOR;
 char const mad_author[]    = MAD_AUTHOR " <" MAD_EMAIL ">";
 char const mad_build[] = ""
+# if defined(DEBUG)
+  "DEBUG "
+# elif defined(NDEBUG)
+  "NDEBUG "
+# endif
+# if defined(EXPERIMENTAL)
+  "EXPERIMENTAL "
+# endif
 # if defined(FPM_64BIT)
  "FPM_64BIT "
 # elif defined(FPM_INTEL)
  "FPM_INTEL "
 # elif defined(FPM_ARM)
  "FPM_ARM "
 # elif defined(FPM_MIPS)
  "FPM_MIPS "
 # elif defined(FPM_SPARC)
  "FPM_SPARC "
 # elif defined(FPM_PPC)
  "FPM_PPC "
 # elif defined(FPM_DEFAULT)
  "FPM_DEFAULT "
 # endif
 # if defined(ASO_IMDCT)
  "ASO_IMDCT "
 # endif
 # if defined(ASO_INTERLEAVE1)
  "ASO_INTERLEAVE1 "
 # endif
 # if defined(ASO_INTERLEAVE2)
  "ASO_INTERLEAVE2 "
 # endif
 # if defined(ASO_ZEROCHECK)
  "ASO_ZEROCHECK "
 # endif
 # if defined(OPT_SPEED)
  "OPT_SPEED "
 # elif defined(OPT_ACCURACY)
  "OPT_ACCURACY "
 # endif
 # if defined(OPT_SSO)
  "OPT_SSO "
 # endif
 # if defined(OPT_DCTO)  /* never defined here */
  "OPT_DCTO "
 # endif
 # if defined(OPT_STRICT)
  "OPT_STRICT "
 # endif
-# if defined(EXPERIMENTAL)
-  "EXPERIMENTAL "
-# endif
-# if defined(DEBUG)
-  "DEBUG "
-# elif defined(NDEBUG)
-  "NDEBUG "
-# endif
 ;