diff options
| author | wm4 <wm4@nowhere> | 2012-08-07 02:21:19 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-07 02:21:19 +0200 |
| commit | 477af1c777116fcfb96885195acbed5cca8a0d4c (patch) | |
| tree | e1330b7156c7fe59b64af31c2304bc9dc6e3af70 /libvo/osd_template.c | |
| parent | 7484ae8e2ee5327400358e7c7cb974d84543aef6 (diff) | |
| download | mpv-477af1c777116fcfb96885195acbed5cca8a0d4c.tar.bz2 mpv-477af1c777116fcfb96885195acbed5cca8a0d4c.tar.xz | |
osd: remove FAST_OSD code
This code has never been active by default, ever since it was added
back in 2001. You had to edit config.h or configure manually to enable
it.
Diffstat (limited to 'libvo/osd_template.c')
| -rw-r--r-- | libvo/osd_template.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libvo/osd_template.c b/libvo/osd_template.c index 2cc07bba39..40a335e30e 100644 --- a/libvo/osd_template.c +++ b/libvo/osd_template.c @@ -37,9 +37,6 @@ static inline void RENAME(vo_draw_alpha_yv12)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){ int y; -#if defined(FAST_OSD) && !HAVE_MMX - w=w>>1; -#endif #if HAVE_MMX __asm__ volatile( "pcmpeqb %%mm5, %%mm5\n\t" // F..F @@ -87,12 +84,7 @@ static inline void RENAME(vo_draw_alpha_yv12)(int w,int h, unsigned char* src, u } #else for(x=0;x<w;x++){ -#ifdef FAST_OSD - if(srca[2*x+0]) dstbase[2*x+0]=src[2*x+0]; - if(srca[2*x+1]) dstbase[2*x+1]=src[2*x+1]; -#else if(srca[x]) dstbase[x]=((dstbase[x]*srca[x])>>8)+src[x]; -#endif } #endif src+=srcstride; @@ -107,9 +99,6 @@ static inline void RENAME(vo_draw_alpha_yv12)(int w,int h, unsigned char* src, u static inline void RENAME(vo_draw_alpha_yuy2)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){ int y; -#if defined(FAST_OSD) && !HAVE_MMX - w=w>>1; -#endif #if HAVE_MMX __asm__ volatile( "pxor %%mm7, %%mm7\n\t" @@ -156,15 +145,10 @@ static inline void RENAME(vo_draw_alpha_yuy2)(int w,int h, unsigned char* src, u } #else for(x=0;x<w;x++){ -#ifdef FAST_OSD - if(srca[2*x+0]) dstbase[4*x+0]=src[2*x+0]; - if(srca[2*x+1]) dstbase[4*x+2]=src[2*x+1]; -#else if(srca[x]) { dstbase[2*x]=((dstbase[2*x]*srca[x])>>8)+src[x]; dstbase[2*x+1]=((((signed)dstbase[2*x+1]-128)*srca[x])>>8)+128; } -#endif } #endif src+=srcstride; @@ -264,13 +248,9 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src, #else /*non x86 arch or x86_64 with MMX disabled */ for(x=0;x<w;x++){ if(srca[x]){ -#ifdef FAST_OSD - dst[0]=dst[1]=dst[2]=src[x]; -#else dst[0]=((dst[0]*srca[x])>>8)+src[x]; dst[1]=((dst[1]*srca[x])>>8)+src[x]; dst[2]=((dst[2]*srca[x])>>8)+src[x]; -#endif } dst+=3; // 24bpp } @@ -386,13 +366,9 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, #else /*non x86 arch or x86_64 with MMX disabled */ for(x=0;x<w;x++){ if(srca[x]){ -#ifdef FAST_OSD - dstbase[4*x+0]=dstbase[4*x+1]=dstbase[4*x+2]=src[x]; -#else dstbase[4*x+0]=((dstbase[4*x+0]*srca[x])>>8)+src[x]; dstbase[4*x+1]=((dstbase[4*x+1]*srca[x])>>8)+src[x]; dstbase[4*x+2]=((dstbase[4*x+2]*srca[x])>>8)+src[x]; -#endif } } #endif /* arch_x86 */ |