]> git.sesse.net Git - vlc/blobdiff - modules/video_filter/blend.c
* modules/control/http.c: Fixed vlc_set_var() and cosmetics.
[vlc] / modules / video_filter / blend.c
index 6c6c4084f9606a4bc70fcc59a861f308e37d5ee2..48f2dd65043af93e0aa775126cf79aec2c481727 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * blend.c: alpha blend 2 pictures together
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Author: Gildas Bazin <gbazin@videolan.org>
@@ -33,6 +33,7 @@
  *****************************************************************************/
 struct filter_sys_t
 {
+    int i_dummy;
 };
 
 /****************************************************************************
@@ -41,20 +42,31 @@ struct filter_sys_t
 static int  OpenFilter ( vlc_object_t * );
 static void CloseFilter( vlc_object_t * );
 
+/* TODO i_alpha support for BlendR16 */
 static void Blend( filter_t *, picture_t *, picture_t *, picture_t *,
-                   int, int );
+                   int, int, int );
 static void BlendI420( filter_t *, picture_t *, picture_t *, picture_t *,
-                       int, int );
+                       int, int, int, int, int );
 static void BlendR16( filter_t *, picture_t *, picture_t *, picture_t *,
-                      int, int );
-static void BlendPalette( filter_t *, picture_t *, picture_t *, picture_t *,
-                          int, int );
+                      int, int, int, int, int );
+static void BlendR24( filter_t *, picture_t *, picture_t *, picture_t *,
+                      int, int, int, int, int );
+static void BlendYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
+                       int, int, int, int, int );
+static void BlendPalI420( filter_t *, picture_t *, picture_t *, picture_t *,
+                          int, int, int, int, int );
+static void BlendPalYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
+                          int, int, int, int, int );
+static void BlendPalRV( filter_t *, picture_t *, picture_t *, picture_t *,
+                        int, int, int, int, int );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Video pictures blending") );
+    set_category( CAT_VIDEO );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video blending", 100 );
     set_callbacks( OpenFilter, CloseFilter );
 vlc_module_end();
@@ -72,8 +84,11 @@ static int OpenFilter( vlc_object_t *p_this )
     if( ( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') &&
           p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','P') ) ||
         ( p_filter->fmt_out.video.i_chroma != VLC_FOURCC('I','4','2','0') &&
+          p_filter->fmt_out.video.i_chroma != VLC_FOURCC('Y','U','Y','2') &&
           p_filter->fmt_out.video.i_chroma != VLC_FOURCC('Y','V','1','2') &&
-          p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R','V','1','6') ) )
+          p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R','V','1','6') &&
+          p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R','V','2','4') &&
+          p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R','V','3','2') ) )
     {
         return VLC_EGENERIC;
     }
@@ -104,29 +119,70 @@ static int OpenFilter( vlc_object_t *p_this )
  ****************************************************************************/
 static void Blend( filter_t *p_filter, picture_t *p_dst,
                    picture_t *p_dst_orig, picture_t *p_src,
-                   int i_x_offset, int i_y_offset )
+                   int i_x_offset, int i_y_offset, int i_alpha )
 {
+    int i_width, i_height;
+
+    i_width = __MIN((int)p_filter->fmt_out.video.i_visible_width - i_x_offset,
+                    (int)p_filter->fmt_in.video.i_visible_width);
+
+    i_height = __MIN((int)p_filter->fmt_out.video.i_visible_height -i_y_offset,
+                     (int)p_filter->fmt_in.video.i_visible_height);
+
+    if( i_width <= 0 || i_height <= 0 ) return;
+
     if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') &&
         ( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('I','4','2','0') ||
           p_filter->fmt_out.video.i_chroma == VLC_FOURCC('Y','V','1','2') ) )
     {
         BlendI420( p_filter, p_dst, p_dst_orig, p_src,
-                   i_x_offset, i_y_offset );
+                   i_x_offset, i_y_offset, i_width, i_height, i_alpha );
+        return;
+    }
+    if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') &&
+        p_filter->fmt_out.video.i_chroma == VLC_FOURCC('Y','U','Y','2') )
+    {
+        BlendYUY2( p_filter, p_dst, p_dst_orig, p_src,
+                   i_x_offset, i_y_offset, i_width, i_height, i_alpha );
         return;
     }
     if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') &&
         p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','1','6') )
     {
         BlendR16( p_filter, p_dst, p_dst_orig, p_src,
-                  i_x_offset, i_y_offset );
+                  i_x_offset, i_y_offset, i_width, i_height, i_alpha );
+        return;
+    }
+    if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') &&
+        ( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','2','4') ||
+          p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','3','2') ) )
+    {
+        BlendR24( p_filter, p_dst, p_dst_orig, p_src,
+                  i_x_offset, i_y_offset, i_width, i_height, i_alpha );
         return;
     }
     if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','P') &&
         ( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('I','4','2','0') ||
           p_filter->fmt_out.video.i_chroma == VLC_FOURCC('Y','V','1','2') ) )
     {
-        BlendPalette( p_filter, p_dst, p_dst_orig, p_src,
-                      i_x_offset, i_y_offset );
+        BlendPalI420( p_filter, p_dst, p_dst_orig, p_src,
+                      i_x_offset, i_y_offset, i_width, i_height, i_alpha );
+        return;
+    }
+    if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','P') &&
+        p_filter->fmt_out.video.i_chroma == VLC_FOURCC('Y','U','Y','2') )
+    {
+        BlendPalYUY2( p_filter, p_dst, p_dst_orig, p_src,
+                      i_x_offset, i_y_offset, i_width, i_height, i_alpha );
+        return;
+    }
+    if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','P') &&
+        ( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','1','6') ||
+          p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','2','4') ||
+          p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','3','2') ) )
+    {
+        BlendPalRV( p_filter, p_dst, p_dst_orig, p_src,
+                    i_x_offset, i_y_offset, i_width, i_height, i_alpha );
         return;
     }
 
@@ -135,15 +191,15 @@ static void Blend( filter_t *p_filter, picture_t *p_dst,
 
 static void BlendI420( filter_t *p_filter, picture_t *p_dst,
                        picture_t *p_dst_orig, picture_t *p_src,
-                       int i_x_offset, int i_y_offset )
+                       int i_x_offset, int i_y_offset,
+                       int i_width, int i_height, int i_alpha )
 {
-    filter_sys_t *p_sys = p_filter->p_sys;
     int i_src1_pitch, i_src2_pitch, i_dst_pitch;
     uint8_t *p_src1_y, *p_src2_y, *p_dst_y;
     uint8_t *p_src1_u, *p_src2_u, *p_dst_u;
     uint8_t *p_src1_v, *p_src2_v, *p_dst_v;
     uint8_t *p_trans;
-    int i_width, i_height, i_x, i_y;
+    int i_x, i_y, i_trans;
     vlc_bool_t b_even_scanline = i_y_offset % 2;
 
     i_dst_pitch = p_dst->p[Y_PLANE].i_pitch;
@@ -153,12 +209,12 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
               ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
     p_dst_u = p_dst->p[U_PLANE].p_pixels + i_x_offset/2 +
               p_filter->fmt_out.video.i_x_offset/2 +
-              p_dst->p[U_PLANE].i_pitch *
-              ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+              p_dst->p[U_PLANE].i_pitch;
     p_dst_v = p_dst->p[V_PLANE].p_pixels + i_x_offset/2 +
               p_filter->fmt_out.video.i_x_offset/2 +
-              p_dst->p[V_PLANE].i_pitch *
-              ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+              p_dst->p[V_PLANE].i_pitch;
 
     i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch;
     p_src1_y = p_dst_orig->p[Y_PLANE].p_pixels + i_x_offset +
@@ -167,12 +223,12 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
                ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
     p_src1_u = p_dst_orig->p[U_PLANE].p_pixels + i_x_offset/2 +
                p_filter->fmt_out.video.i_x_offset/2 +
-               p_dst_orig->p[U_PLANE].i_pitch *
-               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+               p_dst_orig->p[U_PLANE].i_pitch;
     p_src1_v = p_dst_orig->p[V_PLANE].p_pixels + i_x_offset/2 +
                p_filter->fmt_out.video.i_x_offset/2 +
-               p_dst_orig->p[V_PLANE].i_pitch *
-               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+               p_dst_orig->p[V_PLANE].i_pitch;
 
     i_src2_pitch = p_src->p[Y_PLANE].i_pitch;
     p_src2_y = p_src->p[Y_PLANE].p_pixels +
@@ -189,12 +245,6 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
               p_filter->fmt_in.video.i_x_offset +
               p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
 
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
 #define MAX_TRANS 255
 #define TRANS_BITS  8
 
@@ -214,12 +264,13 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
         /* Draw until we reach the end of the line */
         for( i_x = 0; i_x < i_width; i_x++ )
         {
-            if( !p_trans[i_x] )
+            i_trans = ( p_trans[i_x] * i_alpha ) / 255;
+            if( !i_trans )
             {
                 /* Completely transparent. Don't change pixel */
                 continue;
             }
-            else if( p_trans[i_x] == MAX_TRANS )
+            else if( i_trans == MAX_TRANS )
             {
                 /* Completely opaque. Completely overwrite underlying pixel */
                 p_dst_y[i_x] = p_src2_y[i_x];
@@ -233,17 +284,17 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
             }
 
             /* Blending */
-            p_dst_y[i_x] = ( (uint16_t)p_src2_y[i_x] * p_trans[i_x] +
-                (uint16_t)p_src1_y[i_x] * (MAX_TRANS - p_trans[i_x]) )
+            p_dst_y[i_x] = ( (uint16_t)p_src2_y[i_x] * i_trans +
+                (uint16_t)p_src1_y[i_x] * (MAX_TRANS - i_trans) )
                 >> TRANS_BITS;
 
             if( b_even_scanline && i_x % 2 == 0 )
             {
-                p_dst_u[i_x/2] = ( (uint16_t)p_src2_u[i_x] * p_trans[i_x] +
-                (uint16_t)p_src1_u[i_x/2] * (MAX_TRANS - p_trans[i_x]) )
+                p_dst_u[i_x/2] = ( (uint16_t)p_src2_u[i_x] * i_trans +
+                (uint16_t)p_src1_u[i_x/2] * (MAX_TRANS - i_trans) )
                 >> TRANS_BITS;
-                p_dst_v[i_x/2] = ( (uint16_t)p_src2_v[i_x] * p_trans[i_x] +
-                (uint16_t)p_src1_v[i_x/2] * (MAX_TRANS - p_trans[i_x]) )
+                p_dst_v[i_x/2] = ( (uint16_t)p_src2_v[i_x] * i_trans +
+                (uint16_t)p_src1_v[i_x/2] * (MAX_TRANS - i_trans) )
                 >> TRANS_BITS;
             }
         }
@@ -280,26 +331,26 @@ static inline void yuv_to_rgb( int *r, int *g, int *b,
 
 static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic,
                       picture_t *p_dst_orig, picture_t *p_src,
-                      int i_x_offset, int i_y_offset )
+                      int i_x_offset, int i_y_offset,
+                      int i_width, int i_height, int i_alpha )
 {
-    filter_sys_t *p_sys = p_filter->p_sys;
     int i_src1_pitch, i_src2_pitch, i_dst_pitch;
     uint8_t *p_dst, *p_src1, *p_src2_y;
     uint8_t *p_src2_u, *p_src2_v;
     uint8_t *p_trans;
-    int i_width, i_height, i_x, i_y, i_pix_pitch;
+    int i_x, i_y, i_pix_pitch;
     int r, g, b;
 
     i_pix_pitch = p_dst_pic->p->i_pixel_pitch;
     i_dst_pitch = p_dst_pic->p->i_pitch;
-    p_dst = p_dst_pic->p->p_pixels + i_x_offset +
-            p_filter->fmt_out.video.i_x_offset +
+    p_dst = p_dst_pic->p->p_pixels + i_x_offset * i_pix_pitch +
+            p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
             p_dst_pic->p->i_pitch *
             ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
 
     i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch;
-    p_src1 = p_dst_orig->p->p_pixels + i_x_offset +
-               p_filter->fmt_out.video.i_x_offset +
+    p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch +
+               p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
                p_dst_orig->p->i_pitch *
                ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
 
@@ -318,12 +369,6 @@ static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic,
               p_filter->fmt_in.video.i_x_offset +
               p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
 
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
 #define MAX_TRANS 255
 #define TRANS_BITS  8
 
@@ -365,16 +410,204 @@ static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic,
     return;
 }
 
-static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
+static void BlendR24( filter_t *p_filter, picture_t *p_dst_pic,
+                      picture_t *p_dst_orig, picture_t *p_src,
+                      int i_x_offset, int i_y_offset,
+                      int i_width, int i_height, int i_alpha )
+{
+    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
+    uint8_t *p_dst, *p_src1, *p_src2_y;
+    uint8_t *p_src2_u, *p_src2_v;
+    uint8_t *p_trans;
+    int i_x, i_y, i_pix_pitch, i_trans;
+    int r, g, b;
+
+    i_pix_pitch = p_dst_pic->p->i_pixel_pitch;
+    i_dst_pitch = p_dst_pic->p->i_pitch;
+    p_dst = p_dst_pic->p->p_pixels + i_x_offset * i_pix_pitch +
+            p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
+            p_dst_pic->p->i_pitch *
+            ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch;
+    p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch +
+               p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
+               p_dst_orig->p->i_pitch *
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src2_pitch = p_src->p[Y_PLANE].i_pitch;
+    p_src2_y = p_src->p[Y_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset +
+               p_src->p[Y_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
+    p_src2_u = p_src->p[U_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset/2 +
+               p_src->p[U_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset/2;
+    p_src2_v = p_src->p[V_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset/2 +
+               p_src->p[V_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset/2;
+
+    p_trans = p_src->p[A_PLANE].p_pixels +
+              p_filter->fmt_in.video.i_x_offset +
+              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
+
+#define MAX_TRANS 255
+#define TRANS_BITS  8
+
+    /* Draw until we reach the bottom of the subtitle */
+    for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch,
+         p_dst += i_dst_pitch, p_src1 += i_src1_pitch,
+         p_src2_y += i_src2_pitch, p_src2_u += i_src2_pitch,
+         p_src2_v += i_src2_pitch )
+    {
+        /* Draw until we reach the end of the line */
+        for( i_x = 0; i_x < i_width; i_x++ )
+        {
+            i_trans = ( p_trans[i_x] * i_alpha ) / 255;
+            if( !i_trans )
+            {
+                /* Completely transparent. Don't change pixel */
+                continue;
+            }
+            else if( i_trans == MAX_TRANS )
+            {
+                /* Completely opaque. Completely overwrite underlying pixel */
+                yuv_to_rgb( &r, &g, &b,
+                            p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] );
+
+                p_dst[i_x * i_pix_pitch]     = r;
+                p_dst[i_x * i_pix_pitch + 1] = g;
+                p_dst[i_x * i_pix_pitch + 2] = b;
+                continue;
+            }
+
+            /* Blending */
+            yuv_to_rgb( &r, &g, &b,
+                        p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] );
+
+            p_dst[i_x * i_pix_pitch]     = ( r * i_trans +
+                (uint16_t)p_src1[i_x * i_pix_pitch] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+            p_dst[i_x * i_pix_pitch + 1] = ( g * i_trans +
+                (uint16_t)p_src1[i_x * i_pix_pitch + 1] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+            p_dst[i_x * i_pix_pitch + 2] = ( b * i_trans +
+                (uint16_t)p_src1[i_x * i_pix_pitch + 2] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+        }
+    }
+
+#undef MAX_TRANS
+#undef TRANS_BITS
+
+    return;
+}
+
+static void BlendYUY2( filter_t *p_filter, picture_t *p_dst_pic,
+                       picture_t *p_dst_orig, picture_t *p_src,
+                       int i_x_offset, int i_y_offset,
+                       int i_width, int i_height, int i_alpha )
+{
+    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
+    uint8_t *p_dst, *p_src1, *p_src2_y;
+    uint8_t *p_src2_u, *p_src2_v;
+    uint8_t *p_trans;
+    int i_x, i_y, i_pix_pitch, i_trans;
+    vlc_bool_t b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
+
+    i_pix_pitch = 2;
+    i_dst_pitch = p_dst_pic->p->i_pitch;
+    p_dst = p_dst_pic->p->p_pixels + i_x_offset * i_pix_pitch +
+            p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
+            p_dst_pic->p->i_pitch *
+            ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch;
+    p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch +
+               p_filter->fmt_out.video.i_x_offset * i_pix_pitch +
+               p_dst_orig->p->i_pitch *
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src2_pitch = p_src->p[Y_PLANE].i_pitch;
+    p_src2_y = p_src->p[Y_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset +
+               p_src->p[Y_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
+    p_src2_u = p_src->p[U_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset/2 +
+               p_src->p[U_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset/2;
+    p_src2_v = p_src->p[V_PLANE].p_pixels +
+               p_filter->fmt_in.video.i_x_offset/2 +
+               p_src->p[V_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset/2;
+
+    p_trans = p_src->p[A_PLANE].p_pixels +
+              p_filter->fmt_in.video.i_x_offset +
+              p_src->p[A_PLANE].i_pitch * p_filter->fmt_in.video.i_y_offset;
+
+    i_width = (i_width >> 1) << 1; /* Needs to be a multiple of 2 */
+
+#define MAX_TRANS 255
+#define TRANS_BITS  8
+
+    /* Draw until we reach the bottom of the subtitle */
+    for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch,
+         p_dst += i_dst_pitch, p_src1 += i_src1_pitch,
+         p_src2_y += i_src2_pitch, p_src2_u += i_src2_pitch,
+         p_src2_v += i_src2_pitch )
+    {
+        /* Draw until we reach the end of the line */
+        for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
+        {
+            i_trans = ( p_trans[i_x] * i_alpha ) / 255;
+            if( !i_trans )
+            {
+                /* Completely transparent. Don't change pixel */
+            }
+            else if( i_trans == MAX_TRANS )
+            {
+                /* Completely opaque. Completely overwrite underlying pixel */
+                p_dst[i_x * 2]     = p_src2_y[i_x];
+
+                if( b_even )
+                {
+                    p_dst[i_x * 2 + 1] = p_src2_u[i_x];
+                    p_dst[i_x * 2 + 3] = p_src2_v[i_x];
+                }
+            }
+            else
+            {
+                /* Blending */
+                p_dst[i_x * 2]     = ( (uint16_t)p_src2_y[i_x] * i_trans +
+                    (uint16_t)p_src1[i_x * 2] * (MAX_TRANS - i_trans) )
+                    >> TRANS_BITS;
+
+                if( b_even )
+                {
+                    p_dst[i_x * 2 + 1] = ( (uint16_t)p_src2_u[i_x] * i_trans +
+                        (uint16_t)p_src1[i_x * 2 + 1] * (MAX_TRANS - i_trans) )
+                        >> TRANS_BITS;
+                    p_dst[i_x * 2 + 3] = ( (uint16_t)p_src2_v[i_x] * i_trans +
+                        (uint16_t)p_src1[i_x * 2 + 3] * (MAX_TRANS - i_trans) )
+                        >> TRANS_BITS;
+                }
+            }
+        }
+    }
+
+#undef MAX_TRANS
+#undef TRANS_BITS
+
+    return;
+}
+
+static void BlendPalI420( filter_t *p_filter, picture_t *p_dst,
                           picture_t *p_dst_orig, picture_t *p_src,
-                          int i_x_offset, int i_y_offset )
+                          int i_x_offset, int i_y_offset,
+                          int i_width, int i_height, int i_alpha )
 {
-    filter_sys_t *p_sys = p_filter->p_sys;
     int i_src1_pitch, i_src2_pitch, i_dst_pitch;
     uint8_t *p_src1_y, *p_src2, *p_dst_y;
     uint8_t *p_src1_u, *p_dst_u;
     uint8_t *p_src1_v, *p_dst_v;
-    int i_width, i_height, i_x, i_y;
+    int i_x, i_y, i_trans;
     vlc_bool_t b_even_scanline = i_y_offset % 2;
 
     i_dst_pitch = p_dst->p[Y_PLANE].i_pitch;
@@ -384,12 +617,12 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
               ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
     p_dst_u = p_dst->p[U_PLANE].p_pixels + i_x_offset/2 +
               p_filter->fmt_out.video.i_x_offset/2 +
-              p_dst->p[U_PLANE].i_pitch *
-              ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+              p_dst->p[U_PLANE].i_pitch;
     p_dst_v = p_dst->p[V_PLANE].p_pixels + i_x_offset/2 +
               p_filter->fmt_out.video.i_x_offset/2 +
-              p_dst->p[V_PLANE].i_pitch *
-              ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+              ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+              p_dst->p[V_PLANE].i_pitch;
 
     i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch;
     p_src1_y = p_dst_orig->p[Y_PLANE].p_pixels + i_x_offset +
@@ -398,23 +631,17 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
                ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
     p_src1_u = p_dst_orig->p[U_PLANE].p_pixels + i_x_offset/2 +
                p_filter->fmt_out.video.i_x_offset/2 +
-               p_dst_orig->p[U_PLANE].i_pitch *
-               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+               p_dst_orig->p[U_PLANE].i_pitch;
     p_src1_v = p_dst_orig->p[V_PLANE].p_pixels + i_x_offset/2 +
                p_filter->fmt_out.video.i_x_offset/2 +
-               p_dst_orig->p[V_PLANE].i_pitch *
-               ( i_y_offset + p_filter->fmt_out.video.i_y_offset )/2;
+               ( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
+               p_dst_orig->p[V_PLANE].i_pitch;
 
     i_src2_pitch = p_src->p->i_pitch;
     p_src2 = p_src->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
              i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
 
-    i_width = __MIN( p_filter->fmt_out.video.i_visible_width - i_x_offset,
-                     p_filter->fmt_in.video.i_visible_width );
-
-    i_height = __MIN( p_filter->fmt_out.video.i_visible_height - i_y_offset,
-                      p_filter->fmt_in.video.i_visible_height );
-
 #define MAX_TRANS 255
 #define TRANS_BITS  8
 #define p_trans p_src2
@@ -434,12 +661,13 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
         /* Draw until we reach the end of the line */
         for( i_x = 0; i_x < i_width; i_x++ )
         {
-            if( !p_pal[p_trans[i_x]][3] )
+            i_trans = ( p_pal[p_trans[i_x]][3] * i_alpha ) / 255;
+            if( !i_trans )
             {
                 /* Completely transparent. Don't change pixel */
                 continue;
             }
-            else if( p_pal[p_trans[i_x]][3] == MAX_TRANS )
+            else if( i_trans == MAX_TRANS )
             {
                 /* Completely opaque. Completely overwrite underlying pixel */
                 p_dst_y[i_x] = p_pal[p_src2[i_x]][0];
@@ -453,19 +681,198 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
             }
 
             /* Blending */
-            p_dst_y[i_x] = ( (uint16_t)p_pal[p_src2[i_x]][0] *
-                p_pal[p_trans[i_x]][3] + (uint16_t)p_src1_y[i_x] *
-                (MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
+            p_dst_y[i_x] = ( (uint16_t)p_pal[p_src2[i_x]][0] * i_trans +
+                (uint16_t)p_src1_y[i_x] * (MAX_TRANS - i_trans) )
+                >> TRANS_BITS;
 
             if( b_even_scanline && i_x % 2 == 0 )
             {
-                p_dst_u[i_x/2] = ( (uint16_t)p_pal[p_src2[i_x]][1] *
-                    p_pal[p_trans[i_x]][3] + (uint16_t)p_src1_u[i_x/2] *
-                    (MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
-                p_dst_v[i_x/2] = ( (uint16_t)p_pal[p_src2[i_x]][2] *
-                    p_pal[p_trans[i_x]][3] + (uint16_t)p_src1_v[i_x/2] *
-                    (MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
+                p_dst_u[i_x/2] = ( (uint16_t)p_pal[p_src2[i_x]][1] * i_trans +
+                    (uint16_t)p_src1_u[i_x/2] * (MAX_TRANS - i_trans) )
+                    >> TRANS_BITS;
+                p_dst_v[i_x/2] = ( (uint16_t)p_pal[p_src2[i_x]][2] * i_trans +
+                    (uint16_t)p_src1_v[i_x/2] * (MAX_TRANS - i_trans) )
+                    >> TRANS_BITS;
+            }
+        }
+    }
+
+#undef MAX_TRANS
+#undef TRANS_BITS
+#undef p_trans
+#undef p_pal
+
+    return;
+}
+
+static void BlendPalYUY2( filter_t *p_filter, picture_t *p_dst_pic,
+                          picture_t *p_dst_orig, picture_t *p_src,
+                          int i_x_offset, int i_y_offset,
+                          int i_width, int i_height, int i_alpha )
+{
+    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
+    uint8_t *p_src1, *p_src2, *p_dst;
+    int i_x, i_y, i_pix_pitch, i_trans;
+    vlc_bool_t b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
+
+    i_pix_pitch = 2;
+    i_dst_pitch = p_dst_pic->p->i_pitch;
+    p_dst = p_dst_pic->p->p_pixels + i_pix_pitch * (i_x_offset +
+            p_filter->fmt_out.video.i_x_offset) + p_dst_pic->p->i_pitch *
+            ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src1_pitch = p_dst_orig->p->i_pitch;
+    p_src1 = p_dst_orig->p->p_pixels + i_pix_pitch * (i_x_offset +
+             p_filter->fmt_out.video.i_x_offset) + p_dst_orig->p->i_pitch *
+             ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src2_pitch = p_src->p->i_pitch;
+    p_src2 = p_src->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
+             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
+
+    i_width = (i_width >> 1) << 1; /* Needs to be a multiple of 2 */
+
+#define MAX_TRANS 255
+#define TRANS_BITS  8
+#define p_trans p_src2
+#define p_pal p_filter->fmt_in.video.p_palette->palette
+
+    /* Draw until we reach the bottom of the subtitle */
+    for( i_y = 0; i_y < i_height; i_y++,
+         p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_src2 += i_src2_pitch )
+    {
+        /* Draw until we reach the end of the line */
+        for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
+        {
+            i_trans = ( p_pal[p_trans[i_x]][3] * i_alpha ) / 255;
+            if( !i_trans )
+            {
+                /* Completely transparent. Don't change pixel */
+            }
+            else if( i_trans == MAX_TRANS )
+            {
+                /* Completely opaque. Completely overwrite underlying pixel */
+                p_dst[i_x * 2]     = p_pal[p_src2[i_x]][0];
+
+                if( b_even )
+                {
+                    p_dst[i_x * 2 + 1] = p_pal[p_src2[i_x]][1];
+                    p_dst[i_x * 2 + 3] = p_pal[p_src2[i_x]][2];
+                }
             }
+            else
+            {
+                /* Blending */
+                p_dst[i_x * 2]     = ( (uint16_t)p_pal[p_src2[i_x]][0] *
+                    i_trans + (uint16_t)p_src1[i_x * 2] *
+                    (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+
+                if( b_even )
+                {
+                    p_dst[i_x * 2 + 1] = ( (uint16_t)p_pal[p_src2[i_x]][1] *
+                        i_trans + (uint16_t)p_src1[i_x * 2 + 1] *
+                        (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+                    p_dst[i_x * 2 + 3] = ( (uint16_t)p_pal[p_src2[i_x]][2] *
+                        i_trans + (uint16_t)p_src1[i_x * 2 + 3] *
+                        (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+                }
+            }
+        }
+    }
+
+#undef MAX_TRANS
+#undef TRANS_BITS
+#undef p_trans
+#undef p_pal
+
+    return;
+}
+
+static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
+                        picture_t *p_dst_orig, picture_t *p_src,
+                        int i_x_offset, int i_y_offset,
+                        int i_width, int i_height, int i_alpha )
+{
+    int i_src1_pitch, i_src2_pitch, i_dst_pitch;
+    uint8_t *p_src1, *p_src2, *p_dst;
+    int i_x, i_y, i_pix_pitch, i_trans;
+    int r, g, b;
+    video_palette_t rgbpalette;
+
+    i_pix_pitch = p_dst_pic->p->i_pixel_pitch;
+    i_dst_pitch = p_dst_pic->p->i_pitch;
+    p_dst = p_dst_pic->p->p_pixels + i_pix_pitch * (i_x_offset +
+            p_filter->fmt_out.video.i_x_offset) + p_dst_pic->p->i_pitch *
+            ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src1_pitch = p_dst_orig->p->i_pitch;
+    p_src1 = p_dst_orig->p->p_pixels + i_pix_pitch * (i_x_offset +
+             p_filter->fmt_out.video.i_x_offset) + p_dst_orig->p->i_pitch *
+             ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
+
+    i_src2_pitch = p_src->p->i_pitch;
+    p_src2 = p_src->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
+             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
+
+#define MAX_TRANS 255
+#define TRANS_BITS  8
+#define p_trans p_src2
+#define p_pal p_filter->fmt_in.video.p_palette->palette
+#define rgbpal rgbpalette.palette
+
+    /* Convert palette first */
+    for( i_y = 0; i_y < p_filter->fmt_in.video.p_palette->i_entries &&
+         i_y < 256; i_y++ )
+    {
+        yuv_to_rgb( &r, &g, &b, p_pal[i_y][0], p_pal[i_y][1], p_pal[i_y][2] );
+
+        if( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','1','6') )
+        {
+            *(uint16_t *)rgbpal[i_y] =
+                ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
+        }
+        else
+        {
+            rgbpal[i_y][0] = r; rgbpal[i_y][1] = g; rgbpal[i_y][2] = b;
+        }
+    }
+
+    /* Draw until we reach the bottom of the subtitle */
+    for( i_y = 0; i_y < i_height; i_y++,
+         p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_src2 += i_src2_pitch )
+    {
+        /* Draw until we reach the end of the line */
+        for( i_x = 0; i_x < i_width; i_x++ )
+        {
+            i_trans = ( p_pal[p_trans[i_x]][3] * i_alpha ) / 255;
+            if( !i_trans )
+            {
+                /* Completely transparent. Don't change pixel */
+                continue;
+            }
+            else if( i_trans == MAX_TRANS ||
+                     p_filter->fmt_out.video.i_chroma ==
+                     VLC_FOURCC('R','V','1','6') )
+            {
+                /* Completely opaque. Completely overwrite underlying pixel */
+                p_dst[i_x * i_pix_pitch]     = rgbpal[p_src2[i_x]][0];
+                p_dst[i_x * i_pix_pitch + 1] = rgbpal[p_src2[i_x]][1];
+                if( p_filter->fmt_out.video.i_chroma !=
+                    VLC_FOURCC('R','V','1','6') )
+                p_dst[i_x * i_pix_pitch + 2] = rgbpal[p_src2[i_x]][2];
+                continue;
+            }
+
+            /* Blending */
+            p_dst[i_x * i_pix_pitch]     = ( (uint16_t)rgbpal[p_src2[i_x]][0] *
+                i_trans + (uint16_t)p_src1[i_x * i_pix_pitch] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+            p_dst[i_x * i_pix_pitch + 1] = ( (uint16_t)rgbpal[p_src2[i_x]][1] *
+                i_trans + (uint16_t)p_src1[i_x * i_pix_pitch + 1] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
+            p_dst[i_x * i_pix_pitch + 2] = ( (uint16_t)rgbpal[p_src2[i_x]][2] *
+                i_trans + (uint16_t)p_src1[i_x * i_pix_pitch + 2] *
+                (MAX_TRANS - i_trans) ) >> TRANS_BITS;
         }
     }
 
@@ -473,6 +880,7 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
 #undef TRANS_BITS
 #undef p_trans
 #undef p_pal
+#undef rgbpal
 
     return;
 }