From 14a7cbe19edbd660e6e816d199e8229cbe54971b Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 19 Jul 2005 16:08:18 +0000 Subject: [PATCH] ext/dv/gstdvdec.c (gst_dvdec_decode_video): Set the proper framerate on the outbound buffer. Original commit message from CVS: 2005-07-19 Andy Wingo * ext/dv/gstdvdec.c (gst_dvdec_decode_video): Set the proper framerate on the outbound buffer. --- ChangeLog | 3 +++ ext/dv/gstdvdec.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c14f525d0..97e9a34ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-07-19 Andy Wingo + * ext/dv/gstdvdec.c (gst_dvdec_decode_video): Set the proper + framerate on the outbound buffer. + * ext/dv/gstdvdec.c (gst_dvdec_decode_video): Don't clobber alloc_buffer's return value. (gst_dvdec_decode_frame): Handle unlinked pads with grace and diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 5da1787ccb..2f63991733 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -1108,6 +1108,7 @@ gst_dvdec_decode_video (GstDVDec * dvdec, const guint8 * data) if ((dvdec->framerate != framerate) || (dvdec->height != height) || dvdec->wide != wide) { GstCaps *caps; + gboolean setcaps_ret; gint par_x, par_y; dvdec->framerate = framerate; @@ -1138,10 +1139,11 @@ gst_dvdec_decode_video (GstDVDec * dvdec, const guint8 * data) "format", GST_TYPE_FOURCC, GST_STR_FOURCC ("YUY2"), "width", G_TYPE_INT, 720, "height", G_TYPE_INT, height, - "framerate", G_TYPE_DOUBLE, framerate, + "framerate", G_TYPE_DOUBLE, framerate / dvdec->drop_factor, "pixel-aspect-ratio", GST_TYPE_FRACTION, par_x, par_y, NULL); - gst_pad_set_caps (dvdec->videosrcpad, caps); + setcaps_ret = gst_pad_set_caps (dvdec->videosrcpad, caps); gst_caps_unref (caps); + g_return_val_if_fail (setcaps_ret == TRUE, GST_FLOW_UNEXPECTED); }