mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

wavparse: use ALWAYS source pad rather than SOMETIMES

Browse source
This commit is contained in:
Mark Nauwelaerts 2011-07-06 16:31:18 +02:00
parent e9146e7aec
commit a6d9995705
1 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gst/wavparse/gstwavparse.c
View file

@ -83,7 +83,7 @@ static void gst_wavparse_loop (GstPad * pad);
static gboolean gst_wavparse_srcpad_event (GstPad * pad, GstEvent * event); static gboolean gst_wavparse_srcpad_event (GstPad * pad, GstEvent * event);
static GstStaticPadTemplate sink_template_factory = static GstStaticPadTemplate sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("wavparse_sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-wav") GST_STATIC_CAPS ("audio/x-wav")
@ -117,8 +117,8 @@ gst_wavparse_class_init (GstWavParseClass * klass)
gst_element_class_add_pad_template (gstelement_class, gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_template_factory)); gst_static_pad_template_get (&sink_template_factory));
src_template = gst_pad_template_new ("wavparse_src", GST_PAD_SRC, src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_SOMETIMES, gst_riff_create_audio_template_caps ()); GST_PAD_ALWAYS, gst_riff_create_audio_template_caps ());
gst_element_class_add_pad_template (gstelement_class, src_template); gst_element_class_add_pad_template (gstelement_class, src_template);
gst_element_class_set_details_simple (gstelement_class, "WAV audio demuxer", gst_element_class_set_details_simple (gstelement_class, "WAV audio demuxer",
@ -197,8 +197,18 @@ gst_wavparse_init (GstWavParse * wavparse)
GST_DEBUG_FUNCPTR (gst_wavparse_sink_event)); GST_DEBUG_FUNCPTR (gst_wavparse_sink_event));
gst_element_add_pad (GST_ELEMENT_CAST (wavparse), wavparse->sinkpad); gst_element_add_pad (GST_ELEMENT_CAST (wavparse), wavparse->sinkpad);
/* src, will be created later */ /* src */
wavparse->srcpad = NULL; wavparse->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template
(GST_ELEMENT_GET_CLASS (wavparse), "src"), "src");
gst_pad_use_fixed_caps (wavparse->srcpad);
gst_pad_set_query_type_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_get_query_types));
gst_pad_set_query_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_pad_query));
gst_pad_set_event_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_srcpad_event));
gst_element_add_pad (GST_ELEMENT_CAST (wavparse), wavparse->srcpad);
} }
static void static void
@ -210,29 +220,6 @@ gst_wavparse_destroy_sourcepad (GstWavParse * wavparse)
} }
} }
static void
gst_wavparse_create_sourcepad (GstWavParse * wavparse)
{
GstElementClass *klass = GST_ELEMENT_GET_CLASS (wavparse);
GstPadTemplate *src_template;
/* destroy previous one */
gst_wavparse_destroy_sourcepad (wavparse);
/* source */
src_template = gst_element_class_get_pad_template (klass, "wavparse_src");
wavparse->srcpad = gst_pad_new_from_template (src_template, "src");
gst_pad_use_fixed_caps (wavparse->srcpad);
gst_pad_set_query_type_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_get_query_types));
gst_pad_set_query_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_pad_query));
gst_pad_set_event_function (wavparse->srcpad,
GST_DEBUG_FUNCPTR (gst_wavparse_srcpad_event));
GST_DEBUG_OBJECT (wavparse, "srcpad created");
}
/* Compute (value * nom) % denom, avoiding overflow. This can be used /* Compute (value * nom) % denom, avoiding overflow. This can be used
* to perform ceiling or rounding division together with * to perform ceiling or rounding division together with
* gst_util_uint64_scale[_int]. */ * gst_util_uint64_scale[_int]. */
@ -1781,14 +1768,9 @@ gst_wavparse_add_src_pad (GstWavParse * wav, GstBuffer * buf)
} }
} }
gst_wavparse_create_sourcepad (wav);
gst_pad_set_active (wav->srcpad, TRUE);
gst_pad_set_caps (wav->srcpad, wav->caps); gst_pad_set_caps (wav->srcpad, wav->caps);
gst_caps_replace (&wav->caps, NULL); gst_caps_replace (&wav->caps, NULL);
gst_element_add_pad (GST_ELEMENT_CAST (wav), wav->srcpad);
gst_element_no_more_pads (GST_ELEMENT_CAST (wav));
if (wav->start_segment) { if (wav->start_segment) {
GST_DEBUG_OBJECT (wav, "Send start segment event on newpad"); GST_DEBUG_OBJECT (wav, "Send start segment event on newpad");
gst_pad_push_event (wav->srcpad, wav->start_segment); gst_pad_push_event (wav->srcpad, wav->start_segment);
@ -2174,6 +2156,12 @@ gst_wavparse_sink_event (GstPad * pad, GstEvent * event)
GST_LOG_OBJECT (wav, "handling %s event", GST_EVENT_TYPE_NAME (event)); GST_LOG_OBJECT (wav, "handling %s event", GST_EVENT_TYPE_NAME (event));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS:
{
/* discard, we'll come up with proper src caps */
gst_event_unref (event);
break;
}
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
{ {
gint64 start, stop, offset = 0, end_offset = -1; gint64 start, stop, offset = 0, end_offset = -1;