]> git.sesse.net Git - vlc/blobdiff - modules/video_chroma/i420_rgb16.c
l10n: Uzbek update
[vlc] / modules / video_chroma / i420_rgb16.c
index 9907902e65c983f496167626b2f7c712727c30ee..32df817f6caed7cdf17efbbb8e82bdbbe06248bc 100644 (file)
 /*****************************************************************************
  * i420_rgb16.c : YUV to bitmap RGB conversion module for vlc
  *****************************************************************************
- * Copyright (C) 2000 the VideoLAN team
+ * Copyright (C) 2000 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Damien Fouilleul <damienf@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include <string.h>                                            /* strerror() */
-#include <stdlib.h>                                      /* malloc(), free() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_common.h>
+#include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include "i420_rgb.h"
-#if defined (MODULE_NAME_IS_i420_rgb)
-#   include "i420_rgb_c.h"
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   if defined(HAVE_MMX_INTRINSICS)
-#       include <mmintrin.h>
-#   endif
-#   include "i420_rgb_mmx.h"
-#endif
-
-static void SetOffset( int, int, int, int, vlc_bool_t *,
-                       unsigned int *, int * );
+#include "i420_rgb_c.h"
 
-#if defined (MODULE_NAME_IS_i420_rgb)
 /*****************************************************************************
- * I420_RGB16: color YUV 4:2:0 to RGB 16 bpp with dithering
+ * SetOffset: build offset array for conversion functions
  *****************************************************************************
- * Horizontal alignment needed:
- *  - input: 8 pixels (8 Y bytes, 4 U/V bytes), margins not allowed
- *  - output: 1 pixel (2 bytes), margins allowed
- * Vertical alignment needed:
- *  - input: 2 lines (2 Y lines, 1 U/V line)
- *  - output: 1 line
+ * This function will build an offset array used in later conversion functions.
+ * It will also set horizontal and vertical scaling indicators.
  *****************************************************************************/
-void E_(I420_RGB16_dithering)( vout_thread_t *p_vout, picture_t *p_src,
-                                                      picture_t *p_dest )
+static void SetOffset( int i_width, int i_height, int i_pic_width,
+                       int i_pic_height, bool *pb_hscale,
+                       unsigned int *pi_vscale, int *p_offset )
 {
-    /* We got this one from the old arguments */
-    uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
-    uint8_t  *p_y   = p_src->Y_PIXELS;
-    uint8_t  *p_u   = p_src->U_PIXELS;
-    uint8_t  *p_v   = p_src->V_PIXELS;
-
-    vlc_bool_t   b_hscale;                        /* horizontal scaling type */
-    unsigned int i_vscale;                          /* vertical scaling type */
-    unsigned int i_x, i_y;                /* horizontal and vertical indexes */
-    unsigned int i_real_y;                                          /* y % 4 */
-
-    int         i_right_margin;
-    int         i_rewind;
-    int         i_scale_count;                       /* scale modulo counter */
-    int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
-    uint16_t *  p_pic_start;       /* beginning of the current line for copy */
-    int         i_uval, i_vval;                           /* U and V samples */
-    int         i_red, i_green, i_blue;          /* U and V modified samples */
-    uint16_t *  p_yuv = p_vout->chroma.p_sys->p_rgb16;
-    uint16_t *  p_ybase;                     /* Y dependant conversion table */
-
-    /* Conversion buffer pointer */
-    uint16_t *  p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
-    uint16_t *  p_buffer;
-
-    /* Offset array pointer */
-    int *       p_offset_start = p_vout->chroma.p_sys->p_offset;
-    int *       p_offset;
-
-    const int i_source_margin = p_src->p[0].i_pitch
-                                 - p_src->p[0].i_visible_pitch;
-    const int i_source_margin_c = p_src->p[1].i_pitch
-                                 - p_src->p[1].i_visible_pitch;
-
-    /* The dithering matrices */
-    int dither10[4] = {  0x0,  0x8,  0x2,  0xa };
-    int dither11[4] = {  0xc,  0x4,  0xe,  0x6 };
-    int dither12[4] = {  0x3,  0xb,  0x1,  0x9 };
-    int dither13[4] = {  0xf,  0x7,  0xd,  0x5 };
-
-    for(i_x = 0; i_x < 4; i_x++)
-    {
-        dither10[i_x] = dither10[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
-        dither11[i_x] = dither11[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
-        dither12[i_x] = dither12[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
-        dither13[i_x] = dither13[i_x] << (SHIFT - 4 + p_vout->output.i_rrshift);
-    }
-
-    i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
-    if( p_vout->render.i_width & 7 )
-    {
-        i_rewind = 8 - ( p_vout->render.i_width & 7 );
-    }
-    else
-    {
-        i_rewind = 0;
-    }
-
-    /* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
-     * on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
-     * then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
-    SetOffset( p_vout->render.i_width, p_vout->render.i_height,
-               p_vout->output.i_width, p_vout->output.i_height,
-               &b_hscale, &i_vscale, p_offset_start );
-
     /*
-     * Perform conversion
+     * Prepare horizontal offset array
      */
-    i_scale_count = ( i_vscale == 1 ) ?
-                    p_vout->output.i_height : p_vout->render.i_height;
-    for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
-    {
-        i_real_y = i_y & 0x3;
-        p_pic_start = p_pic;
-        p_buffer = b_hscale ? p_buffer_start : p_pic;
-
-        for ( i_x = p_vout->render.i_width / 8; i_x--; )
-        {
-            int *p_dither = dither10;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither11;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither12;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither13;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither10;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither11;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither12;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither13;
-            CONVERT_Y_PIXEL_DITHER(2);
-        }
+    if( i_pic_width - i_width == 0 )
+    {   /* No horizontal scaling: YUV conversion is done directly to picture */
+        *pb_hscale = 0;
+    }
+    else if( i_pic_width - i_width > 0 )
+    {   /* Prepare scaling array for horizontal extension */
+        int i_scale_count = i_pic_width;
 
-        /* Here we do some unaligned reads and duplicate conversions, but
-         * at least we have all the pixels */
-        if( i_rewind )
+        *pb_hscale = 1;
+        for( int i_x = i_width; i_x--; )
         {
-            int *p_dither = dither10;
-            p_y -= i_rewind;
-            p_u -= i_rewind >> 1;
-            p_v -= i_rewind >> 1;
-            p_buffer -= i_rewind;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither11;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither12;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither13;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither10;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither11;
-            CONVERT_Y_PIXEL_DITHER(2);
-            p_dither = dither12;
-            CONVERT_YUV_PIXEL_DITHER(2);
-            p_dither = dither13;
-            CONVERT_Y_PIXEL_DITHER(2);
+            while( (i_scale_count -= i_width) > 0 )
+            {
+                *p_offset++ = 0;
+            }
+            *p_offset++ = 1;
+            i_scale_count += i_pic_width;
         }
-        SCALE_WIDTH;
-        SCALE_HEIGHT( 420, 2 );
+    }
+    else /* if( i_pic_width - i_width < 0 ) */
+    {   /* Prepare scaling array for horizontal reduction */
+        int i_scale_count = i_pic_width;
 
-        p_y += i_source_margin;
-        if( i_y % 2 )
+        *pb_hscale = 1;
+        for( int i_x = i_pic_width; i_x--; )
         {
-            p_u += i_source_margin_c;
-            p_v += i_source_margin_c;
+            *p_offset = 1;
+            while( (i_scale_count -= i_pic_width) > 0 )
+            {
+                *p_offset += 1;
+            }
+            p_offset++;
+            i_scale_count += i_width;
         }
     }
+
+    /*
+     * Set vertical scaling indicator
+     */
+    if( i_pic_height - i_height == 0 )
+        *pi_vscale = 0;
+    else if( i_pic_height - i_height > 0 )
+        *pi_vscale = 1;
+    else /* if( i_pic_height - i_height < 0 ) */
+        *pi_vscale = -1;
 }
-#endif
 
 /*****************************************************************************
  * I420_RGB16: color YUV 4:2:0 to RGB 16 bpp
@@ -202,8 +103,8 @@ void E_(I420_RGB16_dithering)( vout_thread_t *p_vout, picture_t *p_src,
  *  - input: 2 lines (2 Y lines, 1 U/V line)
  *  - output: 1 line
  *****************************************************************************/
-void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
-                                            picture_t *p_dest )
+
+void I420_RGB16( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
 {
     /* We got this one from the old arguments */
     uint16_t *p_pic = (uint16_t*)p_dest->p->p_pixels;
@@ -211,28 +112,26 @@ void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
     uint8_t  *p_u   = p_src->U_PIXELS;
     uint8_t  *p_v   = p_src->V_PIXELS;
 
-    vlc_bool_t  b_hscale;                         /* horizontal scaling type */
+    bool  b_hscale;                         /* horizontal scaling type */
     unsigned int i_vscale;                          /* vertical scaling type */
     unsigned int i_x, i_y;                /* horizontal and vertical indexes */
 
     int         i_right_margin;
     int         i_rewind;
     int         i_scale_count;                       /* scale modulo counter */
-    int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+    int         i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
     uint16_t *  p_pic_start;       /* beginning of the current line for copy */
-#if defined (MODULE_NAME_IS_i420_rgb)
     int         i_uval, i_vval;                           /* U and V samples */
     int         i_red, i_green, i_blue;          /* U and V modified samples */
-    uint16_t *  p_yuv = p_vout->chroma.p_sys->p_rgb16;
+    uint16_t *  p_yuv = p_filter->p_sys->p_rgb16;
     uint16_t *  p_ybase;                     /* Y dependant conversion table */
-#endif
 
     /* Conversion buffer pointer */
-    uint16_t *  p_buffer_start = (uint16_t*)p_vout->chroma.p_sys->p_buffer;
+    uint16_t *  p_buffer_start = (uint16_t*)p_filter->p_sys->p_buffer;
     uint16_t *  p_buffer;
 
     /* Offset array pointer */
-    int *       p_offset_start = p_vout->chroma.p_sys->p_offset;
+    int *       p_offset_start = p_filter->p_sys->p_offset;
     int *       p_offset;
 
     const int i_source_margin = p_src->p[0].i_pitch
@@ -241,166 +140,49 @@ void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
                                  - p_src->p[1].i_visible_pitch;
 
     i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
-    if( p_vout->render.i_width & 7 )
-    {
-        i_rewind = 8 - ( p_vout->render.i_width & 7 );
-    }
-    else
-    {
-        i_rewind = 0;
-    }
+    i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
 
     /* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
      * on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
      * then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
-    SetOffset( p_vout->render.i_width, p_vout->render.i_height,
-               p_vout->output.i_width, p_vout->output.i_height,
+    SetOffset( p_filter->fmt_in.video.i_width,
+               p_filter->fmt_in.video.i_height,
+               p_filter->fmt_out.video.i_width,
+               p_filter->fmt_out.video.i_height,
                &b_hscale, &i_vscale, p_offset_start );
 
     /*
      * Perform conversion
      */
     i_scale_count = ( i_vscale == 1 ) ?
-                    p_vout->output.i_height : p_vout->render.i_height;
-    for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+                    p_filter->fmt_out.video.i_height :
+                    p_filter->fmt_in.video.i_height;
+    for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
     {
         p_pic_start = p_pic;
         p_buffer = b_hscale ? p_buffer_start : p_pic;
 
-#if defined (MODULE_NAME_IS_i420_rgb)
-        for ( i_x = p_vout->render.i_width / 8; i_x--; )
+        for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
         {
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
         }
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-        if( p_vout->output.i_rmask == 0x7c00 )
-        {
-            /* 15bpp 5/5/5 */
-            for ( i_x = p_vout->render.i_width / 8; i_x--; )
-            {
-#   if defined (HAVE_MMX_INTRINSICS)
-                __m64 mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7;
-                uint64_t tmp64;
-                INTRINSICS_INIT_16
-                INTRINSICS_YUV_MUL
-                INTRINSICS_YUV_ADD
-                INTRINSICS_UNPACK_15
-#   else
-                __asm__( MMX_INIT_16
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-
-                __asm__( ".align 8"
-                         MMX_YUV_MUL
-                         MMX_YUV_ADD
-                         MMX_UNPACK_15
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-
-                p_y += 8;
-                p_u += 4;
-                p_v += 4;
-                p_buffer += 8;
-            }
-        }
-        else
-        {
-            /* 16bpp 5/6/5 */
-            for ( i_x = p_vout->render.i_width / 8; i_x--; )
-            {
-#   if defined (HAVE_MMX_INTRINSICS)
-                __m64 mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7;
-                uint64_t tmp64;
-                INTRINSICS_INIT_16
-                INTRINSICS_YUV_MUL
-                INTRINSICS_YUV_ADD
-                INTRINSICS_UNPACK_16
-#   else
-                __asm__( MMX_INIT_16
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-
-                __asm__( ".align 8"
-                         MMX_YUV_MUL
-                         MMX_YUV_ADD
-                         MMX_UNPACK_16
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-
-                p_y += 8;
-                p_u += 4;
-                p_v += 4;
-                p_buffer += 8;
-            }
-        }
-#endif
 
         /* Here we do some unaligned reads and duplicate conversions, but
          * at least we have all the pixels */
         if( i_rewind )
         {
-#if defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   if defined (HAVE_MMX_INTRINSICS)
-            __m64 mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7;
-            uint64_t tmp64;
-#   endif
-#endif
             p_y -= i_rewind;
             p_u -= i_rewind >> 1;
             p_v -= i_rewind >> 1;
             p_buffer -= i_rewind;
-#if defined (MODULE_NAME_IS_i420_rgb)
+
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
             CONVERT_YUV_PIXEL(2);  CONVERT_Y_PIXEL(2);
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-
-#   if defined (HAVE_MMX_INTRINSICS)
-            INTRINSICS_INIT_16
-#   else
-            __asm__( MMX_INIT_16
-                     : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-
-            if( p_vout->output.i_rmask == 0x7c00 )
-            {
-                /* 15bpp 5/5/5 */
-#   if defined (HAVE_MMX_INTRINSICS)
-                INTRINSICS_YUV_MUL
-                INTRINSICS_YUV_ADD
-                INTRINSICS_UNPACK_15
-#   else
-                __asm__( ".align 8"
-                         MMX_YUV_MUL
-                         MMX_YUV_ADD
-                         MMX_UNPACK_15
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-            }
-            else
-            {
-#   if defined (HAVE_MMX_INTRINSICS)
-                INTRINSICS_YUV_MUL
-                INTRINSICS_YUV_ADD
-                INTRINSICS_UNPACK_16
-#   else
-                /* 16bpp 5/6/5 */
-                __asm__( ".align 8"
-                         MMX_YUV_MUL
-                         MMX_YUV_ADD
-                         MMX_UNPACK_16
-                         : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-            }
-
-            p_y += 8;
-            p_u += 4;
-            p_v += 4;
-            p_buffer += 8;
-#endif
         }
         SCALE_WIDTH;
         SCALE_HEIGHT( 420, 2 );
@@ -424,8 +206,8 @@ void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
  *  - input: 2 lines (2 Y lines, 1 U/V line)
  *  - output: 1 line
  *****************************************************************************/
-void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
-                                            picture_t *p_dest )
+
+void I420_RGB32( filter_t *p_filter, picture_t *p_src, picture_t *p_dest )
 {
     /* We got this one from the old arguments */
     uint32_t *p_pic = (uint32_t*)p_dest->p->p_pixels;
@@ -433,28 +215,26 @@ void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
     uint8_t  *p_u   = p_src->U_PIXELS;
     uint8_t  *p_v   = p_src->V_PIXELS;
 
-    vlc_bool_t  b_hscale;                         /* horizontal scaling type */
+    bool  b_hscale;                         /* horizontal scaling type */
     unsigned int i_vscale;                          /* vertical scaling type */
     unsigned int i_x, i_y;                /* horizontal and vertical indexes */
 
     int         i_right_margin;
     int         i_rewind;
     int         i_scale_count;                       /* scale modulo counter */
-    int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+    int         i_chroma_width = p_filter->fmt_in.video.i_width / 2; /* chroma width */
     uint32_t *  p_pic_start;       /* beginning of the current line for copy */
-#if defined (MODULE_NAME_IS_i420_rgb)
     int         i_uval, i_vval;                           /* U and V samples */
     int         i_red, i_green, i_blue;          /* U and V modified samples */
-    uint32_t *  p_yuv = p_vout->chroma.p_sys->p_rgb32;
+    uint32_t *  p_yuv = p_filter->p_sys->p_rgb32;
     uint32_t *  p_ybase;                     /* Y dependant conversion table */
-#endif
 
     /* Conversion buffer pointer */
-    uint32_t *  p_buffer_start = (uint32_t*)p_vout->chroma.p_sys->p_buffer;
+    uint32_t *  p_buffer_start = (uint32_t*)p_filter->p_sys->p_buffer;
     uint32_t *  p_buffer;
 
     /* Offset array pointer */
-    int *       p_offset_start = p_vout->chroma.p_sys->p_offset;
+    int *       p_offset_start = p_filter->p_sys->p_offset;
     int *       p_offset;
 
     const int i_source_margin = p_src->p[0].i_pitch
@@ -463,107 +243,48 @@ void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
                                  - p_src->p[1].i_visible_pitch;
 
     i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
-    if( p_vout->render.i_width & 7 )
-    {
-        i_rewind = 8 - ( p_vout->render.i_width & 7 );
-    }
-    else
-    {
-        i_rewind = 0;
-    }
+    i_rewind = (-p_filter->fmt_in.video.i_width) & 7;
 
     /* Rule: when a picture of size (x1,y1) with aspect ratio r1 is rendered
      * on a picture of size (x2,y2) with aspect ratio r2, if x1 grows to x1'
      * then y1 grows to y1' = x1' * y2/x2 * r2/r1 */
-    SetOffset( p_vout->render.i_width, p_vout->render.i_height,
-               p_vout->output.i_width, p_vout->output.i_height,
+    SetOffset( p_filter->fmt_in.video.i_width,
+               p_filter->fmt_in.video.i_height,
+               p_filter->fmt_out.video.i_width,
+               p_filter->fmt_out.video.i_height,
                &b_hscale, &i_vscale, p_offset_start );
 
     /*
      * Perform conversion
      */
     i_scale_count = ( i_vscale == 1 ) ?
-                    p_vout->output.i_height : p_vout->render.i_height;
-    for( i_y = 0; i_y < p_vout->render.i_height; i_y++ )
+                    p_filter->fmt_out.video.i_height :
+                    p_filter->fmt_in.video.i_height;
+    for( i_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ )
     {
         p_pic_start = p_pic;
         p_buffer = b_hscale ? p_buffer_start : p_pic;
 
-        for ( i_x = p_vout->render.i_width / 8; i_x--; )
+        for ( i_x = p_filter->fmt_in.video.i_width / 8; i_x--; )
         {
-#if defined (MODULE_NAME_IS_i420_rgb)
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   if defined (HAVE_MMX_INTRINSICS)
-            __m64 mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7;
-            uint64_t tmp64;
-            INTRINSICS_INIT_32
-            INTRINSICS_YUV_MUL
-            INTRINSICS_YUV_ADD
-            INTRINSICS_UNPACK_32
-#   else
-            __asm__( MMX_INIT_32
-                     : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-
-            __asm__( ".align 8"
-                     MMX_YUV_MUL
-                     MMX_YUV_ADD
-                     MMX_UNPACK_32
-                     : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-
-            p_y += 8;
-            p_u += 4;
-            p_v += 4;
-            p_buffer += 8;
-#endif
         }
 
         /* Here we do some unaligned reads and duplicate conversions, but
          * at least we have all the pixels */
         if( i_rewind )
         {
-#if defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   if defined (HAVE_MMX_INTRINSICS)
-            __m64 mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7;
-            uint64_t tmp64;
-#   endif
-#endif
             p_y -= i_rewind;
             p_u -= i_rewind >> 1;
             p_v -= i_rewind >> 1;
             p_buffer -= i_rewind;
-#if defined (MODULE_NAME_IS_i420_rgb)
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
             CONVERT_YUV_PIXEL(4);  CONVERT_Y_PIXEL(4);
-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   if defined (HAVE_MMX_INTRINSICS)
-            INTRINSICS_INIT_32
-            INTRINSICS_YUV_MUL
-            INTRINSICS_YUV_ADD
-            INTRINSICS_UNPACK_32
-#   else
-            __asm__( MMX_INIT_32
-                     : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-
-            __asm__( ".align 8"
-                     MMX_YUV_MUL
-                     MMX_YUV_ADD
-                     MMX_UNPACK_32
-                     : : "r" (p_y), "r" (p_u), "r" (p_v), "r" (p_buffer) );
-#   endif
-
-            p_y += 8;
-            p_u += 4;
-            p_v += 4;
-            p_buffer += 8;
-#endif
         }
         SCALE_WIDTH;
         SCALE_HEIGHT( 420, 4 );
@@ -576,76 +297,3 @@ void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
         }
     }
 }
-
-/* Following functions are local */
-
-/*****************************************************************************
- * SetOffset: build offset array for conversion functions
- *****************************************************************************
- * This function will build an offset array used in later conversion functions.
- * It will also set horizontal and vertical scaling indicators.
- *****************************************************************************/
-static void SetOffset( int i_width, int i_height, int i_pic_width,
-                       int i_pic_height, vlc_bool_t *pb_hscale,
-                       unsigned int *pi_vscale, int *p_offset )
-{
-    int i_x;                                    /* x position in destination */
-    int i_scale_count;                                     /* modulo counter */
-
-    /*
-     * Prepare horizontal offset array
-     */
-    if( i_pic_width - i_width == 0 )
-    {
-        /* No horizontal scaling: YUV conversion is done directly to picture */
-        *pb_hscale = 0;
-    }
-    else if( i_pic_width - i_width > 0 )
-    {
-        /* Prepare scaling array for horizontal extension */
-        *pb_hscale = 1;
-        i_scale_count = i_pic_width;
-        for( i_x = i_width; i_x--; )
-        {
-            while( (i_scale_count -= i_width) > 0 )
-            {
-                *p_offset++ = 0;
-            }
-            *p_offset++ = 1;
-            i_scale_count += i_pic_width;
-        }
-    }
-    else /* if( i_pic_width - i_width < 0 ) */
-    {
-        /* Prepare scaling array for horizontal reduction */
-        *pb_hscale = 1;
-        i_scale_count = i_width;
-        for( i_x = i_pic_width; i_x--; )
-        {
-            *p_offset = 1;
-            while( (i_scale_count -= i_pic_width) > 0 )
-            {
-                *p_offset += 1;
-            }
-            p_offset++;
-            i_scale_count += i_width;
-        }
-    }
-
-    /*
-     * Set vertical scaling indicator
-     */
-    if( i_pic_height - i_height == 0 )
-    {
-        *pi_vscale = 0;
-    }
-    else if( i_pic_height - i_height > 0 )
-    {
-        *pi_vscale = 1;
-    }
-    else /* if( i_pic_height - i_height < 0 ) */
-    {
-        *pi_vscale = -1;
-    }
-}
-