Removal of dead code

diff --git a/src/osd/osd_parser.c b/src/osd/osd_parser.c
index ee2838be6be1c96c3d6e0a25a1a2597a02f10a04..18265204704eec5ace789f429966d0aeac4de90d 100644 (file)
--- a/src/osd/osd_parser.c
+++ b/src/osd/osd_parser.c
@@ -54,227 +54,6 @@ static void osd_StatesFree( vlc_object_t *, osd_state_t * );
 \r
 static picture_t *osd_LoadImage( vlc_object_t *, const char *);\r
 \r
-#if 0\r
-/*****************************************************************************\r
- * osd_YuvaYuvp\r
- *****************************************************************************/\r
-static picture_t *osd_YuvaYuvp( vlc_object_t *p_this, picture_t *p_picture )\r
-{\r
-    video_format_t *p_fmt = NULL;\r
-    int i = 0, j = 0, n = 0, p = 0;\r
-    int i_max_entries = 256;\r
-\r
-#ifdef RANDOM_DITHERING\r
-    int i_seed = 0xdeadbeef; /* random seed */\r
-#else\r
-    int *pi_delta = NULL;\r
-#endif\r
-    int i_pixels = p_picture->p[0].i_visible_lines\r
-                    * p_picture->p[0].i_pitch;\r
-    int i_iterator = p_picture->p[0].i_visible_lines * 3 / 4\r
-                        * p_picture->p[0].i_pitch\r
-                    + p_picture->p[0].i_pitch * 1 / 3;\r
-    int i_tolerance = 0;\r
-\r
-    p_fmt = (video_format_t*) malloc( sizeof( video_format_t ) );\r
-    if( !p_fmt )\r
-    {\r
-        msg_Err( p_this, "couldn't allocate video_format_t ... aborting YUVA to YUVP conversion of picture" );\r
-        return p_picture;\r
-    }\r
-    p_fmt->i_chroma = VLC_FOURCC('Y','U','V','P');\r
-    p_fmt->p_palette = (video_palette_t *) malloc( sizeof( video_palette_t ) );\r
-    if( !p_fmt->p_palette )\r
-    {\r
-        msg_Err( p_this, "couldn't allocate video_palette_t ... aborting YUVA to YUVP conversion of picture" );\r
-        free( p_fmt );\r
-        return p_picture;        \r
-    }    \r
-    p_fmt->p_palette->i_entries = 0;\r
-\r
-    /* Find best iterator using Euclide’s algorithm */\r
-    for( ; i_iterator > 1 ; i_iterator-- )\r
-    {\r
-        int a = i_pixels;\r
-        int b = i_iterator;\r
-        int c;\r
-\r
-        while( b )\r
-        {\r
-            c = a % b;\r
-            a = b;\r
-            b = c;\r
-        }\r
-\r
-        if( a == 1 )\r
-        {\r
-            break;\r
-        }\r
-    }\r
-\r
-    /* Count colors, build best palette */\r
-    for( i_tolerance = 0; i_tolerance < 128; i_tolerance++ )\r
-    {\r
-        vlc_bool_t b_success = VLC_TRUE;\r
-        p_fmt->p_palette->i_entries = 0;\r
-\r
-        for( i = 0; i < i_pixels ; )\r
-        {\r
-            uint8_t y  = 0, u = 0, v = 0, a = 0;\r
-            y = p_picture->p[0].p_pixels[i];\r
-            u = p_picture->p[1].p_pixels[i];\r
-            v = p_picture->p[2].p_pixels[i];\r
-            a = p_picture->p[3].p_pixels[i];\r
-            for( j = 0; j < p_fmt->p_palette->i_entries; j++ )\r
-            {\r
-                if( abs((int)p_fmt->p_palette->palette[j][0] - (int)y) <= i_tolerance &&\r
-                    abs((int)p_fmt->p_palette->palette[j][1] - (int)u) <= i_tolerance &&\r
-                    abs((int)p_fmt->p_palette->palette[j][2] - (int)v) <= i_tolerance &&\r
-                    abs((int)p_fmt->p_palette->palette[j][3] - (int)a) <= i_tolerance / 2 )\r
-                {\r
-                    break;\r
-                }\r
-            }\r
-            if( j == p_fmt->p_palette->i_entries )\r
-            {\r
-                p_fmt->p_palette->palette[j][0] = y;\r
-                p_fmt->p_palette->palette[j][1] = u;\r
-                p_fmt->p_palette->palette[j][2] = v;\r
-                p_fmt->p_palette->palette[j][3] = a;\r
-                p_fmt->p_palette->i_entries++;\r
-            }\r
-            if( p_fmt->p_palette->i_entries >= i_max_entries )\r
-            {\r
-                b_success = VLC_FALSE;\r
-                break;\r
-            }\r
-            i += i_iterator;\r
-            if( i > i_pixels )\r
-            {\r
-                i -= i_pixels;\r
-            }\r
-        }\r
-\r
-        if( b_success )\r
-        {\r
-            break;\r
-        }\r
-    }\r
-\r
-#if OSD_MENU_DEBUG\r
-    msg_Dbg( p_this, "best palette has %d colors", p_fmt->p_palette->i_entries );\r
-#endif\r
-\r
-#ifndef RANDOM_DITHERING\r
-    pi_delta = malloc( ( p_picture->p[0].i_pitch + 1 ) * sizeof(int) * 4  );\r
-    if( !pi_delta )\r
-    {\r
-        msg_Err( p_this, "couldn't allocate video_palette_t ... aborting YUVA to YUVP conversion of picture" );\r
-        free( p_fmt->p_palette );\r
-        free( p_fmt );\r
-        return p_picture;        \r
-    }    \r
-    \r
-    for( i = 0; i < (p_picture->p[0].i_pitch + 1) * 4 ; i++ )\r
-    {\r
-        pi_delta[ i ] = 0;\r
-    }\r
-#endif\r
-\r
-    /* Fill image with our new colours */\r
-    for( p = 0; p < p_picture->p[0].i_visible_lines ; p++ )\r
-    {\r
-        int i_ydelta = 0, i_udelta = 0, i_vdelta = 0, i_adelta = 0;\r
-\r
-        for( n = 0; n < p_picture->p[0].i_pitch ; n++ )\r
-        {\r
-            int i_offset = p * p_picture->p[0].i_pitch + n;\r
-            int y, u, v, a;\r
-            int i_mindist, i_best;\r
-\r
-            y = (int)p_picture->p[0].p_pixels[i_offset];\r
-            u = (int)p_picture->p[1].p_pixels[i_offset];\r
-            v = (int)p_picture->p[2].p_pixels[i_offset];\r
-            a = (int)p_picture->p[3].p_pixels[i_offset];\r
-\r
-            /* Add dithering compensation */\r
-#ifdef RANDOM_DITHERING\r
-            y += ((i_seed & 0xff) - 0x80) * i_tolerance / 0x80;\r
-            u += (((i_seed >> 8) & 0xff) - 0x80) * i_tolerance / 0x80;\r
-            v += (((i_seed >> 16) & 0xff) - 0x80) * i_tolerance / 0x80;\r
-            a += (((i_seed >> 24) & 0xff) - 0x80) * i_tolerance / 0x80;\r
-#else\r
-            y += i_ydelta + pi_delta[ n * 4 ];\r
-            u += i_udelta + pi_delta[ n * 4 + 1 ];\r
-            v += i_vdelta + pi_delta[ n * 4 + 2 ];\r
-            a += i_adelta + pi_delta[ n * 4 + 3 ];\r
-#endif\r
-\r
-            /* Find best colour in palette */\r
-            for( i_mindist = 99999999, i_best = 0, j = 0; j < p_fmt->p_palette->i_entries; j++ )\r
-            {\r
-                int i_dist = 0;\r
-\r
-                i_dist += abs((int)p_fmt->p_palette->palette[j][0] - y);\r
-                i_dist += abs((int)p_fmt->p_palette->palette[j][1] - u);\r
-                i_dist += abs((int)p_fmt->p_palette->palette[j][2] - v);\r
-                i_dist += 2 * abs((int)p_fmt->p_palette->palette[j][3] - a);\r
-\r
-                if( i_dist < i_mindist )\r
-                {\r
-                    i_mindist = i_dist;\r
-                    i_best = j;\r
-                }\r
-            }\r
-\r
-            /* Set pixel to best color */\r
-            p_picture->p[0].p_pixels[i_offset] = i_best;\r
-\r
-            /* Update dithering state */\r
-#ifdef RANDOM_DITHERING\r
-            i_seed = (i_seed * 0x1283837) ^ 0x789479 ^ (i_seed >> 13);\r
-#else\r
-            i_ydelta = y - (int)p_fmt->p_palette->palette[i_best][0];\r
-            i_udelta = u - (int)p_fmt->p_palette->palette[i_best][1];\r
-            i_vdelta = v - (int)p_fmt->p_palette->palette[i_best][2];\r
-            i_adelta = a - (int)p_fmt->p_palette->palette[i_best][3];\r
-            pi_delta[ n * 4 ] = i_ydelta * 3 / 8;\r
-            pi_delta[ n * 4 + 1 ] = i_udelta * 3 / 8;\r
-            pi_delta[ n * 4 + 2 ] = i_vdelta * 3 / 8;\r
-            pi_delta[ n * 4 + 3 ] = i_adelta * 3 / 8;\r
-            i_ydelta = i_ydelta * 5 / 8;\r
-            i_udelta = i_udelta * 5 / 8;\r
-            i_vdelta = i_vdelta * 5 / 8;\r
-            i_adelta = i_adelta * 5 / 8;\r
-#endif\r
-        }\r
-    }\r
-\r
-#ifndef RANDOM_DITHERING\r
-    free( pi_delta );\r
-#endif\r
-\r
-    /* pad palette */\r
-    for( i = p_fmt->p_palette->i_entries; i < i_max_entries; i++ )\r
-    {\r
-        p_fmt->p_palette->palette[i][0] = 0;\r
-        p_fmt->p_palette->palette[i][1] = 0;\r
-        p_fmt->p_palette->palette[i][2] = 0;\r
-        p_fmt->p_palette->palette[i][3] = 0;\r
-    }\r
-    p_fmt->p_palette->i_entries = i_max_entries;\r
-#if OSD_MENU_DEBUG\r
-    msg_Dbg( p_this, "best palette has %d colors", p_fmt->p_palette->i_entries );\r
-#endif\r
-\r
-    p_picture->format.i_chroma = VLC_FOURCC('Y','U','V','P');\r
-    if( p_picture->format.p_palette )\r
-        free( p_picture->format.p_palette );\r
-    p_picture->format.p_palette = p_fmt->p_palette;\r
-    free( p_fmt );\r
-    return p_picture;\r
-}\r
-#endif\r
 /*****************************************************************************\r
  * osd_LoadImage: loads the logo image into memory\r
  *****************************************************************************/\r