mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-05 06:58:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

xvimagesink: Fallback to non-XShm mode if allocating the XShm image failed

Browse source 
Fixes bug #630456.
This commit is contained in:
Sebastian Dröge 2011-05-26 12:48:36 +02:00
parent ff1c05d876
commit 1f707ac3e0
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/ximage/ximageutil.c
View file

@ -395,7 +395,13 @@ gst_ximageutil_ximage_new (GstXContext * xcontext,
xcontext->visual, xcontext->depth, xcontext->visual, xcontext->depth,
ZPixmap, NULL, &ximage->SHMInfo, ximage->width, ximage->height); ZPixmap, NULL, &ximage->SHMInfo, ximage->width, ximage->height);
if (!ximage->ximage) { if (!ximage->ximage) {
goto beach; GST_WARNING_OBJECT (parent,
"could not XShmCreateImage a %dx%d image",
ximage->width, ximage->height);
/* Retry without XShm */
xcontext->use_xshm = FALSE;
goto no_xshm;
} }
/* we have to use the returned bytes_per_line for our shm size */ /* we have to use the returned bytes_per_line for our shm size */
@ -421,6 +427,7 @@ gst_ximageutil_ximage_new (GstXContext * xcontext,
XSync (xcontext->disp, FALSE); XSync (xcontext->disp, FALSE);
} else } else
no_xshm:
#endif /* HAVE_XSHM */ #endif /* HAVE_XSHM */
{ {
ximage->ximage = XCreateImage (xcontext->disp, ximage->ximage = XCreateImage (xcontext->disp,