Riff, EBML, fourcc etc. work. Not fully finished, but better than what we used to have and definately worth a first b...

Original commit message from CVS:
Riff, EBML, fourcc etc. work. Not fully finished, but better than
what we used to have and definately worth a first broad testing.

I've revived rifflib. Rifflib used to be a bytestream-for-riff, which
just dup'ed bytestream. I've rewritten rifflib to be a modern riff-
chunk parser that uses bytestream fully, plus adds some extra functions
so that riff file parsing becomes extremely easy. It also contains some
small usability functions for strh/strf and metadata parsing. Note that
it doesn't use the new tagging yet, that's a TODO.

Avidemux has been rewritten to use this. I think we all agreed that
avidemux was pretty much a big mess, which is because it used all
sort of bytestream magic all around the place. It was just ugly.
This is a lot nicer, very complete and safe. I think this is far more
robust than what the old avidemux could ever have been. Of course, it
might contain bugs, please let me know.

EBML writing has also been implemented. This is useful for matroska.
I'm intending to modify avidemux (with a riffwriter) similarly. Maybe
I'll change wavparse/-enc too to use rifflib.

Lastly, several plugins have been modified to use rifflib's fourcc
parsing instead of their own. this puts fourcc parsing in one central
place, which should make it a lot simpler to add new fourccs. We might
want to move this to its own lib instead of rifflib.

Enjoy!

1 files changed, 103 insertions, 0 deletions

diff --git a/gst/matroska/matroska-mux.h b/gst/matroska/matroska-mux.h
new file mode 100644
index 00000000..b89f0d22
--- /dev/null
+++ b/gst/matroska/matroska-mux.h
@@ -0,0 +1,103 @@
+/* GStreamer Matroska muxer/demuxer
+ * (c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * matroska-mux.h: matroska file/stream muxer object types
+ *
+ * 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_MATROSKA_MUX_H__
+#define __GST_MATROSKA_MUX_H__
+
+#include <gst/gst.h>
+
+#include "ebml-write.h"
+#include "matroska-ids.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MATROSKA_MUX \
+  (gst_matroska_mux_get_type ())
+#define GST_MATROSKA_MUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MATROSKA_MUX, GstMatroskaMux))
+#define GST_MATROSKA_MUX_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MATROSKA_MUX, GstMatroskaMux))
+#define GST_IS_MATROSKA_MUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MATROSKA_MUX))
+#define GST_IS_MATROSKA_MUX_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MATROSKA_MUX))
+
+#define GST_MATROSKA_MUX_MAX_STREAMS 64
+
+typedef enum {
+  GST_MATROSKA_MUX_STATE_START,
+  GST_MATROSKA_MUX_STATE_HEADER,
+  GST_MATROSKA_MUX_STATE_DATA,
+} GstMatroskaMuxState;
+
+typedef struct _GstMatroskaMux {
+  GstEbmlWrite   parent;
+
+  /* pads */
+  GstPad 	*srcpad;
+  struct {
+    GstMatroskaTrackContext *track;
+    GstBuffer   *buffer;
+    gboolean     eos;
+  } sink[GST_MATROSKA_MUX_MAX_STREAMS];
+  guint          num_streams,
+                 num_v_streams, num_a_streams, num_t_streams;
+
+  /* metadata - includes writing_app and creation_time */
+  GstCaps       *metadata;
+
+  /* state */
+  GstMatroskaMuxState state;
+
+  /* a cue (index) table */
+  GstMatroskaIndex *index;
+  guint          num_indexes;
+
+  /* timescale in the file */
+  guint64        time_scale;
+
+  /* length, position (time, ns) */
+  guint64        duration;
+
+  /* byte-positions of master-elements (for replacing contents) */
+  guint64        segment_pos,
+		 seekhead_pos,
+		 cues_pos,
+#if 0
+		 tags_pos,
+#endif
+		 info_pos,
+		 tracks_pos,
+		 duration_pos;
+  guint64        segment_master;
+} GstMatroskaMux;
+
+typedef struct _GstMatroskaMuxClass {
+  GstEbmlWriteClass parent;
+} GstMatroskaMuxClass;
+
+GType    gst_matroska_mux_get_type    (void);
+
+gboolean gst_matroska_mux_plugin_init (GstPlugin *plugin);
+
+G_END_DECLS
+
+#endif /* __GST_MATROSKA_MUX_H__ */