Mercurial > libavcodec.hg
changeset 799:fbbe46490ce9 libavcodec
cleanly passing the cpuCaps
| author | michael |
|---|---|
| date | Wed, 30 Oct 2002 01:50:58 +0000 |
| parents | 50ae708fc721 |
| children | 52ac8213387e |
| files | libpostproc/postprocess.c libpostproc/postprocess.h |
| diffstat | 2 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libpostproc/postprocess.c Tue Oct 29 23:36:37 2002 +0000 +++ b/libpostproc/postprocess.c Wed Oct 30 01:50:58 2002 +0000 @@ -77,7 +77,6 @@ //#define DEBUG_BRIGHTNESS #include "../libvo/fastmemcpy.h" #include "postprocess.h" -#include "../cpudetect.h" #include "../mangle.h" #define MIN(a,b) ((a) > (b) ? (b) : (a)) @@ -105,6 +104,8 @@ static const int deringThreshold= 20; +static int cpuCaps=0; + struct PPFilter{ char *shortName; char *longName; @@ -189,15 +190,6 @@ } #endif -static inline long long rdtsc() -{ - long long l; - asm volatile( "rdtsc\n\t" - : "=A" (l) - ); -// printf("%d\n", int(l/1000)); - return l; -} #ifdef ARCH_X86 static inline void prefetchnta(void *p) @@ -229,6 +221,12 @@ } #endif +int pp_init(int caps){ + cpuCaps= caps; + + return 0; +} + // The horizontal Functions exist only in C cuz the MMX code is faster with vertical filters and transposing /** @@ -508,11 +506,11 @@ #ifdef RUNTIME_CPUDETECT #ifdef ARCH_X86 // ordered per speed fasterst first - if(gCpuCaps.hasMMX2) + if(cpuCaps & PP_CPU_CAPS_MMX2) postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); - else if(gCpuCaps.has3DNow) + else if(cpuCaps & PP_CPU_CAPS_3DNOW) postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); - else if(gCpuCaps.hasMMX) + else if(cpuCaps & PP_CPU_CAPS_MMX) postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); else postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
--- a/libpostproc/postprocess.h Tue Oct 29 23:36:37 2002 +0000 +++ b/libpostproc/postprocess.h Wed Oct 30 01:50:58 2002 +0000 @@ -96,4 +96,9 @@ void *pp_get_context(int width, int height); void pp_free_context(void *ppContext); +int pp_init(int cpuCaps); +#define PP_CPU_CAPS_MMX 1 +#define PP_CPU_CAPS_MMX2 2 +#define PP_CPU_CAPS_3DNOW 4 + #endif