diff options
| author | David Schleef <ds@schleef.org> | 2004-01-12 03:40:18 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-12 03:40:18 +0000 |
| commit | 86a4117f7e2eaefa67c7f826d50b709d50258431 (patch) | |
| tree | 0fcb7254e50a66d0febf12adef1cb8698af83eed /ext/gdk_pixbuf | |
| parent | 87db2b726159def45f5e3a3d617fe2c8c7d17af3 (diff) | |
Remove all usage of gst_pad_get_caps(), and replace it with gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap().
Original commit message from CVS:
Remove all usage of gst_pad_get_caps(), and replace it with
gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap().
Diffstat (limited to 'ext/gdk_pixbuf')
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkanimation.c | 2 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.c | 8 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ext/gdk_pixbuf/gstgdkanimation.c b/ext/gdk_pixbuf/gstgdkanimation.c index 934653c6..78e92216 100644 --- a/ext/gdk_pixbuf/gstgdkanimation.c +++ b/ext/gdk_pixbuf/gstgdkanimation.c @@ -370,7 +370,7 @@ gst_gdk_animation_iter_create_pixbuf (GstGdkAnimationIter *iter) g_assert (fakesink); pad = gst_element_get_pad (fakesink, "sink"); g_assert (pad); - caps = gst_pad_get_caps (pad); + caps = gst_pad_get_negotiated_caps (pad); g_assert (caps); g_assert (GST_CAPS_IS_FIXED (caps)); g_assert (gst_caps_has_fixed_property (caps, "bpp") && diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index 10aea2ac..05821887 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -109,6 +109,10 @@ gst_gdk_pixbuf_sink_link (GstPad *pad, const GstCaps *caps) g_return_val_if_fail (GST_IS_GDK_PIXBUF (filter), GST_PAD_LINK_REFUSED); + filter->framerate = 0.0; + gst_structure_get_double (gst_caps_get_structure (caps, 0), "framerate", + &filter->framerate); + return GST_PAD_LINK_OK; } @@ -300,11 +304,11 @@ gst_gdk_pixbuf_chain (GstPad *pad, GstData *_data) filter->rowstride = gdk_pixbuf_get_rowstride(pixbuf); filter->image_size = filter->rowstride * filter->height; - caps = gst_pad_get_caps(filter->srcpad); + caps = gst_caps_copy (gst_pad_get_pad_template_caps (filter->srcpad)); gst_caps_set_simple (caps, "width", G_TYPE_INT, filter->width, "height", G_TYPE_INT, filter->height, - "framerate", G_TYPE_DOUBLE, 0., NULL); + "framerate", G_TYPE_DOUBLE, filter->framerate, NULL); gst_pad_set_explicit_caps (filter->srcpad, caps); } diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.h b/ext/gdk_pixbuf/gstgdkpixbuf.h index 336c1e51..62e11aac 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.h +++ b/ext/gdk_pixbuf/gstgdkpixbuf.h @@ -55,6 +55,8 @@ struct _GstGdkPixbuf int height; int rowstride; unsigned int image_size; + + double framerate; }; struct _GstGdkPixbufClass |