1 files changed, 51 insertions, 13 deletions

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
@@ -2,3 +2,3 @@
  * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
  *
@@ -44,3 +44,3 @@
 static
-mad_fixed_t const sf_table[63] = {
+mad_fixed_t const sf_table[64] = {
 # include "sf_table.dat"
@@ -165,2 +165,8 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
 
+# 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) {
@@ -169,2 +175,3 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
         }
+# endif
       }
@@ -336,16 +343,40 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
     index = 4;
+  else if (header->flags & MAD_FLAG_FREEFORMAT)
+    goto freeformat;
   else {
-    switch (nch == 2 ? header->bitrate / 2 : header->bitrate) {
-    case 32000:
-    case 48000:
-      index = (header->samplerate == 32000) ? 3 : 2;
-      break;
+    unsigned long bitrate_per_channel;
+
+    bitrate_per_channel = header->bitrate;
+    if (nch == 2) {
+      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:
-    case 64000:
-    case 80000:
+    if (bitrate_per_channel <= 48000)
+      index = (header->samplerate == 32000) ? 3 : 2;
+    else if (bitrate_per_channel <= 80000)
       index = 0;
-      break;
-
-    default:
+    else {
+    freeformat:
       index = (header->samplerate == 48000) ? 0 : 1;
@@ -433,2 +464,8 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 
+# 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 ||
@@ -439,2 +476,3 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
         }
+# endif
       }