1 files changed, 202 insertions, 168 deletions

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index f2d1ca93f..7c293c100 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -84,7 +84,7 @@ typedef struct ff_audio_decoder_s {
 #define free16(p) realloc16(p,0)
 
 static void *realloc16 (void *m, size_t s) {
-  unsigned int diff, diff2;
+  unsigned long diff, diff2;
   unsigned char *p = m, *q;
   if (p) {
     diff = p[-1];
@@ -94,13 +94,13 @@ static void *realloc16 (void *m, size_t s) {
     }
     q = realloc (p - diff, s + 16);
     if (!q) return (q);
-    diff2 = 16 - ((unsigned int)q & 15);
+    diff2 = 16 - ((unsigned long)q & 15);
     if (diff2 != diff) memmove (q + diff2, q + diff, s);
   } else {
     if (s == 0) return (NULL);
     q = malloc (s + 16);
     if (!q) return (q);
-    diff2 = 16 - ((unsigned int)q & 15);
+    diff2 = 16 - ((unsigned long)q & 15);
   }
   q += diff2;
   q[-1] = diff2;
@@ -108,7 +108,7 @@ static void *realloc16 (void *m, size_t s) {
 }
 
 
- static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) {
+static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) {
   if (size > this->bufsize) {
     this->bufsize = size + size / 2;
     xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
@@ -118,197 +118,228 @@ static void *realloc16 (void *m, size_t s) {
   }
 }
 
-static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
+static void ff_audio_handle_special_buffer(ff_audio_decoder_t *this, buf_element_t *buf) {
 
-  ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
-  int bytes_consumed;
-  int decode_buffer_size;
-  int offset;
-  int out;
-  audio_buffer_t *audio_buffer;
-  int bytes_to_send;
-  unsigned int codec_type = buf->type & (BUF_MAJOR_MASK | BUF_DECODER_MASK);
+  if (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM) {
 
-  if ( (buf->decoder_flags & (BUF_FLAG_HEADER | BUF_FLAG_SPECIAL)) == BUF_FLAG_HEADER ) {
+    this->context->extradata_size = buf->decoder_info[2];
+    this->context->extradata = malloc(buf->decoder_info[2] +
+                                      FF_INPUT_BUFFER_PADDING_SIZE);
+    memcpy(this->context->extradata, buf->decoder_info_ptr[2],
+           buf->decoder_info[2]);
+  }
+}
 
-    /* accumulate init data */
-    ff_audio_ensure_buffer_size(this, this->size + buf->size);
-    xine_fast_memcpy(this->buf + this->size, buf->content, buf->size);
-    this->size += buf->size;
+static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_type) {
+  size_t i;
+
+  this->codec = NULL;
+
+  for(i = 0; i < sizeof(ff_audio_lookup)/sizeof(ff_codec_t); i++)
+    if(ff_audio_lookup[i].type == codec_type) {
+      pthread_mutex_lock (&ffmpeg_lock);
+      this->codec = avcodec_find_decoder(ff_audio_lookup[i].id);
+      pthread_mutex_unlock (&ffmpeg_lock);
+      _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+                       ff_audio_lookup[i].name);
+      break;
+    }
 
-    if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-      size_t i;
-      xine_waveformatex *audio_header;
+  if (!this->codec) {
+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+             _("ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
+             codec_type);
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
+    return;
+  }
 
-      this->codec = NULL;
+  /* Current ffmpeg audio decoders usually use 16 bits/sample
+   * buf->decoder_info[2] can't be used as it doesn't refer to the output
+   * bits/sample for some codecs (e.g. MS ADPCM) */
+  this->audio_bits = 16;
+
+  this->context->bits_per_sample = this->audio_bits;
+  this->context->sample_rate = this->audio_sample_rate;
+  this->context->channels    = this->audio_channels;
+  this->context->codec_id    = this->codec->id;
+  this->context->codec_type  = this->codec->type;
+  this->context->codec_tag   = _x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC);
+}
 
-      for(i = 0; i < sizeof(ff_audio_lookup)/sizeof(ff_codec_t); i++)
-        if(ff_audio_lookup[i].type == codec_type) {
-	  pthread_mutex_lock (&ffmpeg_lock);
-          this->codec = avcodec_find_decoder(ff_audio_lookup[i].id);
-	  pthread_mutex_unlock (&ffmpeg_lock);
-          _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
-                           ff_audio_lookup[i].name);
-          break;
-        }
+static int ff_audio_open_codec(ff_audio_decoder_t *this, unsigned int codec_type) {
 
-      if (!this->codec) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-                 _("ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"),
-                 codec_type);
-        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-        return;
-      }
+  if ( !this->codec ) {
+    ff_audio_init_codec(this, codec_type);
+  }
+
+  if ( !this->codec ) {
+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+             _("ffmpeg_audio_dec: trying to open null codec\n"));
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
+    return -1;
+  }
 
-      this->context = avcodec_alloc_context();
+  pthread_mutex_lock (&ffmpeg_lock);
+  if (avcodec_open (this->context, this->codec) < 0) {
+    pthread_mutex_unlock (&ffmpeg_lock);
+    xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+             _("ffmpeg_audio_dec: couldn't open decoder\n"));
+    _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
+    return -1;
+  }
+  pthread_mutex_unlock (&ffmpeg_lock);
 
-      if(buf->decoder_flags & BUF_FLAG_STDHEADER) {
-        this->audio_sample_rate = buf->decoder_info[1];
-        this->audio_channels    = buf->decoder_info[3];
+  this->decoder_ok = 1;
 
-        if(this->size) {
-          audio_header = (xine_waveformatex *)this->buf;
+  return 1;
+}
 
-          this->context->block_align = audio_header->nBlockAlign;
-          this->context->bit_rate    = audio_header->nAvgBytesPerSec * 8;
+static void ff_handle_header_buffer(ff_audio_decoder_t *this, buf_element_t *buf)
+{
+  unsigned int codec_type = buf->type & (BUF_MAJOR_MASK | BUF_DECODER_MASK);
+  xine_waveformatex *audio_header;
 
-          if(audio_header->cbSize > 0) {
-            this->context->extradata = malloc(audio_header->cbSize);
-            this->context->extradata_size = audio_header->cbSize;
-            memcpy( this->context->extradata,
-                    (uint8_t *)audio_header + sizeof(xine_waveformatex),
-                    audio_header->cbSize );
-          }
-        }
-      } else {
-        short *ptr;
-
-        switch(codec_type) {
-          case BUF_AUDIO_14_4:
-            this->audio_sample_rate = 8000;
-            this->audio_channels    = 1;
-
-            this->context->block_align = 240;
-            break;
-          case BUF_AUDIO_28_8:
-            this->audio_sample_rate = _X_BE_16(&this->buf[0x30]);
-            this->audio_channels    = this->buf[0x37];
-            /* this->audio_bits = buf->content[0x35] */
-
-            this->context->block_align = _X_BE_32(&this->buf[0x18]);
-
-            this->context->extradata_size = 5*sizeof(short);
-            this->context->extradata      = malloc(this->context->extradata_size);
-
-            ptr = (short *) this->context->extradata;
-
-            ptr[0] = _X_BE_16(&this->buf[0x2C]); /* subpacket size */
-            ptr[1] = _X_BE_16(&this->buf[0x28]); /* subpacket height */
-            ptr[2] = _X_BE_16(&this->buf[0x16]); /* subpacket flavour */
-            ptr[3] = _X_BE_32(&this->buf[0x18]); /* coded frame size */
-            ptr[4] = 0;                          /* codec's data length  */
-
-	    xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                    "ffmpeg_audio_dec: 28_8 audio channels %d bits %d sample rate %d block align %d\n",
-		     this->audio_channels, this->audio_bits, this->audio_sample_rate,
-		     this->context->block_align);
-            break;
-	  case BUF_AUDIO_COOK:
-	    {
-	      int version;
-	      int data_len;
-	      int extradata;
-
-	      version = _X_BE_16 (this->buf+4);
-	      if (version == 4) {
-		this->audio_sample_rate = _X_BE_16 (this->buf+48);
-		this->audio_bits = _X_BE_16 (this->buf+52);
-		this->audio_channels = _X_BE_16 (this->buf+54);
-		data_len = _X_BE_32 (this->buf+67);
-		extradata = 71;
-	      } else {
-		this->audio_sample_rate = _X_BE_16 (this->buf+54);
-		this->audio_bits = _X_BE_16 (this->buf+58);
-		this->audio_channels = _X_BE_16 (this->buf+60);
-		data_len = _X_BE_32 (this->buf+74);
-		extradata = 78;
-	      }
-	      this->context->block_align = _X_BE_16 (this->buf+44);
-
-              xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-	              "ffmpeg_audio_dec: cook audio channels %d bits %d sample rate %d block align %d\n",
-		      this->audio_channels, this->audio_bits, this->audio_sample_rate,
-		      this->context->block_align);
-
-              if (extradata + data_len > this->size)
-                break; /* abort early - extradata length is bad */
-              if (extradata > INT_MAX - data_len)
-                break;/*integer overflow*/
-
-	      this->context->extradata_size = data_len;
-	      this->context->extradata      = malloc(this->context->extradata_size +
-						     FF_INPUT_BUFFER_PADDING_SIZE);
-	      xine_fast_memcpy (this->context->extradata, this->buf + extradata,
-				this->context->extradata_size);
-	      break;
-	    }
-          default:
-            xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                    "ffmpeg_audio_dec: unknown header with buf type 0x%X\n", codec_type);
-            break;
+  /* accumulate init data */
+  ff_audio_ensure_buffer_size(this, this->size + buf->size);
+  xine_fast_memcpy(this->buf + this->size, buf->content, buf->size);
+  this->size += buf->size;
+
+  if (!(buf->decoder_flags & BUF_FLAG_FRAME_END)) {
+    return;
+  }
+
+  if(buf->decoder_flags & BUF_FLAG_STDHEADER) {
+    this->audio_sample_rate = buf->decoder_info[1];
+    this->audio_channels    = buf->decoder_info[3];
+
+    if(this->size) {
+      audio_header = (xine_waveformatex *)this->buf;
+
+      this->context->block_align = audio_header->nBlockAlign;
+      this->context->bit_rate    = audio_header->nAvgBytesPerSec * 8;
+
+      if(audio_header->cbSize > 0) {
+        this->context->extradata = malloc(audio_header->cbSize);
+        this->context->extradata_size = audio_header->cbSize;
+        memcpy( this->context->extradata,
+                (uint8_t *)audio_header + sizeof(xine_waveformatex),
+                audio_header->cbSize );
+      }
+    }
+  } else {
+    short *ptr;
+
+    switch(codec_type) {
+    case BUF_AUDIO_14_4:
+      this->audio_sample_rate = 8000;
+      this->audio_channels    = 1;
+
+      this->context->block_align = 240;
+      break;
+    case BUF_AUDIO_28_8:
+      this->audio_sample_rate = _X_BE_16(&this->buf[0x30]);
+      this->audio_channels    = this->buf[0x37];
+      /* this->audio_bits = buf->content[0x35] */
+
+      this->context->block_align = _X_BE_32(&this->buf[0x18]);
+
+      this->context->extradata_size = 5*sizeof(short);
+      this->context->extradata      = malloc(this->context->extradata_size);
+
+      ptr = (short *) this->context->extradata;
+
+      ptr[0] = _X_BE_16(&this->buf[0x2C]); /* subpacket size */
+      ptr[1] = _X_BE_16(&this->buf[0x28]); /* subpacket height */
+      ptr[2] = _X_BE_16(&this->buf[0x16]); /* subpacket flavour */
+      ptr[3] = _X_BE_32(&this->buf[0x18]); /* coded frame size */
+      ptr[4] = 0;                          /* codec's data length  */
+
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+              "ffmpeg_audio_dec: 28_8 audio channels %d bits %d sample rate %d block align %d\n",
+              this->audio_channels, this->audio_bits, this->audio_sample_rate,
+              this->context->block_align);
+      break;
+    case BUF_AUDIO_COOK:
+      {
+        int version;
+        int data_len;
+        int extradata;
+
+        version = _X_BE_16 (this->buf+4);
+        if (version == 4) {
+          this->audio_sample_rate = _X_BE_16 (this->buf+48);
+          this->audio_bits = _X_BE_16 (this->buf+52);
+          this->audio_channels = _X_BE_16 (this->buf+54);
+          data_len = _X_BE_32 (this->buf+67);
+          extradata = 71;
+        } else {
+          this->audio_sample_rate = _X_BE_16 (this->buf+54);
+          this->audio_bits = _X_BE_16 (this->buf+58);
+          this->audio_channels = _X_BE_16 (this->buf+60);
+          data_len = _X_BE_32 (this->buf+74);
+          extradata = 78;
         }
+        this->context->block_align = _X_BE_16 (this->buf+44);
+
+        xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+                "ffmpeg_audio_dec: cook audio channels %d bits %d sample rate %d block align %d\n",
+                this->audio_channels, this->audio_bits, this->audio_sample_rate,
+                this->context->block_align);
+
+        if (extradata + data_len > this->size)
+          break; /* abort early - extradata length is bad */
+        if (extradata > INT_MAX - data_len)
+          break;/*integer overflow*/
+
+        this->context->extradata_size = data_len;
+        this->context->extradata      = malloc(this->context->extradata_size +
+                                               FF_INPUT_BUFFER_PADDING_SIZE);
+        xine_fast_memcpy (this->context->extradata, this->buf + extradata,
+                          this->context->extradata_size);
+        break;
       }
+    default:
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+              "ffmpeg_audio_dec: unknown header with buf type 0x%X\n", codec_type);
+      break;
+    }
+  }
 
-      /* Current ffmpeg audio decoders usually use 16 bits/sample
-       * buf->decoder_info[2] can't be used as it doesn't refer to the output
-       * bits/sample for some codecs (e.g. MS ADPCM) */
-      this->audio_bits = 16;
+  ff_audio_init_codec(this, codec_type);
 
-      this->context->bits_per_sample = this->audio_bits;
-      this->context->sample_rate = this->audio_sample_rate;
-      this->context->channels    = this->audio_channels;
-      this->context->codec_id    = this->codec->id;
-      this->context->codec_type  = this->codec->type;
-      this->context->codec_tag   = _x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC);
+  this->size = 0;
+}
 
-      this->size = 0;
+static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
-      this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE);
+  ff_audio_decoder_t *this = (ff_audio_decoder_t *) this_gen;
+  int bytes_consumed;
+  int decode_buffer_size;
+  int offset;
+  int out;
+  audio_buffer_t *audio_buffer;
+  int bytes_to_send;
+  unsigned int codec_type = buf->type & (BUF_MAJOR_MASK | BUF_DECODER_MASK);
 
-      return;
-    }
-  } else if ((buf->decoder_flags & BUF_FLAG_SPECIAL) &&
-             (buf->decoder_info[1] == BUF_SPECIAL_STSD_ATOM)) {
+  if (buf->decoder_flags & BUF_FLAG_SPECIAL) {
+    ff_audio_handle_special_buffer(this, buf);
+    return;
+  }
 
-    this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = malloc(buf->decoder_info[2] +
-				      FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-      buf->decoder_info[2]);
+  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+    ff_handle_header_buffer(this, buf);
+    return;
+
+  } else {
 
-  } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
 #if AVAUDIO > 2
     AVPacket avpkt;
 #endif
 
     if( !this->decoder_ok ) {
-      if ( ! this->context || ! this->codec ) {
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-		_("ffmpeg_audio_dec: trying to open null codec\n"));
-	_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
+      if (ff_audio_open_codec(this, codec_type) < 0) {
 	return;
       }
-
-      pthread_mutex_lock (&ffmpeg_lock);
-      if (avcodec_open (this->context, this->codec) < 0) {
-	pthread_mutex_unlock (&ffmpeg_lock);
-        xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-                 _("ffmpeg_audio_dec: couldn't open decoder\n"));
-        _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
-        return;
-      }
-      pthread_mutex_unlock (&ffmpeg_lock);
-      this->decoder_ok = 1;
     }
 
     if( buf->decoder_flags & BUF_FLAG_PREVIEW )
@@ -468,7 +499,7 @@ static void ff_audio_reset (audio_decoder_t *this_gen) {
   this->size = 0;
 
   /* try to reset the wma decoder */
-  if( this->context && this->decoder_ok ) {
+  if( this->decoder_ok ) {
     pthread_mutex_lock (&ffmpeg_lock);
     avcodec_close (this->context);
     if (avcodec_open (this->context, this->codec) < 0)
@@ -527,6 +558,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
 
   ff_audio_ensure_buffer_size(this, AUDIOBUFSIZE);
 
+  this->context = avcodec_alloc_context();
+  this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE);
+
   return &this->audio_decoder;
 }