Commit b5416929 authored by gbazin's avatar gbazin
Browse files

* modules/video_filter/blend.c: YUVP -> YUY2 alpha-blending.

parent e7e63a2d
......@@ -51,7 +51,9 @@ static void BlendR24( filter_t *, picture_t *, picture_t *, picture_t *,
int, int );
static void BlendYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
int, int );
static void BlendPalette( filter_t *, picture_t *, picture_t *, picture_t *,
static void BlendPalI420( filter_t *, picture_t *, picture_t *, picture_t *,
int, int );
static void BlendPalYUY2( filter_t *, picture_t *, picture_t *, picture_t *,
int, int );
/*****************************************************************************
......@@ -147,7 +149,14 @@ static void Blend( filter_t *p_filter, picture_t *p_dst,
( 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,
BlendPalI420( p_filter, p_dst, p_dst_orig, p_src,
i_x_offset, i_y_offset );
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 );
return;
}
......@@ -544,31 +553,44 @@ static void BlendYUY2( filter_t *p_filter, picture_t *p_dst_pic,
if( !p_trans[i_x] )
{
/* Completely transparent. Don't change pixel */
continue;
}
else if( p_trans[i_x] == MAX_TRANS )
{
/* Completely opaque. Completely overwrite underlying pixel */
p_dst[i_x * 2] = p_src2_y[i_x];
p_dst[i_x * 2 + 1] = p_src2_u[i_x];
p_dst[i_x * 2 + 2] = p_src2_y[i_x + 1];
p_dst[i_x * 2 + 3] = p_src2_v[i_x + 1];
continue;
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] * p_trans[i_x] +
(uint16_t)p_src1[i_x * 2] *
(MAX_TRANS - p_trans[i_x]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 1] = ( (uint16_t)p_src2_u[i_x] * p_trans[i_x] +
(uint16_t)p_src1[i_x * 2 + 1] *
(MAX_TRANS - p_trans[i_x]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 3] = ( (uint16_t)p_src2_v[i_x] * p_trans[i_x] +
(uint16_t)p_src1[i_x * 2 + 3] *
(MAX_TRANS - p_trans[i_x]) ) >> TRANS_BITS;
}
/* Blending */
p_dst[i_x * 2] = ( (uint16_t)p_src2_y[i_x] * p_trans[i_x] +
(uint16_t)p_src1[i_x * 2] *
(MAX_TRANS - p_trans[i_x]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 1] = ( (uint16_t)p_src2_u[i_x] * p_trans[i_x] +
(uint16_t)p_src1[i_x * 2 + 1] *
(MAX_TRANS - p_trans[i_x]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 2] = ( (uint16_t)p_src2_y[i_x+1] * p_trans[i_x+1] +
(uint16_t)p_src1[i_x * 2 + 2] *
(MAX_TRANS - p_trans[i_x+1]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 3] = ( (uint16_t)p_src2_v[i_x+1] * p_trans[i_x+1] +
(uint16_t)p_src1[i_x * 2 + 3] *
(MAX_TRANS - p_trans[i_x+1]) ) >> TRANS_BITS;
if( !p_trans[i_x+1] )
{
/* Completely transparent. Don't change pixel */
}
else if( p_trans[i_x+1] == MAX_TRANS )
{
/* Completely opaque. Completely overwrite underlying pixel */
p_dst[i_x * 2 + 2] = p_src2_y[i_x + 1];
}
else
{
/* Blending */
p_dst[i_x * 2 + 2] = ( (uint16_t)p_src2_y[i_x+1] *
p_trans[i_x+1] + (uint16_t)p_src1[i_x * 2 + 2] *
(MAX_TRANS - p_trans[i_x+1]) ) >> TRANS_BITS;
}
}
}
......@@ -578,7 +600,7 @@ static void BlendYUY2( filter_t *p_filter, picture_t *p_dst_pic,
return;
}
static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
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 )
{
......@@ -690,6 +712,100 @@ static void BlendPalette( filter_t *p_filter, picture_t *p_dst,
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 )
{
filter_sys_t *p_sys = p_filter->p_sys;
int i_src1_pitch, i_src2_pitch, i_dst_pitch;
uint8_t *p_src1, *p_src2, *p_dst;
int i_width, i_height, i_x, i_y, i_pix_pitch;
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 = __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
#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 += 2 )
{
if( !p_pal[p_trans[i_x]][3] )
{
/* Completely transparent. Don't change pixel */
}
else if( p_pal[p_trans[i_x]][3] == MAX_TRANS )
{
/* Completely opaque. Completely overwrite underlying pixel */
p_dst[i_x * 2] = p_pal[p_src2[i_x]][0];
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] *
p_pal[p_trans[i_x]][3] + (uint16_t)p_src1[i_x * 2] *
(MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 1] = ( (uint16_t)p_pal[p_src2[i_x]][1] *
p_pal[p_trans[i_x]][3] + (uint16_t)p_src1[i_x * 2 + 1] *
(MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
p_dst[i_x * 2 + 3] = ( (uint16_t)p_pal[p_src2[i_x]][2] *
p_pal[p_trans[i_x]][3] + (uint16_t)p_src1[i_x * 2 + 3] *
(MAX_TRANS - p_pal[p_trans[i_x]][3]) ) >> TRANS_BITS;
}
if( !p_pal[p_trans[i_x+1]][3] )
{
/* Completely transparent. Don't change pixel */
}
else if( p_pal[p_trans[i_x+1]][3] == MAX_TRANS )
{
/* Completely opaque. Completely overwrite underlying pixel */
p_dst[i_x * 2 + 2] = p_pal[p_src2[i_x + 1]][0];
}
else
{
/* Blending */
p_dst[i_x * 2 + 2] = ( (uint16_t)p_pal[p_src2[i_x+1]][0] *
p_pal[p_trans[i_x+1]][3] + (uint16_t)p_src1[i_x * 2 + 2] *
(MAX_TRANS - p_pal[p_trans[i_x+1]][3]) ) >> TRANS_BITS;
}
}
}
#undef MAX_TRANS
#undef TRANS_BITS
#undef p_trans
#undef p_pal
return;
}
/*****************************************************************************
* CloseFilter: clean up the filter
*****************************************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment