From: <wt...@ke...> - 2008-02-29 14:52:15
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: wtay Date: Fri Feb 29 2008 14:52:16 UTC Log message: * ext/libvisual/visual.c: (gst_vis_src_negotiate): When negotiating, actually start from a format that we can support instead of from the too generic template. Modified files: . : ChangeLog ext/libvisual : visual.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3782&r2=1.3783 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/libvisual/visual.c.diff?r1=1.36&r2=1.37 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3782 retrieving revision 1.3783 diff -u -d -r1.3782 -r1.3783 --- ChangeLog 29 Feb 2008 12:26:47 -0000 1.3782 +++ ChangeLog 29 Feb 2008 14:52:01 -0000 1.3783 @@ -1,5 +1,11 @@ 2008-02-29 Wim Taymans <wim...@co...> + * ext/libvisual/visual.c: (gst_vis_src_negotiate): + When negotiating, actually start from a format that we can support + instead of from the too generic template. + +2008-02-29 Wim Taymans <wim...@co...> * gst/playback/gstplaybin2.c: (gst_play_bin_set_property): Enable vis setting. Index: visual.c RCS file: /cvs/gstreamer/gst-plugins-base/ext/libvisual/visual.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- visual.c 29 Dec 2007 16:23:23 -0000 1.36 +++ visual.c 29 Feb 2008 14:52:02 -0000 1.37 @@ -387,15 +387,16 @@ { GstCaps *othercaps, *target, *intersect; GstStructure *structure; - const GstCaps *templ; + GstCaps *caps; - templ = gst_pad_get_pad_template_caps (visual->srcpad); + caps = gst_pad_get_caps (visual->srcpad); /* see what the peer can do */ othercaps = gst_pad_peer_get_caps (visual->srcpad); if (othercaps) { - intersect = gst_caps_intersect (othercaps, templ); + intersect = gst_caps_intersect (othercaps, caps); gst_caps_unref (othercaps); + gst_caps_unref (caps); if (gst_caps_is_empty (intersect)) goto no_format; @@ -404,7 +405,8 @@ gst_caps_unref (intersect); } else { /* need a copy, we'll be modifying it when fixating */ - target = gst_caps_copy (templ); + target = gst_caps_copy (caps); } /* fixate in case something is not fixed. This does nothing if the value is |