mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xorg: fix for Xv and Composite

Browse Source
This commit is contained in:
Jay Sorg 2014-10-04 15:24:35 -07:00
parent 5ccbc37882
commit 1005a29c4f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xorg/server/module/rdpXv.c
View File

@ -37,6 +37,8 @@ XVideo
#include <X11/extensions/Xv.h>
#include <fourcc.h>
#include <fb.h>
#include "rdp.h"
#include "rdpMisc.h"
#include "rdpReg.h"
@ -462,10 +464,20 @@ xrdpVidPutImage(ScrnInfoPtr pScrn,
RegionRec dreg;
BoxRec box;
FbBits *dst1;
FbStride dstStride; /* pixels */
int dstBpp;
int dstXoff;
int dstYoff;
LLOGLN(10, ("xrdpVidPutImage:"));
LLOGLN(10, ("xrdpVidPutImage: src_x %d srcy_y %d", src_x, src_y));
dev = XRDPPTR(pScrn);
fbGetDrawable(dst, dst1, dstStride, dstBpp, dstXoff, dstYoff);
LLOGLN(10, ("dstStride %d dstXoff %d dstYoff %d dst1 %p dev->pfbMemory %p",
dstStride, dstXoff, dstYoff, dst1, dev->pfbMemory));
if (dev->xv_timer_schedualed)
{
TimerCancel(dev->xv_timer);
@ -547,7 +559,7 @@ xrdpVidPutImage(ScrnInfoPtr pScrn,
{
box = REGION_RECTS(&dreg)[jndex];
LLOGLN(10, ("box 2 %d %d %d %d", box.x1, box.y1, box.x2, box.y2));
dst8 = dev->pfbMemory + box.y1 * dev->paddedWidthInBytes;
dst8 = (char *) (dst1 + ((box.y1 + dstYoff) * dstStride) + dstXoff);
src32a = rgbend32 + (box.y1 - drw_y) * drw_w;
for (index = 0; index < box.y2 - box.y1; index++)
{
@ -555,7 +567,7 @@ xrdpVidPutImage(ScrnInfoPtr pScrn,
dst32 += box.x1;
src32 = src32a + (box.x1 - drw_x);
g_memcpy(dst32, src32, (box.x2 - box.x1) * 4);
dst8 += dev->paddedWidthInBytes;
dst8 += dstStride * 4;
src32a += drw_w;
}
}