mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

tcpclientsrc: Update for negotation related API changes

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-16 11:37:39 +02:00
parent 2b9845e60f
commit 7330318e2f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/tcp/gsttcpclientsrc.c
View file

@ -71,7 +71,8 @@ G_DEFINE_TYPE (GstTCPClientSrc, gst_tcp_client_src, GST_TYPE_PUSH_SRC);
static void gst_tcp_client_src_finalize (GObject * gobject); static void gst_tcp_client_src_finalize (GObject * gobject);
static GstCaps *gst_tcp_client_src_getcaps (GstBaseSrc * psrc); static GstCaps *gst_tcp_client_src_getcaps (GstBaseSrc * psrc,
GstCaps * filter);
static GstFlowReturn gst_tcp_client_src_create (GstPushSrc * psrc, static GstFlowReturn gst_tcp_client_src_create (GstPushSrc * psrc,
GstBuffer ** outbuf); GstBuffer ** outbuf);
@ -153,7 +154,7 @@ gst_tcp_client_src_finalize (GObject * gobject)
} }
static GstCaps * static GstCaps *
gst_tcp_client_src_getcaps (GstBaseSrc * bsrc) gst_tcp_client_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
{ {
GstTCPClientSrc *src; GstTCPClientSrc *src;
GstCaps *caps = NULL; GstCaps *caps = NULL;
@ -161,11 +162,15 @@ gst_tcp_client_src_getcaps (GstBaseSrc * bsrc)
src = GST_TCP_CLIENT_SRC (bsrc); src = GST_TCP_CLIENT_SRC (bsrc);
if (!GST_OBJECT_FLAG_IS_SET (src, GST_TCP_CLIENT_SRC_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (src, GST_TCP_CLIENT_SRC_OPEN))
caps = gst_caps_new_any (); caps = (filter ? gst_caps_ref (filter) : gst_caps_new_any ());
else if (src->caps && filter)
caps =
gst_caps_intersect_full (filter, src->caps, GST_CAPS_INTERSECT_FIRST);
else if (src->caps) else if (src->caps)
caps = gst_caps_copy (src->caps); caps = gst_caps_copy (src->caps);
else else
caps = gst_caps_new_any (); caps = (filter ? gst_caps_ref (filter) : gst_caps_new_any ());
GST_DEBUG_OBJECT (src, "returning caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (src, "returning caps %" GST_PTR_FORMAT, caps);
g_assert (GST_IS_CAPS (caps)); g_assert (GST_IS_CAPS (caps));
return caps; return caps;