added SND/AU file demuxer

CVS patchset: 2452
CVS date: 2002/08/14 02:46:22

4 files changed, 488 insertions, 4 deletions

diff --git a/AUTHORS b/AUTHORS
index aa5bb6d7c..2b7c7f8ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -233,9 +233,9 @@ Contributions
     C version for linear blend deinterlacer
 
   Mike Melanson <melanson@pcisys.net>
-    QT, FILM, RoQ, WAV, FLI, SMJPEG, Id CIN, WC3 movie, VOC, VQA, and AIFF 
-    file demuxers, RoQ audio decoder, various ADPCM audio decoders, raw
-    RGB & YUV support, FLI & MS RLE video decoders
+    QT, FILM, RoQ, WAV, FLI, SMJPEG, Id CIN, WC3 movie, VOC, VQA, AIFF,
+    and SND/AU file demuxers, RoQ audio decoder, various ADPCM audio
+    decoders, raw RGB & YUV support, FLI & MS RLE video decoders
 
   Tim Ferguson <timf@mail.csse.monash.edu.au>
     CYUV, RoQ, and Id CIN video decoders
diff --git a/ChangeLog b/ChangeLog
index 736c4d1bf..5f9bce24d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ xine-lib (next version) [someone fill in stability and urgency]
   * Creative Voice (VOC) file demuxer
   * Westwood Studios VQA file demuxer
   * AIFF file demuxer
+  * Sun/NeXT SND/AU file demuxer
   * Id CIN video decoder
 
 xine-lib (0.9.13) unstable; urgency=low
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 8b3a73879..2ed9c1e60 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -31,7 +31,7 @@ lib_LTLIBRARIES = $(ogg_module) $(qt_modules) $(asf_module) xineplug_dmx_avi.la
 	xineplug_dmx_smjpeg.la xineplug_dmx_wav.la \
 	xineplug_dmx_idcin.la xineplug_dmx_wc3movie.la \
 	xineplug_dmx_vqa.la xineplug_dmx_voc.la \
-	xineplug_dmx_aiff.la
+	xineplug_dmx_aiff.la xineplug_dmx_snd.la
 
 xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
 xineplug_dmx_ogg_la_LIBADD = $(OGG_LIBS) \
@@ -118,6 +118,10 @@ xineplug_dmx_aiff_la_SOURCES = demux_aiff.c
 xineplug_dmx_aiff_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
 xineplug_dmx_aiff_la_LDFLAGS = -avoid-version -module
 
+xineplug_dmx_snd_la_SOURCES = demux_snd.c
+xineplug_dmx_snd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
+xineplug_dmx_snd_la_LDFLAGS = -avoid-version -module
+
 include_HEADERS = demux.h qtpalette.h
 
 ##
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
new file mode 100644
index 000000000..df81b1ab7
--- /dev/null
+++ b/src/demuxers/demux_snd.c
@@ -0,0 +1,479 @@
+/*
+ * Copyright (C) 2001-2002 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine 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.
+ *
+ * xine 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
+ *
+ * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
+ *
+ * $Id: demux_snd.c,v 1.1 2002/08/14 02:46:22 tmmm Exp $
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "xine_internal.h"
+#include "xineutils.h"
+#include "demux.h"
+#include "buffer.h"
+#include "bswap.h"
+
+#define BE_16(x) (be2me_16(*(unsigned short *)(x)))
+#define BE_32(x) (be2me_32(*(unsigned int *)(x)))
+
+#define SND_HEADER_SIZE 24
+#define PCM_BLOCK_ALIGN 1024
+/* this is the big-endian hex value '.snd' */
+#define snd_TAG 0x2E736E64
+#define VALID_ENDS "snd,au"
+
+typedef struct {
+
+  demux_plugin_t       demux_plugin;
+
+  xine_t              *xine;
+
+  config_values_t     *config;
+
+  fifo_buffer_t       *video_fifo;
+  fifo_buffer_t       *audio_fifo;
+
+  input_plugin_t      *input;
+
+  pthread_t            thread;
+  int                  thread_running;
+  pthread_mutex_t      mutex;
+  int                  send_end_buffers;
+  int                  status;
+
+  unsigned int         audio_type;
+  unsigned int         audio_frames;
+  unsigned int         audio_sample_rate;
+  unsigned int         audio_bits;
+  unsigned int         audio_channels;
+  unsigned int         audio_block_align;
+  unsigned int         audio_bytes_per_second;
+
+  unsigned int         running_time;
+
+  off_t                data_start;
+  off_t                data_size;
+  off_t                data_end;
+
+  int                  seek_flag;  /* this is set when a seek just occurred */
+} demux_snd_t;
+
+static void *demux_snd_loop (void *this_gen) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+  buf_element_t *buf = NULL;
+  unsigned int remaining_sample_bytes;
+  off_t current_file_pos;
+  int64_t current_pts;
+
+  pthread_mutex_lock( &this->mutex );
+  this->seek_flag = 1;
+
+  this->input->seek(this->input, this->data_start, SEEK_SET);
+
+  /* do-while needed to seek after demux finished */
+  do {
+    /* main demuxer loop */
+    while (this->status == DEMUX_OK) {
+
+      /* someone may want to interrupt us */
+      pthread_mutex_unlock( &this->mutex );
+      pthread_mutex_lock( &this->mutex );
+
+      /* just load data chunks from wherever the stream happens to be
+       * pointing; issue a DEMUX_FINISHED status if EOF is reached */
+      remaining_sample_bytes = this->audio_block_align;
+      current_file_pos = this->input->get_current_pos(this->input);
+
+      current_pts = current_file_pos;
+      current_pts -= this->data_start;
+      current_pts *= 90000;
+      current_pts /= this->audio_bytes_per_second;
+
+      if (this->seek_flag) {
+        xine_demux_control_newpts(this->xine, current_pts, 0);
+        this->seek_flag = 0;
+      }
+
+      while (remaining_sample_bytes) {
+        buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+        buf->type = this->audio_type;
+        buf->input_pos = current_file_pos;
+        buf->input_length = this->data_end;
+        buf->input_time = current_pts / 90000;
+        buf->pts = current_pts;
+
+        if (remaining_sample_bytes > buf->max_size)
+          buf->size = buf->max_size;
+        else
+          buf->size = remaining_sample_bytes;
+        remaining_sample_bytes -= buf->size;
+
+        if (this->input->read(this->input, buf->content, buf->size) !=
+          buf->size) {
+          buf->free_buffer(buf);
+          this->status = DEMUX_FINISHED;
+          break;
+        }
+
+        if (!remaining_sample_bytes)
+          buf->decoder_flags |= BUF_FLAG_FRAME_END;
+
+        this->audio_fifo->put (this->audio_fifo, buf);
+      }
+    }
+
+    /* wait before sending end buffers: user might want to do a new seek */
+    while(this->send_end_buffers && this->audio_fifo->size(this->audio_fifo) &&
+          this->status != DEMUX_OK){
+      pthread_mutex_unlock( &this->mutex );
+      xine_usec_sleep(100000);
+      pthread_mutex_lock( &this->mutex );
+    }
+
+  } while (this->status == DEMUX_OK);
+
+  printf ("demux_snd: demux loop finished (status: %d)\n",
+          this->status);
+
+  /* seek back to the beginning of the data in preparation for another
+   * start */
+  this->input->seek(this->input, this->data_start, SEEK_SET);
+
+  this->status = DEMUX_FINISHED;
+
+  if (this->send_end_buffers) {
+    xine_demux_control_end(this->xine, BUF_FLAG_END_STREAM);
+  }
+
+  this->thread_running = 0;
+  pthread_mutex_unlock(&this->mutex);
+  return NULL;
+}
+
+static int demux_snd_open(demux_plugin_t *this_gen,
+                          input_plugin_t *input, int stage) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+  unsigned char header[SND_HEADER_SIZE];
+
+  this->input = input;
+
+  switch(stage) {
+  case STAGE_BY_CONTENT: {
+    if ((input->get_capabilities(input) & INPUT_CAP_SEEKABLE) == 0)
+      return DEMUX_CANNOT_HANDLE;
+
+    input->seek(input, 0, SEEK_SET);
+    if (input->read(input, header, SND_HEADER_SIZE) != SND_HEADER_SIZE)
+      return DEMUX_CANNOT_HANDLE;
+
+    /* check the signature */
+    if (BE_32(&header[0]) == snd_TAG)
+      return DEMUX_CAN_HANDLE;
+
+    return DEMUX_CANNOT_HANDLE;
+  }
+  break;
+
+  case STAGE_BY_EXTENSION: {
+    char *suffix;
+    char *MRL;
+    char *m, *valid_ends;
+
+    MRL = input->get_mrl (input);
+
+    suffix = strrchr(MRL, '.');
+
+    if(!suffix)
+      return DEMUX_CANNOT_HANDLE;
+
+    xine_strdupa(valid_ends, (this->config->register_string(this->config,
+                                                            "mrl.ends_snd", VALID_ENDS,
+                                                            _("valid mrls ending for snd demuxer"),
+                                                            NULL, NULL, NULL)));    while((m = xine_strsep(&valid_ends, ",")) != NULL) {
+
+      while(*m == ' ' || *m == '\t') m++;
+
+      if(!strcasecmp((suffix + 1), m)) {
+        this->input = input;
+        return DEMUX_CAN_HANDLE;
+      }
+    }
+    return DEMUX_CANNOT_HANDLE;
+  }
+  break;
+
+  default:
+    return DEMUX_CANNOT_HANDLE;
+    break;
+  }
+
+  return DEMUX_CANNOT_HANDLE;
+}
+
+static int demux_snd_start (demux_plugin_t *this_gen,
+                            fifo_buffer_t *video_fifo,
+                            fifo_buffer_t *audio_fifo,
+                            off_t start_pos, int start_time) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+  buf_element_t *buf;
+  int err;
+  unsigned char header[SND_HEADER_SIZE];
+  unsigned int encoding;
+
+  /* if thread is not running, initialize demuxer */
+  if (!this->thread_running) {
+    this->video_fifo = video_fifo;
+    this->audio_fifo = audio_fifo;
+
+    this->input->seek(this->input, 0, SEEK_SET);
+    if (this->input->read(this->input, header, SND_HEADER_SIZE) !=
+      SND_HEADER_SIZE) {
+      this->status = DEMUX_FINISHED;
+      pthread_mutex_lock(&this->mutex);
+      return DEMUX_FINISHED;
+    }
+
+    this->data_start = BE_32(&header[0x04]);
+    this->data_size = BE_32(&header[0x08]);
+    encoding = BE_32(&header[0x0C]);
+    this->audio_sample_rate = BE_32(&header[0x10]);
+    this->audio_channels = BE_32(&header[0x14]);
+    this->data_end = this->data_start + this->data_size;
+
+    /* basic sanity checks on the loaded audio parameters */
+    if ((!this->audio_sample_rate) ||
+        (!this->audio_channels)) {
+      xine_log(this->xine, XINE_LOG_FORMAT,
+        _("demux_snd: bad header parameters\n"));
+      this->status = DEMUX_FINISHED;
+      pthread_mutex_lock(&this->mutex);
+      return DEMUX_FINISHED;
+    }
+
+    switch (encoding) {
+      case 3:
+        this->audio_type = BUF_AUDIO_LPCM_BE;
+        this->audio_bits = 16;
+        this->audio_frames = this->data_size / 
+          (this->audio_channels * this->audio_bits / 8);
+        this->audio_block_align = PCM_BLOCK_ALIGN;
+        break;
+
+      default:
+        xine_log(this->xine, XINE_LOG_FORMAT,
+          _("demux_snd: unsupported audio type: %d\n"), encoding);
+        this->status = DEMUX_FINISHED;
+        pthread_mutex_lock(&this->mutex);
+        return DEMUX_FINISHED;
+        break;
+    }
+
+    this->running_time = this->audio_frames / this->audio_sample_rate;
+    this->audio_bytes_per_second = this->audio_channels *
+      (this->audio_bits / 8) * this->audio_sample_rate;
+
+    /* print vital stats */
+    xine_log(this->xine, XINE_LOG_FORMAT,
+      _("demux_snd: %d Hz, %d channels, %d bits, %d frames\n"),
+      this->audio_sample_rate,
+      this->audio_channels,
+      this->audio_bits,
+      this->audio_frames);
+    xine_log(this->xine, XINE_LOG_FORMAT,
+      _("demux_snd: running time: %d min, %d sec\n"),
+      this->running_time / 60,
+      this->running_time % 60);
+
+    /* send start buffers */
+    xine_demux_control_start(this->xine);
+
+    /* send init info to decoders */
+    if (this->audio_fifo && this->audio_type) {
+      buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+      buf->type = this->audio_type;
+      buf->decoder_flags = BUF_FLAG_HEADER;
+      buf->decoder_info[0] = 0;
+      buf->decoder_info[1] = this->audio_sample_rate;
+      buf->decoder_info[2] = this->audio_bits;
+      buf->decoder_info[3] = this->audio_channels;
+      buf->size = 0;
+      this->audio_fifo->put (this->audio_fifo, buf);
+    }
+
+    this->status = DEMUX_OK;
+    this->send_end_buffers = 1;
+    this->thread_running = 1;
+
+    if ((err = pthread_create (&this->thread, NULL, demux_snd_loop, this)) != 0) {
+      printf ("demux_snd: can't create new thread (%s)\n", strerror(err));
+      abort();
+    }
+  }
+
+  pthread_mutex_unlock(&this->mutex);
+
+  return DEMUX_OK;
+}
+
+static int demux_snd_seek (demux_plugin_t *this_gen,
+                           off_t start_pos, int start_time) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+  int status;
+
+  off_t data_offset;
+
+  pthread_mutex_lock(&this->mutex);
+
+  /* check the boundary offsets */
+  if (start_pos < this->data_start)
+    this->input->seek(this->input, this->data_start, SEEK_SET);
+  else if (start_pos >= this->data_end) {
+    this->status = DEMUX_FINISHED;
+    status = this->status;
+    pthread_mutex_unlock(&this->mutex);
+    return status;
+  } else {
+    /* This function must seek along the block alignment. Determine how
+     * far into the data the requested offset lies, divide the diff
+     * by the block alignment integer-wise, and multiply that by the
+     * block alignment to get the new aligned offset. */
+    data_offset = start_pos - this->data_start;
+    data_offset /= this->audio_block_align;
+    data_offset *= this->audio_block_align;
+    data_offset += this->data_start;
+
+    this->input->seek(this->input, data_offset, SEEK_SET);
+  }
+
+  this->seek_flag = 1;
+  status = this->status = DEMUX_OK;
+  xine_demux_flush_engine (this->xine);
+  pthread_mutex_unlock(&this->mutex);
+
+  return status;
+}
+
+static void demux_snd_stop (demux_plugin_t *this_gen) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+  void *p;
+
+  pthread_mutex_lock( &this->mutex );
+
+  if (!this->thread_running) {
+    pthread_mutex_unlock( &this->mutex );
+    return;
+  }
+
+  /* seek back to the beginning of the data in preparation for another
+   * start */
+  this->input->seek(this->input, this->data_start, SEEK_SET);
+
+  this->send_end_buffers = 0;
+  this->status = DEMUX_FINISHED;
+
+  pthread_mutex_unlock( &this->mutex );
+  pthread_join (this->thread, &p);
+
+  xine_demux_flush_engine(this->xine);
+
+  xine_demux_control_end(this->xine, BUF_FLAG_END_USER);
+}
+
+static void demux_snd_close (demux_plugin_t *this_gen) {
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+
+  pthread_mutex_destroy (&this->mutex);
+  free(this);
+}
+
+static int demux_snd_get_status (demux_plugin_t *this_gen) {
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+
+  return this->status;
+}
+
+static char *demux_snd_get_id(void) {
+  return "SND/AU";
+}
+
+static char *demux_snd_get_mimetypes(void) {
+  return NULL;
+}
+
+/* return the approximate length in seconds */
+static int demux_snd_get_stream_length (demux_plugin_t *this_gen) {
+
+  demux_snd_t *this = (demux_snd_t *) this_gen;
+
+  return this->running_time;
+}
+
+demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+
+  demux_snd_t *this;
+
+  if (iface != 10) {
+    printf (_("demux_snd: plugin doesn't support plugin API version %d.\n"
+              "           this means there's a version mismatch between xine and this "
+              "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
+            iface);
+    return NULL;
+  }
+
+  this         = xine_xmalloc (sizeof (demux_snd_t));
+  this->config = xine->config;
+  this->xine   = xine;
+
+  (void*) this->config->register_string(this->config,
+                                        "mrl.ends_snd", VALID_ENDS,
+                                        _("valid mrls ending for snd demuxer"),                                        NULL, NULL, NULL);
+
+  this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
+  this->demux_plugin.open              = demux_snd_open;
+  this->demux_plugin.start             = demux_snd_start;
+  this->demux_plugin.seek              = demux_snd_seek;
+  this->demux_plugin.stop              = demux_snd_stop;
+  this->demux_plugin.close             = demux_snd_close;
+  this->demux_plugin.get_status        = demux_snd_get_status;
+  this->demux_plugin.get_identifier    = demux_snd_get_id;
+  this->demux_plugin.get_stream_length = demux_snd_get_stream_length;
+  this->demux_plugin.get_mimetypes     = demux_snd_get_mimetypes;
+
+  this->status = DEMUX_FINISHED;
+  pthread_mutex_init( &this->mutex, NULL );
+
+  return (demux_plugin_t *) this;
+}