diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2014-10-09 18:55:16 -0700 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2014-10-09 18:55:16 -0700 |
commit | cdb2fff298a7ebaa1e33e4dc73b7aca65bc749c6 (patch) | |
tree | 80b1753999f378ef27e7f60e70b3c6351c2d393f /xorg/server/module | |
parent | c0839cd6a5a5e98d5975e169dd5f186bc9d008fe (diff) | |
download | xrdp-proprietary-cdb2fff298a7ebaa1e33e4dc73b7aca65bc749c6.tar.gz xrdp-proprietary-cdb2fff298a7ebaa1e33e4dc73b7aca65bc749c6.zip |
Xorg: move simd functions assign to it's own file
Diffstat (limited to 'xorg/server/module')
-rw-r--r-- | xorg/server/module/Makefile | 2 | ||||
-rw-r--r-- | xorg/server/module/rdpSimd.c | 130 | ||||
-rw-r--r-- | xorg/server/module/rdpSimd.h | 34 | ||||
-rw-r--r-- | xorg/server/module/rdpXv.c | 90 | ||||
-rw-r--r-- | xorg/server/module/rdpXv.h | 9 |
5 files changed, 178 insertions, 87 deletions
diff --git a/xorg/server/module/Makefile b/xorg/server/module/Makefile index 8f4f442b..8036400b 100644 --- a/xorg/server/module/Makefile +++ b/xorg/server/module/Makefile @@ -6,7 +6,7 @@ rdpPolyFillArc.o rdpPolyText8.o rdpPolyText16.o rdpImageText8.o \ rdpImageText16.o rdpImageGlyphBlt.o rdpPolyGlyphBlt.o rdpPushPixels.o \ rdpCursor.o rdpMain.o rdpRandR.o rdpMisc.o rdpReg.o \ rdpComposite.o rdpGlyphs.o rdpPixmap.o rdpInput.o rdpClientCon.o rdpCapture.o \ -rdpTrapezoids.o rdpXv.o +rdpTrapezoids.o rdpXv.o rdpSimd.o ;OBJS += cpuid_x86.o i420_to_rgb32_x86_sse2.o yv12_to_rgb32_x86_sse2.o yuy2_to_rgb32_x86_sse2.o uyvy_to_rgb32_x86_sse2.o ;OBJS += cpuid_amd64.o i420_to_rgb32_amd64_sse2.o yv12_to_rgb32_amd64_sse2.o yuy2_to_rgb32_amd64_sse2.o uyvy_to_rgb32_amd64_sse2.o diff --git a/xorg/server/module/rdpSimd.c b/xorg/server/module/rdpSimd.c new file mode 100644 index 00000000..098b71f3 --- /dev/null +++ b/xorg/server/module/rdpSimd.c @@ -0,0 +1,130 @@ +/* +Copyright 2014 Jay Sorg + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +SIMD function asign + +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* this should be before all X11 .h files */ +#include <xorg-server.h> +#include <xorgVersion.h> + +/* all driver need this */ +#include <xf86.h> +#include <xf86_OSproc.h> + +#include "rdp.h" +#include "rdpXv.h" + +/* use simd, run time */ +int g_simd_use_accel = 1; + +/* use simd, compile time, if zero, g_simd_use_accel does not matter */ +#if !defined(SIMD_USE_ACCEL) +#define SIMD_USE_ACCEL 0 +#endif + +#define LOG_LEVEL 1 +#define LLOGLN(_level, _args) \ + do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0) + +/*****************************************************************************/ +Bool +rdpSimdInit(ScreenPtr pScreen, ScrnInfoPtr pScrn) +{ + rdpPtr dev; + + dev = XRDPPTR(pScrn); + /* assign functions */ + LLOGLN(0, ("rdpSimdInit: assigning yuv functions")); +#if SIMD_USE_ACCEL + if (g_simd_use_accel) + { +#if defined(__x86_64__) || defined(__AMD64__) || defined (_M_AMD64) + int ax, bx, cx, dx; + cpuid_amd64(1, 0, &ax, &bx, &cx, &dx); + LLOGLN(0, ("rdpSimdInit: cpuid ax 1 cx 0 return ax 0x%8.8x bx " + "0x%8.8x cx 0x%8.8x dx 0x%8.8x", ax, bx, cx, dx)); + if (dx & (1 << 26)) /* SSE 2 */ + { + dev->yv12_to_rgb32 = yv12_to_rgb32_amd64_sse2; + dev->i420_to_rgb32 = i420_to_rgb32_amd64_sse2; + dev->yuy2_to_rgb32 = yuy2_to_rgb32_amd64_sse2; + dev->uyvy_to_rgb32 = uyvy_to_rgb32_amd64_sse2; + LLOGLN(0, ("rdpSimdInit: sse2 amd64 yuv functions assigned")); + } + else + { + dev->yv12_to_rgb32 = YV12_to_RGB32; + dev->i420_to_rgb32 = I420_to_RGB32; + dev->yuy2_to_rgb32 = YUY2_to_RGB32; + dev->uyvy_to_rgb32 = UYVY_to_RGB32; + LLOGLN(0, ("rdpSimdInit: warning, c yuv functions assigned")); + } +#elif defined(__x86__) || defined(_M_IX86) || defined(__i386__) + int ax, bx, cx, dx; + cpuid_x86(1, 0, &ax, &bx, &cx, &dx); + LLOGLN(0, ("rdpSimdInit: cpuid ax 1 cx 0 return ax 0x%8.8x bx " + "0x%8.8x cx 0x%8.8x dx 0x%8.8x", ax, bx, cx, dx)); + if (dx & (1 << 26)) /* SSE 2 */ + { + dev->yv12_to_rgb32 = yv12_to_rgb32_x86_sse2; + dev->i420_to_rgb32 = i420_to_rgb32_x86_sse2; + dev->yuy2_to_rgb32 = yuy2_to_rgb32_x86_sse2; + dev->uyvy_to_rgb32 = uyvy_to_rgb32_x86_sse2; + LLOGLN(0, ("rdpSimdInit: sse2 x86 yuv functions assigned")); + } + else + { + dev->yv12_to_rgb32 = YV12_to_RGB32; + dev->i420_to_rgb32 = I420_to_RGB32; + dev->yuy2_to_rgb32 = YUY2_to_RGB32; + dev->uyvy_to_rgb32 = UYVY_to_RGB32; + LLOGLN(0, ("rdpSimdInit: warning, c yuv functions assigned")); + } +#else + dev->yv12_to_rgb32 = YV12_to_RGB32; + dev->i420_to_rgb32 = I420_to_RGB32; + dev->yuy2_to_rgb32 = YUY2_to_RGB32; + dev->uyvy_to_rgb32 = UYVY_to_RGB32; + LLOGLN(0, ("rdpSimdInit: warning, c yuv functions assigned")); +#endif + } + else + { + dev->yv12_to_rgb32 = YV12_to_RGB32; + dev->i420_to_rgb32 = I420_to_RGB32; + dev->yuy2_to_rgb32 = YUY2_to_RGB32; + dev->uyvy_to_rgb32 = UYVY_to_RGB32; + LLOGLN(0, ("rdpSimdInit: warning, c yuv functions assigned")); + } +#else + dev->yv12_to_rgb32 = YV12_to_RGB32; + dev->i420_to_rgb32 = I420_to_RGB32; + dev->yuy2_to_rgb32 = YUY2_to_RGB32; + dev->uyvy_to_rgb32 = UYVY_to_RGB32; + LLOGLN(0, ("rdpSimdInit: warning, c yuv functions assigned")); +#endif + return 1; +} + diff --git a/xorg/server/module/rdpSimd.h b/xorg/server/module/rdpSimd.h new file mode 100644 index 00000000..73bf1ba5 --- /dev/null +++ b/xorg/server/module/rdpSimd.h @@ -0,0 +1,34 @@ +/* +Copyright 2014 Jay Sorg + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +SIMD function asign + +*/ + +#ifndef __RDPSIMD_H +#define __RDPSIMD_H + +#include <xorg-server.h> +#include <xorgVersion.h> +#include <xf86.h> + +Bool +rdpSimdInit(ScreenPtr pScreen, ScrnInfoPtr pScrn); + +#endif diff --git a/xorg/server/module/rdpXv.c b/xorg/server/module/rdpXv.c index 501b19a1..3a6fadf6 100644 --- a/xorg/server/module/rdpXv.c +++ b/xorg/server/module/rdpXv.c @@ -48,14 +48,6 @@ XVideo #define LLOGLN(_level, _args) \ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0) -/* use simd, run time */ -int g_xv_use_accel = 1; - -/* use simd, compile time, if zero, g_xv_use_accel does not matter */ -#if !defined(XV_USE_ACCEL) -#define XV_USE_ACCEL 0 -#endif - #define T_NUM_ENCODINGS 1 static XF86VideoEncodingRec g_xrdpVidEncodings[T_NUM_ENCODINGS] = { { 0, "XV_IMAGE", 2046, 2046, { 1, 1 } } }; @@ -165,7 +157,7 @@ xrdpVidQueryBestSize(ScrnInfoPtr pScrn, Bool motion, } /*****************************************************************************/ -static int +int YV12_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) { int size_total; @@ -206,7 +198,7 @@ YV12_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) } /*****************************************************************************/ -static int +int I420_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) { int size_total; @@ -247,7 +239,7 @@ I420_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) } /*****************************************************************************/ -static int +int YUY2_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) { int y1; @@ -301,7 +293,7 @@ YUY2_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) } /*****************************************************************************/ -static int +int UYVY_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs) { int y1; @@ -644,7 +636,6 @@ xrdpVidQueryImageAttributes(ScrnInfoPtr pScrn, int id, Bool rdpXvInit(ScreenPtr pScreen, ScrnInfoPtr pScrn) { - rdpPtr dev; XF86VideoAdaptorPtr adaptor; DevUnion* pDevUnion; int bytes; @@ -690,79 +681,6 @@ rdpXvInit(ScreenPtr pScreen, ScrnInfoPtr pScrn) return 0; } xf86XVFreeVideoAdaptorRec(adaptor); - - dev = XRDPPTR(pScrn); - /* assign functions */ - LLOGLN(0, ("rdpXvInit: assigning yuv functions")); -#if XV_USE_ACCEL - if (g_xv_use_accel) - { -#if defined(__x86_64__) || defined(__AMD64__) || defined (_M_AMD64) - int ax, bx, cx, dx; - cpuid_amd64(1, 0, &ax, &bx, &cx, &dx); - LLOGLN(0, ("rdpXvInit: cpuid ax 1 cx 0 return ax 0x%8.8x bx " - "0x%8.8x cx 0x%8.8x dx 0x%8.8x", ax, bx, cx, dx)); - if (dx & (1 << 26)) /* SSE 2 */ - { - dev->yv12_to_rgb32 = yv12_to_rgb32_amd64_sse2; - dev->i420_to_rgb32 = i420_to_rgb32_amd64_sse2; - dev->yuy2_to_rgb32 = yuy2_to_rgb32_amd64_sse2; - dev->uyvy_to_rgb32 = uyvy_to_rgb32_amd64_sse2; - LLOGLN(0, ("rdpXvInit: sse2 amd64 yuv functions assigned")); - } - else - { - dev->yv12_to_rgb32 = YV12_to_RGB32; - dev->i420_to_rgb32 = I420_to_RGB32; - dev->yuy2_to_rgb32 = YUY2_to_RGB32; - dev->uyvy_to_rgb32 = UYVY_to_RGB32; - LLOGLN(0, ("rdpXvInit: warning, c yuv functions assigned")); - } -#elif defined(__x86__) || defined(_M_IX86) || defined(__i386__) - int ax, bx, cx, dx; - cpuid_x86(1, 0, &ax, &bx, &cx, &dx); - LLOGLN(0, ("rdpXvInit: cpuid ax 1 cx 0 return ax 0x%8.8x bx " - "0x%8.8x cx 0x%8.8x dx 0x%8.8x", ax, bx, cx, dx)); - if (dx & (1 << 26)) /* SSE 2 */ - { - dev->yv12_to_rgb32 = yv12_to_rgb32_x86_sse2; - dev->i420_to_rgb32 = i420_to_rgb32_x86_sse2; - dev->yuy2_to_rgb32 = yuy2_to_rgb32_x86_sse2; - dev->uyvy_to_rgb32 = uyvy_to_rgb32_x86_sse2; - LLOGLN(0, ("rdpXvInit: sse2 x86 yuv functions assigned")); - } - else - { - dev->yv12_to_rgb32 = YV12_to_RGB32; - dev->i420_to_rgb32 = I420_to_RGB32; - dev->yuy2_to_rgb32 = YUY2_to_RGB32; - dev->uyvy_to_rgb32 = UYVY_to_RGB32; - LLOGLN(0, ("rdpXvInit: warning, c yuv functions assigned")); - } -#else - dev->yv12_to_rgb32 = YV12_to_RGB32; - dev->i420_to_rgb32 = I420_to_RGB32; - dev->yuy2_to_rgb32 = YUY2_to_RGB32; - dev->uyvy_to_rgb32 = UYVY_to_RGB32; - LLOGLN(0, ("rdpXvInit: warning, c yuv functions assigned")); -#endif - } - else - { - dev->yv12_to_rgb32 = YV12_to_RGB32; - dev->i420_to_rgb32 = I420_to_RGB32; - dev->yuy2_to_rgb32 = YUY2_to_RGB32; - dev->uyvy_to_rgb32 = UYVY_to_RGB32; - LLOGLN(0, ("rdpXvInit: warning, c yuv functions assigned")); - } -#else - dev->yv12_to_rgb32 = YV12_to_RGB32; - dev->i420_to_rgb32 = I420_to_RGB32; - dev->yuy2_to_rgb32 = YUY2_to_RGB32; - dev->uyvy_to_rgb32 = UYVY_to_RGB32; - LLOGLN(0, ("rdpXvInit: warning, c yuv functions assigned")); -#endif - return 1; } diff --git a/xorg/server/module/rdpXv.h b/xorg/server/module/rdpXv.h index 94331688..9cf28700 100644 --- a/xorg/server/module/rdpXv.h +++ b/xorg/server/module/rdpXv.h @@ -31,4 +31,13 @@ XVideo Bool rdpXvInit(ScreenPtr pScreen, ScrnInfoPtr pScrn); +int +YV12_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs); +int +I420_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs); +int +YUY2_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs); +int +UYVY_to_RGB32(unsigned char *yuvs, int width, int height, int *rgbs); + #endif |