mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/ximage/ximagesink.c: Change to using a framerate of [1,100] instead of [0,MAX], since 0 isn't handled correctly, ...

Browse source 
Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents),
(gst_ximagesink_xcontext_get), (gst_ximagesink_getcaps),
(gst_ximagesink_set_xwindow_id): Change to using a framerate
of [1,100] instead of [0,MAX], since 0 isn't handled correctly,
and neither is 100+, most likely.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
(gst_xvimagesink_getcaps): same
This commit is contained in:
David Schleef 2004-01-20 09:25:51 +00:00
parent bd6bc6d3b7
commit 879b0b7ac0
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-01-20 David Schleef <ds@schleef.org>
* sys/ximage/ximagesink.c: (gst_ximagesink_handle_xevents),
(gst_ximagesink_xcontext_get), (gst_ximagesink_getcaps),
(gst_ximagesink_set_xwindow_id): Change to using a framerate
of [1,100] instead of [0,MAX], since 0 isn't handled correctly,
and neither is 100+, most likely.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
(gst_xvimagesink_getcaps): same
2004-01-19 Benjamin Otte <in7y118@public.uni-hamburg.de> 2004-01-19 Benjamin Otte <in7y118@public.uni-hamburg.de>
* configure.ac: * configure.ac:

20
sys/ximage/ximagesink.c
View file

@ -342,15 +342,15 @@ gst_ximagesink_handle_xevents (GstXImageSink *ximagesink, GstPad *pad)
"red_mask", G_TYPE_INT, ximagesink->xcontext->visual->red_mask, "red_mask", G_TYPE_INT, ximagesink->xcontext->visual->red_mask,
"green_mask", G_TYPE_INT, ximagesink->xcontext->visual->green_mask, "green_mask", G_TYPE_INT, ximagesink->xcontext->visual->green_mask,
"blue_mask", G_TYPE_INT, ximagesink->xcontext->visual->blue_mask, "blue_mask", G_TYPE_INT, ximagesink->xcontext->visual->blue_mask,
"width", G_TYPE_INT, e.xconfigure.width & ~3, "width", G_TYPE_INT, e.xconfigure.width,
"height", G_TYPE_INT, e.xconfigure.height & ~3, "height", G_TYPE_INT, e.xconfigure.height,
"framerate", G_TYPE_DOUBLE, ximagesink->framerate, "framerate", G_TYPE_DOUBLE, ximagesink->framerate,
NULL)); NULL));
if ( (r == GST_PAD_LINK_OK) || (r == GST_PAD_LINK_DONE) ) if ( (r == GST_PAD_LINK_OK) || (r == GST_PAD_LINK_DONE) )
{ {
GST_VIDEOSINK_WIDTH (ximagesink) = e.xconfigure.width & ~3; GST_VIDEOSINK_WIDTH (ximagesink) = e.xconfigure.width;
GST_VIDEOSINK_HEIGHT (ximagesink) = e.xconfigure.height & ~3; GST_VIDEOSINK_HEIGHT (ximagesink) = e.xconfigure.height;
if ( (ximagesink->ximage) && if ( (ximagesink->ximage) &&
( (GST_VIDEOSINK_WIDTH (ximagesink) != ximagesink->ximage->width) || ( (GST_VIDEOSINK_WIDTH (ximagesink) != ximagesink->ximage->width) ||
@ -521,7 +521,7 @@ gst_ximagesink_xcontext_get (GstXImageSink *ximagesink)
"blue_mask", G_TYPE_INT, xcontext->visual->blue_mask, "blue_mask", G_TYPE_INT, xcontext->visual->blue_mask,
"width", GST_TYPE_INT_RANGE, 0, G_MAXINT, "width", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 0, G_MAXINT, "height", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, "framerate", GST_TYPE_DOUBLE_RANGE, 1.0, 100.0,
NULL); NULL);
g_mutex_unlock (ximagesink->x_lock); g_mutex_unlock (ximagesink->x_lock);
@ -587,7 +587,7 @@ gst_ximagesink_getcaps (GstPad *pad)
return gst_caps_copy (ximagesink->xcontext->caps); return gst_caps_copy (ximagesink->xcontext->caps);
return gst_caps_from_string ("video/x-raw-rgb, " return gst_caps_from_string ("video/x-raw-rgb, "
"framerate = (double) [ 0, MAX ], " "framerate = (double) [ 1, 100 ], "
"width = (int) [ 0, MAX ], " "width = (int) [ 0, MAX ], "
"height = (int) [ 0, MAX ]"); "height = (int) [ 0, MAX ]");
} }
@ -1013,16 +1013,16 @@ gst_ximagesink_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
"red_mask", G_TYPE_INT, ximagesink->xcontext->visual->red_mask, "red_mask", G_TYPE_INT, ximagesink->xcontext->visual->red_mask,
"green_mask", G_TYPE_INT, ximagesink->xcontext->visual->green_mask, "green_mask", G_TYPE_INT, ximagesink->xcontext->visual->green_mask,
"blue_mask", G_TYPE_INT, ximagesink->xcontext->visual->blue_mask, "blue_mask", G_TYPE_INT, ximagesink->xcontext->visual->blue_mask,
"width", G_TYPE_INT, xwindow->width & ~3, "width", G_TYPE_INT, xwindow->width,
"height", G_TYPE_INT, xwindow->height & ~3, "height", G_TYPE_INT, xwindow->height,
"framerate", G_TYPE_DOUBLE, ximagesink->framerate, "framerate", G_TYPE_DOUBLE, ximagesink->framerate,
NULL)); NULL));
/* If caps nego succeded updating our size */ /* If caps nego succeded updating our size */
if ( (r == GST_PAD_LINK_OK) || (r == GST_PAD_LINK_DONE) ) if ( (r == GST_PAD_LINK_OK) || (r == GST_PAD_LINK_DONE) )
{ {
GST_VIDEOSINK_WIDTH (ximagesink) = xwindow->width & ~3; GST_VIDEOSINK_WIDTH (ximagesink) = xwindow->width;
GST_VIDEOSINK_HEIGHT (ximagesink) = xwindow->height & ~3; GST_VIDEOSINK_HEIGHT (ximagesink) = xwindow->height;
} }
} }
} }

6
sys/xvimage/xvimagesink.c
View file

@ -559,7 +559,7 @@ gst_xvimagesink_get_xv_support (GstXContext *xcontext)
"red_mask", G_TYPE_INT, formats[i].blue_mask, "red_mask", G_TYPE_INT, formats[i].blue_mask,
"width", GST_TYPE_INT_RANGE, 0, G_MAXINT, "width", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 0, G_MAXINT, "height", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, "framerate", GST_TYPE_DOUBLE_RANGE, 1.0, 100.0,
NULL); NULL);
/* For RGB caps we store them and the image /* For RGB caps we store them and the image
@ -585,7 +585,7 @@ gst_xvimagesink_get_xv_support (GstXContext *xcontext)
"format", GST_TYPE_FOURCC,formats[i].id, "format", GST_TYPE_FOURCC,formats[i].id,
"width", GST_TYPE_INT_RANGE, 0, G_MAXINT, "width", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 0, G_MAXINT, "height", GST_TYPE_INT_RANGE, 0, G_MAXINT,
"framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, "framerate", GST_TYPE_DOUBLE_RANGE, 1.0, 100.0,
NULL); NULL);
break; break;
default: default:
@ -863,7 +863,7 @@ gst_xvimagesink_getcaps (GstPad *pad)
return gst_caps_from_string( return gst_caps_from_string(
"video/x-raw-rgb, " "video/x-raw-rgb, "
"framerate = (double) [ 0, MAX ], " "framerate = (double) [ 1.0, 100.0 ], "
"width = (int) [ 0, MAX ], " "width = (int) [ 0, MAX ], "
"height = (int) [ 0, MAX ]; " "height = (int) [ 0, MAX ]; "
"video/x-raw-yuv, " "video/x-raw-yuv, "