summaryrefslogtreecommitdiffstats
path: root/sys/ximagesrc/ximagesrc.c
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2006-03-31 17:52:36 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2006-03-31 17:52:36 +0000
commit7becef8f96aa821eca208b8e5ef7980da8963d12 (patch)
treedf9d8372e353331f6fae7ce94e92fa3722d7521b /sys/ximagesrc/ximagesrc.c
parent10496d32d77078782f402b8fea831f777faf7512 (diff)
downloadgst-plugins-bad-7becef8f96aa821eca208b8e5ef7980da8963d12.tar.gz
gst-plugins-bad-7becef8f96aa821eca208b8e5ef7980da8963d12.tar.bz2
gst-plugins-bad-7becef8f96aa821eca208b8e5ef7980da8963d12.zip
Add tests and fix PAR caps issue to ximagesrc
Original commit message from CVS: 2006-03-31 Zaheer Abbas Merali <zaheerabbas at merali dot org> * Makefile.am: * configure.ac: * sys/ximagesrc/ximagesrc.c: (gst_ximagesrc_ximage_get), (gst_ximagesrc_get_caps), (gst_ximagesrc_class_init): * sys/ximagesrc/ximageutil.c: * tests/Makefile.am: * tests/icles/Makefile.am: * tests/icles/ximagesrc-test.c: (terminate_playback), (main): Add tests and fix PAR caps issue to ximagesrc
Diffstat (limited to 'sys/ximagesrc/ximagesrc.c')
-rw-r--r--sys/ximagesrc/ximagesrc.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/ximagesrc/ximagesrc.c b/sys/ximagesrc/ximagesrc.c
index 2edbfd74..95c54bae 100644
--- a/sys/ximagesrc/ximagesrc.c
+++ b/sys/ximagesrc/ximagesrc.c
@@ -68,7 +68,8 @@ static GstStaticPadTemplate t =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw-rgb, "
"framerate = (fraction) [ 0, MAX ], "
- "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ] "));
+ "width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ], "
+ "pixel-aspect-ratio = (fraction) [ 0, MAX ]"));
enum
{
@@ -369,7 +370,9 @@ gst_ximagesrc_ximage_get (GstXImageSrc * ximagesrc)
"width", G_TYPE_INT, xcontext->width,
"height", G_TYPE_INT, xcontext->height,
"framerate", GST_TYPE_FRACTION, ximagesrc->fps_n, ximagesrc->fps_d,
- "pixel-aspect-ratio", GST_TYPE_FRACTION, xcontext->par, NULL);
+ "pixel-aspect-ratio", GST_TYPE_FRACTION,
+ gst_value_get_fraction_numerator (xcontext->par),
+ gst_value_get_fraction_denominator (xcontext->par), NULL);
gst_buffer_set_caps (GST_BUFFER (ximage), caps);
g_mutex_unlock (ximagesrc->x_lock);
@@ -717,7 +720,9 @@ gst_ximagesrc_get_caps (GstBaseSrc * bs)
"blue_mask", G_TYPE_INT, xcontext->b_mask_output,
"width", G_TYPE_INT, xcontext->width,
"height", G_TYPE_INT, xcontext->height,
- "framerate", GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1, NULL);
+ "framerate", GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1,
+ "pixel-aspect-ratio", GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1,
+ NULL);
}
static gboolean