mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

More fractional framerate conversions

Browse source 
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
This commit is contained in:
Jan Schmidt 2005-11-22 22:21:37 +00:00
parent dad9986cb4
commit 11c39abc9a
15 changed files with 127 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ChangeLog
View file

@ -1,3 +1,28 @@
2005-11-22 Jan Schmidt <thaytan@mad.scientist.com>
* 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
2005-11-22 Jan Schmidt <thaytan@mad.scientist.com> 2005-11-22 Jan Schmidt <thaytan@mad.scientist.com>
* ext/aalib/gstaasink.c: (gst_aasink_fixate): * ext/aalib/gstaasink.c: (gst_aasink_fixate):

19
ext/cairo/gsttextoverlay.c
View file

@ -251,7 +251,8 @@ gst_text_overlay_init (GstTextOverlay * overlay, GstTextOverlayClass * klass)
overlay->scale = 20; overlay->scale = 20;
gst_text_overlay_font_init (overlay); gst_text_overlay_font_init (overlay);
overlay->framerate = 0.0; overlay->fps_n = 0;
overlay->fps_d = 1;
overlay->collect = gst_collect_pads_new (); overlay->collect = gst_collect_pads_new ();
@ -530,7 +531,7 @@ gst_text_overlay_setcaps (GstPad * pad, GstCaps * caps)
GstTextOverlay *overlay; GstTextOverlay *overlay;
GstStructure *structure; GstStructure *structure;
gboolean ret = FALSE; gboolean ret = FALSE;
gdouble fps = 0.0; const GValue *fps;
if (!GST_PAD_IS_SINK (pad)) if (!GST_PAD_IS_SINK (pad))
return TRUE; return TRUE;
@ -542,13 +543,16 @@ gst_text_overlay_setcaps (GstPad * pad, GstCaps * caps)
overlay->width = 0; overlay->width = 0;
overlay->height = 0; overlay->height = 0;
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
fps = gst_structure_get_value (structure, "framerate");
if (gst_structure_get_int (structure, "width", &overlay->width) && if (gst_structure_get_int (structure, "width", &overlay->width) &&
gst_structure_get_int (structure, "height", &overlay->height)) { gst_structure_get_int (structure, "height", &overlay->height) &&
fps != NULL) {
ret = gst_pad_set_caps (overlay->srcpad, caps); ret = gst_pad_set_caps (overlay->srcpad, caps);
} }
(void) gst_structure_get_double (structure, "framerate", &fps); overlay->fps_n = gst_value_get_fraction_numerator (fps);
overlay->framerate = fps; overlay->fps_d = gst_value_get_fraction_denominator (fps);
return ret; return ret;
} }
@ -780,8 +784,9 @@ gst_text_overlay_collected (GstCollectPads * pads, gpointer data)
if (GST_BUFFER_DURATION (video_frame) != GST_CLOCK_TIME_NONE) { if (GST_BUFFER_DURATION (video_frame) != GST_CLOCK_TIME_NONE) {
frame_end = now + GST_BUFFER_DURATION (video_frame); frame_end = now + GST_BUFFER_DURATION (video_frame);
} else if (overlay->framerate > 0.0) { } else if (overlay->fps_n > 0) {
frame_end = now + (GST_SECOND / overlay->framerate); frame_end = now + gst_util_clock_time_scale (GST_SECOND,
overlay->fps_d, overlay->fps_n);
} else { } else {
/* magic value, does not really matter since texts /* magic value, does not really matter since texts
* tend to span quite a few frames in practice anyway */ * tend to span quite a few frames in practice anyway */

3
ext/cairo/gsttextoverlay.h
View file

@ -51,7 +51,8 @@ struct _GstTextOverlay {
gint width; gint width;
gint height; gint height;
gdouble framerate; gint fps_n;
gint fps_d;
GstTextOverlayVAlign valign; GstTextOverlayVAlign valign;
GstTextOverlayHAlign halign; GstTextOverlayHAlign halign;

10
ext/gdk_pixbuf/gstgdkpixbuf.c
View file

@ -107,14 +107,18 @@ static GstPadLinkReturn
gst_gdk_pixbuf_sink_link (GstPad * pad, const GstCaps * caps) gst_gdk_pixbuf_sink_link (GstPad * pad, const GstCaps * caps)
{ {
GstGdkPixbuf *filter; GstGdkPixbuf *filter;
const GValue *fps;
filter = GST_GDK_PIXBUF (gst_pad_get_parent (pad)); filter = GST_GDK_PIXBUF (gst_pad_get_parent (pad));
g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED); g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
g_return_val_if_fail (GST_IS_GDK_PIXBUF (filter), GST_PAD_LINK_REFUSED); g_return_val_if_fail (GST_IS_GDK_PIXBUF (filter), GST_PAD_LINK_REFUSED);
filter->framerate = 1.0; fps = gst_structure_get_value (gst_caps_get_structure (caps, 0), "framerate");
gst_structure_get_double (gst_caps_get_structure (caps, 0), "framerate", if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) {
&filter->framerate); filter->fps_n = gst_value_get_fraction_numerator (fps);
filter->fps_d = gst_value_get_fraction_denominator (fps);
} else
return GST_PAD_LINK_REFUSED;
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }

3
ext/gdk_pixbuf/gstgdkpixbuf.h
View file

@ -56,7 +56,8 @@ struct _GstGdkPixbuf
int rowstride; int rowstride;
unsigned int image_size; unsigned int image_size;
double framerate; gint fps_n;
gint fps_d;
}; };
struct _GstGdkPixbufClass struct _GstGdkPixbufClass

5
ext/libpng/gstpngdec.c
View file

@ -155,7 +155,8 @@ gst_pngdec_init (GstPngDec * pngdec)
pngdec->width = -1; pngdec->width = -1;
pngdec->height = -1; pngdec->height = -1;
pngdec->bpp = -1; pngdec->bpp = -1;
pngdec->fps = 0.0; pngdec->fps_n = 0;
pngdec->fps_d = 1;
} }
static void static void
@ -336,7 +337,7 @@ gst_pngdec_caps_create_and_set (GstPngDec * pngdec)
"width", G_TYPE_INT, pngdec->width, "width", G_TYPE_INT, pngdec->width,
"height", G_TYPE_INT, pngdec->height, "height", G_TYPE_INT, pngdec->height,
"bpp", G_TYPE_INT, pngdec->bpp, "bpp", G_TYPE_INT, pngdec->bpp,
"framerate", G_TYPE_DOUBLE, pngdec->fps, NULL); "framerate", GST_TYPE_FRACTION, pngdec->fps_n, pngdec->fps_d, NULL);
templ = gst_static_pad_template_get (&gst_pngdec_src_pad_template); templ = gst_static_pad_template_get (&gst_pngdec_src_pad_template);

3
ext/libpng/gstpngdec.h
View file

@ -58,7 +58,8 @@ struct _GstPngDec
gint height; gint height;
gint bpp; gint bpp;
gint color_type; gint color_type;
gdouble fps; gint fps_n;
gint fps_d;
}; };
struct _GstPngDecClass struct _GstPngDecClass

10
ext/libpng/gstpngenc.c
View file

@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("image/png, " GST_STATIC_CAPS ("image/png, "
"width = (int) [ 16, 4096 ], " "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 = static GstStaticPadTemplate pngenc_sink_template =
@ -147,7 +147,7 @@ static gboolean
gst_pngenc_setcaps (GstPad * pad, GstCaps * caps) gst_pngenc_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstPngEnc *pngenc; GstPngEnc *pngenc;
gdouble fps; const GValue *fps;
GstStructure *structure; GstStructure *structure;
GstCaps *pcaps; GstCaps *pcaps;
gboolean ret = TRUE; gboolean ret = TRUE;
@ -158,15 +158,17 @@ gst_pngenc_setcaps (GstPad * pad, GstCaps * caps)
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "width", &pngenc->width); gst_structure_get_int (structure, "width", &pngenc->width);
gst_structure_get_int (structure, "height", &pngenc->height); 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); gst_structure_get_int (structure, "bpp", &pngenc->bpp);
opeer = gst_pad_get_peer (pngenc->srcpad); opeer = gst_pad_get_peer (pngenc->srcpad);
if (opeer) { if (opeer) {
pcaps = gst_caps_new_simple ("image/png", pcaps = gst_caps_new_simple ("image/png",
"framerate", G_TYPE_DOUBLE, fps,
"width", G_TYPE_INT, pngenc->width, "width", G_TYPE_INT, pngenc->width,
"height", G_TYPE_INT, pngenc->height, NULL); "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)) { if (gst_pad_accept_caps (opeer, pcaps)) {
gst_pad_set_caps (pngenc->srcpad, pcaps); gst_pad_set_caps (pngenc->srcpad, pcaps);
} else } else

5
gst/alpha/gstalphacolor.c
View file

@ -193,7 +193,7 @@ gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
GstAlphaColor *alpha; GstAlphaColor *alpha;
GstStructure *structure; GstStructure *structure;
gboolean ret; gboolean ret;
gdouble fps; const GValue *fps;
gint red_mask; gint red_mask;
alpha = GST_ALPHA_COLOR (btrans); alpha = GST_ALPHA_COLOR (btrans);
@ -201,7 +201,8 @@ gst_alpha_color_set_caps (GstBaseTransform * btrans, GstCaps * incaps,
ret = gst_structure_get_int (structure, "width", &alpha->in_width); ret = gst_structure_get_int (structure, "width", &alpha->in_width);
ret &= gst_structure_get_int (structure, "height", &alpha->in_height); ret &= gst_structure_get_int (structure, "height", &alpha->in_height);
ret &= gst_structure_get_double (structure, "framerate", &fps); fps = gst_structure_get_value (structure, "framerate");
ret &= (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps));
ret &= gst_structure_get_int (structure, "red_mask", &red_mask); ret &= gst_structure_get_int (structure, "red_mask", &red_mask);
if (!ret) if (!ret)

33
gst/avi/gstavimux.c
View file

@ -71,51 +71,51 @@ static GstStaticPadTemplate video_sink_factory =
"format = (fourcc) { YUY2, I420 }, " "format = (fourcc) { YUY2, I420 }, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"image/jpeg, " "image/jpeg, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"video/x-divx, " "video/x-divx, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ], " "framerate = (fraction) [ 0, MAX ], "
"divxversion = (int) [ 3, 5 ]; " "divxversion = (int) [ 3, 5 ]; "
"video/x-xvid, " "video/x-xvid, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"video/x-3ivx, " "video/x-3ivx, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"video/x-msmpeg, " "video/x-msmpeg, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ], " "framerate = (fraction) [ 0, MAX ], "
"msmpegversion = (int) [ 41, 43 ]; " "msmpegversion = (int) [ 41, 43 ]; "
"video/mpeg, " "video/mpeg, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ], " "framerate = (fraction) [ 0, MAX ], "
"mpegversion = (int) 1, " "mpegversion = (int) 1, "
"systemstream = (boolean) FALSE; " "systemstream = (boolean) FALSE; "
"video/x-h263, " "video/x-h263, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"video/x-h264, " "video/x-h264, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (double) [ 0, MAX ]; " "framerate = (fraction) [ 0, MAX ]; "
"video/x-dv, " "video/x-dv, "
"width = (int) 720, " "width = (int) 720, "
"height = (int) { 576, 480 }, " "height = (int) { 576, 480 }, "
"framerate = (double) [ 0, MAX ], " "framerate = (fraction) [ 0, MAX ], "
"systemstream = (boolean) FALSE; " "systemstream = (boolean) FALSE; "
"video/x-huffyuv, " "video/x-huffyuv, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "framerate = (double) [ 0, MAX ]") "height = (int) [ 16, 4096 ], " "framerate = (fraction) [ 0, MAX ]")
); );
static GstStaticPadTemplate audio_sink_factory = static GstStaticPadTemplate audio_sink_factory =
@ -277,7 +277,7 @@ gst_avimux_init (GstAviMux * avimux)
memset (&(avimux->auds_hdr), 0, sizeof (gst_riff_strh)); memset (&(avimux->auds_hdr), 0, sizeof (gst_riff_strh));
memset (&(avimux->auds), 0, sizeof (gst_riff_strf_auds)); memset (&(avimux->auds), 0, sizeof (gst_riff_strf_auds));
avimux->vids_hdr.type = GST_MAKE_FOURCC ('v', 'i', 'd', 's'); avimux->vids_hdr.type = GST_MAKE_FOURCC ('v', 'i', 'd', 's');
avimux->vids_hdr.rate = 1000000; avimux->vids_hdr.rate = 1;
avimux->avi_hdr.max_bps = 10000000; avimux->avi_hdr.max_bps = 10000000;
avimux->auds_hdr.type = GST_MAKE_FOURCC ('a', 'u', 'd', 's'); avimux->auds_hdr.type = GST_MAKE_FOURCC ('a', 'u', 'd', 's');
avimux->vids_hdr.quality = 0xFFFFFFFF; avimux->vids_hdr.quality = 0xFFFFFFFF;
@ -299,7 +299,7 @@ gst_avimux_vidsinkconnect (GstPad * pad, const GstCaps * vscaps)
GstAviMux *avimux; GstAviMux *avimux;
GstStructure *structure; GstStructure *structure;
const gchar *mimetype; const gchar *mimetype;
gdouble fps = 0.; const GValue *fps;
gboolean ret; gboolean ret;
avimux = GST_AVIMUX (gst_pad_get_parent (pad)); avimux = GST_AVIMUX (gst_pad_get_parent (pad));
@ -315,12 +315,13 @@ gst_avimux_vidsinkconnect (GstPad * pad, const GstCaps * vscaps)
avimux->vids.planes = 1; avimux->vids.planes = 1;
ret = gst_structure_get_int (structure, "width", &avimux->vids.width); ret = gst_structure_get_int (structure, "width", &avimux->vids.width);
ret &= gst_structure_get_int (structure, "height", &avimux->vids.height); ret &= gst_structure_get_int (structure, "height", &avimux->vids.height);
ret &= gst_structure_get_double (structure, "framerate", &fps); fps = gst_structure_get_value (structure, "framerate");
ret &= (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps));
if (!ret) if (!ret)
return GST_PAD_LINK_REFUSED; return GST_PAD_LINK_REFUSED;
if (fps != 0.) avimux->vids_hdr.rate = gst_value_get_fraction_numerator (fps);
avimux->vids_hdr.scale = avimux->vids_hdr.rate / fps; avimux->vids_hdr.scale = gst_value_get_fraction_denominator (fps);
if (!strcmp (mimetype, "video/x-raw-yuv")) { if (!strcmp (mimetype, "video/x-raw-yuv")) {
guint32 format; guint32 format;

4
gst/flx/gstflxdec.c
View file

@ -498,8 +498,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
gst_caps_set_simple (caps, gst_caps_set_simple (caps,
"width", G_TYPE_INT, flxh->width, "width", G_TYPE_INT, flxh->width,
"height", G_TYPE_INT, flxh->height, "height", G_TYPE_INT, flxh->height,
"framerate", G_TYPE_DOUBLE, "framerate", GST_TYPE_FRACTION, (gint) GST_MSECOND,
(gdouble) (GST_SECOND / flxdec->frame_time), NULL); (gint) flxdec->frame_time / 1000, NULL);
gst_pad_set_caps (flxdec->srcpad, caps); gst_pad_set_caps (flxdec->srcpad, caps);
gst_caps_unref (caps); gst_caps_unref (caps);

29
gst/goom/gstgoom.c
View file

@ -174,7 +174,8 @@ gst_goom_init (GstGoom * goom)
goom->width = 320; goom->width = 320;
goom->height = 200; goom->height = 200;
goom->fps = 25.; /* desired frame rate */ goom->fps_n = 25; /* desired frame rate */
goom->fps_d = 1; /* desired frame rate */
goom->channels = 0; goom->channels = 0;
goom->sample_rate = 0; goom->sample_rate = 0;
goom->audio_basetime = GST_CLOCK_TIME_NONE; goom->audio_basetime = GST_CLOCK_TIME_NONE;
@ -221,14 +222,22 @@ gst_goom_src_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstGoom *goom; GstGoom *goom;
GstStructure *structure; GstStructure *structure;
const GValue *fps;
goom = GST_GOOM (GST_PAD_PARENT (pad)); goom = GST_GOOM (GST_PAD_PARENT (pad));
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "width", &goom->width); if (!gst_structure_get_int (structure, "width", &goom->width) ||
gst_structure_get_int (structure, "height", &goom->height); !gst_structure_get_int (structure, "height", &goom->height))
gst_structure_get_double (structure, "framerate", &goom->fps); return FALSE;
fps = gst_structure_get_value (structure, "framerate");
if (fps == NULL || !GST_VALUE_HOLDS_FRACTION (fps))
return FALSE;
goom->fps_n = gst_value_get_fraction_numerator (fps);
goom->fps_d = gst_value_get_fraction_denominator (fps);
goom_set_resolution (goom->width, goom->height); goom_set_resolution (goom->width, goom->height);
@ -241,6 +250,7 @@ gst_goom_src_negotiate (GstGoom * goom)
GstCaps *othercaps, *target, *intersect; GstCaps *othercaps, *target, *intersect;
GstStructure *structure; GstStructure *structure;
const GstCaps *templ; const GstCaps *templ;
GValue fps = { 0 };
templ = gst_pad_get_pad_template_caps (goom->srcpad); templ = gst_pad_get_pad_template_caps (goom->srcpad);
@ -262,7 +272,11 @@ gst_goom_src_negotiate (GstGoom * goom)
structure = gst_caps_get_structure (target, 0); structure = gst_caps_get_structure (target, 0);
gst_structure_fixate_field_nearest_int (structure, "width", 320); gst_structure_fixate_field_nearest_int (structure, "width", 320);
gst_structure_fixate_field_nearest_int (structure, "height", 240); gst_structure_fixate_field_nearest_int (structure, "height", 240);
gst_structure_fixate_field_nearest_double (structure, "framerate", 30.0);
g_value_init (&fps, GST_TYPE_FRACTION);
gst_value_set_fraction (&fps, 30, 1);
gst_structure_fixate_field_nearest_fraction (structure, "framerate", &fps);
g_value_unset (&fps);
gst_pad_set_caps (goom->srcpad, target); gst_pad_set_caps (goom->srcpad, target);
gst_caps_unref (target); gst_caps_unref (target);
@ -326,7 +340,7 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
goom->audio_basetime = 0; goom->audio_basetime = 0;
bytesperread = GOOM_SAMPLES * goom->channels * sizeof (gint16); bytesperread = GOOM_SAMPLES * goom->channels * sizeof (gint16);
samples_per_frame = goom->sample_rate / goom->fps; samples_per_frame = goom->sample_rate * goom->fps_d / goom->fps_n;
data = (gint16 *) GST_BUFFER_DATA (bufin); data = (gint16 *) GST_BUFFER_DATA (bufin);
gst_adapter_push (goom->adapter, bufin); gst_adapter_push (goom->adapter, bufin);
@ -351,7 +365,8 @@ gst_goom_chain (GstPad * pad, GstBuffer * bufin)
GstClockTimeDiff frame_duration; GstClockTimeDiff frame_duration;
gint i; gint i;
frame_duration = GST_SECOND / goom->fps; frame_duration = gst_util_clock_time_scale (GST_SECOND, goom->fps_d,
goom->fps_n);
data = (const guint16 *) gst_adapter_peek (goom->adapter, bytesperread); data = (const guint16 *) gst_adapter_peek (goom->adapter, bytesperread);
if (goom->channels == 2) { if (goom->channels == 2) {

3
gst/goom/gstgoom.h
View file

@ -53,7 +53,8 @@ struct _GstGoom
guint64 samples_consumed; guint64 samples_consumed;
/* video state */ /* video state */
gdouble fps; gint fps_n;
gint fps_d;
gint width; gint width;
gint height; gint height;
gint channels; gint channels;

20
gst/matroska/matroska-demux.c
View file

@ -3069,21 +3069,29 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
} }
if (context->default_duration > 0) { if (context->default_duration > 0) {
gdouble framerate = (gdouble) GST_SECOND / context->default_duration; GValue fps_double = { 0 };
GValue fps_fraction = { 0 };
gst_structure_set (structure, g_value_init (&fps_double, G_TYPE_DOUBLE);
"framerate", G_TYPE_DOUBLE, framerate, NULL); g_value_init (&fps_fraction, GST_TYPE_FRACTION);
g_value_set_double (&fps_double,
GST_SECOND / context->default_duration);
g_value_transform (&fps_double, &fps_fraction);
gst_structure_set_value (structure, "framerate", &fps_fraction);
g_value_unset (&fps_double);
g_value_unset (&fps_fraction);
} else { } else {
/* sort of a hack to get most codecs to support, /* sort of a hack to get most codecs to support,
* even if the default_duration is missing */ * even if the default_duration is missing */
gst_structure_set (structure, "framerate", G_TYPE_DOUBLE, gst_structure_set (structure, "framerate", GST_TYPE_FRACTION,
(gdouble) 25.0, NULL); 25, 1, NULL);
} }
} else { } else {
gst_structure_set (structure, gst_structure_set (structure,
"width", GST_TYPE_INT_RANGE, 16, 4096, "width", GST_TYPE_INT_RANGE, 16, 4096,
"height", GST_TYPE_INT_RANGE, 16, 4096, "height", GST_TYPE_INT_RANGE, 16, 4096,
"framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, NULL); "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
} }
} }
} }

12
gst/matroska/matroska-mux.c
View file

@ -56,7 +56,7 @@ static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
#define COMMON_VIDEO_CAPS \ #define COMMON_VIDEO_CAPS \
"width = (int) [ 16, 4096 ], " \ "width = (int) [ 16, 4096 ], " \
"height = (int) [ 16, 4096 ], " \ "height = (int) [ 16, 4096 ], " \
"framerate = (double) [ 0, MAX ]" "framerate = (fraction) [ 0, MAX ]"
static GstStaticPadTemplate videosink_templ = static GstStaticPadTemplate videosink_templ =
GST_STATIC_PAD_TEMPLATE ("video_%d", GST_STATIC_PAD_TEMPLATE ("video_%d",
@ -424,7 +424,7 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps)
GstMatroskaPad *collect_pad; GstMatroskaPad *collect_pad;
const gchar *mimetype; const gchar *mimetype;
gint width, height, pixel_width, pixel_height; gint width, height, pixel_width, pixel_height;
gdouble framerate; const GValue *framerate;
GstStructure *structure; GstStructure *structure;
gboolean ret; gboolean ret;
@ -444,11 +444,15 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps)
/* get general properties */ /* get general properties */
gst_structure_get_int (structure, "width", &width); gst_structure_get_int (structure, "width", &width);
gst_structure_get_int (structure, "height", &height); gst_structure_get_int (structure, "height", &height);
gst_structure_get_double (structure, "framerate", &framerate); framerate = gst_structure_get_value (structure, "framerate");
if (framerate == NULL || !GST_VALUE_HOLDS_FRACTION (framerate))
return FALSE;
videocontext->pixel_width = width; videocontext->pixel_width = width;
videocontext->pixel_height = height; videocontext->pixel_height = height;
context->default_duration = GST_SECOND / framerate; context->default_duration = gst_util_clock_time_scale (GST_SECOND,
gst_value_get_fraction_numerator (framerate),
gst_value_get_fraction_denominator (framerate));
ret = gst_structure_get_int (structure, "pixel_width", &pixel_width); ret = gst_structure_get_int (structure, "pixel_width", &pixel_width);
ret &= gst_structure_get_int (structure, "pixel_height", &pixel_height); ret &= gst_structure_get_int (structure, "pixel_height", &pixel_height);