Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the same 'xiph' plugin.

As the three decoders requires Ogg support, and requires an Ogg demuxer to play, enabling any one of them will then enable the ogg demuxer.

The Ogg demuxer, on its own, needs to know which of the three formats are enabled, or it will not be able to properly decode them.

With this change, only one plugin will need to load and know about Xiph formats and libraries.

--HG--
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

1 files changed, 0 insertions, 419 deletions

diff --git a/src/libxineadec/xine_speex_decoder.c b/src/libxineadec/xine_speex_decoder.c
deleted file mode 100644
index 034e726a6..000000000
--- a/src/libxineadec/xine_speex_decoder.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/* 
- * Copyright (C) 2000-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
- *
- * $Id: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $
- *
- * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#define LOG_MODULE "speex_decoder"
-#define LOG_VERBOSE
-/*
-#define LOG
-*/
-#define LOG_BUFFERS 0
-
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-
-#include <ogg/ogg.h>
-
-#include <speex/speex.h>
-#include <speex/speex_header.h>
-#include <speex/speex_callbacks.h>
-#include <speex/speex_stereo.h>
-
-#define MAX_FRAME_SIZE 2000
-
-typedef struct {
-  audio_decoder_class_t   decoder_class;
-} speex_class_t;
-
-typedef struct speex_decoder_s {
-  audio_decoder_t   audio_decoder;
-
-  int64_t           pts;
-
-  int               output_sampling_rate;
-  int               output_open;
-  int               output_mode;
-
-  /* speex stuff */
-  void             *st;
-  int               frame_size;
-  int               rate;
-  int               nframes;
-  int               channels;
-  SpeexBits         bits;
-  SpeexStereoState  stereo;
-  int               expect_metadata;
-
-  int               header_count;
-
-  xine_stream_t    *stream;
-
-} speex_decoder_t;
-
-
-static void speex_reset (audio_decoder_t *this_gen) {
-
-  speex_decoder_t *this = (speex_decoder_t *) this_gen;
-
-  speex_bits_init (&this->bits);
-}
-
-static void speex_discontinuity (audio_decoder_t *this_gen) {
-
-  speex_decoder_t *this = (speex_decoder_t *) this_gen;
-
-  this->pts=0;
-}
-
-/* Known speex comment keys from ogg123 sources*/
-static struct {
-  char *key;         /* includes the '=' for programming convenience */
-  int   xine_metainfo_index;
-} speex_comment_keys[] = {
-  {"ARTIST=", XINE_META_INFO_ARTIST},
-  {"ALBUM=", XINE_META_INFO_ALBUM},
-  {"TITLE=", XINE_META_INFO_TITLE},
-  {"GENRE=", XINE_META_INFO_GENRE},
-  {"DESCRIPTION=", XINE_META_INFO_COMMENT},
-  {"DATE=", XINE_META_INFO_YEAR},
-  {NULL, 0}
-};
-
-#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
-                           ((buf[base+2]<<16)&0xff0000)| \
-                           ((buf[base+1]<<8)&0xff00)| \
-                            (buf[base]&0xff))
-
-static
-void read_metadata (speex_decoder_t *this, char * comments, int length)
-{
-  char * c = comments;
-  int len, i, nb_fields;
-  char * end;
-
-  _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "speex");
-
-  if (length < 8) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
-    return;
-  }
-
-  end = c+length;
-  len = readint (c, 0);
-  c += 4;
-
-  if (c+len > end) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
-    return;
-  }
-
-#ifdef LOG
-  /* Encoder */
-  printf ("libspeex: ");
-  fwrite (c, 1, len, stdout);
-  printf ("\n");
-#endif
-
-  c += len;
-
-  if (c+4 > end) {
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
-    return;
-  }
-
-  nb_fields = readint (c, 0);
-  c += 4;
-
-  for (i = 0; i < nb_fields; i++) {
-    if (c+4 > end) {
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
-      return;
-    }
-
-    len = readint (c, 0);
-    c += 4;
-    if (c+len > end) {
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
-      return;
-    }
-
-#ifdef LOG
-    printf ("libspeex: ");
-    fwrite (c, 1, len, stdout);
-    printf ("\n");
-#endif
-
-    for (i = 0; speex_comment_keys[i].key != NULL; i++) {
-
-      if ( !strncasecmp (speex_comment_keys[i].key, c,
-			 strlen(speex_comment_keys[i].key)) ) {
-	int keylen = strlen(speex_comment_keys[i].key);
-	char meta_info[(len - keylen) + 1];
-	
-	lprintf ("known metadata %d %d\n",
-		 i, speex_comment_keys[i].xine_metainfo_index);
-	
-	snprintf(meta_info, (len - keylen), "%s", c + keylen);
-	_x_meta_info_set_utf8(this->stream, speex_comment_keys[i].xine_metainfo_index, meta_info);
-      }
-    }
-
-    c += len;
-  }
-}
-
-static void speex_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
-
-  speex_decoder_t *this = (speex_decoder_t *) this_gen;
-
-  llprintf (LOG_BUFFERS, "decode buf=%8p content=%8p flags=%08x\n",
-	    buf, buf->content, buf->decoder_flags);
-
-  if ( (buf->decoder_flags & BUF_FLAG_HEADER) &&
-       !(buf->decoder_flags & BUF_FLAG_STDHEADER) ) {
-    lprintf ("preview buffer, %d headers to go\n", this->header_count);
-
-    if (this->header_count) {
-
-      if (!this->st) {
-	SpeexMode * spx_mode;
-	SpeexHeader * spx_header;
-	int modeID;
-	int bitrate;
-
-	speex_bits_init (&this->bits);
-
-	spx_header = speex_packet_to_header (buf->content, buf->size);
-
-	if (!spx_header) {
-	  xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: could not read Speex header\n");
-	  return;
-	}
-
-	modeID = spx_header->mode;
-	spx_mode = (SpeexMode *) speex_mode_list[modeID];
-
-	if (spx_mode->bitstream_version != spx_header->mode_bitstream_version) {
-	  xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: incompatible Speex mode bitstream version\n");
-	  return;
-	}
-
-	this->st = speex_decoder_init (spx_mode);
-	if (!this->st) {
-	  xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: decoder initialization failed\n");
-	  return;
-	}
-
-	this->rate = spx_header->rate;
-	speex_decoder_ctl (this->st, SPEEX_SET_SAMPLING_RATE, &this->rate);
-	_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE,
-	  this->rate);
-
-	this->channels = spx_header->nb_channels;
-	if (this->channels == 2) {
-	  SpeexCallback callback;
-	
-	  callback.callback_id = SPEEX_INBAND_STEREO;
-	  callback.func = speex_std_stereo_request_handler;
-	  callback.data = &this->stereo;
-	  speex_decoder_ctl (this->st, SPEEX_SET_HANDLER, &callback);
-	}
-
-	this->nframes = spx_header->frames_per_packet;
-	if (!this->nframes) this->nframes = 1;
-      
-	speex_decoder_ctl (this->st, SPEEX_GET_FRAME_SIZE, &this->frame_size);
-
-	speex_decoder_ctl (this->st, SPEEX_GET_BITRATE, &bitrate);
-	if (bitrate <= 1) bitrate = 16000; /* assume 16 kbit */
-	_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, bitrate);
-
-	this->header_count += spx_header->extra_headers;
-	this->expect_metadata = 1;
-
-	free (spx_header);
-      } else if (this->expect_metadata) {
-	read_metadata (this, buf->content, buf->size);
-      }
-
-      this->header_count--;
-
-      if (!this->header_count) {
-        int mode = _x_ao_channels2mode(this->channels);
-	
-	if (!this->output_open) {
-	  this->output_open =
-	    this->stream->audio_out->open(this->stream->audio_out, 
-					  this->stream,
-					  16,
-					  this->rate,
-					  mode);
-            lprintf ("this->output_open after attempt is %d\n", this->output_open);
-	}
-      }
-    }
-    
-  } else if (this->output_open) {
-    int i, j;
-
-    audio_buffer_t *audio_buffer;
-
-    audio_buffer =
-      this->stream->audio_out->get_buffer (this->stream->audio_out);
-
-    speex_bits_read_from (&this->bits, buf->content, buf->size);
-
-    for (j = 0; j < this->nframes; j++) {
-      int ret;
-      int bitrate;
-
-      ret = speex_decode_int (this->st, &this->bits, audio_buffer->mem);
-
-      if (ret==-1)
-	break;
-      if (ret==-2) {
-	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: Decoding error, corrupted stream?\n");
-	break;
-      }
-      if (speex_bits_remaining(&this->bits)<0) {
-	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: Decoding overflow, corrupted stream?\n");
-	break;
-      }
-
-      if (this->channels == 2) {
-	speex_decode_stereo_int (audio_buffer->mem, this->frame_size, &this->stereo);
-      }
-
-      speex_decoder_ctl (this->st, SPEEX_GET_BITRATE, &bitrate);
-      if (bitrate <= 1) bitrate = 16000; /* assume 16 kbit */
-      _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, bitrate);
-
-      audio_buffer->vpts       = this->pts;
-      this->pts=0;
-      audio_buffer->num_frames = this->frame_size;
-	
-      this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-	
-      buf->pts=0;
-
-    }
-  }
-  else {
-    llprintf (LOG_BUFFERS, "output not open\n");
-  }
-}
-
-static void speex_dispose (audio_decoder_t *this_gen) {
-
-  speex_decoder_t *this = (speex_decoder_t *) this_gen; 
-  
-  if (this->st) {
-    speex_decoder_destroy (this->st);
-  }
-  speex_bits_destroy (&this->bits);
-
-  if (this->output_open) 
-    this->stream->audio_out->close (this->stream->audio_out, this->stream);
-
-  free (this_gen);
-}
-
-static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, 
-				     xine_stream_t *stream) {
-
-  speex_decoder_t *this ;
-  static SpeexStereoState init_stereo = SPEEX_STEREO_STATE_INIT;
-
-  this = (speex_decoder_t *) xine_xmalloc (sizeof (speex_decoder_t));
-
-  this->audio_decoder.decode_data         = speex_decode_data;
-  this->audio_decoder.reset               = speex_reset;
-  this->audio_decoder.discontinuity       = speex_discontinuity;
-  this->audio_decoder.dispose             = speex_dispose;
-  this->stream                            = stream;
-
-  this->output_open     = 0;
-  this->header_count    = 1;
-  this->expect_metadata = 0;
-
-  this->st = NULL;
-
-  this->channels = 1;
-
-  memcpy (&this->stereo, &init_stereo, sizeof (SpeexStereoState));
-
-  return (audio_decoder_t *) this;
-}
-
-/*
- * speex plugin class
- */
-
-static char *get_identifier (audio_decoder_class_t *this) {
-  return "speex";
-}
-
-static char *get_description (audio_decoder_class_t *this) {
-  return "Speex audio decoder plugin";
-}
-
-static void dispose_class (audio_decoder_class_t *this) {
-  free (this);
-}
-
-static void *init_plugin (xine_t *xine, void *data) {
-
-  speex_class_t *this;
-  
-  this = (speex_class_t *) xine_xmalloc (sizeof (speex_class_t));
-
-  this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
-  this->decoder_class.dispose         = dispose_class;
-
-  return this;
-}
-
-static uint32_t audio_types[] = { 
-  BUF_AUDIO_SPEEX, 0
- };
-
-static const decoder_info_t dec_info_audio = {
-  audio_types,         /* supported types */
-  5                    /* priority        */
-};
-
-const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_AUDIO_DECODER, 15, "speex", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};