[0.11] gstreamer: plugins: proxy allocation query
Wim Taymans
wtay at kemper.freedesktop.org
Thu Feb 2 04:23:51 PST 2012
Module: gstreamer
Branch: 0.11
Commit: 87b805a6399ae352b8e91dddf3d9d6ef3b82e2b8
URL: http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=87b805a6399ae352b8e91dddf3d9d6ef3b82e2b8
Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Thu Feb 2 12:32:07 2012 +0100
plugins: proxy allocation query
---
plugins/elements/gstinputselector.c | 1 +
plugins/elements/gstqueue.c | 1 +
plugins/elements/gstqueue2.c | 5 +++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c
index 3bd4f22..83f1a29 100644
--- a/plugins/elements/gstinputselector.c
+++ b/plugins/elements/gstinputselector.c
@@ -1214,6 +1214,7 @@ gst_input_selector_request_new_pad (GstElement * element,
GST_DEBUG_FUNCPTR (gst_selector_pad_iterate_linked_pads));
GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_PROXY_CAPS);
+ GST_OBJECT_FLAG_SET (sinkpad, GST_PAD_FLAG_PROXY_ALLOCATION);
gst_pad_set_active (sinkpad, TRUE);
gst_element_add_pad (GST_ELEMENT (sel), sinkpad);
GST_INPUT_SELECTOR_UNLOCK (sel);
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 274017d..5e36a4c 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -396,6 +396,7 @@ gst_queue_init (GstQueue * queue)
gst_pad_set_query_function (queue->sinkpad, gst_queue_handle_sink_query);
gst_pad_set_link_function (queue->sinkpad, gst_queue_link_sink);
GST_PAD_SET_PROXY_CAPS (queue->sinkpad);
+ GST_PAD_SET_PROXY_ALLOCATION (queue->sinkpad);
gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad);
queue->srcpad = gst_pad_new_from_static_template (&srctemplate, "src");
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 8c26224..279d003 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -398,7 +398,8 @@ gst_queue2_init (GstQueue2 * queue)
GST_DEBUG_FUNCPTR (gst_queue2_handle_sink_event));
gst_pad_set_query_function (queue->sinkpad,
GST_DEBUG_FUNCPTR (gst_queue2_handle_sink_query));
- GST_OBJECT_FLAG_SET (queue->sinkpad, GST_PAD_FLAG_PROXY_CAPS);
+ GST_PAD_SET_PROXY_CAPS (queue->sinkpad);
+ GST_PAD_SET_PROXY_ALLOCATION (queue->sinkpad);
gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad);
queue->srcpad = gst_pad_new_from_static_template (&srctemplate, "src");
@@ -411,7 +412,7 @@ gst_queue2_init (GstQueue2 * queue)
GST_DEBUG_FUNCPTR (gst_queue2_handle_src_event));
gst_pad_set_query_function (queue->srcpad,
GST_DEBUG_FUNCPTR (gst_queue2_handle_src_query));
- GST_OBJECT_FLAG_SET (queue->srcpad, GST_PAD_FLAG_PROXY_CAPS);
+ GST_PAD_SET_PROXY_CAPS (queue->srcpad);
gst_element_add_pad (GST_ELEMENT (queue), queue->srcpad);
/* levels */
More information about the gstreamer-commits
mailing list