[vlc-commits] chroma: chain: rename misleading p_parent parameter
Steve Lhomme
git at videolan.org
Wed Sep 18 09:06:24 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Sep 17 16:17:28 2019 +0200| [0dc947704ff273e1903c00cf9c5e6e5383508dbe] | committer: Steve Lhomme
chroma: chain: rename misleading p_parent parameter
The filter_t passed to internal functions is not the parent. It's the actual
chain filter.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0dc947704ff273e1903c00cf9c5e6e5383508dbe
---
modules/video_chroma/chain.c | 38 ++++++++++++++++++--------------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 899081a4fc..f87e30a4aa 100644
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -60,8 +60,8 @@ static int BuildChromaResize( filter_t * );
static int BuildChromaChain( filter_t *p_filter );
static int BuildFilterChain( filter_t *p_filter );
-static int CreateChain( filter_t *p_parent, const es_format_t *p_fmt_mid );
-static int CreateResizeChromaChain( filter_t *p_parent, const es_format_t *p_fmt_mid );
+static int CreateChain( filter_t *p_filter, const es_format_t *p_fmt_mid );
+static int CreateResizeChromaChain( filter_t *p_filter, const es_format_t *p_fmt_mid );
static filter_t * AppendTransform( filter_chain_t *p_chain, const es_format_t *p_fmt_in,
const es_format_t *p_fmt_out );
static void EsFormatMergeSize( es_format_t *p_dst,
@@ -419,20 +419,18 @@ static int BuildFilterChain( filter_t *p_filter )
/*****************************************************************************
*
*****************************************************************************/
-static int CreateChain( filter_t *p_parent, const es_format_t *p_fmt_mid )
+static int CreateChain( filter_t *p_filter, const es_format_t *p_fmt_mid )
{
- filter_sys_t *p_sys = p_parent->p_sys;
- filter_chain_Reset( p_sys->p_chain, &p_parent->fmt_in, &p_parent->fmt_out );
-
- filter_t *p_filter;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &p_filter->fmt_out );
- if( p_parent->fmt_in.video.orientation != p_fmt_mid->video.orientation)
+ if( p_filter->fmt_in.video.orientation != p_fmt_mid->video.orientation)
{
- p_filter = AppendTransform( p_sys->p_chain, &p_parent->fmt_in, p_fmt_mid );
+ filter_t *p_transform = AppendTransform( p_sys->p_chain, &p_filter->fmt_in, p_fmt_mid );
// Check if filter was enough:
- if( p_filter == NULL )
+ if( p_transform == NULL )
return VLC_EGENERIC;
- if( es_format_IsSimilar(&p_filter->fmt_out, &p_parent->fmt_out ))
+ if( es_format_IsSimilar(&p_transform->fmt_out, &p_filter->fmt_out ))
return VLC_SUCCESS;
}
else
@@ -442,16 +440,16 @@ static int CreateChain( filter_t *p_parent, const es_format_t *p_fmt_mid )
return VLC_EGENERIC;
}
- if( p_fmt_mid->video.orientation != p_parent->fmt_out.video.orientation)
+ if( p_fmt_mid->video.orientation != p_filter->fmt_out.video.orientation)
{
if( AppendTransform( p_sys->p_chain, p_fmt_mid,
- &p_parent->fmt_out ) == NULL )
+ &p_filter->fmt_out ) == NULL )
goto error;
}
else
{
if( filter_chain_AppendConverter( p_sys->p_chain,
- p_fmt_mid, &p_parent->fmt_out ) )
+ p_fmt_mid, &p_filter->fmt_out ) )
goto error;
}
return VLC_SUCCESS;
@@ -461,17 +459,17 @@ error:
return VLC_EGENERIC;
}
-static int CreateResizeChromaChain( filter_t *p_parent, const es_format_t *p_fmt_mid )
+static int CreateResizeChromaChain( filter_t *p_filter, const es_format_t *p_fmt_mid )
{
- filter_sys_t *p_sys = p_parent->p_sys;
- filter_chain_Reset( p_sys->p_chain, &p_parent->fmt_in, &p_parent->fmt_out );
+ filter_sys_t *p_sys = p_filter->p_sys;
+ filter_chain_Reset( p_sys->p_chain, &p_filter->fmt_in, &p_filter->fmt_out );
int i_ret = filter_chain_AppendConverter( p_sys->p_chain,
NULL, p_fmt_mid );
if( i_ret != VLC_SUCCESS )
return i_ret;
- if( p_parent->b_allow_fmt_out_change )
+ if( p_filter->b_allow_fmt_out_change )
{
/* XXX: Update i_sar_num/i_sar_den from last converter. Cf.
* p_filter->b_allow_fmt_out_change comment in video_chroma/swscale.c.
@@ -480,7 +478,7 @@ static int CreateResizeChromaChain( filter_t *p_parent, const es_format_t *p_fmt
es_format_t fmt_out;
es_format_Copy( &fmt_out,
filter_chain_GetFmtOut( p_sys->p_chain ) );
- fmt_out.video.i_chroma = p_parent->fmt_out.video.i_chroma;
+ fmt_out.video.i_chroma = p_filter->fmt_out.video.i_chroma;
i_ret = filter_chain_AppendConverter( p_sys->p_chain,
NULL, &fmt_out );
@@ -488,7 +486,7 @@ static int CreateResizeChromaChain( filter_t *p_parent, const es_format_t *p_fmt
}
else
i_ret = filter_chain_AppendConverter( p_sys->p_chain,
- NULL, &p_parent->fmt_out );
+ NULL, &p_filter->fmt_out );
if( i_ret != VLC_SUCCESS )
filter_chain_Clear( p_sys->p_chain );
More information about the vlc-commits
mailing list