Merge from 1.1.

--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

8 files changed, 166 insertions, 123 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ea6c2484..924a184fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,10 @@ xine-lib (1.1.90) (Unreleased)
     active and thus it's no more usable. If you were using SyncFB somehow,
     please use DirectFB or VIDIX instead.
 
+xine-lib (1.1.10) (unreleased)
+  * Update Ogg and Annodex mimetypes and extensions.
+  * Change the default v4l device paths to /dev/video0 and /dev/radio0.
+
 xine-lib (1.1.9.1)
   * Security fixes:
     - Fix a buffer overflow in RTSP header-handling code. (CVE-2008-0225)
diff --git a/debian/changelog b/debian/changelog
index 63a658013..2460b1267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,16 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
 
  -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Tue, 17 Apr 2007 16:50:37 +0100
 
-xine-lib (1.1.9~hg-0) unstable; urgency=low
+xine-lib (1.1.10~hg-0) unstable; urgency=low
+
+  [ Darren Salt ]
+  * Hg snapshot.
 
   [ Reinhard Tartler ]
   * remove gs from build-dependencies
   * change the maintainer field to xine-devel@lists.sourceforge.net.
 
- -- Reinhard Tartler <siretart@tauware.de>  Sun, 25 Nov 2007 23:45:52 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Mon, 14 Jan 2008 22:57:42 +0000
 
 xine-lib (1.1.5~cvs-0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a0c994cde..28030e0bf 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3),
 	libxcb-shape0-dev | libxv-dev (<< 1:1.0.3),
 	libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, 
-	libdirectfb-dev (>= 0.9.22),
 	libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 	libaa1-dev, libcaca-dev, libmodplug-dev,
 	libmagick9-dev, libpng12-dev, libfreetype6-dev, 
@@ -19,7 +18,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libesd0-dev, libgnomevfs2-dev,
 	zlib1g-dev, libartsc0-dev,
 	liblircclient-dev, libjack0.100.0-dev | libjack-dev,
-	libdirectfb-dev, libgtk2.0-dev,
+	libdirectfb-dev (>= 0.9.22), libgtk2.0-dev,
 	libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev,
 	libsmbclient-dev, libspeex-dev, libmng-dev, 
 	libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), libvcdinfo-dev,
diff --git a/doc/faq/faq.docbook b/doc/faq/faq.docbook
index 57da1c5bd..8d09441e1 100644
--- a/doc/faq/faq.docbook
+++ b/doc/faq/faq.docbook
@@ -8,7 +8,7 @@
   <title>The xine engine FAQ</title>
   <titleabbrev>xine FAQ</titleabbrev>
   <copyright>
-   <year>2001-2007</year>
+   <year>2001-2008</year>
    <holder>the xine project team</holder>
   </copyright>
  </bookinfo>
@@ -948,7 +948,7 @@
      Latest xine-lib modules (1-beta3 or newer) support external subtitles
      for any media file, not only AVI. In order to use it you can pass a
      special MRL construction like:
-     <screen>&nbsp;&nbsp;&nbsp;<command>xine test.mpg#subtitle:file.sub</command></screen>
+     <screen>&nbsp;&nbsp;&nbsp;<command>xine file://path/to/test.mpg#subtitle:/path/to/file.sub</command></screen>
      The external subtitles support can also be used by any xine frontend.
      Currently xine-ui and kaffeine implement this feature with a subtitle
      selection dialog.
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index 6d651f153..ad3a07188 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -41,6 +41,7 @@
 #include <vorbis/codec.h>
 
 #define MAX_NUM_SAMPLES 4096
+#define INIT_BUFSIZE    8192
 
 typedef struct {
   audio_decoder_class_t   decoder_class;
@@ -70,6 +71,11 @@ typedef struct vorbis_decoder_s {
 
   xine_stream_t    *stream;
 
+  /* data accumulation stuff */
+  unsigned char    *buf;
+  int               bufsize;
+  int               size;
+
 } vorbis_decoder_t;
 
 
@@ -78,6 +84,7 @@ static void vorbis_reset (audio_decoder_t *this_gen) {
   vorbis_decoder_t *this = (vorbis_decoder_t *) this_gen;
 
   if( this->header_count ) return;
+  this->size = 0;
 
   /* clear block first, as it might contain allocated data */
   vorbis_block_clear(&this->vb);
@@ -136,126 +143,147 @@ static void get_metadata (vorbis_decoder_t *this) {
   _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "vorbis");
 }
 
+static void vorbis_check_bufsize (vorbis_decoder_t *this, int size) {
+  if (size > this->bufsize) {
+    this->bufsize = size + size / 2;
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+	    _("vorbis: increasing buffer to %d to avoid overflow.\n"), 
+	    this->bufsize);
+    this->buf = realloc(this->buf, this->bufsize);
+  }
+}
+
 static void vorbis_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   vorbis_decoder_t *this = (vorbis_decoder_t *) this_gen;
 
   memset( &this->op, 0, sizeof(this->op) );
-  this->op.packet = buf->content;
-  this->op.bytes = buf->size;
-
-  if ( (buf->decoder_flags & BUF_FLAG_HEADER) &&
-       !(buf->decoder_flags & BUF_FLAG_STDHEADER) ) {
-    lprintf ("%d headers to go\n", this->header_count);
 
-    if (this->header_count) {
-      int res = 0;
+  /* data accumulation */
+  vorbis_check_bufsize(this, this->size + buf->size);
+  xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
+  this->size += buf->size;
 
-      if (this->header_count == 3)
-        this->op.b_o_s = 1;
+  if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
+    this->op.packet = this->buf;
+    this->op.bytes = this->size;
 
-      
-      if( (res = vorbis_synthesis_headerin(&this->vi,&this->vc,&this->op)) < 0 ){ 
-	/* error case; not a vorbis header */
-	xine_log(this->stream->xine, XINE_LOG_MSG, "libvorbis: this bitstream does not contain vorbis audio data. Following first 64 bytes (return: %d).\n", res);
-	xine_hexdump((char *)this->op.packet, this->op.bytes < 64 ? this->op.bytes : 64);
-	return;
-      }
-
-      this->header_count--;
-
-      if (!this->header_count) {
-      
-	int mode = AO_CAP_MODE_MONO;
-	
-	get_metadata (this);
-
-	mode = _x_ao_channels2mode(this->vi.channels);
-	
-	this->convsize=MAX_NUM_SAMPLES/this->vi.channels;
-
-	if (!this->output_open) {
-	  this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, 
-						    this->stream,
-						    16,
-						    this->vi.rate,
-						    mode) ;
-
-	  _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, 
-	    this->vi.bitrate_nominal);
-
-	}
-
-	/* OK, got and parsed all three headers. Initialize the Vorbis
-	 * packet->PCM decoder. */
-	lprintf("all three headers parsed. initializing decoder.\n");
-	/* initialize central decode state */ 
-	vorbis_synthesis_init(&this->vd,&this->vi); 
-	/* initialize local state for most of the decode so multiple
-	 * block decodes can proceed in parallel. We could init 
-	 * multiple vorbis_block structures for vd here */
-	vorbis_block_init(&this->vd,&this->vb);      
+    /* reset accumultaion buffer */
+    this->size = 0;
+  
+    if ( (buf->decoder_flags & BUF_FLAG_HEADER) &&
+        !(buf->decoder_flags & BUF_FLAG_STDHEADER) ) {
+  
+      lprintf ("%d headers to go\n", this->header_count);
+  
+      if (this->header_count) {
+        int res = 0;
+  
+        if (this->header_count == 3)
+          this->op.b_o_s = 1;
+  
+        if ( (res = vorbis_synthesis_headerin(&this->vi,&this->vc,&this->op)) < 0 ) {
+          /* error case; not a vorbis header */
+          xine_log(this->stream->xine, XINE_LOG_MSG, "libvorbis: this bitstream does not contain vorbis audio data. Following first 64 bytes (return: %d).\n", res);
+          xine_hexdump((char *)this->op.packet, this->op.bytes < 64 ? this->op.bytes : 64);
+          return;
+        }
+  
+        this->header_count--;
+  
+        if (!this->header_count) {
+        
+          int mode = AO_CAP_MODE_MONO;
+          
+          get_metadata (this);
+  
+          mode = _x_ao_channels2mode(this->vi.channels);
+          
+          this->convsize=MAX_NUM_SAMPLES/this->vi.channels;
+          
+          if (!this->output_open) {
+            this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, 
+                                                      this->stream,
+                                                      16,
+                                                      this->vi.rate,
+                                                      mode) ;
+          
+            _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, 
+              this->vi.bitrate_nominal);
+          
+          }
+  
+          /* OK, got and parsed all three headers. Initialize the Vorbis
+                  * packet->PCM decoder. */
+          lprintf("all three headers parsed. initializing decoder.\n");
+          /* initialize central decode state */ 
+          vorbis_synthesis_init(&this->vd,&this->vi); 
+          /* initialize local state for most of the decode so multiple
+            * block decodes can proceed in parallel. We could init 
+            * multiple vorbis_block structures for vd here */
+          vorbis_block_init(&this->vd,&this->vb);      
+        }
       }
-    }
- 
-  } else if (this->output_open) {
-
-    float **pcm;
-    int samples;
-
-    if(vorbis_synthesis(&this->vb,&this->op)==0) 
-      vorbis_synthesis_blockin(&this->vd,&this->vb);
-
-    if (buf->pts!=0)
-      this->pts=buf->pts;
-
-    while ((samples=vorbis_synthesis_pcmout(&this->vd,&pcm))>0){
-
-      /* **pcm is a multichannel float vector. In stereo, for
-       * example, pcm[0][...] is left, and pcm[1][...] is right.
-       * samples is the size of each channel. Convert the float
-       * values (-1.<=range<=1.) to whatever PCM format and write
-       * it out
-       */
-
-      int i,j;
-      int bout=(samples<this->convsize?samples:this->convsize);
-      audio_buffer_t *audio_buffer;
-
-      audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
-      
-      /* convert floats to 16 bit signed ints (host order) and
-	 interleave */
-      for(i=0;i<this->vi.channels;i++){
-	ogg_int16_t *ptr=audio_buffer->mem+i;
-	float  *mono=pcm[i];
-	for(j=0;j<bout;j++){
-	  int val=(mono[j] + 1.0f) * 32768.f;
-          val -= 32768;
-	  /* might as well guard against clipping */
-	  if(val>32767){
-	    val=32767;
-	  } else if(val<-32768){
-	    val=-32768;
-	  }
-	  *ptr=val;
-	  ptr+=this->vi.channels;
-	}
+  
+    } else if (this->output_open) {
+  
+      float **pcm;
+      int samples;
+  
+      if(vorbis_synthesis(&this->vb,&this->op)==0) 
+        vorbis_synthesis_blockin(&this->vd,&this->vb);
+  
+      if (buf->pts!=0)
+        this->pts=buf->pts;
+  
+      while ((samples=vorbis_synthesis_pcmout(&this->vd,&pcm))>0){
+  
+        /* **pcm is a multichannel float vector. In stereo, for
+        * example, pcm[0][...] is left, and pcm[1][...] is right.
+        * samples is the size of each channel. Convert the float
+        * values (-1.<=range<=1.) to whatever PCM format and write
+        * it out
+        */
+  
+        int i,j;
+        int bout=(samples<this->convsize?samples:this->convsize);
+        audio_buffer_t *audio_buffer;
+  
+        audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
+        
+        /* convert floats to 16 bit signed ints (host order) and
+          interleave */
+        for(i=0;i<this->vi.channels;i++){
+          ogg_int16_t *ptr=audio_buffer->mem+i;
+          float  *mono=pcm[i];
+          for(j=0;j<bout;j++){
+            int val=(mono[j] + 1.0f) * 32768.f;
+            val -= 32768;
+            /* might as well guard against clipping */
+            if(val>32767){
+              val=32767;
+            } else if(val<-32768){
+              val=-32768;
+            }
+            *ptr=val;
+            ptr+=this->vi.channels;
+          }
+        }
+  
+        audio_buffer->vpts       = this->pts;
+        this->pts=0;
+        audio_buffer->num_frames = bout;
+  
+        this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
+  
+        buf->pts=0;
+  
+        /* tell libvorbis how many samples we actually consumed */
+        vorbis_synthesis_read(&this->vd,bout);
       }
-
-      audio_buffer->vpts       = this->pts;
-      this->pts=0;
-      audio_buffer->num_frames = bout;
-
-      this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
-
-      buf->pts=0;
-
-      /* tell libvorbis how many samples we actually consumed */
-      vorbis_synthesis_read(&this->vd,bout);
+    } else {
+      lprintf("output not open\n");
     }
-  } else {
-    lprintf("output not open\n");
   }
 }
 
@@ -299,6 +327,10 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
   this->header_count    = 3;
   this->convsize        = 0;
 
+  this->bufsize         = INIT_BUFSIZE;
+  this->buf             = xine_xmalloc(INIT_BUFSIZE);
+  this->size            = 0;
+
   vorbis_info_init(&this->vi);
   vorbis_comment_init(&this->vc);
 
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c
index 97537c337..75ad11c75 100644
--- a/src/demuxers/asfheader.c
+++ b/src/demuxers/asfheader.c
@@ -140,9 +140,9 @@ static uint8_t *asf_reader_get_bytes(asf_reader_t *reader, size_t size) {
 static char *asf_reader_get_string(asf_reader_t *reader, size_t size, iconv_t cd) {

   char *inbuf, *outbuf;

   size_t inbytesleft, outbytesleft;

-  char scratch[2048]; 

+  char scratch[2048];

 

-  if ((reader->size - reader->pos) < size)

+  if ((size == 0) ||((reader->size - reader->pos) < size))

     return NULL;

 

   inbuf = (char *)reader->buffer + reader->pos;

@@ -596,6 +596,12 @@ static int asf_header_parse_content_description(asf_header_t *header_pub, uint8_
   content->description = asf_reader_get_string(&reader, description_length, iconv_cd);

   content->rating = asf_reader_get_string(&reader, rating_length, iconv_cd);

 

+  lprintf("title: %d chars: \"%s\"\n", title_length, content->title);

+  lprintf("author: %d chars: \"%s\"\n", author_length, content->author);

+  lprintf("copyright: %d chars: \"%s\"\n", copyright_length, content->copyright);

+  lprintf("description: %d chars: \"%s\"\n", description_length, content->description);

+  lprintf("rating: %d chars: \"%s\"\n", rating_length, content->rating);

+

   header->pub.content = content;

 

   iconv_close(iconv_cd);

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 1a97e12bf..57624aa15 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -722,6 +722,9 @@ static void asf_send_buffer_nodefrag (demux_asf_t *this, asf_demux_stream_t *str
     buf->size       = bufsize;
     timestamp       = 0;
 
+    if (stream->frag_offset == 0)
+      buf->decoder_flags |= BUF_FLAG_FRAME_START;
+
     stream->frag_offset += bufsize;
     frag_len -= bufsize;
 
@@ -732,10 +735,6 @@ static void asf_send_buffer_nodefrag (demux_asf_t *this, asf_demux_stream_t *str
     else
       check_newpts (this, buf->pts, PTS_AUDIO, package_done);
 
-      
-    if (frag_offset == 0)
-      buf->decoder_flags |= BUF_FLAG_FRAME_START;
-      
     /* test if whole packet read */
     if (package_done) {
       buf->decoder_flags |= BUF_FLAG_FRAME_END;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 28e5b16ce..a8f387b3d 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -114,8 +114,8 @@ static const char *const tv_standard_names[] = { "PAL", "NTSC", "SECAM", NULL };
 static const int tv_standard_values[] = { VIDEO_MODE_PAL, VIDEO_MODE_NTSC, VIDEO_MODE_SECAM };
 
 #define NUM_RESOLUTIONS  (sizeof(resolutions)/sizeof(resolutions[0]))
-#define RADIO_DEV        "/dev/v4l/radio0"
-#define VIDEO_DEV        "/dev/v4l/video0"
+#define RADIO_DEV        "/dev/radio0"
+#define VIDEO_DEV        "/dev/video0"
 
 #if !defined(NDELAY) && defined(O_NDELAY)
 #define FNDELAY O_NDELAY