diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-22 22:21:37 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-22 22:21:37 +0000 |
commit | 11c39abc9a99d5fcb0070988ffe0d773d9780875 (patch) | |
tree | c92b2175e0a98b9de7e969cb851c9dc8f0db59fb /ext/libpng/gstpngenc.c | |
parent | dad9986cb4646c0090a9c8408c1a1d9e00869ae2 (diff) |
More fractional framerate conversions
Original commit message from CVS:
* ext/cairo/gsttextoverlay.c: (gst_text_overlay_init),
(gst_text_overlay_setcaps), (gst_text_overlay_collected):
* ext/cairo/gsttextoverlay.h:
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_link):
* ext/gdk_pixbuf/gstgdkpixbuf.h:
* ext/libpng/gstpngdec.c: (gst_pngdec_init),
(gst_pngdec_caps_create_and_set):
* ext/libpng/gstpngdec.h:
* ext/libpng/gstpngenc.c: (gst_pngenc_setcaps):
* gst/alpha/gstalphacolor.c: (gst_alpha_color_set_caps):
* gst/avi/gstavimux.c: (gst_avimux_init),
(gst_avimux_vidsinkconnect):
* gst/flx/gstflxdec.c: (gst_flxdec_chain):
* gst/goom/gstgoom.c: (gst_goom_init), (gst_goom_src_setcaps),
(gst_goom_src_negotiate), (gst_goom_chain):
* gst/goom/gstgoom.h:
* gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps):
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps):
* sys/osxvideo/osxvideosink.h:
* sys/osxvideo/osxvideosink.m:
More fractional framerate conversions
Diffstat (limited to 'ext/libpng/gstpngenc.c')
-rw-r--r-- | ext/libpng/gstpngenc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index f0ce7b8a..261f4208 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("image/png, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ], " "framerate = (double) [ 0.0, MAX ]") + "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0.0, MAX ]") ); static GstStaticPadTemplate pngenc_sink_template = @@ -147,7 +147,7 @@ static gboolean gst_pngenc_setcaps (GstPad * pad, GstCaps * caps) { GstPngEnc *pngenc; - gdouble fps; + const GValue *fps; GstStructure *structure; GstCaps *pcaps; gboolean ret = TRUE; @@ -158,15 +158,17 @@ gst_pngenc_setcaps (GstPad * pad, GstCaps * caps) structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "width", &pngenc->width); gst_structure_get_int (structure, "height", &pngenc->height); - gst_structure_get_double (structure, "framerate", &fps); + fps = gst_structure_get_value (structure, "framerate"); gst_structure_get_int (structure, "bpp", &pngenc->bpp); opeer = gst_pad_get_peer (pngenc->srcpad); if (opeer) { pcaps = gst_caps_new_simple ("image/png", - "framerate", G_TYPE_DOUBLE, fps, "width", G_TYPE_INT, pngenc->width, "height", G_TYPE_INT, pngenc->height, NULL); + structure = gst_caps_get_structure (pcaps, 0); + gst_structure_set_value (structure, "framerate", fps); + if (gst_pad_accept_caps (opeer, pcaps)) { gst_pad_set_caps (pngenc->srcpad, pcaps); } else |