- rework semantics of some buffer flags. check buffer.h for details.

- increase demux and decoder apis
- fix runtime changing of ogg/ogm audio channels
note: i hope i haven't broken any demux->decoder data exchange. please report any problems.

CVS patchset: 6014
CVS date: 2004/01/09 01:26:32

14 files changed, 28 insertions, 28 deletions

diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c
index e625a0745..16b2e6957 100644
--- a/src/libxinevdec/cinepak.c
+++ b/src/libxinevdec/cinepak.c
@@ -22,7 +22,7 @@
  * based on overview of Cinepak algorithm and example decoder
  * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/
  *
- * $Id: cinepak.c,v 1.35 2003/12/14 22:13:25 siggi Exp $
+ * $Id: cinepak.c,v 1.36 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdlib.h>
@@ -388,7 +388,7 @@ static void cvid_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     xine_bmiheader *bih;
     int		    chroma_size;
 
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index 1711dde0f..e1657dfe1 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.c
@@ -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: cyuv.c,v 1.23 2003/12/14 22:13:25 siggi Exp $
+ * $Id: cyuv.c,v 1.24 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -148,7 +148,7 @@ static void cyuv_decode_data (video_decoder_t *this_gen,
   if (buf->decoder_flags & (BUF_FLAG_PREVIEW | BUF_FLAG_SPECIAL))
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 526bfb60b..40916d8d7 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -23,7 +23,7 @@
  * value from the last frame. This creates a slowly rotating solid color
  * frame when the frames are played in succession.
  *
- * $Id: foovideo.c,v 1.19 2003/12/14 22:13:25 siggi Exp $
+ * $Id: foovideo.c,v 1.20 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -92,7 +92,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen,
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index c3db3f090..21436886b 100644
--- a/src/libxinevdec/idcinvideo.c
+++ b/src/libxinevdec/idcinvideo.c
@@ -21,7 +21,7 @@
  * the Id CIN format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  * 
- * $Id: idcinvideo.c,v 1.20 2003/12/14 22:13:25 siggi Exp $
+ * $Id: idcinvideo.c,v 1.21 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -234,7 +234,7 @@ static void idcinvideo_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     xine_bmiheader *bih = (xine_bmiheader *)buf->content;
 
     this->stream->video_out->open (this->stream->video_out, this->stream);
diff --git a/src/libxinevdec/interplayvideo.c b/src/libxinevdec/interplayvideo.c
index d7b171ccc..3b955ae3a 100644
--- a/src/libxinevdec/interplayvideo.c
+++ b/src/libxinevdec/interplayvideo.c
@@ -21,7 +21,7 @@
  * For more information regarding the Interplay MVE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: interplayvideo.c,v 1.9 2003/12/14 22:13:25 siggi Exp $
+ * $Id: interplayvideo.c,v 1.10 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -1151,7 +1151,7 @@ static void interplay_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index b314a1303..24c6234c7 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
  * For more information on the MS RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: msrle.c,v 1.23 2003/12/14 22:13:25 siggi Exp $
+ * $Id: msrle.c,v 1.24 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -207,7 +207,7 @@ static void msrle_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index 2f92180d0..235028057 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.27 2003/12/14 22:13:25 siggi Exp $
+ * $Id: msvc.c,v 1.28 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdlib.h>
@@ -223,7 +223,7 @@ static void msvc_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
         &this->color_table[i]);
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     xine_bmiheader *bih;
     int		    image_size;
 
diff --git a/src/libxinevdec/qtrle.c b/src/libxinevdec/qtrle.c
index b994c3729..69f3f0a9c 100644
--- a/src/libxinevdec/qtrle.c
+++ b/src/libxinevdec/qtrle.c
@@ -21,7 +21,7 @@
  * For more information on the QT RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtrle.c,v 1.17 2003/12/14 22:13:25 siggi Exp $
+ * $Id: qtrle.c,v 1.18 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -837,7 +837,7 @@ static void qtrle_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index f13986917..50d45f80b 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
  * For more information about the RPZA format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: qtrpza.c,v 1.21 2003/12/14 22:13:25 siggi Exp $
+ * $Id: qtrpza.c,v 1.22 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -299,7 +299,7 @@ static void qtrpza_decode_data (video_decoder_t *this_gen,
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index 6ac2256d9..45b5ff229 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
  * For more information on the SMC format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtsmc.c,v 1.21 2003/12/14 22:13:25 siggi Exp $
+ * $Id: qtsmc.c,v 1.22 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -531,7 +531,7 @@ static void qtsmc_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 6161fc1f4..156fe452c 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just converts a raw RGB image to a YUY2 map
  * suitable for display under xine.
  * 
- * $Id: rgb.c,v 1.23 2003/12/14 22:13:25 siggi Exp $
+ * $Id: rgb.c,v 1.24 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -99,7 +99,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
     }
   }
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)
diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c
index cc6e81dd1..a90f75871 100644
--- a/src/libxinevdec/roqvideo.c
+++ b/src/libxinevdec/roqvideo.c
@@ -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: roqvideo.c,v 1.25 2003/12/14 22:13:25 siggi Exp $
+ * $Id: roqvideo.c,v 1.26 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 /* And this is the header that came with the RoQ video decoder: */
@@ -390,7 +390,7 @@ static void roqvideo_decode_data (video_decoder_t *this_gen,
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     xine_bmiheader *bih = (xine_bmiheader *)buf->content;
 
     this->stream->video_out->open (this->stream->video_out, this->stream);
diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c
index 206ec8607..c30b04935 100644
--- a/src/libxinevdec/svq1.c
+++ b/src/libxinevdec/svq1.c
@@ -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: svq1.c,v 1.29 2003/12/14 22:13:25 siggi Exp $
+ * $Id: svq1.c,v 1.30 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -1327,7 +1327,7 @@ static void svq1dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     this->video_step = buf->decoder_info[1];
 
     if (this->buf)
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index aba87bdcf..2885b0cc7 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
  * 
- * $Id: yuv.c,v 1.27 2004/01/07 22:28:34 jstembridge Exp $
+ * $Id: yuv.c,v 1.28 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -86,7 +86,7 @@ static void yuv_decode_data (video_decoder_t *this_gen,
   if (buf->decoder_flags & BUF_FLAG_PREVIEW)
     return;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) { /* need to initialize */
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
     this->stream->video_out->open (this->stream->video_out, this->stream);
 
     if(this->buf)