1 files changed, 11 insertions, 7 deletions

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,51 +1,51 @@
 /*
  * 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  */
@@ -165,260 +165,264 @@ int decode_header(struct mad_header *header, struct mad_stream *stream)
 
   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: