Changeset 07d2f3edd5e3c3c64db6feac4c9e4317f470ccbe

Timestamp:

20/08/08 23:23:19 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219267399 +0200

git-parent:

[d7507865a0e8c36ab44ede8b4f9ccc844b2a35c3]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219267228 +0200

Message:

Last part of blend.c cleanup, added RV15 and fixed RV16 blending support.

I have tested that RGBA blending to I420/YUY2/RV32/RV16 have the right colors.

Files:

• modules/video_filter/blend.c (modified) (41 diffs)

modules/video_filter/blend.c

@@ -2 +2 @@
- * blend.c: alpha blend 2 pictures together
- *****************************************************************************
-7
+8
- * $Id$
- *
@@ -30 +30 @@
-#endif
-
+#include <assert.h>
-#include <vlc_common.h>
-#include <vlc_plugin.h>
@@ -36 +37 @@
-
-/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int  OpenFilter ( vlc_object_t * );
+static void CloseFilter( vlc_object_t * );
+
+vlc_module_begin();
+    set_description( N_("Video pictures blending") );
+    set_capability( "video blending", 100 );
+    set_callbacks( OpenFilter, CloseFilter );
+vlc_module_end();
+
+
+/*****************************************************************************
- * filter_sys_t : filter descriptor
- *****************************************************************************/
@@ -43 +57 @@
-};
-
+#define FCC_YUVA VLC_FOURCC('Y','U','V','A')
+#define FCC_YUVP VLC_FOURCC('Y','U','V','P')
+#define FCC_RGBA VLC_FOURCC('R','G','B','A')
+
+#define FCC_I420 VLC_FOURCC('I','4','2','0')
+#define FCC_YV12 VLC_FOURCC('Y','V','1','2')
+#define FCC_YUY2 VLC_FOURCC('Y','U','Y','2')
+#define FCC_UYVY VLC_FOURCC('U','Y','V','Y')
+#define FCC_YVYU VLC_FOURCC('Y','V','Y','U')
+#define FCC_RV15 VLC_FOURCC('R','V','1','5')
+#define FCC_RV16 VLC_FOURCC('R','V','1','6')
+#define FCC_RV24 VLC_FOURCC('R','V','2','4')
+#define FCC_RV32 VLC_FOURCC('R','V','3','2')
+
-/****************************************************************************
- * Local prototypes
- ****************************************************************************/
-static int  OpenFilter ( vlc_object_t * );
-static void CloseFilter( vlc_object_t * );
-
-static void Blend( filter_t *, picture_t *, picture_t *, picture_t *,
-                   int, int, int );
-
-/* TODO i_alpha support for BlendR16 */
-/* YUVA */
-static void BlendI420( filter_t *, picture_t *, picture_t *, picture_t *,
@@ -94 +118 @@
-                          int, int, int, int, int );
-
-
-
-
-
-
-
-
-
+
-
-/*****************************************************************************
@@ -115 +132 @@
-    int in_chroma = p_filter->fmt_in.video.i_chroma;
-    int out_chroma = p_filter->fmt_out.video.i_chroma;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    {
-        return VLC_EGENERIC;
@@ -133 +145 @@
-
-    /* Allocate the memory needed to store the decoder's structure */
-if( ( p_filter->p_sys = p_sys =
-      (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL
+p_filter->p_sys = p_sys = malloc(sizeof(filter_sys_t));
+if( !p_sys
-        return VLC_ENOMEM;
-
@@ -163 +175 @@
- * This function is called just after the thread is launched.
- ****************************************************************************/
+typedef void (*BlendFunction)( filter_t *, picture_t *,
+                       picture_t *, picture_t *,
+                       int , int , int , int , int );
+
+#define FCC_PLANAR_420 { FCC_I420, FCC_YV12, 0 }
+#define FCC_PACKED_422 { FCC_YUY2, FCC_UYVY, FCC_YVYU, 0 }
+#define FCC_RGB_16 { FCC_RV15, FCC_RV16, 0 }
+#define FCC_RGB_24 { FCC_RV24, FCC_RV32, 0 }
+
+#define BLEND_CFG( fccSrc, fctPlanar, fctPacked, fctRgb16, fctRgb24  ) \
+    { .src = fccSrc, .p_dst = FCC_PLANAR_420, .pf_blend = fctPlanar }, \
+    { .src = fccSrc, .p_dst = FCC_PACKED_422, .pf_blend = fctPacked }, \
+    { .src = fccSrc, .p_dst = FCC_RGB_16,     .pf_blend = fctRgb16  }, \
+    { .src = fccSrc, .p_dst = FCC_RGB_24,     .pf_blend = fctRgb24  }
+
+static const struct
+{
+    vlc_fourcc_t src;
+    vlc_fourcc_t p_dst[16];
+    BlendFunction pf_blend;
+} p_blend_cfg[] = {
+
+    BLEND_CFG( FCC_YUVA, BlendI420, BlendYUVPacked, BlendR16, BlendR24 ),
+
+    BLEND_CFG( FCC_YUVP, BlendPalI420, BlendPalYUVPacked, BlendPalRV, BlendPalRV ),
+
+    BLEND_CFG( FCC_RGBA, BlendRGBAI420, BlendRGBAYUVPacked, BlendRGBAR16, BlendRGBAR24 ),
+
+    BLEND_CFG( FCC_I420, BlendI420I420, BlendI420YUVPacked, BlendI420R16, BlendI420R24 ),
+
+    BLEND_CFG( FCC_YV12, BlendI420I420, BlendI420YUVPacked, BlendI420R16, BlendI420R24 ),
+
+    { 0, {0,}, NULL }
+};
+
-static void Blend( filter_t *p_filter, picture_t *p_dst,
-                   picture_t *p_dst_orig, picture_t *p_src,
@@ -169 +216 @@
-    int i_width, i_height;
-
-
+
+
-
-    i_width = __MIN((int)p_filter->fmt_out.video.i_visible_width - i_x_offset,
@@ -177 +225 @@
-                     (int)p_filter->fmt_in.video.i_visible_height);
-
-
+
+
+
+
+
-
-#if 0
@@ -185 +237 @@
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -337 +285 @@
-static inline int vlc_alpha( int t, int a )
-{
+    if( a == 255 )
+        return t;
-    return (t * a) / 255;
-}
@@ -391 +341 @@
-}
-
+static void vlc_yuv_packed_index( int *pi_y, int *pi_u, int *pi_v, vlc_fourcc_t i_chroma )
+{
+    static const struct {
+        vlc_fourcc_t chroma;
+        int y, u ,v;
+    } p_index[] = {
+        { FCC_YUY2, 0, 1, 3 },
+        { FCC_UYVY, 1, 0, 2 },
+        { FCC_YVYU, 0, 3, 1 },
+        { 0, 0, 0, 0 }
+    };
+    int i;
+
+    for( i = 0; p_index[i].chroma != 0; i++ )
+    {
+        if( p_index[i].chroma == i_chroma )
+            break;
+    }
+    *pi_y = p_index[i].y;
+    *pi_u = p_index[i].u;
+    *pi_v = p_index[i].v;
+}
+
+static void vlc_blend_packed( uint8_t *p_dst, const uint8_t *p_src,
+                              int i_offset0, int i_offset1, int i_offset2,
+                              int c0, int c1, int c2, int i_alpha,
+                              bool b_do12 )
+{
+    p_dst[i_offset0] = vlc_blend( c0, p_src[i_offset0], i_alpha );
+    if( b_do12 )
+    {
+        p_dst[i_offset1] = vlc_blend( c1, p_src[i_offset1], i_alpha );
+        p_dst[i_offset2] = vlc_blend( c2, p_src[i_offset2], i_alpha );
+    }
+}
+
+static void vlc_blend_rgb16( uint16_t *p_dst, const uint16_t *p_src,
+                             int R, int G, int B, int i_alpha,
+                             const video_format_t *p_fmt )
+{
+    const int i_pix = *p_src;
+    const int r = ( i_pix & p_fmt->i_rmask ) >> p_fmt->i_lrshift;
+    const int g = ( i_pix & p_fmt->i_gmask ) >> p_fmt->i_lgshift;
+    const int b = ( i_pix & p_fmt->i_bmask ) >> p_fmt->i_lbshift;
+
+    *p_dst = ( vlc_blend( R >> p_fmt->i_rrshift, r, i_alpha ) << p_fmt->i_lrshift ) |
+             ( vlc_blend( G >> p_fmt->i_rgshift, g, i_alpha ) << p_fmt->i_lgshift ) |
+             ( vlc_blend( B >> p_fmt->i_rbshift, b, i_alpha ) << p_fmt->i_lbshift );
+}
+
+/*****************************************************************************
+ * BinaryLog: computes the base 2 log of a binary value
+ *****************************************************************************
+ * This functions is used by MaskToShift, to get a bit index from a binary
+ * value.
+ *****************************************************************************/
+static int BinaryLog( uint32_t i )
+{
+    int i_log = 0;
+
+    if( i == 0 ) return -31337;
+
+    if( i & 0xffff0000 ) i_log += 16;
+    if( i & 0xff00ff00 ) i_log += 8;
+    if( i & 0xf0f0f0f0 ) i_log += 4;
+    if( i & 0xcccccccc ) i_log += 2;
+    if( i & 0xaaaaaaaa ) i_log += 1;
+
+    return i_log;
+}
+
+/**
+ * It transforms a color mask into right and left shifts
+ * FIXME copied from video_output.c
+ */
+#if 1
+static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex,
+                           const video_format_t *p_fmt )
+{
+    if( p_fmt->i_chroma != FCC_RV24 && p_fmt->i_chroma != FCC_RV32 )
+        return;
+
+    /* XXX it will works only if mask are 8 bits aligned */
+#ifdef WORDS_BIGENDIAN
+    const int i_mask_bits = p_fmt->i_chroma == FCC_RV24 ? 24 : 32;
+    *pi_rindex = ( i_mask_bits - p_fmt->i_lrshift ) / 8;
+    *pi_gindex = ( i_mask_bits - p_fmt->i_lgshift ) / 8;
+    *pi_bindex = ( i_mask_bits - p_fmt->i_lbshift ) / 8;
+#else
+    *pi_rindex = p_fmt->i_lrshift / 8;
+    *pi_gindex = p_fmt->i_lgshift / 8;
+    *pi_bindex = p_fmt->i_lbshift / 8;
+#endif
+}
+#endif
+
+
+/*
+ * FIXME copied from video_output.c
+ */
+static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
+{
+    uint32_t i_low, i_high;            /* lower hand higher bits of the mask */
+
+    if( !i_mask )
+    {
+        *pi_left = *pi_right = 0;
+        return;
+    }
+
+    /* Get bits */
+    i_low = i_high = i_mask;
+
+    i_low &= - (int32_t)i_low;          /* lower bit of the mask */
+    i_high += i_low;                    /* higher bit of the mask */
+
+    /* Transform bits into an index. Also deal with i_high overflow, which
+     * is faster than changing the BinaryLog code to handle 64 bit integers. */
+    i_low =  BinaryLog (i_low);
+    i_high = i_high ? BinaryLog (i_high) : 32;
+
+    /* Update pointers and return */
+    *pi_left =   i_low;
+    *pi_right = (8 - i_high + i_low);
+}
+
+/* FIXME should be moved to src/ */
+static void video_format_FixRgb( video_format_t *p_fmt )
+{
+    if( p_fmt->i_chroma != FCC_RV15 &&
+        p_fmt->i_chroma != FCC_RV16 &&
+        p_fmt->i_chroma != FCC_RV24 &&
+        p_fmt->i_chroma != FCC_RV32 )
+        return;
+
+    /* FIXME find right default mask */
+    if( !p_fmt->i_rmask || !p_fmt->i_gmask || !p_fmt->i_bmask )
+    {
+        switch( p_fmt->i_chroma )
+        {
+        case FCC_RV15:
+            p_fmt->i_rmask = 0x7c00;
+            p_fmt->i_gmask = 0x03e0;
+            p_fmt->i_bmask = 0x001f;
+            break;
+
+        case FCC_RV16:
+            p_fmt->i_rmask = 0xf800;
+            p_fmt->i_gmask = 0x07e0;
+            p_fmt->i_bmask = 0x001f;
+            break;
+
+        case FCC_RV24:
+            p_fmt->i_rmask = 0xff0000;
+            p_fmt->i_gmask = 0x00ff00;
+            p_fmt->i_bmask = 0x0000ff;
+            break;
+        case FCC_RV32:
+            p_fmt->i_rmask = 0x00ff0000;
+            p_fmt->i_gmask = 0x0000ff00;
+            p_fmt->i_bmask = 0x000000ff;
+            break;
+
+        default:
+            assert(0);
+            break;
+        }
+    }
+
+    MaskToShift( &p_fmt->i_lrshift, &p_fmt->i_rrshift,
+                 p_fmt->i_rmask );
+    MaskToShift( &p_fmt->i_lgshift, &p_fmt->i_rgshift,
+                 p_fmt->i_gmask );
+    MaskToShift( &p_fmt->i_lbshift, &p_fmt->i_rbshift,
+                 p_fmt->i_bmask );
+}
+
-/***********************************************************************
- * YUVA
@@ -512 +639 @@
-
-            /* Blending */
-            /* FIXME: do the blending
-             * FIXME use rgb shift (when present) */
-            yuv_to_rgb( &r, &g, &b,
-                        p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] );
-
-
+
+
+
-        }
-    }
@@ -572 +699 @@
-        uint32_t i_rmask, i_gmask, i_bmask;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        /* Draw until we reach the bottom of the subtitle */
-        for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch,
@@ -650 +746 @@
-    else
-    {
-bindex, i_g
+gindex, i_b
-        uint32_t i_rmask, i_gmask, i_bmask;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        /* Draw until we reach the bottom of the subtitle */
@@ -700 +769 @@
-                    continue;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            }
-        }
@@ -742 +793 @@
-    int i_x, i_y, i_pix_pitch, i_trans = 0;
-    bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    i_pix_pitch = 2;
@@ -801 +836 @@
-
-            /* Blending */
-            p_dst[i_x * 2 + i_l_offset] = vlc_blend( p_src2_y[i_x], p_src1[i_x * 2 + i_l_offset], i_trans );
-            if( b_even )
-            {
@@ -817 +851 @@
-                    i_v = p_src2_v[i_x];
-                }
-
-
+
+
+
+
+
+
+
+
-            }
-        }
@@ -837 +877 @@
-    int i_x, i_y;
-    bool b_even_scanline = i_y_offset % 2;
+
+    if( i_alpha == 0xff )
+    {
+        BlendI420I420_no_alpha( p_filter, p_dst, p_dst_orig, p_src,
+                                i_x_offset, i_y_offset, i_width, i_height );
+        return;
+    }
+
-
-    i_dst_pitch = p_dst->p[Y_PLANE].i_pitch;
@@ -1008 +1056 @@
-        for( i_x = 0; i_x < i_width; i_x++ )
-        {
-            if( i_alpha == MAX_TRANS )
-            {
-                /* Completely opaque. Completely overwrite underlying pixel */
-                yuv_to_rgb( &r, &g, &b,
-                            p_src2_y[i_x], p_src2_u[i_x/2], p_src2_v[i_x/2] );
-
-    ((uint16_t *)(&p_dst[i_x * i_pix_pitch]))[0] = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
-                continue;
-            }
-
-            /* Blending */
-            /* FIXME: do the blending
-             * FIXME use rgb shifts */
-            yuv_to_rgb( &r, &g, &b,
-                        p_src2_y[i_x], p_src2_u[i_x/2], p_src2_v[i_x/2] );
-
-
+
+
+
-        }
-        if( i_y%2 == 1 )
@@ -1043 +1081 @@
-    uint8_t *p_src2_u, *p_src2_v;
-    int i_x, i_y, i_pix_pitch;
+    int i_rindex, i_gindex, i_bindex;
-    int r, g, b;
-
@@ -1065 +1104 @@
-                                0, 0, &p_filter->fmt_in.video, 2 );
-
+    vlc_rgb_index( &i_rindex, &i_gindex, &i_bindex, &p_filter->fmt_out.video );
-
-    /* Draw until we reach the bottom of the subtitle */
@@ -1082 +1122 @@
-                        p_src2_y[i_x], p_src2_u[i_x/2], p_src2_v[i_x/2] );
-
-
-
-
+
+
-        }
-        if( i_y%2 == 1 )
@@ -1104 +1143 @@
-    int i_x, i_y, i_pix_pitch;
-    bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    i_pix_pitch = 2;
@@ -1160 +1183 @@
-
-            /* Blending */
-
-
-
-
-
-
-
-
+
+
+
-        }
-        if( i_y%2 == 1 )
@@ -1266 +1284 @@
-    int i_x, i_y, i_pix_pitch, i_trans;
-    bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    i_pix_pitch = 2;
@@ -1302 +1304 @@
-             i_src2_pitch * p_filter->fmt_in.video.i_y_offset;
-
-= (i_width >> 1) << 
+&= ~
-
-    const uint8_t *p_trans = p_src2;
@@ -1319 +1321 @@
-
-            /* Blending */
-            p_dst[i_x * 2 + i_l_offset] = vlc_blend( p_pal[p_src2[i_x]][0], p_src1[i_x * 2 + i_l_offset], i_trans );
-            if( b_even )
-            {
@@ -1335 +1336 @@
-                }
-
-
-
+
+
+
+
+
+
+
-            }
-        }
@@ -1353 +1359 @@
-    int r, g, b;
-    video_palette_t rgbpalette;
+    int i_rindex, i_gindex, i_bindex;
-
-    i_pix_pitch = p_dst_pic->p->i_pixel_pitch;
@@ -1374 +1381 @@
-
-    /* Convert palette first */
-
-
+
-    {
-        yuv_to_rgb( &r, &g, &b, p_pal[i_y][0], p_pal[i_y][1], p_pal[i_y][2] );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    /* Draw until we reach the bottom of the subtitle */
@@ -1401 +1401 @@
-                continue;
-
-            if( i_trans == MAX_TRANS ||
-                p_filter->fmt_out.video.i_chroma == VLC_FOURCC('R','V','1','6') )
-            {
-                /* FIXME implement blending for RV16 */
-                /* 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 */
-
-
-
+
+
+
+
+
+
+
+
+
+
+