From f84de0efb7b6073c96d38109e9936a0978a93bba Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Fri, 31 Mar 2006 17:52:36 +0000 Subject: Add tests and fix PAR caps issue to ximagesrc Original commit message from CVS: 2006-03-31 Zaheer Abbas Merali * 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 --- sys/ximage/gstximagesrc.c | 11 ++++++++--- sys/ximage/ximageutil.c | 6 ++---- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'sys/ximage') diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index 2edbfd74..95c54bae 100644 --- a/sys/ximage/gstximagesrc.c +++ b/sys/ximage/gstximagesrc.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 diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c index 2c1149bc..c9b7c566 100644 --- a/sys/ximage/ximageutil.c +++ b/sys/ximage/ximageutil.c @@ -140,12 +140,11 @@ ximageutil_xcontext_get (GstElement * parent, const gchar * display_name) xcontext = g_new0 (GstXContext, 1); xcontext->disp = XOpenDisplay (display_name); - + GST_DEBUG_OBJECT (parent, "opened display 0x%x", xcontext->disp); if (!xcontext->disp) { g_free (xcontext); return NULL; } - xcontext->screen = DefaultScreenOfDisplay (xcontext->disp); xcontext->screen_num = DefaultScreen (xcontext->disp); xcontext->visual = DefaultVisual (xcontext->disp, xcontext->screen_num); @@ -164,7 +163,6 @@ ximageutil_xcontext_get (GstElement * parent, const gchar * display_name) GST_DEBUG_OBJECT (parent, "X reports %dx%d pixels and %d mm x %d mm", xcontext->width, xcontext->height, xcontext->widthmm, xcontext->heightmm); - ximageutil_calculate_pixel_aspect_ratio (xcontext); /* We get supported pixmap formats at supported depth */ @@ -288,7 +286,7 @@ ximageutil_calculate_pixel_aspect_ratio (GstXContext * xcontext) xcontext->par = g_new0 (GValue, 1); g_value_init (xcontext->par, GST_TYPE_FRACTION); gst_value_set_fraction (xcontext->par, par[index][0], par[index][1]); - GST_DEBUG ("set xcontext PAR to %d/%d", + GST_DEBUG ("set xcontext PAR to %d/%d\n", gst_value_get_fraction_numerator (xcontext->par), gst_value_get_fraction_denominator (xcontext->par)); } -- cgit