pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hans de Goede fixed bug #495

Browse source 
When running boswars: http://www.boswars.org/ on a machine with intel
integrathed graphics it crashes when it tries to play the initial theora
splashscreen video:
X Error of failed request:  BadAlloc (insufficient resources for operation)
  Major opcode of failed request:  140 (XVideo)
  Minor opcode of failed request:  19 ()
  Serial number of failed request:  25
  Current serial number in output stream:  26
boswars: xcb_xlib.c:41: xcb_xlib_lock: Assertion `!c->xlib.lock' failed.
Aborted

I recognized this problem from a few years back, when I encountered it while
working on the Xv blitter for xmame. The problem is that for some reason
creation the Xvport and XvImage succeeds, and failure (lack of resources / hw
capability?) is only indicated during the first XvPut[Shm]Image. I've written a
patch for SDL using the work around for this I developed for xmame (and which
is still used successfully in xmame after many years of usage).

I'll admit it isn't very pretty, but after investigating several possibilities
this was the best option, any other fixes would need changes to the SDL api and
abi.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402659
This commit is contained in:
Sam Lantinga 2007-12-29 02:23:48 +00:00
parent 385c1a65d4
commit 6a789765e3
1 changed files with 125 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

125
src/video/x11/SDL_x11yuv.c
View file

@ -44,6 +44,10 @@
/* Workaround when pitch != width */
#define PITCH_WORKAROUND
/* Workaround intel i810 video overlay waiting with failing until the
first Xv[Shm]PutImage call <sigh> */
#define INTEL_XV_BADALLOC_WORKAROUND
/* Fix for the NVidia GeForce 2 - use the last available adaptor */
/*#define USE_LAST_ADAPTOR*/ /* Apparently the NVidia drivers are fixed */
@ -90,6 +94,69 @@ static int xv_errhandler(Display *d, XErrorEvent *e)
return(X_handler(d,e));
}
#ifdef INTEL_XV_BADALLOC_WORKAROUND
static int intel_errhandler(Display *d, XErrorEvent *e)
{
if ( e->error_code == BadAlloc ) {
xv_error = True;
return(0);
} else
return(X_handler(d,e));
}
static void X11_ClearYUVOverlay(SDL_Overlay *overlay)
{
int x,y;
switch (overlay->format)
{
case SDL_YV12_OVERLAY:
case SDL_IYUV_OVERLAY:
for (y = 0; y < overlay->h; y++)
memset(overlay->pixels[0] + y * overlay->pitches[0],
0, overlay->w);
for (y = 0; y < (overlay->h / 2); y++)
{
memset(overlay->pixels[1] + y * overlay->pitches[1],
-128, overlay->w / 2);
memset(overlay->pixels[2] + y * overlay->pitches[2],
-128, overlay->w / 2);
}
break;
case SDL_YUY2_OVERLAY:
case SDL_YVYU_OVERLAY:
for (y = 0; y < overlay->h; y++)
{
for (x = 0; x < overlay->w; x += 2)
{
Uint8 *pixel_pair = overlay->pixels[0] +
y * overlay->pitches[0] + x * 2;
pixel_pair[0] = 0;
pixel_pair[1] = -128;
pixel_pair[2] = 0;
pixel_pair[3] = -128;
}
}
break;
case SDL_UYVY_OVERLAY:
for (y = 0; y < overlay->h; y++)
{
for (x = 0; x < overlay->w; x += 2)
{
Uint8 *pixel_pair = overlay->pixels[0] +
y * overlay->pitches[0] + x * 2;
pixel_pair[0] = -128;
pixel_pair[1] = 0;
pixel_pair[2] = -128;
pixel_pair[3] = 0;
}
}
break;
}
}
#endif
SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface *display)
{
SDL_Overlay *overlay;
@ -102,6 +169,9 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
#ifndef NO_SHARED_MEMORY
XShmSegmentInfo *yuvshm;
#endif
#ifdef INTEL_XV_BADALLOC_WORKAROUND
int intel_adapter = False;
#endif
/* Look for the XVideo extension with a valid port for this format */
xv_port = -1;
@ -129,6 +199,12 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
continue;
}
}
#ifdef INTEL_XV_BADALLOC_WORKAROUND
if ( !strcmp(ainfo[i].name, "Intel(R) Video Overla"))
intel_adapter = True;
else
intel_adapter = False;
#endif
if ( (ainfo[i].type & XvInputMask) &&
(ainfo[i].type & XvImageMask) ) {
int num_formats;
@ -340,6 +416,55 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S
X11_DisableAutoRefresh(this);
#endif
#ifdef INTEL_XV_BADALLOC_WORKAROUND
/* HACK, GRRR sometimes (i810) creating the overlay succeeds, but the
first call to XvShm[Put]Image to a mapped window fails with:
"BadAlloc (insufficient resources for operation)". This happens with
certain formats when the XvImage is too large to the i810's liking.
We work around this by doing a test XvShm[Put]Image with a black
Xv image, this may cause some flashing, so only do this check if we
are running on an intel Xv-adapter. */
if (intel_adapter)
{
xv_error = False;
X_handler = XSetErrorHandler(intel_errhandler);
X11_ClearYUVOverlay(overlay);
/* We set the destination height and width to 1 pixel to avoid
putting a large black rectangle over the screen, thus
strongly reducing possible flashing. */
#ifndef NO_SHARED_MEMORY
if ( hwdata->yuv_use_mitshm ) {
SDL_NAME(XvShmPutImage)(GFX_Display, hwdata->port,
SDL_Window, SDL_GC,
hwdata->image,
0, 0, overlay->w, overlay->h,
0, 0, 1, 1, False);
}
else
#endif
{
SDL_NAME(XvPutImage)(GFX_Display, hwdata->port,
SDL_Window, SDL_GC,
hwdata->image,
0, 0, overlay->w, overlay->h,
0, 0, 1, 1);
}
XSync(GFX_Display, False);
XSetErrorHandler(X_handler);
if (xv_error)
{
X11_FreeYUVOverlay(this, overlay);
return NULL;
}
/* Repair the (1 pixel worth of) damage we've just done */
X11_RefreshDisplay(this);
}
#endif
/* We're all done.. */
return(overlay);
}