Skip to content

V
vlc
Commit 418f6bca authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 325 additions and 459 deletions
include/vlc_filter.h
View file @ 418f6bca
...@@ -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 );
......
include/vlc_osd.h
View file @ 418f6bca
...@@ -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 ) );
/** @}*/ /** @}*/
......
modules/access/screen/screen.h
View file @ 418f6bca
...@@ -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
......
modules/access/screen/x11.c
View file @ 418f6bca
...@@ -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,
......
modules/stream_out/transcode.c
View file @ 418f6bca
...@@ -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 );
} }
......
modules/video_filter/blend.c
View file @ 418f6bca
...@@ -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 );
p_src1_u = vlc_plane_start( NULL, p_dst_orig, U_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 );
p_src1_v = vlc_plane_start( NULL, p_dst_orig, V_PLANE,
i_x_offset, i_y_offset, &p_filter->fmt_out.video, 2 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 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,
} }
} }
static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVAYUVPacked( 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;
bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2); bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
...@@ -694,17 +671,11 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -694,17 +671,11 @@ static void BlendYUVAYUVPacked( 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 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 );
...@@ -712,10 +683,10 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -712,10 +683,10 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
i_width &= ~1; /* Needs to be a multiple of 2 */ i_width &= ~1; /* Needs to be a multiple of 2 */
/* 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++, b_even = !b_even ) for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
...@@ -732,22 +703,22 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -732,22 +703,22 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
/* FIXME what's with 0xaa ? */ /* FIXME what's with 0xaa ? */
if( p_trans[i_x+1] > 0xaa ) if( p_trans[i_x+1] > 0xaa )
{ {
i_u = (p_src2_u[i_x]+p_src2_u[i_x+1])>>1; i_u = (p_src_u[i_x]+p_src_u[i_x+1])>>1;
i_v = (p_src2_v[i_x]+p_src2_v[i_x+1])>>1; i_v = (p_src_v[i_x]+p_src_v[i_x+1])>>1;
} }
else else
{ {
i_u = p_src2_u[i_x]; i_u = p_src_u[i_x];
i_v = p_src2_v[i_x]; i_v = p_src_v[i_x];
} }
vlc_blend_packed( &p_dst[i_x * 2], &p_src1[i_x * 2], vlc_blend_packed( &p_dst[i_x * 2], &p_dst[i_x * 2],
i_l_offset, i_u_offset, i_v_offset, i_l_offset, i_u_offset, i_v_offset,
p_src2_y[i_x], i_u, i_v, i_trans, true ); p_src_y[i_x], i_u, i_v, i_trans, true );
} }
else else
{ {
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 ); p_dst[i_x * 2 + i_l_offset] = vlc_blend( p_src_y[i_x], p_dst[i_x * 2 + i_l_offset], i_trans );
} }
} }
} }
...@@ -755,21 +726,21 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -755,21 +726,21 @@ static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
/*********************************************************************** /***********************************************************************
* I420, YV12 * I420, YV12
***********************************************************************/ ***********************************************************************/
static void BlendI420I420( filter_t *p_filter, picture_t *p_dst, static void BlendI420I420( 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;
int i_x, i_y; int i_x, i_y;
bool b_even_scanline = i_y_offset % 2; bool b_even_scanline = i_y_offset % 2;
if( i_alpha == 0xff ) if( i_alpha == 0xff )
{ {
BlendI420I420_no_alpha( p_filter, p_dst, p_dst_orig, p_src, BlendI420I420_no_alpha( p_filter, p_dst, p_src,
i_x_offset, i_y_offset, i_width, i_height ); i_x_offset, i_y_offset, i_width, i_height );
return; return;
} }
...@@ -789,39 +760,23 @@ static void BlendI420I420( filter_t *p_filter, picture_t *p_dst, ...@@ -789,39 +760,23 @@ static void BlendI420I420( filter_t *p_filter, picture_t *p_dst,
( 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; p_dst->p[V_PLANE].i_pitch;
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_y = p_dst_orig->p[Y_PLANE].p_pixels + i_x_offset +
p_filter->fmt_out.video.i_x_offset +
p_dst_orig->p[Y_PLANE].i_pitch *
( 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 +
( 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 +
( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
p_dst_orig->p[V_PLANE].i_pitch;
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
i_width &= ~1; i_width &= ~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++, for( i_y = 0; i_y < i_height; i_y++,
p_dst_y += i_dst_pitch, p_src1_y += i_src1_pitch, p_dst_y += i_dst_pitch,
p_src2_y += i_src2_pitch ) p_src_y += i_src_pitch )
{ {
if( b_even_scanline ) if( b_even_scanline )
{ {
p_dst_u += i_dst_pitch/2; p_dst_u += i_dst_pitch/2;
p_dst_v += i_dst_pitch/2; p_dst_v += i_dst_pitch/2;
p_src1_u += i_src1_pitch/2;
p_src1_v += i_src1_pitch/2;
} }
b_even_scanline = !b_even_scanline; b_even_scanline = !b_even_scanline;
...@@ -832,30 +787,29 @@ static void BlendI420I420( filter_t *p_filter, picture_t *p_dst, ...@@ -832,30 +787,29 @@ static void BlendI420I420( 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_alpha ); p_dst_y[i_x] = vlc_blend( p_src_y[i_x], p_dst_y[i_x], i_alpha );
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/2], p_src1_u[i_x/2], i_alpha ); p_dst_u[i_x/2] = vlc_blend( p_src_u[i_x/2], p_dst_u[i_x/2], i_alpha );
p_dst_v[i_x/2] = vlc_blend( p_src2_v[i_x/2], p_src1_v[i_x/2], i_alpha ); p_dst_v[i_x/2] = vlc_blend( p_src_v[i_x/2], p_dst_v[i_x/2], i_alpha );
} }
} }
if( i_y%2 == 1 ) if( i_y%2 == 1 )
{ {
p_src2_u += i_src2_pitch/2; p_src_u += i_src_pitch/2;
p_src2_v += i_src2_pitch/2; p_src_v += i_src_pitch/2;
} }
} }
} }
static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst, static void BlendI420I420_no_alpha( 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_width, int i_height )
{ {
VLC_UNUSED(p_dst_orig); int i_src_pitch, i_dst_pitch;
int i_src2_pitch, i_dst_pitch; uint8_t *p_src_y, *p_dst_y;
uint8_t *p_src2_y, *p_dst_y; uint8_t *p_src_u, *p_dst_u;
uint8_t *p_src2_u, *p_dst_u; uint8_t *p_src_v, *p_dst_v;
uint8_t *p_src2_v, *p_dst_v;
int i_y; int i_y;
bool b_even_scanline = i_y_offset % 2; bool b_even_scanline = i_y_offset % 2;
...@@ -873,21 +827,21 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst, ...@@ -873,21 +827,21 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst,
( 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; p_dst->p[V_PLANE].i_pitch;
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE, p_src_y = vlc_plane_start( &i_src_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
i_width &= ~1; i_width &= ~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; for( i_y = 0; i_y < i_height;
i_y++, p_dst_y += i_dst_pitch, p_src2_y += i_src2_pitch ) i_y++, p_dst_y += i_dst_pitch, p_src_y += i_src_pitch )
{ {
/* Completely opaque. Completely overwrite underlying pixel */ /* Completely opaque. Completely overwrite underlying pixel */
vlc_memcpy( p_dst_y, p_src2_y, i_width ); vlc_memcpy( p_dst_y, p_src_y, i_width );
if( b_even_scanline ) if( b_even_scanline )
{ {
p_dst_u += i_dst_pitch/2; p_dst_u += i_dst_pitch/2;
...@@ -895,26 +849,26 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst, ...@@ -895,26 +849,26 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst,
} }
else else
{ {
vlc_memcpy( p_dst_u, p_src2_u, i_width/2 ); vlc_memcpy( p_dst_u, p_src_u, i_width/2 );
vlc_memcpy( p_dst_v, p_src2_v, i_width/2 ); vlc_memcpy( p_dst_v, p_src_v, i_width/2 );
} }
b_even_scanline = !b_even_scanline; b_even_scanline = !b_even_scanline;
if( i_y%2 == 1 ) if( i_y%2 == 1 )
{ {
p_src2_u += i_src2_pitch/2; p_src_u += i_src_pitch/2;
p_src2_v += i_src2_pitch/2; p_src_v += i_src_pitch/2;
} }
} }
} }
static void BlendI420R16( filter_t *p_filter, picture_t *p_dst_pic, static void BlendI420R16( 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;
int i_x, i_y, i_pix_pitch; int i_x, i_y, i_pix_pitch;
int r, g, b; int r, g, b;
...@@ -925,51 +879,45 @@ static void BlendI420R16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -925,51 +879,45 @@ static void BlendI420R16( 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
/* 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++, for( i_y = 0; i_y < i_height; i_y++,
p_dst += i_dst_pitch, p_src1 += i_src1_pitch, p_dst += i_dst_pitch,
p_src2_y += i_src2_pitch ) p_src_y += 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++ )
{ {
/* Blending */ /* Blending */
yuv_to_rgb( &r, &g, &b, yuv_to_rgb( &r, &g, &b,
p_src2_y[i_x], p_src2_u[i_x/2], p_src2_v[i_x/2] ); p_src_y[i_x], p_src_u[i_x/2], p_src_v[i_x/2] );
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_alpha, &p_filter->fmt_out.video ); r, g, b, i_alpha, &p_filter->fmt_out.video );
} }
if( i_y%2 == 1 ) if( i_y%2 == 1 )
{ {
p_src2_u += i_src2_pitch/2; p_src_u += i_src_pitch/2;
p_src2_v += i_src2_pitch/2; p_src_v += i_src_pitch/2;
} }
} }
} }
static void BlendI420R24( filter_t *p_filter, picture_t *p_dst_pic, static void BlendI420R24( 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;
int i_x, i_y, i_pix_pitch; int i_x, i_y, i_pix_pitch;
int i_rindex, i_gindex, i_bindex; int i_rindex, i_gindex, i_bindex;
int r, g, b; int r, g, b;
...@@ -981,26 +929,20 @@ static void BlendI420R24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -981,26 +929,20 @@ static void BlendI420R24( 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
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++, for( i_y = 0; i_y < i_height; i_y++,
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++ )
...@@ -1010,27 +952,27 @@ static void BlendI420R24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1010,27 +952,27 @@ static void BlendI420R24( 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/2], p_src2_v[i_x/2] ); p_src_y[i_x], p_src_u[i_x/2], p_src_v[i_x/2] );
vlc_blend_packed( &p_dst[i_x * i_pix_pitch], &p_src1[i_x * i_pix_pitch], vlc_blend_packed( &p_dst[i_x * i_pix_pitch], &p_dst[i_x * i_pix_pitch],
i_rindex, i_gindex, i_bindex, r, g, b, i_alpha, true ); i_rindex, i_gindex, i_bindex, r, g, b, i_alpha, true );
} }
if( i_y%2 == 1 ) if( i_y%2 == 1 )
{ {
p_src2_u += i_src2_pitch/2; p_src_u += i_src_pitch/2;
p_src2_v += i_src2_pitch/2; p_src_v += i_src_pitch/2;
} }
} }
} }
static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic, static void BlendI420YUVPacked( 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;
int i_x, i_y, i_pix_pitch; int i_x, i_y, i_pix_pitch;
bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2); bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
int i_l_offset, i_u_offset, i_v_offset; int i_l_offset, i_u_offset, i_v_offset;
...@@ -1045,26 +987,20 @@ static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1045,26 +987,20 @@ static void BlendI420YUVPacked( 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 +
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 );
p_src2_y = vlc_plane_start( &i_src2_pitch, p_src, Y_PLANE,
0, 0, &p_filter->fmt_in.video, 1 ); 0, 0, &p_filter->fmt_in.video, 1 );
p_src2_u = vlc_plane_start( NULL, p_src, U_PLANE, p_src_u = vlc_plane_start( NULL, p_src, U_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
p_src2_v = vlc_plane_start( NULL, p_src, V_PLANE, p_src_v = vlc_plane_start( NULL, p_src, V_PLANE,
0, 0, &p_filter->fmt_in.video, 2 ); 0, 0, &p_filter->fmt_in.video, 2 );
i_width &= ~1; /* Needs to be a multiple of 2 */ i_width &= ~1; /* Needs to be a multiple of 2 */
/* 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++, for( i_y = 0; i_y < i_height; i_y++,
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++, b_even = !b_even ) for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
...@@ -1073,14 +1009,14 @@ static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1073,14 +1009,14 @@ static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
continue; continue;
/* Blending */ /* Blending */
vlc_blend_packed( &p_dst[i_x * 2], &p_src1[i_x * 2], vlc_blend_packed( &p_dst[i_x * 2], &p_dst[i_x * 2],
i_l_offset, i_u_offset, i_v_offset, i_l_offset, i_u_offset, i_v_offset,
p_src2_y[i_x], p_src2_u[i_x/2], p_src2_v[i_x/2], i_alpha, b_even ); p_src_y[i_x], p_src_u[i_x/2], p_src_v[i_x/2], i_alpha, b_even );
} }
if( i_y%2 == 1 ) if( i_y%2 == 1 )
{ {
p_src2_u += i_src2_pitch/2; p_src_u += i_src_pitch/2;
p_src2_v += i_src2_pitch/2; p_src_v += i_src_pitch/2;
} }
} }
} }
...@@ -1088,15 +1024,15 @@ static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1088,15 +1024,15 @@ static void BlendI420YUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
/*********************************************************************** /***********************************************************************
* YUVP * YUVP
***********************************************************************/ ***********************************************************************/
static void BlendPalI420( filter_t *p_filter, picture_t *p_dst, static void BlendPalI420( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst, picture_t *p_src_pic,
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, *p_dst_y; uint8_t *p_src, *p_dst_y;
uint8_t *p_src1_u, *p_dst_u; uint8_t *p_dst_u;
uint8_t *p_src1_v, *p_dst_v; uint8_t *p_dst_v;
int i_x, i_y, i_trans; int i_x, i_y, i_trans;
bool b_even_scanline = i_y_offset % 2; bool b_even_scanline = i_y_offset % 2;
...@@ -1114,36 +1050,20 @@ static void BlendPalI420( filter_t *p_filter, picture_t *p_dst, ...@@ -1114,36 +1050,20 @@ static void BlendPalI420( filter_t *p_filter, picture_t *p_dst,
( 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; p_dst->p[V_PLANE].i_pitch;
i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch; i_src_pitch = p_src_pic->p->i_pitch;
p_src1_y = p_dst_orig->p[Y_PLANE].p_pixels + i_x_offset + p_src = p_src_pic->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
p_filter->fmt_out.video.i_x_offset + i_src_pitch * p_filter->fmt_in.video.i_y_offset;
p_dst_orig->p[Y_PLANE].i_pitch *
( 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 +
( 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 +
( 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;
#define p_pal p_filter->fmt_in.video.p_palette->palette #define p_pal p_filter->fmt_in.video.p_palette->palette
/* 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++, for( i_y = 0; i_y < i_height; i_y++,
p_dst_y += i_dst_pitch, p_src1_y += i_src1_pitch, p_dst_y += i_dst_pitch,
p_src2 += i_src2_pitch, p_src += i_src_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_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 )
{ {
const uint8_t *p_trans = p_src2; const uint8_t *p_trans = p_src;
b_even_scanline = !b_even_scanline; b_even_scanline = !b_even_scanline;
/* Draw until we reach the end of the line */ /* Draw until we reach the end of the line */
...@@ -1154,24 +1074,24 @@ static void BlendPalI420( filter_t *p_filter, picture_t *p_dst, ...@@ -1154,24 +1074,24 @@ static void BlendPalI420( filter_t *p_filter, picture_t *p_dst,
continue; continue;
/* Blending */ /* Blending */
p_dst_y[i_x] = vlc_blend( p_pal[p_src2[i_x]][0], p_src1_y[i_x], i_trans ); p_dst_y[i_x] = vlc_blend( p_pal[p_src[i_x]][0], 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_pal[p_src2[i_x]][1], p_src1_u[i_x/2], i_trans ); p_dst_u[i_x/2] = vlc_blend( p_pal[p_src[i_x]][1], p_dst_u[i_x/2], i_trans );
p_dst_v[i_x/2] = vlc_blend( p_pal[p_src2[i_x]][2], p_src1_v[i_x/2], i_trans ); p_dst_v[i_x/2] = vlc_blend( p_pal[p_src[i_x]][2], p_dst_v[i_x/2], i_trans );
} }
} }
} }
#undef p_pal #undef p_pal
} }
static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, static void BlendPalYUVPacked( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, picture_t *p_src_pic,
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, *p_src2, *p_dst; uint8_t *p_src, *p_dst;
int i_x, i_y, i_pix_pitch, i_trans; 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); bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
int i_l_offset, i_u_offset, i_v_offset; int i_l_offset, i_u_offset, i_v_offset;
...@@ -1185,14 +1105,9 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1185,14 +1105,9 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
p_filter->fmt_out.video.i_x_offset) + p_dst_pic->p->i_pitch * 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_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src1_pitch = p_dst_orig->p->i_pitch; i_src_pitch = p_src_pic->p->i_pitch;
p_src1 = p_dst_orig->p->p_pixels + i_pix_pitch * (i_x_offset + p_src = p_src_pic->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
p_filter->fmt_out.video.i_x_offset) + p_dst_orig->p->i_pitch * i_src_pitch * p_filter->fmt_in.video.i_y_offset;
( 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 &= ~1; /* Needs to be a multiple of 2 */ i_width &= ~1; /* Needs to be a multiple of 2 */
...@@ -1200,9 +1115,9 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1200,9 +1115,9 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
/* 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++, 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 ) p_dst += i_dst_pitch, p_src += i_src_pitch )
{ {
const uint8_t *p_trans = p_src2; const uint8_t *p_trans = p_src;
/* 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++, b_even = !b_even ) for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
{ {
...@@ -1217,35 +1132,35 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1217,35 +1132,35 @@ static void BlendPalYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
uint16_t i_v; uint16_t i_v;
if( p_trans[i_x+1] > 0xaa ) if( p_trans[i_x+1] > 0xaa )
{ {
i_u = (p_pal[p_src2[i_x]][1] + p_pal[p_src2[i_x+1]][1]) >> 1; i_u = (p_pal[p_src[i_x]][1] + p_pal[p_src[i_x+1]][1]) >> 1;
i_v = (p_pal[p_src2[i_x]][2] + p_pal[p_src2[i_x+1]][2]) >> 1; i_v = (p_pal[p_src[i_x]][2] + p_pal[p_src[i_x+1]][2]) >> 1;
} }
else else
{ {
i_u = p_pal[p_src2[i_x]][1]; i_u = p_pal[p_src[i_x]][1];
i_v = p_pal[p_src2[i_x]][2]; i_v = p_pal[p_src[i_x]][2];
} }
vlc_blend_packed( &p_dst[i_x * 2], &p_src1[i_x * 2], vlc_blend_packed( &p_dst[i_x * 2], &p_dst[i_x * 2],
i_l_offset, i_u_offset, i_v_offset, i_l_offset, i_u_offset, i_v_offset,
p_pal[p_src2[i_x]][0], i_u, i_v, i_trans, true ); p_pal[p_src[i_x]][0], i_u, i_v, i_trans, true );
} }
else else
{ {
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 ); p_dst[i_x * 2 + i_l_offset] = vlc_blend( p_pal[p_src[i_x]][0], p_dst[i_x * 2 + i_l_offset], i_trans );
} }
} }
} }
#undef p_pal #undef p_pal
} }
static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic, static void BlendPalRV( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, picture_t *p_src_pic,
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, *p_src2, *p_dst; uint8_t *p_src, *p_dst;
int i_x, i_y, i_pix_pitch, i_trans; int i_x, i_y, i_pix_pitch, i_trans;
video_palette_t rgbpalette; video_palette_t rgbpalette;
int i_rindex, i_gindex, i_bindex; int i_rindex, i_gindex, i_bindex;
...@@ -1256,14 +1171,9 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1256,14 +1171,9 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
p_filter->fmt_out.video.i_x_offset) + p_dst_pic->p->i_pitch * 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_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src1_pitch = p_dst_orig->p->i_pitch; i_src_pitch = p_src_pic->p->i_pitch;
p_src1 = p_dst_orig->p->p_pixels + i_pix_pitch * (i_x_offset + p_src = p_src_pic->p->p_pixels + p_filter->fmt_in.video.i_x_offset +
p_filter->fmt_out.video.i_x_offset) + p_dst_orig->p->i_pitch * i_src_pitch * p_filter->fmt_in.video.i_y_offset;
( 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 p_pal p_filter->fmt_in.video.p_palette->palette #define p_pal p_filter->fmt_in.video.p_palette->palette
#define rgbpal rgbpalette.palette #define rgbpal rgbpalette.palette
...@@ -1284,9 +1194,9 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1284,9 +1194,9 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
/* 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++, 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 ) p_dst += i_dst_pitch, p_src += i_src_pitch )
{ {
const uint8_t *p_trans = p_src2; const uint8_t *p_trans = p_src;
/* 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++ )
{ {
...@@ -1297,14 +1207,14 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1297,14 +1207,14 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
/* Blending */ /* Blending */
if( p_filter->fmt_out.video.i_chroma == FCC_RV15 || p_filter->fmt_out.video.i_chroma == FCC_RV16 ) if( p_filter->fmt_out.video.i_chroma == FCC_RV15 || p_filter->fmt_out.video.i_chroma == FCC_RV16 )
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],
rgbpal[p_src2[i_x]][0], rgbpal[p_src2[i_x]][1], rgbpal[p_src2[i_x]][2], rgbpal[p_src[i_x]][0], rgbpal[p_src[i_x]][1], rgbpal[p_src[i_x]][2],
i_trans, i_trans,
&p_filter->fmt_out.video ); &p_filter->fmt_out.video );
else else
vlc_blend_packed( &p_dst[i_x * i_pix_pitch], &p_src1[i_x * i_pix_pitch], vlc_blend_packed( &p_dst[i_x * i_pix_pitch], &p_dst[i_x * i_pix_pitch],
i_rindex, i_gindex, i_bindex, i_rindex, i_gindex, i_bindex,
rgbpal[p_src2[i_x]][0], rgbpal[p_src2[i_x]][1], rgbpal[p_src2[i_x]][2], rgbpal[p_src[i_x]][0], rgbpal[p_src[i_x]][1], rgbpal[p_src[i_x]][2],
i_trans, true ); i_trans, true );
} }
} }
...@@ -1316,16 +1226,16 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1316,16 +1226,16 @@ static void BlendPalRV( filter_t *p_filter, picture_t *p_dst_pic,
/*********************************************************************** /***********************************************************************
* RGBA * RGBA
***********************************************************************/ ***********************************************************************/
static void BlendRGBAI420( filter_t *p_filter, picture_t *p_dst, static void BlendRGBAI420( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst, picture_t *p_src_pic,
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, i_src_pix_pitch; int i_src_pitch, i_dst_pitch, i_src_pix_pitch;
uint8_t *p_src1_y, *p_dst_y; uint8_t *p_dst_y;
uint8_t *p_src1_u, *p_dst_u; uint8_t *p_dst_u;
uint8_t *p_src1_v, *p_dst_v; uint8_t *p_dst_v;
uint8_t *p_src2; uint8_t *p_src;
int i_x, i_y, i_trans; int i_x, i_y, i_trans;
uint8_t y, u, v; uint8_t y, u, v;
...@@ -1345,69 +1255,53 @@ static void BlendRGBAI420( filter_t *p_filter, picture_t *p_dst, ...@@ -1345,69 +1255,53 @@ static void BlendRGBAI420( filter_t *p_filter, picture_t *p_dst,
( 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; p_dst->p[V_PLANE].i_pitch;
i_src1_pitch = p_dst_orig->p[Y_PLANE].i_pitch; i_src_pix_pitch = p_src_pic->p->i_pixel_pitch;
p_src1_y = p_dst_orig->p[Y_PLANE].p_pixels + i_x_offset + i_src_pitch = p_src_pic->p->i_pitch;
p_filter->fmt_out.video.i_x_offset + p_src = p_src_pic->p->p_pixels +
p_dst_orig->p[Y_PLANE].i_pitch *
( 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 +
( 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 +
( i_y_offset + p_filter->fmt_out.video.i_y_offset ) / 2 *
p_dst_orig->p[V_PLANE].i_pitch;
i_src_pix_pitch = p_src->p->i_pixel_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_src_pix_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src_pic->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
/* 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++, for( i_y = 0; i_y < i_height; i_y++,
p_dst_y += i_dst_pitch, p_src1_y += i_src1_pitch, p_dst_y += i_dst_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_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 += i_src_pitch )
p_src2 += i_src2_pitch )
{ {
b_even_scanline = !b_even_scanline; b_even_scanline = !b_even_scanline;
/* 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++ )
{ {
const int R = p_src2[i_x * i_src_pix_pitch + 0]; const int R = p_src[i_x * i_src_pix_pitch + 0];
const int G = p_src2[i_x * i_src_pix_pitch + 1]; const int G = p_src[i_x * i_src_pix_pitch + 1];
const int B = p_src2[i_x * i_src_pix_pitch + 2]; const int B = p_src[i_x * i_src_pix_pitch + 2];
i_trans = vlc_alpha( p_src2[i_x * i_src_pix_pitch + 3], i_alpha ); i_trans = vlc_alpha( p_src[i_x * i_src_pix_pitch + 3], i_alpha );
if( !i_trans ) if( !i_trans )
continue; continue;
/* Blending */ /* Blending */
rgb_to_yuv( &y, &u, &v, R, G, B ); rgb_to_yuv( &y, &u, &v, R, G, B );
p_dst_y[i_x] = vlc_blend( y, p_src1_y[i_x], i_trans ); p_dst_y[i_x] = vlc_blend( y, 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( u, p_src1_u[i_x/2], i_trans ); p_dst_u[i_x/2] = vlc_blend( u, p_dst_u[i_x/2], i_trans );
p_dst_v[i_x/2] = vlc_blend( v, p_src1_v[i_x/2], i_trans ); p_dst_v[i_x/2] = vlc_blend( v, p_dst_v[i_x/2], i_trans );
} }
} }
} }
} }
static void BlendRGBAR24( filter_t *p_filter, picture_t *p_dst_pic, static void BlendRGBAR24( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, picture_t *p_src_pic,
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; uint8_t *p_dst, *p_src;
int i_x, i_y, i_pix_pitch, i_trans, i_src_pix_pitch; int i_x, i_y, i_pix_pitch, i_trans, i_src_pix_pitch;
int i_rindex, i_gindex, i_bindex; int i_rindex, i_gindex, i_bindex;
...@@ -1418,50 +1312,44 @@ static void BlendRGBAR24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1418,50 +1312,44 @@ static void BlendRGBAR24( 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; i_src_pix_pitch = p_src_pic->p->i_pixel_pitch;
p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch + i_src_pitch = p_src_pic->p->i_pitch;
p_filter->fmt_out.video.i_x_offset * i_pix_pitch + p_src = p_src_pic->p->p_pixels +
p_dst_orig->p->i_pitch *
( i_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src_pix_pitch = p_src->p->i_pixel_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_src_pix_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src_pic->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
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++, 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 ) p_dst += i_dst_pitch, p_src += 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++ )
{ {
const int R = p_src2[i_x * i_src_pix_pitch + 0]; const int R = p_src[i_x * i_src_pix_pitch + 0];
const int G = p_src2[i_x * i_src_pix_pitch + 1]; const int G = p_src[i_x * i_src_pix_pitch + 1];
const int B = p_src2[i_x * i_src_pix_pitch + 2]; const int B = p_src[i_x * i_src_pix_pitch + 2];
i_trans = vlc_alpha( p_src2[i_x * i_src_pix_pitch + 3], i_alpha ); i_trans = vlc_alpha( p_src[i_x * i_src_pix_pitch + 3], i_alpha );
if( !i_trans ) if( !i_trans )
continue; continue;
/* Blending */ /* Blending */
vlc_blend_packed( &p_dst[i_x * i_pix_pitch], &p_src1[i_x * i_pix_pitch], vlc_blend_packed( &p_dst[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_trans, true ); R, G, B, i_trans, true );
} }
} }
} }
static void BlendRGBAR16( filter_t *p_filter, picture_t *p_dst_pic, static void BlendRGBAR16( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, picture_t *p_src_pic,
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; uint8_t *p_dst, *p_src;
int i_x, i_y, i_pix_pitch, i_trans, i_src_pix_pitch; int i_x, i_y, i_pix_pitch, i_trans, i_src_pix_pitch;
i_pix_pitch = p_dst_pic->p->i_pixel_pitch; i_pix_pitch = p_dst_pic->p->i_pixel_pitch;
...@@ -1471,48 +1359,42 @@ static void BlendRGBAR16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1471,48 +1359,42 @@ static void BlendRGBAR16( 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; i_src_pix_pitch = p_src_pic->p->i_pixel_pitch;
p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch + i_src_pitch = p_src_pic->p->i_pitch;
p_filter->fmt_out.video.i_x_offset * i_pix_pitch + p_src = p_src_pic->p->p_pixels +
p_dst_orig->p->i_pitch *
( i_y_offset + p_filter->fmt_out.video.i_y_offset );
i_src_pix_pitch = p_src->p->i_pixel_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_src_pix_pitch + p_filter->fmt_in.video.i_x_offset * i_src_pix_pitch +
p_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset; p_src_pic->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
/* 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++, 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 ) p_dst += i_dst_pitch, p_src += 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++ )
{ {
const int R = p_src2[i_x * i_src_pix_pitch + 0]; const int R = p_src[i_x * i_src_pix_pitch + 0];
const int G = p_src2[i_x * i_src_pix_pitch + 1]; const int G = p_src[i_x * i_src_pix_pitch + 1];
const int B = p_src2[i_x * i_src_pix_pitch + 2]; const int B = p_src[i_x * i_src_pix_pitch + 2];
i_trans = vlc_alpha( p_src2[i_x * i_src_pix_pitch + 3], i_alpha ); i_trans = vlc_alpha( p_src[i_x * i_src_pix_pitch + 3], i_alpha );
if( !i_trans ) if( !i_trans )
continue; continue;
/* Blending */ /* Blending */
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 BlendRGBAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, static void BlendRGBAYUVPacked( filter_t *p_filter,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_pic, picture_t *p_src_pic,
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, i_src_pix_pitch; int i_src_pitch, i_dst_pitch, i_src_pix_pitch;
uint8_t *p_dst, *p_src1, *p_src2; uint8_t *p_dst, *p_src;
uint8_t *p_trans; uint8_t *p_trans;
int i_x, i_y, i_pix_pitch, i_trans; 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); bool b_even = !((i_x_offset + p_filter->fmt_out.video.i_x_offset)%2);
...@@ -1529,40 +1411,34 @@ static void BlendRGBAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -1529,40 +1411,34 @@ static void BlendRGBAYUVPacked( 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; i_src_pix_pitch = p_src_pic->p->i_pixel_pitch;
p_src1 = p_dst_orig->p->p_pixels + i_x_offset * i_pix_pitch + i_src_pitch = p_src_pic->p->i_pitch;
p_filter->fmt_out.video.i_x_offset * i_pix_pitch + p_src = p_src_pic->p->p_pixels +
p_dst_orig->p->i_pitch * p_filter->fmt_in.video.i_x_offset * i_src_pitch +
( i_y_offset + p_filter->fmt_out.video.i_y_offset ); p_src_pic->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
i_src_pix_pitch = p_src->p->i_pixel_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_src->p->i_pitch * p_filter->fmt_in.video.i_y_offset;
i_width &= ~1; /* Needs to be a multiple of 2 */ i_width &= ~1; /* Needs to be a multiple of 2 */
/* 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 += i_src2_pitch ) p_src += 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++, b_even = !b_even ) for( i_x = 0; i_x < i_width; i_x++, b_even = !b_even )
{ {
const int R = p_src2[i_x * i_src_pix_pitch + 0]; const int R = p_src[i_x * i_src_pix_pitch + 0];
const int G = p_src2[i_x * i_src_pix_pitch + 1]; const int G = p_src[i_x * i_src_pix_pitch + 1];
const int B = p_src2[i_x * i_src_pix_pitch + 2]; const int B = p_src[i_x * i_src_pix_pitch + 2];
i_trans = vlc_alpha( p_src2[i_x * i_src_pix_pitch + 3], i_alpha ); i_trans = vlc_alpha( p_src[i_x * i_src_pix_pitch + 3], i_alpha );
if( !i_trans ) if( !i_trans )
continue; continue;
/* Blending */ /* Blending */
rgb_to_yuv( &y, &u, &v, R, G, B ); rgb_to_yuv( &y, &u, &v, R, G, B );
vlc_blend_packed( &p_dst[i_x * 2], &p_src1[i_x * 2], vlc_blend_packed( &p_dst[i_x * 2], &p_dst[i_x * 2],
i_l_offset, i_u_offset, i_v_offset, i_l_offset, i_u_offset, i_v_offset,
y, u, v, i_trans, b_even ); y, u, v, i_trans, b_even );
} }
......
modules/video_filter/blendbench.c
View file @ 418f6bca
...@@ -240,7 +240,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -240,7 +240,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
mtime_t time = mdate(); mtime_t time = mdate();
for( int i_iter = 0; i_iter < p_sys->i_loops; ++i_iter ) for( int i_iter = 0; i_iter < p_sys->i_loops; ++i_iter )
{ {
p_blend->pf_video_blend( p_blend, p_sys->p_base_image, p_blend->pf_video_blend( p_blend,
p_sys->p_base_image, p_sys->p_blend_image, p_sys->p_base_image, p_sys->p_blend_image,
0, 0, p_sys->i_alpha ); 0, 0, p_sys->i_alpha );
} }
......
modules/video_filter/logo.c
View file @ 418f6bca
...@@ -587,7 +587,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) ...@@ -587,7 +587,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date ); vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date );
if( p_pic ) if( p_pic )
p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic, p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic,
p_pic, p_sys->posx, p_sys->posy, p_pic, p_sys->posx, p_sys->posy,
p_logo->i_alpha != -1 ? p_logo->i_alpha p_logo->i_alpha != -1 ? p_logo->i_alpha
: p_logo_list->i_alpha ); : p_logo_list->i_alpha );
......
src/video_output/vout_pictures.c
View file @ 418f6bca
...@@ -351,7 +351,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -351,7 +351,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic ); vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic );
spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out,
PP_OUTPUTPICTURE[0], p_pic, p_subpic, PP_OUTPUTPICTURE[0], p_subpic,
i_scale_width, i_scale_height ); i_scale_width, i_scale_height );
vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] );
...@@ -378,7 +378,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -378,7 +378,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic ); vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic );
spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out,
PP_OUTPUTPICTURE[0], p_pic, PP_OUTPUTPICTURE[0],
p_subpic, i_scale_width, i_scale_height ); p_subpic, i_scale_width, i_scale_height );
vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] ); vout_UnlockPicture( p_vout, PP_OUTPUTPICTURE[0] );
...@@ -415,7 +415,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -415,7 +415,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic ); p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic );
/* Render subpictures on the first direct buffer */ /* Render subpictures on the first direct buffer */
spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, p_tmp_pic, spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out,
p_tmp_pic, p_subpic, p_tmp_pic, p_subpic,
i_scale_width, i_scale_height ); i_scale_width, i_scale_height );
...@@ -435,7 +435,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -435,7 +435,7 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
/* Render subpictures on the first direct buffer */ /* Render subpictures on the first direct buffer */
spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out,
&p_vout->p_picture[0], &p_vout->p_picture[0], &p_vout->p_picture[0],
p_subpic, i_scale_width, i_scale_height ); p_subpic, i_scale_width, i_scale_height );
} }
......
src/video_output/vout_subpictures.c
View file @ 418f6bca
...@@ -652,7 +652,7 @@ exit: ...@@ -652,7 +652,7 @@ exit:
} }
static void SpuRenderRegion( spu_t *p_spu, static void SpuRenderRegion( spu_t *p_spu,
picture_t *p_pic_dst, picture_t *p_pic_src, picture_t *p_pic_dst,
subpicture_t *p_subpic, subpicture_region_t *p_region, subpicture_t *p_subpic, subpicture_region_t *p_region,
const int i_scale_width_orig, const int i_scale_height_orig, const int i_scale_width_orig, const int i_scale_height_orig,
const int pi_subpic_x[SCALE_SIZE], const int pi_subpic_x[SCALE_SIZE],
...@@ -923,7 +923,7 @@ static void SpuRenderRegion( spu_t *p_spu, ...@@ -923,7 +923,7 @@ static void SpuRenderRegion( spu_t *p_spu,
if( p_spu->p_blend->p_module ) if( p_spu->p_blend->p_module )
{ {
p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst, p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
p_pic_src, &p_region->picture, i_x_offset, i_y_offset, &p_region->picture, i_x_offset, i_y_offset,
i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 ); i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 );
} }
else else
...@@ -950,7 +950,7 @@ exit: ...@@ -950,7 +950,7 @@ exit:
} }
void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
picture_t *p_pic_dst, picture_t *p_pic_src, picture_t *p_pic_dst,
subpicture_t *p_subpic, subpicture_t *p_subpic,
int i_scale_width_orig, int i_scale_height_orig ) int i_scale_width_orig, int i_scale_height_orig )
{ {
...@@ -1165,7 +1165,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, ...@@ -1165,7 +1165,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
} }
for( ; p_region != NULL; p_region = p_region->p_next ) for( ; p_region != NULL; p_region = p_region->p_next )
SpuRenderRegion( p_spu, p_pic_dst, p_pic_src, SpuRenderRegion( p_spu, p_pic_dst,
p_subpic, p_region, i_scale_width_orig, i_scale_height_orig, p_subpic, p_region, i_scale_width_orig, i_scale_height_orig,
pi_subpic_x, pi_scale_width, pi_scale_height, pi_subpic_x, pi_scale_width, pi_scale_height,
p_fmt ); p_fmt );
......
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