Added the riff code into a seperate library in /libs dir. The plugin loader also checks the /libs path.

Original commit message from CVS:
Added the riff code into a seperate library in /libs dir. The plugin
loader also checks the /libs path.
The avi parser now uses the riff library.
WAV is broken.

9 files changed, 494 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index 0172ce2c3..32d3d7431 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
 Erik Walthinsen <omega@cse.ogi.edu>
+Wim Taymans <wim.taymans@tvd.be>
diff --git a/configure.in b/configure.in
index 44d220e5f..a847de595 100644
--- a/configure.in
+++ b/configure.in
@@ -294,11 +294,12 @@ gst/types/Makefile
 gst/meta/Makefile
 gst/elements/Makefile
 gst/xml/Makefile
+libs/Makefile
+libs/riff/Makefile
 plugins/Makefile
 plugins/au/Makefile
 plugins/wav/Makefile
-plugins/riff/Makefile
-plugins/riff/avi/Makefile
+plugins/avi/Makefile
 plugins/mp3decode/Makefile
 plugins/mp3decode/xa/Makefile
 plugins/mp3decode/xing/Makefile
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 12272b014..609d88104 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -55,6 +55,9 @@ void _gst_plugin_initialize() {
   /* the catch-all plugins directory */
   _gst_plugin_paths = g_list_prepend(_gst_plugin_paths,
                                      PLUGINS_SRCDIR "/plugins");
+  /* the libreary directory */
+  _gst_plugin_paths = g_list_prepend(_gst_plugin_paths,
+                                     PLUGINS_SRCDIR "/libs");
   /* location libgstelements.so */
   _gst_plugin_paths = g_list_prepend(_gst_plugin_paths,
                                      PLUGINS_SRCDIR "/gst/elements");
diff --git a/libs/Makefile.am b/libs/Makefile.am
new file mode 100644
index 000000000..419ca9cbf
--- /dev/null
+++ b/libs/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = riff
+
+DIST_SUBDIRS = riff
diff --git a/libs/riff/Makefile.am b/libs/riff/Makefile.am
new file mode 100644
index 000000000..70f3bef82
--- /dev/null
+++ b/libs/riff/Makefile.am
@@ -0,0 +1,12 @@
+filterdir = $(libdir)/gst
+
+filter_LTLIBRARIES = libgstriff.la
+
+libgstriff_la_SOURCES = gstriff.c
+
+noinst_HEADERS = gstriff.h
+
+CFLAGS += -O2 -Wall
+
+INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
+LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
diff --git a/libs/riff/gstriff.c b/libs/riff/gstriff.c
new file mode 100644
index 000000000..c09b6b999
--- /dev/null
+++ b/libs/riff/gstriff.c
@@ -0,0 +1,148 @@
+/* Gnome-Streamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#include <gstriff.h>
+
+
+GstRiff *gst_riff_new(GstRiffCallback function, gpointer data) {
+  GstRiff *riff;
+
+  riff = (GstRiff *)g_malloc(sizeof(GstRiff));
+  g_return_val_if_fail(riff != NULL, NULL);
+
+  riff->form = 0;
+  riff->chunks = NULL;
+  riff->state = 0;
+  riff->curoffset = 0;
+  riff->nextlikely = 0;
+	riff->new_tag_found = function;
+	riff->callback_data = data;
+
+  return riff;
+}
+
+gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) {
+  gulong last;
+  GstRiffChunk *chunk;
+
+  g_return_val_if_fail(riff != NULL, GST_RIFF_EINVAL);
+  g_return_val_if_fail(buf != NULL, GST_RIFF_EINVAL);
+  g_return_val_if_fail(GST_BUFFER_DATA(buf) != NULL, GST_RIFF_EINVAL);
+
+  last = off + GST_BUFFER_SIZE(buf);
+
+	//g_print("offset new buffer 0x%08lx\n", off);
+
+  if (off == 0) {
+    gulong *words = (gulong *)GST_BUFFER_DATA(buf);
+
+		// don't even try to parse the head if it's not there
+		if (last < 12) {
+      riff->state = GST_RIFF_ENOTRIFF;
+      return riff->state;
+		}
+
+    //g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0]));
+    /* verify this is a valid RIFF file, first of all */
+    if (words[0] != GST_RIFF_TAG_RIFF) {
+      riff->state = GST_RIFF_ENOTRIFF;
+      return riff->state;
+    }
+    riff->form = words[2];
+    //g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2]));
+    riff->nextlikely = 12;	/* skip 'RIFF', length, and form */
+  }
+
+  /* loop while the next likely chunk header is in this buffer */
+  while ((riff->nextlikely+12) < last) {
+    gulong *words = (gulong *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off );
+
+		// loop over all of the chunks to check which one is finished
+		while (riff->chunks) {
+			chunk = g_list_nth_data(riff->chunks, 0);
+
+      //g_print("next 0x%08x  offset 0x%08lx size 0x%08x\n",riff->nextlikely, chunk->offset, chunk->size);
+			if (riff->nextlikely >= chunk->offset+chunk->size) {
+        //g_print("found END LIST\n");
+				// we have the end of the chunk on the stack, remove it
+				riff->chunks = g_list_remove(riff->chunks, chunk);
+			}
+			else break;
+		}
+
+    //g_print("next likely chunk is at offset 0x%08x\n",riff->nextlikely);
+
+    chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk));
+    g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM);
+
+    chunk->offset = riff->nextlikely+8;	/* point to the actual data */
+    chunk->id = words[0];
+    chunk->size = words[1];
+		chunk->data = (gchar *)(words+2);
+		// we need word alignment
+		if (chunk->size & 0x01) chunk->size++;
+		chunk->form = words[2]; /* fill in the form,  might not be valid */
+
+		// send the buffer to the listener if we have received a function
+		if (riff->new_tag_found) {
+		  riff->new_tag_found(chunk, riff->callback_data);
+		}
+
+		if (chunk->id == GST_RIFF_TAG_LIST) {
+      //g_print("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form));
+      riff->nextlikely += 12;	
+			// we push the list chunk on our 'stack'
+      riff->chunks = g_list_prepend(riff->chunks,chunk);
+		}
+		else {
+
+      //g_print("chunk id is 0x%08lx '%s' and is 0x%08lx long\n",words[0],
+       //     gst_riff_id_to_fourcc(words[0]),words[1]);
+
+      riff->nextlikely += 8 + chunk->size;	/* doesn't include hdr */
+			g_free(chunk);
+      //riff->chunks = g_list_prepend(riff->chunks,chunk);
+		}
+  }
+
+  return 0;
+}
+
+
+gulong gst_riff_fourcc_to_id(gchar *fourcc) {
+  g_return_val_if_fail(fourcc != NULL, 0);
+
+  return (fourcc[0] << 0) | (fourcc[1] << 8) |
+         (fourcc[2] << 16) | (fourcc[3] << 24);
+}
+
+gchar *gst_riff_id_to_fourcc(gulong id) {
+  gchar *fourcc = (gchar *)g_malloc(5);
+
+  g_return_val_if_fail(fourcc != NULL, NULL);
+
+  fourcc[0] = (id >> 0) & 0xff;
+  fourcc[1] = (id >> 8) & 0xff;
+  fourcc[2] = (id >> 16) & 0xff;
+  fourcc[3] = (id >> 24) & 0xff;
+  fourcc[4] = 0;
+
+  return fourcc;
+}
diff --git a/libs/riff/gstriff.h b/libs/riff/gstriff.h
new file mode 100644
index 000000000..1d5281dfa
--- /dev/null
+++ b/libs/riff/gstriff.h
@@ -0,0 +1,317 @@
+/* Gnome-Streamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __GST_RIFF_H__
+#define __GST_RIFF_H__
+
+
+#include <gst/gstbuffer.h>
+#include <gst/gstplugin.h>
+
+
+#define GST_RIFF_ENOTRIFF -1		/* not a RIFF file */
+#define GST_RIFF_EINVAL   -2		/* wrong parameters */
+#define GST_RIFF_ENOMEM   -3		/* out of memory */
+
+#define MAKE_FOUR_CC(a,b,c,d) ( ((guint32)a)     | (((guint32)b)<< 8) | \
+                                ((guint32)c)<<16 | (((guint32)d)<<24) )
+																
+/* RIFF types */
+#define GST_RIFF_RIFF_WAVE MAKE_FOUR_CC('W','A','V','E')
+#define GST_RIFF_RIFF_AVI  MAKE_FOUR_CC('A','V','I',' ')
+
+/* tags */
+#define GST_RIFF_TAG_RIFF MAKE_FOUR_CC('R','I','F','F')
+#define GST_RIFF_TAG_RIFX MAKE_FOUR_CC('R','I','F','X')
+#define GST_RIFF_TAG_LIST MAKE_FOUR_CC('L','I','S','T')
+#define GST_RIFF_TAG_avih MAKE_FOUR_CC('a','v','i','h')
+#define GST_RIFF_TAG_strd MAKE_FOUR_CC('s','t','r','d')
+#define GST_RIFF_TAG_strh MAKE_FOUR_CC('s','t','r','h')
+#define GST_RIFF_TAG_strf MAKE_FOUR_CC('s','t','r','f')
+#define GST_RIFF_TAG_vedt MAKE_FOUR_CC('v','e','d','t')
+#define GST_RIFF_TAG_JUNK MAKE_FOUR_CC('J','U','N','K')
+#define GST_RIFF_TAG_idx1 MAKE_FOUR_CC('i','d','x','1')
+/* WAV stuff */
+#define GST_RIFF_TAG_fmt  MAKE_FOUR_CC('f','m','t',' ')
+#define GST_RIFF_TAG_data MAKE_FOUR_CC('d','a','t','a')
+
+/* LIST types */
+#define GST_RIFF_LIST_movi MAKE_FOUR_CC('m','o','v','i')
+#define GST_RIFF_LIST_hdrl MAKE_FOUR_CC('h','d','r','l')
+#define GST_RIFF_LIST_strl MAKE_FOUR_CC('s','t','r','l')
+
+/* fcc types */
+#define GST_RIFF_FCC_vids MAKE_FOUR_CC('v','i','d','s')
+#define GST_RIFF_FCC_auds MAKE_FOUR_CC('a','u','d','s')
+#define GST_RIFF_FCC_pads MAKE_FOUR_CC('p','a','d','s')
+#define GST_RIFF_FCC_txts MAKE_FOUR_CC('t','x','t','s')
+/* fcc handlers */
+#define GST_RIFF_FCCH_RLE  MAKE_FOUR_CC('R','L','E',' ')
+#define GST_RIFF_FCCH_msvc MAKE_FOUR_CC('m','s','v','c')
+#define GST_RIFF_FCCH_MSVC MAKE_FOUR_CC('M','S','V','C')
+
+/*********Chunk Names***************/
+#define GST_RIFF_FF00 MAKE_FOUR_CC(0xFF,0xFF,0x00,0x00)
+#define GST_RIFF_00   MAKE_FOUR_CC( '0', '0',0x00,0x00)
+#define GST_RIFF_01   MAKE_FOUR_CC( '0', '1',0x00,0x00)
+#define GST_RIFF_02   MAKE_FOUR_CC( '0', '2',0x00,0x00)
+#define GST_RIFF_03   MAKE_FOUR_CC( '0', '3',0x00,0x00)
+#define GST_RIFF_04   MAKE_FOUR_CC( '0', '4',0x00,0x00)
+#define GST_RIFF_05   MAKE_FOUR_CC( '0', '5',0x00,0x00)
+#define GST_RIFF_06   MAKE_FOUR_CC( '0', '6',0x00,0x00)
+#define GST_RIFF_07   MAKE_FOUR_CC( '0', '7',0x00,0x00)
+#define GST_RIFF_00pc MAKE_FOUR_CC( '0', '0', 'p', 'c')
+#define GST_RIFF_01pc MAKE_FOUR_CC( '0', '1', 'p', 'c')
+#define GST_RIFF_00dc MAKE_FOUR_CC( '0', '0', 'd', 'c')
+#define GST_RIFF_00dx MAKE_FOUR_CC( '0', '0', 'd', 'x')
+#define GST_RIFF_00db MAKE_FOUR_CC( '0', '0', 'd', 'b')
+#define GST_RIFF_00xx MAKE_FOUR_CC( '0', '0', 'x', 'x')
+#define GST_RIFF_00id MAKE_FOUR_CC( '0', '0', 'i', 'd')
+#define GST_RIFF_00rt MAKE_FOUR_CC( '0', '0', 'r', 't')
+#define GST_RIFF_0021 MAKE_FOUR_CC( '0', '0', '2', '1')
+#define GST_RIFF_00iv MAKE_FOUR_CC( '0', '0', 'i', 'v')
+#define GST_RIFF_0031 MAKE_FOUR_CC( '0', '0', '3', '1')
+#define GST_RIFF_0032 MAKE_FOUR_CC( '0', '0', '3', '2')
+#define GST_RIFF_00vc MAKE_FOUR_CC( '0', '0', 'v', 'c')
+#define GST_RIFF_00xm MAKE_FOUR_CC( '0', '0', 'x', 'm')
+#define GST_RIFF_01wb MAKE_FOUR_CC( '0', '1', 'w', 'b')
+#define GST_RIFF_01dc MAKE_FOUR_CC( '0', '1', 'd', 'c')
+
+/*********VIDEO CODECS**************/
+#define GST_RIFF_cram MAKE_FOUR_CC( 'c', 'r', 'a', 'm')
+#define GST_RIFF_CRAM MAKE_FOUR_CC( 'C', 'R', 'A', 'M')
+#define GST_RIFF_wham MAKE_FOUR_CC( 'w', 'h', 'a', 'm')
+#define GST_RIFF_WHAM MAKE_FOUR_CC( 'W', 'H', 'A', 'M')
+#define GST_RIFF_rgb  MAKE_FOUR_CC(0x00,0x00,0x00,0x00)
+#define GST_RIFF_RGB  MAKE_FOUR_CC( 'R', 'G', 'B', ' ')
+#define GST_RIFF_rle8 MAKE_FOUR_CC(0x01,0x00,0x00,0x00)
+#define GST_RIFF_RLE8 MAKE_FOUR_CC( 'R', 'L', 'E', '8')
+#define GST_RIFF_rle4 MAKE_FOUR_CC(0x02,0x00,0x00,0x00)
+#define GST_RIFF_RLE4 MAKE_FOUR_CC( 'R', 'L', 'E', '4')
+#define GST_RIFF_none MAKE_FOUR_CC(0x00,0x00,0xFF,0xFF)
+#define GST_RIFF_NONE MAKE_FOUR_CC( 'N', 'O', 'N', 'E')
+#define GST_RIFF_pack MAKE_FOUR_CC(0x01,0x00,0xFF,0xFF)
+#define GST_RIFF_PACK MAKE_FOUR_CC( 'P', 'A', 'C', 'K')
+#define GST_RIFF_tran MAKE_FOUR_CC(0x02,0x00,0xFF,0xFF)
+#define GST_RIFF_TRAN MAKE_FOUR_CC( 'T', 'R', 'A', 'N')
+#define GST_RIFF_ccc  MAKE_FOUR_CC(0x03,0x00,0xFF,0xFF)
+#define GST_RIFF_CCC  MAKE_FOUR_CC( 'C', 'C', 'C', ' ')
+#define GST_RIFF_cyuv MAKE_FOUR_CC( 'c', 'y', 'u', 'v')
+#define GST_RIFF_CYUV MAKE_FOUR_CC( 'C', 'Y', 'U', 'V')
+#define GST_RIFF_jpeg MAKE_FOUR_CC(0x04,0x00,0xFF,0xFF)
+#define GST_RIFF_JPEG MAKE_FOUR_CC( 'J', 'P', 'E', 'G')
+#define GST_RIFF_MJPG MAKE_FOUR_CC( 'M', 'J', 'P', 'G')
+#define GST_RIFF_mJPG MAKE_FOUR_CC( 'm', 'J', 'P', 'G')
+#define GST_RIFF_IJPG MAKE_FOUR_CC( 'I', 'J', 'P', 'G')
+#define GST_RIFF_rt21 MAKE_FOUR_CC( 'r', 't', '2', '1')
+#define GST_RIFF_RT21 MAKE_FOUR_CC( 'R', 'T', '2', '1')
+#define GST_RIFF_iv31 MAKE_FOUR_CC( 'i', 'v', '3', '1')
+#define GST_RIFF_IV31 MAKE_FOUR_CC( 'I', 'V', '3', '1')
+#define GST_RIFF_iv32 MAKE_FOUR_CC( 'i', 'v', '3', '2')
+#define GST_RIFF_IV32 MAKE_FOUR_CC( 'I', 'V', '3', '2')
+#define GST_RIFF_iv41 MAKE_FOUR_CC( 'i', 'v', '4', '1')
+#define GST_RIFF_IV41 MAKE_FOUR_CC( 'I', 'V', '4', '1')
+#define GST_RIFF_iv50 MAKE_FOUR_CC( 'i', 'v', '5', '0')
+#define GST_RIFF_IV50 MAKE_FOUR_CC( 'I', 'V', '5', '0')
+#define GST_RIFF_cvid MAKE_FOUR_CC( 'c', 'v', 'i', 'd')
+#define GST_RIFF_CVID MAKE_FOUR_CC( 'C', 'V', 'I', 'D')
+#define GST_RIFF_ULTI MAKE_FOUR_CC( 'U', 'L', 'T', 'I')
+#define GST_RIFF_ulti MAKE_FOUR_CC( 'u', 'l', 't', 'i')
+#define GST_RIFF_YUV9 MAKE_FOUR_CC( 'Y', 'V', 'U', '9')
+#define GST_RIFF_YVU9 MAKE_FOUR_CC( 'Y', 'U', 'V', '9')
+#define GST_RIFF_XMPG MAKE_FOUR_CC( 'X', 'M', 'P', 'G')
+#define GST_RIFF_xmpg MAKE_FOUR_CC( 'x', 'm', 'p', 'g')
+#define GST_RIFF_VDOW MAKE_FOUR_CC( 'V', 'D', 'O', 'W')
+#define GST_RIFF_MVI1 MAKE_FOUR_CC( 'M', 'V', 'I', '1')
+#define GST_RIFF_v422 MAKE_FOUR_CC( 'v', '4', '2', '2')
+#define GST_RIFF_V422 MAKE_FOUR_CC( 'V', '4', '2', '2')
+#define GST_RIFF_mvi1 MAKE_FOUR_CC( 'm', 'v', 'i', '1')
+#define GST_RIFF_MPIX MAKE_FOUR_CC(0x04,0x00, 'i', '1')     /* MotionPixels munged their id */
+#define GST_RIFF_AURA MAKE_FOUR_CC( 'A', 'U', 'R', 'A')
+#define GST_RIFF_DMB1 MAKE_FOUR_CC( 'D', 'M', 'B', '1')
+#define GST_RIFF_dmb1 MAKE_FOUR_CC( 'd', 'm', 'b', '1')
+
+#define GST_RIFF_BW10 MAKE_FOUR_CC( 'B', 'W', '1', '0')
+#define GST_RIFF_bw10 MAKE_FOUR_CC( 'b', 'w', '1', '0')
+
+#define GST_RIFF_yuy2 MAKE_FOUR_CC( 'y', 'u', 'y', '2')
+#define GST_RIFF_YUY2 MAKE_FOUR_CC( 'Y', 'U', 'Y', '2')
+#define GST_RIFF_YUV8 MAKE_FOUR_CC( 'Y', 'U', 'V', '8')
+#define GST_RIFF_WINX MAKE_FOUR_CC( 'W', 'I', 'N', 'X')
+#define GST_RIFF_WPY2 MAKE_FOUR_CC( 'W', 'P', 'Y', '2')
+#define GST_RIFF_m263 MAKE_FOUR_CC( 'm', '2', '6', '3')
+#define GST_RIFF_M263 MAKE_FOUR_CC( 'M', '2', '6', '3')
+
+#define GST_RIFF_Q1_0 MAKE_FOUR_CC( 'Q', '1',0x2e, '0')
+#define GST_RIFF_SFMC MAKE_FOUR_CC( 'S', 'F', 'M', 'C')
+
+#define GST_RIFF_y41p MAKE_FOUR_CC( 'y', '4', '1', 'p')
+#define GST_RIFF_Y41P MAKE_FOUR_CC( 'Y', '4', '1', 'P')
+#define GST_RIFF_yv12 MAKE_FOUR_CC( 'y', 'v', '1', '2')
+#define GST_RIFF_YV12 MAKE_FOUR_CC( 'Y', 'V', '1', '2')
+#define GST_RIFF_vixl MAKE_FOUR_CC( 'v', 'i', 'x', 'l')
+#define GST_RIFF_VIXL MAKE_FOUR_CC( 'V', 'I', 'X', 'L')
+#define GST_RIFF_iyuv MAKE_FOUR_CC( 'i', 'y', 'u', 'v')
+#define GST_RIFF_IYUV MAKE_FOUR_CC( 'I', 'Y', 'U', 'V')
+#define GST_RIFF_i420 MAKE_FOUR_CC( 'i', '4', '2', '0')
+#define GST_RIFF_I420 MAKE_FOUR_CC( 'I', '4', '2', '0')
+#define GST_RIFF_vyuy MAKE_FOUR_CC( 'v', 'y', 'u', 'y')
+#define GST_RIFF_VYUY MAKE_FOUR_CC( 'V', 'Y', 'U', 'Y')
+
+#define GST_RIFF_rpza MAKE_FOUR_CC( 'r', 'p', 'z', 'a')
+/* And this here's the mistakes that need to be supported */
+#define GST_RIFF_azpr MAKE_FOUR_CC( 'a', 'z', 'p', 'r')  /* recognize Apple's rpza mangled? */
+
+/*********** FND in MJPG **********/
+#define GST_RIFF_ISFT MAKE_FOUR_CC( 'I', 'S', 'F', 'T')
+#define GST_RIFF_IDIT MAKE_FOUR_CC( 'I', 'D', 'I', 'T')
+
+#define GST_RIFF_00AM MAKE_FOUR_CC( '0', '0', 'A', 'M')
+#define GST_RIFF_DISP MAKE_FOUR_CC( 'D', 'I', 'S', 'P')
+#define GST_RIFF_ISBJ MAKE_FOUR_CC( 'I', 'S', 'B', 'J')
+
+#define GST_RIFF_rec  MAKE_FOUR_CC( 'r', 'e', 'c', ' ')
+
+/* common data structures */
+struct gst_riff_avih {
+  guint32 us_frame;          /* microsec per frame */
+  guint32 max_bps;           /* byte/s overall */
+  guint32 pad_gran;          /* pad_gran (???) */
+  guint32 flags;
+/* flags values */
+#define GST_RIFF_AVIH_HASINDEX       0x00000010 /* has idx1 chunk */
+#define GST_RIFF_AVIH_MUSTUSEINDEX   0x00000020 /* must use idx1 chunk to determine order */
+#define GST_RIFF_AVIH_ISINTERLEAVED  0x00000100 /* AVI file is interleaved */
+#define GST_RIFF_AVIH_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */
+#define GST_RIFF_AVIH_COPYRIGHTED    0x00020000 /* contains copyrighted data */
+  guint32 tot_frames;        /* # of frames (all) */
+  guint32 init_frames;       /* initial frames (???) */
+  guint32 streams;
+  guint32 bufsize;           /* suggested buffer size */
+  guint32 width;
+  guint32 height;
+  guint32 scale;
+  guint32 rate;
+  guint32 start;
+  guint32 length;
+};
+
+struct gst_riff_strh {
+  gchar   type[4];           /* stream type */
+  guint32 fcc_handler;       /* fcc_handler */
+  guint32 flags;
+/* flags values */
+#define GST_RIFF_STRH_DISABLED        0x000000001
+#define GST_RIFF_STRH_VIDEOPALCHANGES 0x000010000
+  guint32 priority;
+  guint32 init_frames;       /* initial frames (???) */
+  guint32 scale;
+  guint32 rate;
+  guint32 start;
+  guint32 length;
+  guint32 bufsize;           /* suggested buffer size */
+  guint32 quality;
+  guint32 samplesize;
+  /* XXX 16 bytes ? */
+};
+
+struct gst_riff_strf_vids {       /* == BitMapInfoHeader */
+  guint32 size;
+  guint32 width;
+  guint32 height;
+  guint16 planes;
+  guint16 bit_cnt;
+  gchar   compression[4];
+  guint32 image_size;
+  guint32 xpels_meter;
+  guint32 ypels_meter;
+  guint32 num_colors;        /* used colors */
+  guint32 imp_colors;        /* important colors */
+  /* may be more for some codecs */
+};
+
+
+struct gst_riff_strf_auds {       /* == WaveHeader (?) */
+  guint16 format;
+/**** from public Microsoft RIFF docs ******/
+#define GST_RIFF_WAVE_FORMAT_UNKNOWN        (0x0000)
+#define GST_RIFF_WAVE_FORMAT_PCM            (0x0001)
+#define GST_RIFF_WAVE_FORMAT_ADPCM          (0x0002)
+#define GST_RIFF_WAVE_FORMAT_IBM_CVSD       (0x0005)
+#define GST_RIFF_WAVE_FORMAT_ALAW           (0x0006)
+#define GST_RIFF_WAVE_FORMAT_MULAW          (0x0007)
+#define GST_RIFF_WAVE_FORMAT_OKI_ADPCM      (0x0010)
+#define GST_RIFF_WAVE_FORMAT_DVI_ADPCM      (0x0011)
+#define GST_RIFF_WAVE_FORMAT_DIGISTD        (0x0015)
+#define GST_RIFF_WAVE_FORMAT_DIGIFIX        (0x0016)
+#define GST_RIFF_WAVE_FORMAT_YAMAHA_ADPCM   (0x0020)
+#define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022)
+#define GST_RIFF_WAVE_FORMAT_GSM610         (0x0031)
+#define GST_RIFF_IBM_FORMAT_MULAW           (0x0101)
+#define GST_RIFF_IBM_FORMAT_ALAW            (0x0102)
+#define GST_RIFF_IBM_FORMAT_ADPCM           (0x0103)
+  guint16 channels;
+  guint32 rate;
+  guint32 av_bps;
+  guint16 blockalign;
+  guint16 size;
+};
+
+
+typedef struct _GstRiff GstRiff;
+typedef struct _GstRiffChunk GstRiffChunk;
+
+typedef void (*GstRiffCallback) (GstRiffChunk *chunk, gpointer data);
+
+struct _GstRiff {
+  guint32 form;
+
+  /* list of chunks, most recent at the head */
+  GList *chunks;
+
+  /* parse state */
+  gint state;
+  guint32 curoffset;
+  guint32 nextlikely;
+
+	/* callback function and data pointer */
+	GstRiffCallback new_tag_found;
+	gpointer callback_data;
+};
+
+struct _GstRiffChunk {
+  gulong offset;
+
+  guint32 id;
+  guint32 size;
+  guint32 form; /* for list chunks */
+
+	gchar *data;
+};
+
+
+GstRiff *gst_riff_new(GstRiffCallback function, gpointer data);
+gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off);
+
+gulong gst_riff_fourcc_to_id(gchar *fourcc);
+gchar *gst_riff_id_to_fourcc(gulong id);
+
+
+#endif /* __GST_RIFF_H__ */
diff --git a/test/.gitignore b/test/.gitignore
index c5307d3cb..a99922f20 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -5,9 +5,7 @@ Makefile.in
 *.la
 .deps
 .libs
-
 *.xml
-
 basic
 m
 types
@@ -35,4 +33,10 @@ ac3play
 dvdcat
 fake
 cobin
+<<<<<<< .cvsignore
+videotest
 mp1parse
+aviparse
+=======
+mp1parse
+>>>>>>> 1.2
diff --git a/test/videotest.c b/test/videotest.c
index ed058e085..9912f3c6f 100644
--- a/test/videotest.c
+++ b/test/videotest.c
@@ -34,7 +34,7 @@ int main(int argc,char *argv[]) {
 
   src = gst_elementfactory_create(srcfactory,"src");
   videosink = gst_elementfactory_create(videosinkfactory,"videosink");
-  gtk_object_set(GTK_OBJECT(videosink),"width",640,"height",480,NULL);
+  gtk_object_set(GTK_OBJECT(videosink),"width",120,"height",80,NULL);
 
 
   gst_bin_add(GST_BIN(bin),GST_ELEMENT(src));