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.

1 files changed, 0 insertions, 43 deletions

diff --git a/libvo/osd.c b/libvo/osd.c
index 0b5ef8efa2..9adcc3f664 100644
--- a/libvo/osd.c
+++ b/libvo/osd.c
@@ -20,9 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-//#define FAST_OSD
-//#define FAST_OSD_TABLE
-
 #include "config.h"
 #include "osd.h"
 #include "mp_msg.h"
@@ -156,21 +153,7 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i
 #endif
 }
 
-#ifdef FAST_OSD_TABLE
-static unsigned short fast_osd_12bpp_table[256];
-static unsigned short fast_osd_15bpp_table[256];
-static unsigned short fast_osd_16bpp_table[256];
-#endif
-
 void vo_draw_alpha_init(void){
-#ifdef FAST_OSD_TABLE
-    int i;
-    for(i=0;i<256;i++){
-        fast_osd_12bpp_table[i]=((i>>4)<< 8)|((i>>4)<<4)|(i>>4);
-        fast_osd_15bpp_table[i]=((i>>3)<<10)|((i>>3)<<5)|(i>>3);
-        fast_osd_16bpp_table[i]=((i>>3)<<11)|((i>>2)<<5)|(i>>3);
-    }
-#endif
 //FIXME the optimized stuff is a lie for 15/16bpp as they aren't optimized yet
 	if( mp_msg_test(MSGT_OSD,MSGL_V) )
 	{
@@ -196,14 +179,6 @@ void vo_draw_alpha_rgb12(int w, int h, unsigned char* src, unsigned char *srca,
         register int x;
         for (x = 0; x < w; x++) {
             if(srca[x]){
-#ifdef FAST_OSD
-#ifdef FAST_OSD_TABLE
-                dst[x] = fast_osd_12bpp_table[src[x]];
-#else
-                register unsigned int a = src[x] >> 4;
-                dst[x] = (a << 8) | (a << 4) | a;
-#endif
-#else
                 unsigned char r = dst[x] & 0x0F;
                 unsigned char g = (dst[x] >> 4) & 0x0F;
                 unsigned char b = (dst[x] >> 8) & 0x0F;
@@ -211,7 +186,6 @@ void vo_draw_alpha_rgb12(int w, int h, unsigned char* src, unsigned char *srca,
                 g = (((g*srca[x]) >> 4) + src[x]) >> 4;
                 b = (((b*srca[x]) >> 4) + src[x]) >> 4;
                 dst[x] = (b << 8) | (g << 4) | r;
-#endif
             }
         }
         src += srcstride;
@@ -228,14 +202,6 @@ void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, unsigned char *srca, i
         register int x;
         for(x=0;x<w;x++){
             if(srca[x]){
-#ifdef FAST_OSD
-#ifdef FAST_OSD_TABLE
-                dst[x]=fast_osd_15bpp_table[src[x]];
-#else
-		register unsigned int a=src[x]>>3;
-                dst[x]=(a<<10)|(a<<5)|a;
-#endif
-#else
                 unsigned char r=dst[x]&0x1F;
                 unsigned char g=(dst[x]>>5)&0x1F;
                 unsigned char b=(dst[x]>>10)&0x1F;
@@ -243,7 +209,6 @@ void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, unsigned char *srca, i
                 g=(((g*srca[x])>>5)+src[x])>>3;
                 b=(((b*srca[x])>>5)+src[x])>>3;
                 dst[x]=(b<<10)|(g<<5)|r;
-#endif
             }
         }
         src+=srcstride;
@@ -260,13 +225,6 @@ void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, unsigned char *srca, i
         register int x;
         for(x=0;x<w;x++){
             if(srca[x]){
-#ifdef FAST_OSD
-#ifdef FAST_OSD_TABLE
-                dst[x]=fast_osd_16bpp_table[src[x]];
-#else
-                dst[x]=((src[x]>>3)<<11)|((src[x]>>2)<<5)|(src[x]>>3);
-#endif
-#else
                 unsigned char r=dst[x]&0x1F;
                 unsigned char g=(dst[x]>>5)&0x3F;
                 unsigned char b=(dst[x]>>11)&0x1F;
@@ -274,7 +232,6 @@ void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, unsigned char *srca, i
                 g=(((g*srca[x])>>6)+src[x])>>2;
                 b=(((b*srca[x])>>5)+src[x])>>3;
                 dst[x]=(b<<11)|(g<<5)|r;
-#endif
             }
         }
         src+=srcstride;