mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/elements/gsttypefindelement.*: Set caps on all outgoing buffers, not just the first one.

Browse source 
Original commit message from CVS:
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(gst_type_find_element_chain), (gst_type_find_element_getrange):
* gst/elements/gsttypefindelement.h:
Set caps on all outgoing buffers, not just the first one.
This commit is contained in:
Tim-Philipp Müller 2005-08-01 11:15:47 +00:00
parent 8ec43a5445
commit 536aef2218
5 changed files with 19 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-08-01 Tim-Philipp Müller <tim at centricular dot net>
* gst/elements/gsttypefindelement.c:
(gst_type_find_element_have_type), (gst_type_find_element_init),
(stop_typefinding), (gst_type_find_element_handle_event),
(gst_type_find_element_chain), (gst_type_find_element_getrange):
* gst/elements/gsttypefindelement.h:
Set caps on all outgoing buffers, not just the first one.
2005-08-01 Tim-Philipp Müller <tim at centricular dot net> 2005-08-01 Tim-Philipp Müller <tim at centricular dot net>
* gst/elements/gsttypefindelement.c: * gst/elements/gsttypefindelement.c:

25
gst/elements/gsttypefindelement.c
View file

@ -148,20 +148,9 @@ gst_type_find_element_have_type (GstTypeFindElement * typefind,
GST_INFO_OBJECT (typefind, "found caps %" GST_PTR_FORMAT, caps); GST_INFO_OBJECT (typefind, "found caps %" GST_PTR_FORMAT, caps);
typefind->caps = gst_caps_copy (caps); typefind->caps = gst_caps_copy (caps);
typefind->caps_changed = TRUE;
gst_pad_set_caps (typefind->src, (GstCaps *) caps); gst_pad_set_caps (typefind->src, (GstCaps *) caps);
} }
static inline void
gst_type_find_element_check_set_buffer_caps (GstTypeFindElement * typefind,
GstBuffer * buffer)
{
if (typefind->caps_changed && buffer != NULL) {
gst_buffer_set_caps (buffer, typefind->caps);
typefind->caps_changed = FALSE;
}
}
static void static void
gst_type_find_element_base_init (gpointer g_class) gst_type_find_element_base_init (gpointer g_class)
{ {
@ -240,7 +229,6 @@ gst_type_find_element_init (GstTypeFindElement * typefind)
typefind->mode = MODE_TYPEFIND; typefind->mode = MODE_TYPEFIND;
typefind->caps = NULL; typefind->caps = NULL;
typefind->caps_changed = FALSE;
typefind->min_probability = 1; typefind->min_probability = 1;
typefind->max_probability = GST_TYPE_FIND_MAXIMUM; typefind->max_probability = GST_TYPE_FIND_MAXIMUM;
@ -441,7 +429,7 @@ stop_typefinding (GstTypeFindElement * typefind)
gst_buffer_unref (typefind->store); gst_buffer_unref (typefind->store);
} else { } else {
typefind->mode = MODE_NORMAL; typefind->mode = MODE_NORMAL;
gst_type_find_element_check_set_buffer_caps (typefind, typefind->store); gst_buffer_set_caps (typefind->store, typefind->caps);
gst_pad_push (typefind->src, typefind->store); gst_pad_push (typefind->src, typefind->store);
} }
typefind->store = NULL; typefind->store = NULL;
@ -512,8 +500,7 @@ gst_type_find_element_handle_event (GstPad * pad, GstEvent * event)
g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE],
0, entry->probability, entry->caps); 0, entry->probability, entry->caps);
stop_typefinding (typefind); stop_typefinding (typefind);
gst_type_find_element_check_set_buffer_caps (typefind, gst_buffer_set_caps (typefind->store, typefind->caps);
typefind->store);
gst_pad_push (typefind->src, typefind->store); gst_pad_push (typefind->src, typefind->store);
typefind->store = NULL; typefind->store = NULL;
res = gst_pad_event_default (pad, event); res = gst_pad_event_default (pad, event);
@ -614,7 +601,7 @@ gst_type_find_element_chain (GstPad * pad, GstBuffer * buffer)
switch (typefind->mode) { switch (typefind->mode) {
case MODE_NORMAL: case MODE_NORMAL:
gst_type_find_element_check_set_buffer_caps (typefind, buffer); gst_buffer_set_caps (buffer, typefind->caps);
return gst_pad_push (typefind->src, buffer); return gst_pad_push (typefind->src, buffer);
case MODE_TYPEFIND:{ case MODE_TYPEFIND:{
gboolean done = TRUE; gboolean done = TRUE;
@ -766,12 +753,8 @@ gst_type_find_element_getrange (GstPad * srcpad,
ret = gst_pad_pull_range (typefind->sink, offset, length, buffer); ret = gst_pad_pull_range (typefind->sink, offset, length, buffer);
if (typefind->caps_changed) { if (ret == GST_FLOW_OK && buffer && *buffer)
if (ret == GST_FLOW_OK && buffer && *buffer) {
gst_buffer_set_caps (*buffer, typefind->caps); gst_buffer_set_caps (*buffer, typefind->caps);
typefind->caps_changed = FALSE;
}
}
return ret; return ret;
} }

1
gst/elements/gsttypefindelement.h
View file

@ -51,7 +51,6 @@ struct _GstTypeFindElement {
guint min_probability; guint min_probability;
guint max_probability; guint max_probability;
GstCaps * caps; GstCaps * caps;
gboolean caps_changed;
guint mode; guint mode;
GstBuffer * store; GstBuffer * store;

25
plugins/elements/gsttypefindelement.c
View file

@ -148,20 +148,9 @@ gst_type_find_element_have_type (GstTypeFindElement * typefind,
GST_INFO_OBJECT (typefind, "found caps %" GST_PTR_FORMAT, caps); GST_INFO_OBJECT (typefind, "found caps %" GST_PTR_FORMAT, caps);
typefind->caps = gst_caps_copy (caps); typefind->caps = gst_caps_copy (caps);
typefind->caps_changed = TRUE;
gst_pad_set_caps (typefind->src, (GstCaps *) caps); gst_pad_set_caps (typefind->src, (GstCaps *) caps);
} }
static inline void
gst_type_find_element_check_set_buffer_caps (GstTypeFindElement * typefind,
GstBuffer * buffer)
{
if (typefind->caps_changed && buffer != NULL) {
gst_buffer_set_caps (buffer, typefind->caps);
typefind->caps_changed = FALSE;
}
}
static void static void
gst_type_find_element_base_init (gpointer g_class) gst_type_find_element_base_init (gpointer g_class)
{ {
@ -240,7 +229,6 @@ gst_type_find_element_init (GstTypeFindElement * typefind)
typefind->mode = MODE_TYPEFIND; typefind->mode = MODE_TYPEFIND;
typefind->caps = NULL; typefind->caps = NULL;
typefind->caps_changed = FALSE;
typefind->min_probability = 1; typefind->min_probability = 1;
typefind->max_probability = GST_TYPE_FIND_MAXIMUM; typefind->max_probability = GST_TYPE_FIND_MAXIMUM;
@ -441,7 +429,7 @@ stop_typefinding (GstTypeFindElement * typefind)
gst_buffer_unref (typefind->store); gst_buffer_unref (typefind->store);
} else { } else {
typefind->mode = MODE_NORMAL; typefind->mode = MODE_NORMAL;
gst_type_find_element_check_set_buffer_caps (typefind, typefind->store); gst_buffer_set_caps (typefind->store, typefind->caps);
gst_pad_push (typefind->src, typefind->store); gst_pad_push (typefind->src, typefind->store);
} }
typefind->store = NULL; typefind->store = NULL;
@ -512,8 +500,7 @@ gst_type_find_element_handle_event (GstPad * pad, GstEvent * event)
g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE], g_signal_emit (typefind, gst_type_find_element_signals[HAVE_TYPE],
0, entry->probability, entry->caps); 0, entry->probability, entry->caps);
stop_typefinding (typefind); stop_typefinding (typefind);
gst_type_find_element_check_set_buffer_caps (typefind, gst_buffer_set_caps (typefind->store, typefind->caps);
typefind->store);
gst_pad_push (typefind->src, typefind->store); gst_pad_push (typefind->src, typefind->store);
typefind->store = NULL; typefind->store = NULL;
res = gst_pad_event_default (pad, event); res = gst_pad_event_default (pad, event);
@ -614,7 +601,7 @@ gst_type_find_element_chain (GstPad * pad, GstBuffer * buffer)
switch (typefind->mode) { switch (typefind->mode) {
case MODE_NORMAL: case MODE_NORMAL:
gst_type_find_element_check_set_buffer_caps (typefind, buffer); gst_buffer_set_caps (buffer, typefind->caps);
return gst_pad_push (typefind->src, buffer); return gst_pad_push (typefind->src, buffer);
case MODE_TYPEFIND:{ case MODE_TYPEFIND:{
gboolean done = TRUE; gboolean done = TRUE;
@ -766,12 +753,8 @@ gst_type_find_element_getrange (GstPad * srcpad,
ret = gst_pad_pull_range (typefind->sink, offset, length, buffer); ret = gst_pad_pull_range (typefind->sink, offset, length, buffer);
if (typefind->caps_changed) { if (ret == GST_FLOW_OK && buffer && *buffer)
if (ret == GST_FLOW_OK && buffer && *buffer) {
gst_buffer_set_caps (*buffer, typefind->caps); gst_buffer_set_caps (*buffer, typefind->caps);
typefind->caps_changed = FALSE;
}
}
return ret; return ret;
} }

1
plugins/elements/gsttypefindelement.h
View file

@ -51,7 +51,6 @@ struct _GstTypeFindElement {
guint min_probability; guint min_probability;
guint max_probability; guint max_probability;
GstCaps * caps; GstCaps * caps;
gboolean caps_changed;
guint mode; guint mode;
GstBuffer * store; GstBuffer * store;