From 5056bb87ab3f1207c967cf90d3def90573798a54 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Wed, 26 Apr 2006 17:08:24 +0000 Subject: gst/auparse/gstauparse.*: Rewrite auparse to suck a little bit less: make source pad dynamic, so decodebin/playbin wo... Original commit message from CVS: * gst/auparse/gstauparse.c: (gst_au_parse_base_init), (gst_au_parse_class_init), (gst_au_parse_init), (gst_au_parse_reset), (gst_au_parse_add_srcpad), (gst_au_parse_remove_srcpad), (gst_au_parse_parse_header), (gst_au_parse_chain), (gst_au_parse_src_convert), (gst_au_parse_src_query), (gst_au_parse_handle_seek), (gst_au_parse_sink_event), (gst_au_parse_src_event), (gst_au_parse_change_state): * gst/auparse/gstauparse.h: Rewrite auparse to suck a little bit less: make source pad dynamic, so decodebin/playbin work with non-raw formats like alaw/mulaw; add query function for duration/position queries; check whether we have enough data before attempting to parse the header (instead of crashing when that is not the case); work around audioconvert sucking by swapping endianness to the native endianness ourselves for float formats; send initial newsegment event. Fixes #161712. --- gst/auparse/gstauparse.h | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'gst/auparse/gstauparse.h') diff --git a/gst/auparse/gstauparse.h b/gst/auparse/gstauparse.h index d38369ba..a74d6818 100644 --- a/gst/auparse/gstauparse.h +++ b/gst/auparse/gstauparse.h @@ -1,5 +1,6 @@ /* GStreamer * Copyright (C) <1999> Erik Walthinsen + * Copyright (C) <2006> Tim-Philipp Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,8 +19,8 @@ */ -#ifndef __GST_AUPARSE_H__ -#define __GST_AUPARSE_H__ +#ifndef __GST_AU_PARSE_H__ +#define __GST_AU_PARSE_H__ #include @@ -33,10 +34,10 @@ G_BEGIN_DECLS #define GST_AU_PARSE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AU_PARSE,GstAuParse)) #define GST_AU_PARSE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AU_PARSE,GstAuParse)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AU_PARSE,GstAuParseClass)) #define GST_IS_AU_PARSE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AU_PARSE)) -#define GST_IS_AU_PARSE_CLASS(obj) \ +#define GST_IS_AU_PARSE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AU_PARSE)) typedef struct _GstAuParse GstAuParse; @@ -45,19 +46,26 @@ typedef struct _GstAuParseClass GstAuParseClass; struct _GstAuParse { GstElement element; - GstPad *sinkpad,*srcpad; + GstPad *sinkpad; + GstPad *srcpad; - guchar le; - glong offset; - glong buffer_offset; - gint sample_size; - glong size; - glong encoding; - glong frequency; - glong channels; + GstCaps *src_caps; GstAdapter *adapter; + /* GstSegment segment; */ + + gint64 offset; /* where sample data starts */ + gint64 buffer_offset; + guint sample_size; + guint encoding; + guint samplerate; + guint endianness; + guint channels; + + /* audioconvert only handles float in native endianness, + * so we need to swap endianness here ourselves for now */ + guint float_swap; /* 0, 32 or 64 */ }; struct _GstAuParseClass { @@ -68,4 +76,4 @@ GType gst_au_parse_get_type (void); G_END_DECLS -#endif /* __GST_AUPARSE_H__ */ +#endif /* __GST_AU_PARSE_H__ */ -- cgit