initial commit for raw AAC file demuxer

CVS patchset: 5923
CVS date: 2003/12/19 05:09:16

4 files changed, 254 insertions, 3 deletions

diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index ff73b32e7..b0966e4a2 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -116,7 +116,8 @@ xineplug_dmx_games_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
 				demux_cdda.c demux_mpgaudio.c demux_nsf.c \
 				demux_realaudio.c demux_snd.c demux_voc.c \
-				demux_vox.c demux_wav.c demux_ac3.c id3.c
+				demux_vox.c demux_wav.c demux_ac3.c id3.c \
+				demux_aac.c
 xineplug_dmx_audio_la_LIBADD = $(XINE_LIB)
 xineplug_dmx_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
new file mode 100644
index 000000000..8008a0d27
--- /dev/null
+++ b/src/demuxers/demux_aac.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2001-2003 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
+ *
+ * Raw AAC File Demuxer by Mike Melanson (melanson@pcisys.net)
+ * This demuxer presently only detects a raw AAC file by the extension 
+ * '.aac'. Then it shovels buffer-sized chunks over to the AAC decoder.
+ *
+ * $Id: demux_aac.c,v 1.1 2003/12/19 05:09:16 tmmm Exp $
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.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"
+#include "group_audio.h"
+
+typedef struct {
+  demux_plugin_t       demux_plugin;
+
+  xine_stream_t       *stream;
+  fifo_buffer_t       *video_fifo;
+  fifo_buffer_t       *audio_fifo;
+  input_plugin_t      *input;
+  int                  status;
+
+  off_t                data_start;
+  off_t                data_size;
+
+  int                  seek_flag;  /* this is set when a seek just occurred */
+} demux_aac_t;
+
+typedef struct {
+  demux_class_t     demux_class;
+} demux_aac_class_t;
+
+
+static int demux_aac_send_chunk(demux_plugin_t *this_gen) {
+  demux_aac_t *this = (demux_aac_t *) this_gen;
+  int bytes_read;
+
+  buf_element_t *buf = NULL;
+
+  /* just load an entire buffer from wherever the audio happens to be */
+  buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+  buf->type = BUF_AUDIO_AAC;
+  buf->extra_info->input_pos = this->input->get_current_pos(this->input);
+  buf->extra_info->input_length = this->input->get_length(this->input);
+  buf->pts = 0;
+
+  bytes_read = this->input->read(this->input, buf->content, buf->max_size);
+  if (bytes_read == 0) {
+    buf->free_buffer(buf);
+    this->status = DEMUX_FINISHED;
+    return this->status;
+  } else 
+    buf->size = bytes_read;
+
+  /* each buffer stands on its own */
+  buf->decoder_flags |= BUF_FLAG_FRAME_END;
+
+  this->audio_fifo->put (this->audio_fifo, buf);
+
+  return this->status;
+}
+
+static void demux_aac_send_headers(demux_plugin_t *this_gen) {
+  demux_aac_t *this = (demux_aac_t *) this_gen;
+  buf_element_t *buf;
+
+  this->video_fifo  = this->stream->video_fifo;
+  this->audio_fifo  = this->stream->audio_fifo;
+
+  this->status = DEMUX_OK;
+
+  /* send start buffers */
+  _x_demux_control_start(this->stream);
+
+  /* send init info to decoders */
+  if (this->audio_fifo) {
+    buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
+    buf->type = BUF_AUDIO_AAC;
+    buf->decoder_flags = BUF_FLAG_HEADER;
+    buf->decoder_info[0] = 0;
+    /* this is a guess at the correct parameters */
+    buf->decoder_info[1] = 44100;
+    buf->decoder_info[2] = 16;
+    buf->decoder_info[3] = 2;
+    buf->content = NULL;
+    buf->size = 0;
+    this->audio_fifo->put (this->audio_fifo, buf);
+  }
+}
+
+static int demux_aac_seek (demux_plugin_t *this_gen,
+                           off_t start_pos, int start_time, int playing) {
+  demux_aac_t *this = (demux_aac_t *) this_gen;
+
+  /* if thread is not running, initialize demuxer */
+  if( !playing ) {
+
+    /* send new pts */
+    _x_demux_control_newpts(this->stream, 0, 0);
+
+    this->status = DEMUX_OK;
+  }
+
+  return this->status;
+}
+
+static void demux_aac_dispose (demux_plugin_t *this_gen) {
+//  demux_aac_t *this = (demux_aac_t *) this_gen;
+
+}
+
+static int demux_aac_get_status (demux_plugin_t *this_gen) {
+  demux_aac_t *this = (demux_aac_t *) this_gen;
+
+  return this->status;
+}
+
+static int demux_aac_get_stream_length (demux_plugin_t *this_gen) {
+//  demux_aac_t *this = (demux_aac_t *) this_gen;
+
+  return 0;
+}
+
+static uint32_t demux_aac_get_capabilities(demux_plugin_t *this_gen) {
+  return DEMUX_CAP_NOCAP;
+}
+
+static int demux_aac_get_optional_data(demux_plugin_t *this_gen,
+                                       void *data, int data_type) {
+  return DEMUX_OPTIONAL_UNSUPPORTED;
+}
+
+static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream,
+                                    input_plugin_t *input) {
+
+  demux_aac_t    *this;
+
+  this         = xine_xmalloc (sizeof (demux_aac_t));
+  this->stream = stream;
+  this->input  = input;
+
+  this->demux_plugin.send_headers      = demux_aac_send_headers;
+  this->demux_plugin.send_chunk        = demux_aac_send_chunk;
+  this->demux_plugin.seek              = demux_aac_seek;
+  this->demux_plugin.dispose           = demux_aac_dispose;
+  this->demux_plugin.get_status        = demux_aac_get_status;
+  this->demux_plugin.get_stream_length = demux_aac_get_stream_length;
+  this->demux_plugin.get_capabilities  = demux_aac_get_capabilities;
+  this->demux_plugin.get_optional_data = demux_aac_get_optional_data;
+  this->demux_plugin.demux_class       = class_gen;
+
+  this->status = DEMUX_FINISHED;
+  switch (stream->content_detection_method) {
+
+  case METHOD_BY_EXTENSION:
+  case METHOD_EXPLICIT: {
+    char *extensions, *mrl;
+
+    mrl = input->get_mrl (input);
+    extensions = class_gen->get_extensions (class_gen);
+
+    if (!_x_demux_check_extension (mrl, extensions)) {
+      free (this);
+      return NULL;
+    }
+  }
+  break;
+
+  case METHOD_BY_CONTENT:
+    return NULL;
+  break;
+
+  default:
+    free (this);
+    return NULL;
+  }
+
+  return &this->demux_plugin;
+}
+
+static char *get_description (demux_class_t *this_gen) {
+  return "Raw AAC demux plugin";
+}
+
+static char *get_identifier (demux_class_t *this_gen) {
+  return "Raw AAC";
+}
+
+static char *get_extensions (demux_class_t *this_gen) {
+  return "aac";
+}
+
+static char *get_mimetypes (demux_class_t *this_gen) {
+  return NULL;
+}
+
+static void class_dispose (demux_class_t *this_gen) {
+  demux_aac_class_t *this = (demux_aac_class_t *) this_gen;
+
+  free (this);
+}
+
+void *demux_aac_init_plugin (xine_t *xine, void *data) {
+  demux_aac_class_t     *this;
+
+  this = xine_xmalloc (sizeof (demux_aac_class_t));
+
+  this->demux_class.open_plugin     = open_plugin;
+  this->demux_class.get_description = get_description;
+  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.get_mimetypes   = get_mimetypes;
+  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.dispose         = class_dispose;
+
+  return this;
+}
+
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index 68ecb124c..58f19b59e 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -19,7 +19,7 @@
  *
  * This file contains plugin entries for several demuxers used in games
  *
- * $Id: group_audio.c,v 1.9 2003/11/15 14:01:05 miguelfreitas Exp $
+ * $Id: group_audio.c,v 1.10 2003/12/19 05:09:16 tmmm Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +37,7 @@
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
+  { PLUGIN_DEMUX, 23, "aac", XINE_VERSION_CODE, NULL, demux_aac_init_plugin },
   { PLUGIN_DEMUX, 23, "ac3", XINE_VERSION_CODE, NULL, demux_ac3_init_plugin },
   { PLUGIN_DEMUX, 23, "aud", XINE_VERSION_CODE, NULL, demux_aud_init_plugin },
   { PLUGIN_DEMUX, 23, "aiff", XINE_VERSION_CODE, NULL, demux_aiff_init_plugin },
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
index 848559b3a..8c4dd01e9 100644
--- a/src/demuxers/group_audio.h
+++ b/src/demuxers/group_audio.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: group_audio.h,v 1.2 2003/10/06 15:46:20 mroi Exp $
+ * $Id: group_audio.h,v 1.3 2003/12/19 05:09:16 tmmm Exp $
  */
 
 #ifndef HAVE_GROUP_AUDIO_H
@@ -25,6 +25,7 @@
 
 #include "xine_internal.h"
 
+void *demux_aac_init_plugin (xine_t *xine, void *data);
 void *demux_ac3_init_plugin (xine_t *xine, void *data);
 void *demux_aud_init_plugin (xine_t *xine, void *data);
 void *demux_aiff_init_plugin (xine_t *xine, void *data);