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

X11rdp: work on xv, still off by default

Browse Source
This commit is contained in:
Jay Sorg 2013-06-15 11:04:42 -07:00
parent d22778ca69
commit 62c16bad5a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorg/X11R7.6/rdp/rdpmain.c
View File

@ -527,6 +527,8 @@ rdpScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
} }
//rdpXvInit(pScreen);
ErrorF("rdpScreenInit: ret %d\n", ret); ErrorF("rdpScreenInit: ret %d\n", ret);
return ret; return ret;

15
xorg/X11R7.6/rdp/rdpxv.c
View File

@ -29,7 +29,11 @@ XVideo extension
#include <fourcc.h> #include <fourcc.h>
extern rdpScreenInfoRec g_rdpScreen; /* from rdpmain.c */
static DevPrivateKey g_XvScreenKey; static DevPrivateKey g_XvScreenKey;
static char g_xv_adaptor_name[] = "xrdp XVideo adaptor";
static char g_xv_encoding_name[] = "XV_IMAGE";
#define GET_XV_SCREEN(pScreen) \ #define GET_XV_SCREEN(pScreen) \
((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, g_XvScreenKey)) ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, g_XvScreenKey))
@ -359,10 +363,11 @@ rdpXvInitAdaptors(ScreenPtr pScreen)
pAdaptor = malloc(sizeof(XvAdaptorRec)); pAdaptor = malloc(sizeof(XvAdaptorRec));
memset(pAdaptor, 0, sizeof(XvAdaptorRec)); memset(pAdaptor, 0, sizeof(XvAdaptorRec));
pAdaptor->type = XvInputMask | XvImageMask | XvVideoMask | XvStillMask; pAdaptor->type = XvInputMask | XvOutputMask | XvImageMask |
XvVideoMask | XvStillMask;
pAdaptor->pScreen = pScreen; pAdaptor->pScreen = pScreen;
pAdaptor->name = "xrdp XVideo adaptor"; pAdaptor->name = g_xv_adaptor_name;
pAdaptor->nEncodings = T_NUM_ENCODINGS; pAdaptor->nEncodings = T_NUM_ENCODINGS;
pAdaptor->pEncodings = g_encodings; pAdaptor->pEncodings = g_encodings;
@ -394,15 +399,15 @@ rdpXvInitAdaptors(ScreenPtr pScreen)
memset(g_encodings, 0, sizeof(g_encodings)); memset(g_encodings, 0, sizeof(g_encodings));
g_encodings[0].id = FakeClientID(0); g_encodings[0].id = FakeClientID(0);
g_encodings[0].pScreen = pScreen; g_encodings[0].pScreen = pScreen;
g_encodings[0].name = "XV_IMAGE"; g_encodings[0].name = g_xv_encoding_name;
g_encodings[0].width = 2046; g_encodings[0].width = 2046;
g_encodings[0].height = 2046; g_encodings[0].height = 2046;
g_encodings[0].rate.numerator = 1; g_encodings[0].rate.numerator = 1;
g_encodings[0].rate.denominator = 1; g_encodings[0].rate.denominator = 1;
memset(g_formats, 0, sizeof(g_formats)); memset(g_formats, 0, sizeof(g_formats));
g_formats[0].depth = 24; g_formats[0].depth = g_rdpScreen.depth;
g_formats[0].visual = TrueColor; g_formats[0].visual = pScreen->rootVisual;
memset(g_ports, 0, sizeof(g_ports)); memset(g_ports, 0, sizeof(g_ports));
g_ports[0].id = FakeClientID(0); g_ports[0].id = FakeClientID(0);