audioparsers: move 'flacparse' into it

gst/audioparsers/Makefile.am

@@ -1,11 +1,16 @@
 plugin_LTLIBRARIES = libgstaudioparsersbad.la
 
 libgstaudioparsersbad_la_SOURCES = \
-	gstaacparse.c gstamrparse.c gstac3parse.c gstbaseparse.c plugin.c
+	gstaacparse.c gstamrparse.c gstac3parse.c gstflacparse.c \
+	gstbaseparse.c plugin.c
 
-libgstaudioparsersbad_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstaudioparsersbad_la_LIBADD = $(GST_BASE_LIBS)
+libgstaudioparsersbad_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstaudioparsersbad_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
+	-lgstaudio-$(GST_MAJORMINOR) \
+	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstaudioparsersbad_la_LDFLAGS = $(PACKAGE_LIBS) $(GST_PLUGIN_LDFLAGS)
 libgstaudioparsersbad_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = gstaacparse.h gstamrparse.h gstac3parse.h gstbaseparse.h
+noinst_HEADERS = gstaacparse.h gstamrparse.h gstac3parse.h gstflacparse.h \
+	gstbaseparse.h

gst/audioparsers/gstflacparse.h

@@ -0,0 +1,87 @@
+/* GStreamer
+ *
+ * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
+ *
+ * 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_FLAC_PARSE_H__
+#define __GST_FLAC_PARSE_H__
+
+#include <gst/gst.h>
+#include "gstbaseparse.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_FLAC_PARSE		   (gst_flac_parse_get_type())
+#define GST_FLAC_PARSE(obj)		   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FLAC_PARSE,GstFlacParse))
+#define GST_FLAC_PARSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FLAC_PARSE,GstFlacParseClass))
+#define GST_FLAC_PARSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_FLAC_PARSE,GstFlacParseClass))
+#define GST_IS_FLAC_PARSE(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FLAC_PARSE))
+#define GST_IS_FLAC_PARSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLAC_PARSE))
+#define GST_FLAC_PARSE_CAST(obj)	((GstFlacParse *)(obj))
+
+typedef struct _GstFlacParse GstFlacParse;
+typedef struct _GstFlacParseClass GstFlacParseClass;
+
+typedef enum {
+  GST_FLAC_PARSE_STATE_INIT,
+  GST_FLAC_PARSE_STATE_HEADERS,
+  GST_FLAC_PARSE_STATE_GENERATE_HEADERS,
+  GST_FLAC_PARSE_STATE_DATA
+} GstFlacParseState;
+
+typedef struct {
+  guint8 type;
+} GstFlacParseSubFrame;
+
+struct _GstFlacParse {
+  GstBaseParse parent;
+
+  GstFlacParseState state;
+
+  gint64 upstream_length;
+
+  /* STREAMINFO content */
+  guint16 min_blocksize, max_blocksize;
+  guint32 min_framesize, max_framesize;
+  guint32 samplerate;
+  guint8 channels;
+  guint8 bps;
+  guint64 total_samples;
+
+  guint requested_frame_size;
+
+  /* Current frame */
+  guint64 offset;
+  guint8 blocking_strategy;
+  guint16 block_size;
+  guint64 sample_number;
+
+  GstTagList *tags;
+
+  GList *headers;
+};
+
+struct _GstFlacParseClass {
+  GstBaseParseClass parent_class;
+};
+
+GType gst_flac_parse_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_FLAC_PARSE_H__ */

gst/audioparsers/plugin.c

@@ -24,6 +24,7 @@
 #include "gstaacparse.h"
 #include "gstamrparse.h"
 #include "gstac3parse.h"
+#include "gstflacparse.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
@@ -36,6 +37,8 @@ plugin_init (GstPlugin * plugin)
       GST_RANK_PRIMARY + 1, GST_TYPE_AMRPARSE);
   ret &= gst_element_register (plugin, "ac3parse",
       GST_RANK_MARGINAL, GST_TYPE_AC3_PARSE);
+  ret &= gst_element_register (plugin, "flacparse",
+      GST_RANK_NONE, GST_TYPE_FLAC_PARSE);
 
   return ret;
 }