mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
- Move common function to gstformat
Original commit message from CVS: - Move common function to gstformat - sending events on disabled pad is allowed, buffers isn't...
This commit is contained in:
parent
155369d80c
commit
0f930b062b
2 changed files with 39 additions and 13 deletions
|
@ -122,6 +122,31 @@ gst_format_get_by_nick (const gchar *nick)
|
||||||
return GST_FORMAT_UNDEFINED;
|
return GST_FORMAT_UNDEFINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gst_formats_contains:
|
||||||
|
* @formats: The format array to search
|
||||||
|
* @format: the format to find
|
||||||
|
*
|
||||||
|
* See if the given format is inside the format array.
|
||||||
|
*
|
||||||
|
* Returns: TRUE if the format is found inside the array
|
||||||
|
*/
|
||||||
|
gboolean
|
||||||
|
gst_formats_contains (const GstFormat *formats, GstFormat format)
|
||||||
|
{
|
||||||
|
if (!formats)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
while (*formats) {
|
||||||
|
if (*formats == format)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
|
formats++;
|
||||||
|
}
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_format_get_details:
|
* gst_format_get_details:
|
||||||
* @format: The format to get details of
|
* @format: The format to get details of
|
||||||
|
|
27
gst/gstpad.c
27
gst/gstpad.c
|
@ -214,6 +214,8 @@ gst_real_pad_init (GstRealPad *pad)
|
||||||
pad->formatsfunc = gst_pad_get_formats_default;
|
pad->formatsfunc = gst_pad_get_formats_default;
|
||||||
pad->querytypefunc = gst_pad_get_query_types_default;
|
pad->querytypefunc = gst_pad_get_query_types_default;
|
||||||
|
|
||||||
|
GST_FLAG_SET (pad, GST_PAD_DISABLED);
|
||||||
|
|
||||||
gst_probe_dispatcher_init (&pad->probedisp);
|
gst_probe_dispatcher_init (&pad->probedisp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2154,7 +2156,7 @@ gst_ghost_pad_save_thyself (GstPad *pad, xmlNodePtr parent)
|
||||||
void
|
void
|
||||||
gst_pad_push (GstPad *pad, GstBuffer *buf)
|
gst_pad_push (GstPad *pad, GstBuffer *buf)
|
||||||
{
|
{
|
||||||
GstRealPad *peer = GST_RPAD_PEER (pad);
|
GstRealPad *peer;
|
||||||
|
|
||||||
GST_DEBUG_ENTER ("(%s:%s)", GST_DEBUG_PAD_NAME (pad));
|
GST_DEBUG_ENTER ("(%s:%s)", GST_DEBUG_PAD_NAME (pad));
|
||||||
|
|
||||||
|
@ -2163,11 +2165,19 @@ gst_pad_push (GstPad *pad, GstBuffer *buf)
|
||||||
if (!gst_probe_dispatcher_dispatch (&(GST_REAL_PAD (pad)->probedisp), GST_DATA (buf)))
|
if (!gst_probe_dispatcher_dispatch (&(GST_REAL_PAD (pad)->probedisp), GST_DATA (buf)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
peer = GST_RPAD_PEER (pad);
|
||||||
|
|
||||||
if (!peer) {
|
if (!peer) {
|
||||||
g_warning ("push on pad %s:%s but it is unconnected",
|
g_warning ("push on pad %s:%s but it is unconnected",
|
||||||
GST_DEBUG_PAD_NAME (pad));
|
GST_DEBUG_PAD_NAME (pad));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if (!GST_IS_EVENT (buf) && !GST_PAD_IS_ACTIVE (pad)) {
|
||||||
|
g_warning ("push on pad %s:%s but it is unusable",
|
||||||
|
GST_DEBUG_PAD_NAME (pad));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (peer->chainhandler) {
|
if (peer->chainhandler) {
|
||||||
if (buf) {
|
if (buf) {
|
||||||
GST_DEBUG (GST_CAT_DATAFLOW,
|
GST_DEBUG (GST_CAT_DATAFLOW,
|
||||||
|
@ -2207,13 +2217,13 @@ GstBuffer*
|
||||||
gst_pad_pull (GstPad *pad)
|
gst_pad_pull (GstPad *pad)
|
||||||
{
|
{
|
||||||
GstRealPad *peer;
|
GstRealPad *peer;
|
||||||
|
|
||||||
peer = GST_RPAD_PEER (pad);
|
|
||||||
|
|
||||||
GST_DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad));
|
GST_DEBUG_ENTER("(%s:%s)",GST_DEBUG_PAD_NAME(pad));
|
||||||
|
|
||||||
g_return_val_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SINK, NULL);
|
g_return_val_if_fail (GST_PAD_DIRECTION (pad) == GST_PAD_SINK, NULL);
|
||||||
|
|
||||||
|
peer = GST_RPAD_PEER (pad);
|
||||||
|
|
||||||
if (!peer) {
|
if (!peer) {
|
||||||
gst_element_error (GST_PAD_PARENT (pad),
|
gst_element_error (GST_PAD_PARENT (pad),
|
||||||
"pull on pad %s:%s but it was unconnected",
|
"pull on pad %s:%s but it was unconnected",
|
||||||
|
@ -2976,17 +2986,8 @@ gst_pad_handles_format (GstPad *pad, GstFormat format)
|
||||||
const GstFormat *formats;
|
const GstFormat *formats;
|
||||||
|
|
||||||
formats = gst_pad_get_formats (pad);
|
formats = gst_pad_get_formats (pad);
|
||||||
if (!formats)
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
while (*formats) {
|
return gst_formats_contains (formats, format);
|
||||||
if (*formats == format)
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
formats++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
|
Loading…
Reference in a new issue