Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: Copy DummyEncoding into each adapter. 

As we use the static DummyEncoding and may attempt to modify it for each
adaptor (on each device), we should use copies instead.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-07-12 17:26:37 +01:00
parent e30f0338fb
commit 56e5816252
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/intel_video.c
View File

@ -128,7 +128,7 @@ static Atom xvSyncToVblank;
#endif
/* client libraries expect an encoding */
static XF86VideoEncodingRec DummyEncoding[1] = {
static const XF86VideoEncodingRec DummyEncoding[1] = {
{
0,
"XV_IMAGE",
@ -423,16 +423,18 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr screen)
OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(intel_adaptor_private) + sizeof(DevUnion))))
if (!(adapt = calloc(1,
sizeof(XF86VideoAdaptorRec) +
sizeof(intel_adaptor_private) +
sizeof(DevUnion))))
return NULL;
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
adapt->flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT */ ;
adapt->name = "Intel(R) Video Overlay";
adapt->nEncodings = 1;
adapt->pEncodings = DummyEncoding;
/* update the DummyEncoding for these two chipsets */
adapt->pEncodings = xnfalloc(sizeof(DummyEncoding));
memcpy(adapt->pEncodings, DummyEncoding, sizeof(DummyEncoding));
if (IS_845G(intel) || IS_I830(intel)) {
adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY;
adapt->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY;
@ -550,7 +552,8 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr screen)
adapt->flags = 0;
adapt->name = "Intel(R) Textured Video";
adapt->nEncodings = 1;
adapt->pEncodings = DummyEncoding;
adapt->pEncodings = xnfalloc(sizeof(DummyEncoding));
memcpy(adapt->pEncodings, DummyEncoding, sizeof(DummyEncoding));
adapt->nFormats = NUM_FORMATS;
adapt->pFormats = Formats;
adapt->nPorts = nports;