mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +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 #630442.
This commit is contained in:
Sebastian Dröge 2011-05-26 12:33:08 +02:00
parent 34ae792075
commit 7716358d04
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/xvimage/xvimagesink.c
View file

@ -562,16 +562,23 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
xvimage->width, xvimage->height, &xvimage->SHMInfo); xvimage->width, xvimage->height, &xvimage->SHMInfo);
if (!xvimage->xvimage || error_caught) { if (!xvimage->xvimage || error_caught) {
g_mutex_unlock (xvimagesink->x_lock); g_mutex_unlock (xvimagesink->x_lock);
/* Reset error handler */
/* Reset error flag */
error_caught = FALSE; error_caught = FALSE;
XSetErrorHandler (handler);
/* Push an error */ /* Push a warning */
GST_ELEMENT_ERROR (xvimagesink, RESOURCE, WRITE, GST_ELEMENT_WARNING (xvimagesink, RESOURCE, WRITE,
("Failed to create output image buffer of %dx%d pixels", ("Failed to create output image buffer of %dx%d pixels",
xvimage->width, xvimage->height), xvimage->width, xvimage->height),
("could not XvShmCreateImage a %dx%d image", ("could not XvShmCreateImage a %dx%d image",
xvimage->width, xvimage->height)); xvimage->width, xvimage->height));
goto beach_unlocked;
/* Retry without XShm */
xvimagesink->xcontext->use_xshm = FALSE;
/* Hold X mutex again to try without XShm */
g_mutex_lock (xvimagesink->x_lock);
goto no_xshm;
} }
/* we have to use the returned data_size for our shm size */ /* we have to use the returned data_size for our shm size */
@ -680,6 +687,7 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
GST_DEBUG_OBJECT (xvimagesink, "XServer ShmAttached to 0x%x, id 0x%lx", GST_DEBUG_OBJECT (xvimagesink, "XServer ShmAttached to 0x%x, id 0x%lx",
xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg); xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg);
} else } else
no_xshm:
#endif /* HAVE_XSHM */ #endif /* HAVE_XSHM */
{ {
xvimage->xvimage = XvCreateImage (xvimagesink->xcontext->disp, xvimage->xvimage = XvCreateImage (xvimagesink->xcontext->disp,