mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

videotestsrc: Update for negotiation related API changes

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-11 17:39:06 +02:00
parent 0d39d5bb8f
commit 219b610fdd
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/videotestsrc/gstvideotestsrc.c
View file

@ -92,7 +92,8 @@ static void gst_video_test_src_set_property (GObject * object, guint prop_id,
static void gst_video_test_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static GstCaps *gst_video_test_src_getcaps (GstBaseSrc * bsrc);
static GstCaps *gst_video_test_src_getcaps (GstBaseSrc * bsrc,
GstCaps * filter);
static gboolean gst_video_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps);
static void gst_video_test_src_src_fixate (GstPad * pad, GstCaps * caps);
@ -297,7 +298,7 @@ gst_video_test_src_class_init (GstVideoTestSrcClass * klass)
gst_element_class_add_pad_template (gstelement_class,
gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
gst_video_test_src_getcaps (NULL)));
gst_video_test_src_getcaps (NULL, NULL)));
gstbasesrc_class->get_caps = gst_video_test_src_getcaps;
gstbasesrc_class->set_caps = gst_video_test_src_setcaps;
@ -574,7 +575,7 @@ gst_video_test_src_get_property (GObject * object, guint prop_id,
/* threadsafe because this gets called as the plugin is loaded */
static GstCaps *
gst_video_test_src_getcaps (GstBaseSrc * bsrc)
gst_video_test_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter)
{
static GstCaps *capslist = NULL;
@ -596,7 +597,10 @@ gst_video_test_src_getcaps (GstBaseSrc * bsrc)
capslist = caps;
}
return gst_caps_copy (capslist);
if (filter)
return gst_caps_intersect_full (filter, capslist, GST_CAPS_INTERSECT_FIRST);
else
return gst_caps_ref (capslist);
}
static gboolean