Skip to content

V
vlc
Commit 390c4286 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Cosmetics.

parent dc0252f7
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 34 deletions
modules/video_filter/blend.c
View file @ 390c4286
...@@ -77,13 +77,13 @@ static void Blend( filter_t *, picture_t *, picture_t *, picture_t *, ...@@ -77,13 +77,13 @@ static void Blend( filter_t *, picture_t *, picture_t *, picture_t *,
int, int, int ); int, int, int );
/* YUVA */ /* YUVA */
static void BlendI420( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVAI420( filter_t *, picture_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendR16( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVARV16( filter_t *, picture_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendR24( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVARV24( filter_t *, picture_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
static void BlendYUVPacked( filter_t *, picture_t *, picture_t *, picture_t *, static void BlendYUVAYUVPacked( filter_t *, picture_t *, picture_t *, picture_t *,
int, int, int, int, int ); int, int, int, int, int );
/* I420, YV12 */ /* I420, YV12 */
...@@ -196,7 +196,7 @@ static const struct ...@@ -196,7 +196,7 @@ static const struct
BlendFunction pf_blend; BlendFunction pf_blend;
} p_blend_cfg[] = { } p_blend_cfg[] = {
BLEND_CFG( FCC_YUVA, BlendI420, BlendYUVPacked, BlendR16, BlendR24 ), BLEND_CFG( FCC_YUVA, BlendYUVAI420, BlendYUVAYUVPacked, BlendYUVARV16, BlendYUVARV24 ),
BLEND_CFG( FCC_YUVP, BlendPalI420, BlendPalYUVPacked, BlendPalRV, BlendPalRV ), BLEND_CFG( FCC_YUVP, BlendPalI420, BlendPalYUVPacked, BlendPalRV, BlendPalRV ),
...@@ -411,11 +411,6 @@ static int BinaryLog( uint32_t i ) ...@@ -411,11 +411,6 @@ static int BinaryLog( uint32_t i )
return i_log; return i_log;
} }
/**
* It transforms a color mask into right and left shifts
* FIXME copied from video_output.c
*/
#if 1
static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex, static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex,
const video_format_t *p_fmt ) const video_format_t *p_fmt )
{ {
...@@ -434,10 +429,9 @@ static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex, ...@@ -434,10 +429,9 @@ static void vlc_rgb_index( int *pi_rindex, int *pi_gindex, int *pi_bindex,
*pi_bindex = p_fmt->i_lbshift / 8; *pi_bindex = p_fmt->i_lbshift / 8;
#endif #endif
} }
#endif
/* /**
* It transforms a color mask into right and left shifts
* FIXME copied from video_output.c * FIXME copied from video_output.c
*/ */
static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
...@@ -520,7 +514,7 @@ static void video_format_FixRgb( video_format_t *p_fmt ) ...@@ -520,7 +514,7 @@ static void video_format_FixRgb( video_format_t *p_fmt )
/*********************************************************************** /***********************************************************************
* YUVA * YUVA
***********************************************************************/ ***********************************************************************/
static void BlendI420( filter_t *p_filter, picture_t *p_dst, static void BlendYUVAI420( filter_t *p_filter, picture_t *p_dst,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_orig, picture_t *p_src,
int i_x_offset, int i_y_offset, int i_x_offset, int i_y_offset,
int i_width, int i_height, int i_alpha ) int i_width, int i_height, int i_alpha )
...@@ -589,7 +583,7 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst, ...@@ -589,7 +583,7 @@ static void BlendI420( filter_t *p_filter, picture_t *p_dst,
} }
} }
static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVARV16( filter_t *p_filter, picture_t *p_dst_pic,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_orig, picture_t *p_src,
int i_x_offset, int i_y_offset, int i_x_offset, int i_y_offset,
int i_width, int i_height, int i_alpha ) int i_width, int i_height, int i_alpha )
...@@ -648,7 +642,7 @@ static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -648,7 +642,7 @@ static void BlendR16( filter_t *p_filter, picture_t *p_dst_pic,
} }
} }
static void BlendR24( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVARV24( filter_t *p_filter, picture_t *p_dst_pic,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_orig, picture_t *p_src,
int i_x_offset, int i_y_offset, int i_x_offset, int i_y_offset,
int i_width, int i_height, int i_alpha ) int i_width, int i_height, int i_alpha )
...@@ -781,7 +775,7 @@ static void BlendR24( filter_t *p_filter, picture_t *p_dst_pic, ...@@ -781,7 +775,7 @@ static void BlendR24( filter_t *p_filter, picture_t *p_dst_pic,
} }
} }
static void BlendYUVPacked( filter_t *p_filter, picture_t *p_dst_pic, static void BlendYUVAYUVPacked( filter_t *p_filter, picture_t *p_dst_pic,
picture_t *p_dst_orig, picture_t *p_src, picture_t *p_dst_orig, picture_t *p_src,
int i_x_offset, int i_y_offset, int i_x_offset, int i_y_offset,
int i_width, int i_height, int i_alpha ) int i_width, int i_height, int i_alpha )
......
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