Commit 418f6bca authored by Antoine Cellerier's avatar Antoine Cellerier

Remove useless argument to pf_video_blend

We were already blending directly on top of the destination
picture. This simplifies the code and should prevent further
confusion.
parent ff987196
...@@ -59,7 +59,7 @@ struct filter_t ...@@ -59,7 +59,7 @@ struct filter_t
picture_t * ( * pf_video_filter ) ( filter_t *, picture_t * ); picture_t * ( * pf_video_filter ) ( filter_t *, picture_t * );
block_t * ( * pf_audio_filter ) ( filter_t *, block_t * ); block_t * ( * pf_audio_filter ) ( filter_t *, block_t * );
void ( * pf_video_blend ) ( filter_t *, picture_t *, void ( * pf_video_blend ) ( filter_t *,
picture_t *, picture_t *, picture_t *, picture_t *,
int, int, int ); int, int, int );
......
...@@ -124,7 +124,7 @@ VLC_EXPORT( subpicture_region_t *,__spu_MakeRegion, ( vlc_object_t *, video_form ...@@ -124,7 +124,7 @@ VLC_EXPORT( subpicture_region_t *,__spu_MakeRegion, ( vlc_object_t *, video_form
#define spu_DestroyRegion(a,b) __spu_DestroyRegion(VLC_OBJECT(a),b) #define spu_DestroyRegion(a,b) __spu_DestroyRegion(VLC_OBJECT(a),b)
VLC_EXPORT( void, __spu_DestroyRegion, ( vlc_object_t *, subpicture_region_t * ) ); VLC_EXPORT( void, __spu_DestroyRegion, ( vlc_object_t *, subpicture_region_t * ) );
VLC_EXPORT( subpicture_t *, spu_SortSubpictures, ( spu_t *, mtime_t, bool ) ); VLC_EXPORT( subpicture_t *, spu_SortSubpictures, ( spu_t *, mtime_t, bool ) );
VLC_EXPORT( void, spu_RenderSubpictures, ( spu_t *, video_format_t *, picture_t *, picture_t *, subpicture_t *, int, int ) ); VLC_EXPORT( void, spu_RenderSubpictures, ( spu_t *, video_format_t *, picture_t *, subpicture_t *, int, int ) );
/** @}*/ /** @}*/
......
...@@ -59,7 +59,6 @@ struct demux_sys_t ...@@ -59,7 +59,6 @@ struct demux_sys_t
#ifdef SCREEN_MOUSE #ifdef SCREEN_MOUSE
picture_t *p_mouse; picture_t *p_mouse;
filter_t *p_blend; filter_t *p_blend;
picture_t src;
picture_t dst; picture_t dst;
#endif #endif
......
...@@ -172,12 +172,6 @@ block_t *screen_Capture( demux_t *p_demux ) ...@@ -172,12 +172,6 @@ block_t *screen_Capture( demux_t *p_demux )
vlc_memcpy( p_block->p_buffer, image->data, i_size ); vlc_memcpy( p_block->p_buffer, image->data, i_size );
else else
{ {
if( !p_sys->src.i_planes )
vout_InitPicture( p_demux, &p_sys->src,
p_sys->fmt.video.i_chroma,
p_sys->fmt.video.i_width,
p_sys->fmt.video.i_height,
p_sys->fmt.video.i_aspect );
if( !p_sys->dst.i_planes ) if( !p_sys->dst.i_planes )
vout_InitPicture( p_demux, &p_sys->dst, vout_InitPicture( p_demux, &p_sys->dst,
p_sys->fmt.video.i_chroma, p_sys->fmt.video.i_chroma,
...@@ -208,13 +202,10 @@ block_t *screen_Capture( demux_t *p_demux ) ...@@ -208,13 +202,10 @@ block_t *screen_Capture( demux_t *p_demux )
} }
if( p_sys->p_blend ) if( p_sys->p_blend )
{ {
/* FIXME: why is this memcpy needed?!? (bug in blend?) */
vlc_memcpy( p_block->p_buffer, image->data, i_size ); vlc_memcpy( p_block->p_buffer, image->data, i_size );
p_sys->dst.p->p_pixels = p_block->p_buffer; p_sys->dst.p->p_pixels = p_block->p_buffer;
p_sys->src.p->p_pixels = image->data;
p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_sys->p_blend->pf_video_blend( p_sys->p_blend,
&p_sys->dst, &p_sys->dst,
&p_sys->src,
p_sys->p_mouse, p_sys->p_mouse,
root_x, root_x,
root_y, root_y,
......
...@@ -2017,7 +2017,7 @@ static int transcode_video_process( sout_stream_t *p_stream, ...@@ -2017,7 +2017,7 @@ static int transcode_video_process( sout_stream_t *p_stream,
fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width; fmt.i_sar_num = fmt.i_aspect * fmt.i_height / fmt.i_width;
fmt.i_sar_den = VOUT_ASPECT_FACTOR; fmt.i_sar_den = VOUT_ASPECT_FACTOR;
spu_RenderSubpictures( p_sys->p_spu, &fmt, p_pic, p_pic, p_subpic, spu_RenderSubpictures( p_sys->p_spu, &fmt, p_pic, p_subpic,
i_scale_width, i_scale_height ); i_scale_width, i_scale_height );
} }
......
...@@ -73,48 +73,48 @@ struct filter_sys_t ...@@ -73,48 +73,48 @@ struct filter_sys_t
/**************************************************************************** /****************************************************************************
* Local prototypes * Local prototypes
****************************************************************************/ ****************************************************************************/
static void Blend( filter_t *, picture_t *, picture_t *, picture_t *, static void Blend( filter_t *, picture_t *, picture_t *,
int, int, int ); int, int, int );
/* YUVA */ /* YUVA */
static void BlendYUVAI420( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVAI420( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendYUVARV16( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVARV16( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendYUVARV24( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVARV24( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendYUVAYUVPacked( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVAYUVPacked( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
/* I420, YV12 */ /* I420, YV12 */
static void BlendI420I420( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendI420I420( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendI420I420_no_alpha( static void BlendI420I420_no_alpha(
filter_t *, picture_t *, picture_t *, picture_t *, filter_t *, picture_t *, picture_t *,
int, int, int, int ); int, int, int, int );
static void BlendI420R16( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendI420R16( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendI420R24( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendI420R24( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendI420YUVPacked( filter_t *, picture_t *, picture_t *, static void BlendI420YUVPacked( filter_t *, picture_t *,
picture_t *, int, int, int, int, int ); picture_t *, int, int, int, int, int );
/* YUVP */ /* YUVP */
static void BlendPalI420( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendPalI420( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendPalYUVPacked( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendPalYUVPacked( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendPalRV( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendPalRV( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
/* RGBA */ /* RGBA */
static void BlendRGBAI420( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendRGBAI420( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendRGBAYUVPacked( filter_t *, picture_t *, picture_t *, static void BlendRGBAYUVPacked( filter_t *, picture_t *,
picture_t *, int, int, int, int, int ); picture_t *, int, int, int, int, int );
static void BlendRGBAR16( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendRGBAR16( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendRGBAR24( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendRGBAR24( filter_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
/***************************************************************************** /*****************************************************************************
...@@ -172,7 +172,7 @@ static void CloseFilter( vlc_object_t *p_this ) ...@@ -172,7 +172,7 @@ static void CloseFilter( vlc_object_t *p_this )
**************************************************************************** ****************************************************************************
* This function is called just after the thread is launched. * This function is called just after the thread is launched.
****************************************************************************/ ****************************************************************************/
typedef void (*BlendFunction)( filter_t *, picture_t *, typedef void (*BlendFunction)( filter_t *,
picture_t *, picture_t *, picture_t *, picture_t *,
int , int , int , int , int ); int , int , int , int , int );
...@@ -207,8 +207,8 @@ static const struct ...@@ -207,8 +207,8 @@ static const struct
{ 0, {0,}, NULL } { 0, {0,}, NULL }
}; };
static void Blend( filter_t *p_filter, picture_t *p_dst, static void Blend( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst, picture_t *p_src,
int i_x_offset, int i_y_offset, int i_alpha ) int i_x_offset, int i_y_offset, int i_alpha )
{ {
int i_width, i_height; int i_width, i_height;
...@@ -243,8 +243,9 @@ static void Blend( filter_t *p_filter, picture_t *p_dst, ...@@ -243,8 +243,9 @@ static void Blend( filter_t *p_filter, picture_t *p_dst,
if( p_blend_cfg[i].p_dst[j] != p_filter->fmt_out.video.i_chroma ) if( p_blend_cfg[i].p_dst[j] != p_filter->fmt_out.video.i_chroma )
continue; continue;
p_blend_cfg[i].pf_blend( p_filter, p_dst, p_dst_orig, p_src, p_blend_cfg[i].pf_blend( p_filter, p_dst, p_src,
i_x_offset, i_y_offset, i_width, i_height, i_alpha ); i_x_offset, i_y_offset,
i_width, i_height, i_alpha );
return; return;
} }
} }
...@@ -410,15 +411,15 @@ static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex, ...@@ -410,15 +411,15 @@ static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex,
/*********************************************************************** /***********************************************************************
* YUVA * YUVA
***********************************************************************/ ***********************************************************************/
static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst, static void BlendYUVAI420( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst, 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 ) int i_width, int i_height, int i_alpha )
{ {
int i_src1_pitch, i_src2_pitch, i_dst_pitch; int i_src_pitch, i_dst_pitch;
uint8_t *p_src1_y, *p_src2_y, *p_dst_y; uint8_t *p_src_y, *p_dst_y;
uint8_t *p_src1_u, *p_src2_u, *p_dst_u; uint8_t *p_src_u, *p_dst_u;
uint8_t *p_src1_v, *p_src2_v, *p_dst_v; uint8_t *p_src_v, *p_dst_v;
uint8_t *p_trans; uint8_t *p_trans;
int i_x, i_y, i_trans = 0; int i_x, i_y, i_trans = 0;
bool b_even_scanline = i_y_offset % 2; bool b_even_scanline = i_y_offset % 2;
...@@ -430,32 +431,22 @@ static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst, ...@@ -430,32 +431,22 @@ static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst,
p_dst_v = vlc_plane_start( NULL, p_dst, V_PLANE, p_dst_v = vlc_plane_start( NULL, p_dst, V_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 ); i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 );
p_src1_y = vlc_plane_start( &i_src1_pitch, p_dst_orig, Y_PLANE, p_src_y = vlc_plane_start( &i_src_pitch, p_src, Y_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src1_u = vlc_plane_start( NULL, p_dst_orig, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src1_v = vlc_plane_start( NULL, p_dst_orig, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_trans = vlc_plane_start( NULL, p_src, A_PLANE, p_trans = vlc_plane_start( NULL, p_src, A_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
/* Draw until we reach the bottom of the subtitle */ /* Draw until we reach the bottom of the subtitle */
for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch, for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src_pitch,
p_dst_y += i_dst_pitch, p_src1_y += i_src1_pitch, p_dst_y += i_dst_pitch, p_src_y += i_src_pitch,
p_src2_y += i_src2_pitch,
p_dst_u += b_even_scanline ? i_dst_pitch/2 : 0, p_dst_u += b_even_scanline ? i_dst_pitch/2 : 0,
p_src1_u += b_even_scanline ? i_src1_pitch/2 : 0, p_src_u += i_src_pitch,
p_src2_u += i_src2_pitch,
p_dst_v += b_even_scanline ? i_dst_pitch/2 : 0, p_dst_v += b_even_scanline ? i_dst_pitch/2 : 0,
p_src1_v += b_even_scanline ? i_src1_pitch/2 : 0, p_src_v += i_src_pitch )
p_src2_v += i_src2_pitch )
{ {
b_even_scanline = !b_even_scanline; b_even_scanline = !b_even_scanline;
...@@ -469,24 +460,24 @@ static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst, ...@@ -469,24 +460,24 @@ static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst,
continue; continue;
/* Blending */ /* Blending */
p_dst_y[i_x] = vlc_blend( p_src2_y[i_x], p_src1_y[i_x], i_trans ); p_dst_y[i_x] = vlc_blend( p_src_y[i_x], p_dst_y[i_x], i_trans );
if( b_even_scanline && i_x % 2 == 0 ) if( b_even_scanline && i_x % 2 == 0 )
{ {
p_dst_u[i_x/2] = vlc_blend( p_src2_u[i_x], p_src1_u[i_x/2], i_trans ); p_dst_u[i_x/2] = vlc_blend( p_src_u[i_x], p_dst_u[i_x/2], i_trans );
p_dst_v[i_x/2] = vlc_blend( p_src2_v[i_x], p_src1_v[i_x/2], i_trans ); p_dst_v[i_x/2] = vlc_blend( p_src_v[i_x], p_dst_v[i_x/2], i_trans );
} }
} }
} }
} }
static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVARV16( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, 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 ) int i_width, int i_height, int i_alpha )
{ {
int i_src1_pitch, i_src2_pitch, i_dst_pitch; int i_src_pitch, i_dst_pitch;
uint8_t *p_dst, *p_src1, *p_src2_y; uint8_t *p_dst, *p_src_y;
uint8_t *p_src2_u, *p_src2_v; uint8_t *p_src_u, *p_src_v;
uint8_t *p_trans; uint8_t *p_trans;
int i_x, i_y, i_pix_pitch, i_trans = 0; int i_x, i_y, i_pix_pitch, i_trans = 0;
int r, g, b; int r, g, b;
...@@ -498,26 +489,20 @@ static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -498,26 +489,20 @@ static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic,
p_dst_pic->p->i_pitch * p_dst_pic->p->i_pitch *
( i_y_offset + p_filter->fmt_out.video.i_y_offset ); ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch; p_src_y = vlc_plane_start( &i_src_pitch, p_src, Y_PLANE,
p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch + 0, 0, &p_filter->fmt_in.video, 1 );
p_filter->fmt_out.video.i_x_offset * i_pix_pitch + p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
p_dst_orig->p->i_pitch * 0, 0, &p_filter->fmt_in.video, 2 );
( i_y_offset + p_filter->fmt_out.video.i_y_offset ); p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_trans = vlc_plane_start( NULL, p_src, A_PLANE, p_trans = vlc_plane_start( NULL, p_src, A_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
/* Draw until we reach the bottom of the subtitle */ /* Draw until we reach the bottom of the subtitle */
for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch, for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src_pitch,
p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_dst += i_dst_pitch,
p_src2_y += i_src2_pitch, p_src2_u += i_src2_pitch, p_src_y += i_src_pitch, p_src_u += i_src_pitch,
p_src2_v += i_src2_pitch ) p_src_v += i_src_pitch )
{ {
/* Draw until we reach the end of the line */ /* Draw until we reach the end of the line */
for( i_x = 0; i_x < i_width; i_x++ ) for( i_x = 0; i_x < i_width; i_x++ )
...@@ -529,23 +514,23 @@ static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -529,23 +514,23 @@ static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic,
/* Blending */ /* Blending */
yuv_to_rgb( &r, &g, &b, yuv_to_rgb( &r, &g, &b,
p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] ); p_src_y[i_x], p_src_u[i_x], p_src_v[i_x] );
vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch], vlc_blend_rgb16( (uint16_t*)&p_dst[i_x * i_pix_pitch],
(const uint16_t*)&p_src1[i_x * i_pix_pitch], (const uint16_t*)&p_dst[i_x * i_pix_pitch],
r, g, b, i_trans, &p_filter->fmt_out.video ); r, g, b, i_trans, &p_filter->fmt_out.video );
} }
} }
} }
static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVARV24( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, 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 ) int i_width, int i_height, int i_alpha )
{ {
int i_src1_pitch, i_src2_pitch, i_dst_pitch; int i_src_pitch, i_dst_pitch;
uint8_t *p_dst, *p_src1, *p_src2_y; uint8_t *p_dst, *p_src_y;
uint8_t *p_src2_u, *p_src2_v; uint8_t *p_src_u, *p_src_v;
uint8_t *p_trans; uint8_t *p_trans;
int i_x, i_y, i_pix_pitch, i_trans = 0; int i_x, i_y, i_pix_pitch, i_trans = 0;
int r, g, b; int r, g, b;
...@@ -557,23 +542,17 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -557,23 +542,17 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
p_dst_pic->p->i_pitch * p_dst_pic->p->i_pitch *
( i_y_offset + p_filter->fmt_out.video.i_y_offset ); ( i_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src1_pitch = p_dst_orig->p->i_pitch; p_src_y = vlc_plane_start( &i_src_pitch, p_src, Y_PLANE,
p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch + 0, 0, &p_filter->fmt_in.video, 1 );
p_filter->fmt_out.video.i_x_offset * i_pix_pitch + p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
p_dst_orig->p->i_pitch * 0, 0, &p_filter->fmt_in.video, 2 );
( i_y_offset + p_filter->fmt_out.video.i_y_offset ); p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 );
p_trans = vlc_plane_start( NULL, p_src, A_PLANE, p_trans = vlc_plane_start( NULL, p_src, A_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
if( (i_pix_pitch == 4) if( (i_pix_pitch == 4)
&& (((((intptr_t)p_dst)|((intptr_t)p_src1)|i_dst_pitch|i_src1_pitch) && (((((intptr_t)p_dst)|i_dst_pitch) /* FIXME? */
& 3) == 0) ) & 3) == 0) )
{ {
/* /*
...@@ -582,8 +561,6 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -582,8 +561,6 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
*/ */
uint32_t *p32_dst = (uint32_t *)p_dst; uint32_t *p32_dst = (uint32_t *)p_dst;
uint32_t i32_dst_pitch = (uint32_t)(i_dst_pitch>>2); uint32_t i32_dst_pitch = (uint32_t)(i_dst_pitch>>2);
uint32_t *p32_src1 = (uint32_t *)p_src1;
uint32_t i32_src1_pitch = (uint32_t)(i_src1_pitch>>2);
int i_rshift, i_gshift, i_bshift; int i_rshift, i_gshift, i_bshift;
uint32_t i_rmask, i_gmask, i_bmask; uint32_t i_rmask, i_gmask, i_bmask;
...@@ -596,10 +573,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -596,10 +573,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
i_bshift = p_filter->fmt_out.video.i_lbshift; i_bshift = p_filter->fmt_out.video.i_lbshift;
/* Draw until we reach the bottom of the subtitle */ /* Draw until we reach the bottom of the subtitle */
for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch, for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src_pitch,
p32_dst += i32_dst_pitch, p32_src1 += i32_src1_pitch, p32_dst += i32_dst_pitch,
p_src2_y += i_src2_pitch, p_src2_u += i_src2_pitch, p_src_y += i_src_pitch, p_src_u += i_src_pitch,
p_src2_v += i_src2_pitch ) p_src_v += i_src_pitch )
{ {
/* Draw until we reach the end of the line */ /* Draw until we reach the end of the line */
for( i_x = 0; i_x < i_width; i_x++ ) for( i_x = 0; i_x < i_width; i_x++ )
...@@ -613,7 +590,7 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -613,7 +590,7 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
{ {
/* Completely opaque. Completely overwrite underlying pixel */ /* Completely opaque. Completely overwrite underlying pixel */
yuv_to_rgb( &r, &g, &b, yuv_to_rgb( &r, &g, &b,
p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] ); p_src_y[i_x], p_src_u[i_x], p_src_v[i_x] );
p32_dst[i_x] = (r<<i_rshift) | p32_dst[i_x] = (r<<i_rshift) |
(g<<i_gshift) | (g<<i_gshift) |
...@@ -622,13 +599,13 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -622,13 +599,13 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
else else
{ {
/* Blending */ /* Blending */
uint32_t i_pix_src1 = p32_src1[i_x]; uint32_t i_pix_dst = p32_dst[i_x];
yuv_to_rgb( &r, &g, &b, yuv_to_rgb( &r, &g, &b,
p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] ); p_src_y[i_x], p_src_u[i_x], p_src_v[i_x] );
p32_dst[i_x] = ( vlc_blend( r, (i_pix_src1 & i_rmask)>>i_rshift, i_trans ) << i_rshift ) | p32_dst[i_x] = ( vlc_blend( r, (i_pix_dst & i_rmask)>>i_rshift, i_trans ) << i_rshift ) |
( vlc_blend( g, (i_pix_src1 & i_gmask)>>i_gshift, i_trans ) << i_gshift ) | ( vlc_blend( g, (i_pix_dst & i_gmask)>>i_gshift, i_trans ) << i_gshift ) |
( vlc_blend( b, (i_pix_src1 & i_bmask)>>i_bshift, i_trans ) << i_bshift ); ( vlc_blend( b, (i_pix_dst & i_bmask)>>i_bshift, i_trans ) << i_bshift );
} }
} }
} }
...@@ -645,10 +622,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -645,10 +622,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
vlc_rgb_index( &i_rindex, &i_gindex, &i_bindex, &p_filter->fmt_out.video ); vlc_rgb_index( &i_rindex, &i_gindex, &i_bindex, &p_filter->fmt_out.video );
/* Draw until we reach the bottom of the subtitle */ /* Draw until we reach the bottom of the subtitle */
for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src2_pitch, for( i_y = 0; i_y < i_height; i_y++, p_trans += i_src_pitch,
p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_dst += i_dst_pitch,
p_src2_y += i_src2_pitch, p_src2_u += i_src2_pitch, p_src_y += i_src_pitch, p_src_u += i_src_pitch,
p_src2_v += i_src2_pitch ) p_src_v += i_src_pitch )
{ {
/* Draw until we reach the end of the line */ /* Draw until we reach the end of the line */
for( i_x = 0; i_x < i_width; i_x++ ) for( i_x = 0; i_x < i_width; i_x++ )
...@@ -660,10 +637,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -660,10 +637,10 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
/* Blending */ /* Blending */
yuv_to_rgb( &r, &g, &b, yuv_to_rgb( &r, &g, &b,
p_src2_y[i_x], p_src2_u[i_x], p_src2_v[i_x] ); p_src_y[i_x], p_src_u[i_x], p_src_v[i_x] );
vlc_blend_packed( &p_dst[ i_x * i_pix_pitch], vlc_blend_packed( &p_dst[ i_x * i_pix_pitch],
&p_src1[i_x * i_pix_pitch], &p_dst[i_x * i_pix_pitch],
i_rindex, i_gindex, i_bindex, i_rindex, i_gindex, i_bindex,
r, g, b, i_alpha, true ); r, g, b, i_alpha, true );
} }
...@@ -671,14 +648,14 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -671,14 +648,14 @@ static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
}