[vlc-devel] [PATCH v1 33/33] filter: rename VIDEO_FILTER_WRAPPER2 to VIDEO_FILTER_WRAPPER
Steve Lhomme
robux4 at ycbcr.xyz
Fri Sep 25 16:47:09 CEST 2020
---
include/vlc_filter.h | 2 +-
modules/arm_neon/chroma_yuv.c | 28 +++++++++++++-------------
modules/arm_neon/yuv_rgb.c | 10 +++++-----
modules/hw/d3d11/d3d11_surface.c | 6 +++---
modules/hw/d3d9/dxa9.c | 4 ++--
modules/video_chroma/grey_yuv.c | 4 ++--
modules/video_chroma/i420_nv12.c | 12 +++++------
modules/video_chroma/i420_rgb.c | 18 ++++++++---------
modules/video_chroma/i420_yuy2.c | 10 +++++-----
modules/video_chroma/i422_i420.c | 6 +++---
modules/video_chroma/i422_yuy2.c | 10 +++++-----
modules/video_chroma/omxdl.c | 34 ++++++++++++++++----------------
modules/video_chroma/yuvp.c | 2 +-
modules/video_chroma/yuy2_i420.c | 6 +++---
modules/video_chroma/yuy2_i422.c | 6 +++---
15 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index 8bc914cb3c1..394b96a91ae 100644
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -383,7 +383,7 @@ VLC_API void filter_DeleteBlend( vlc_blender_t * );
*
* Currently used by the chroma video filters
*/
-#define VIDEO_FILTER_WRAPPER2( name ) \
+#define VIDEO_FILTER_WRAPPER( name ) \
static int name ## _Filter ( filter_t *p_filter, \
picture_t *p_pic, \
struct vlc_video_sink *sink ) \
diff --git a/modules/arm_neon/chroma_yuv.c b/modules/arm_neon/chroma_yuv.c
index a62a24669e9..53fe0f86f51 100644
--- a/modules/arm_neon/chroma_yuv.c
+++ b/modules/arm_neon/chroma_yuv.c
@@ -63,7 +63,7 @@ static void I420_YUYV (filter_t *filter, picture_t *src, picture_t *dst)
i420_yuyv_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I420_YUYV)
+VIDEO_FILTER_WRAPPER (I420_YUYV)
static void I420_YVYU (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -72,7 +72,7 @@ static void I420_YVYU (filter_t *filter, picture_t *src, picture_t *dst)
i420_yuyv_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I420_YVYU)
+VIDEO_FILTER_WRAPPER (I420_YVYU)
static void I420_UYVY (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -81,7 +81,7 @@ static void I420_UYVY (filter_t *filter, picture_t *src, picture_t *dst)
i420_uyvy_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I420_UYVY)
+VIDEO_FILTER_WRAPPER (I420_UYVY)
static void I420_VYUY (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -90,7 +90,7 @@ static void I420_VYUY (filter_t *filter, picture_t *src, picture_t *dst)
i420_uyvy_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I420_VYUY)
+VIDEO_FILTER_WRAPPER (I420_VYUY)
/* Semiplanar NV12/21/16/24 to planar I420/YV12/I422/I444 */
@@ -118,7 +118,7 @@ static void name (filter_t *filter, picture_t *src, \
filter->fmt_in.video.i_width / h_subsamp, \
filter->fmt_in.video.i_height / v_subsamp); \
} \
-VIDEO_FILTER_WRAPPER2 (name) \
+VIDEO_FILTER_WRAPPER (name) \
#define SEMIPLANAR_FILTERS_SWAP(name, h_subsamp, v_subsamp) \
static void name (filter_t *filter, picture_t *src, \
@@ -131,7 +131,7 @@ static void name (filter_t *filter, picture_t *src, \
filter->fmt_in.video.i_width / h_subsamp, \
filter->fmt_in.video.i_height / v_subsamp); \
} \
-VIDEO_FILTER_WRAPPER2 (name) \
+VIDEO_FILTER_WRAPPER (name) \
SEMIPLANAR_FILTERS (Semiplanar_Planar_420, 2, 2)
SEMIPLANAR_FILTERS_SWAP (Semiplanar_Planar_420_Swap, 2, 2)
@@ -147,7 +147,7 @@ static void I422_YUYV (filter_t *filter, picture_t *src, picture_t *dst)
i422_yuyv_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I422_YUYV)
+VIDEO_FILTER_WRAPPER (I422_YUYV)
static void I422_YVYU (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -156,7 +156,7 @@ static void I422_YVYU (filter_t *filter, picture_t *src, picture_t *dst)
i422_yuyv_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I422_YVYU)
+VIDEO_FILTER_WRAPPER (I422_YVYU)
static void I422_UYVY (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -165,7 +165,7 @@ static void I422_UYVY (filter_t *filter, picture_t *src, picture_t *dst)
i422_uyvy_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I422_UYVY)
+VIDEO_FILTER_WRAPPER (I422_UYVY)
static void I422_VYUY (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -174,7 +174,7 @@ static void I422_VYUY (filter_t *filter, picture_t *src, picture_t *dst)
i422_uyvy_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (I422_VYUY)
+VIDEO_FILTER_WRAPPER (I422_VYUY)
/* Packed YUV422 to planar YUV422 */
@@ -185,7 +185,7 @@ static void YUYV_I422 (filter_t *filter, picture_t *src, picture_t *dst)
yuyv_i422_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (YUYV_I422)
+VIDEO_FILTER_WRAPPER (YUYV_I422)
static void YVYU_I422 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -194,7 +194,7 @@ static void YVYU_I422 (filter_t *filter, picture_t *src, picture_t *dst)
yuyv_i422_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (YVYU_I422)
+VIDEO_FILTER_WRAPPER (YVYU_I422)
static void UYVY_I422 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -203,7 +203,7 @@ static void UYVY_I422 (filter_t *filter, picture_t *src, picture_t *dst)
uyvy_i422_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (UYVY_I422)
+VIDEO_FILTER_WRAPPER (UYVY_I422)
static void VYUY_I422 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -212,7 +212,7 @@ static void VYUY_I422 (filter_t *filter, picture_t *src, picture_t *dst)
uyvy_i422_neon (&out, &in, filter->fmt_in.video.i_width,
filter->fmt_in.video.i_height);
}
-VIDEO_FILTER_WRAPPER2 (VYUY_I422)
+VIDEO_FILTER_WRAPPER (VYUY_I422)
static int Open (vlc_object_t *obj)
{
diff --git a/modules/arm_neon/yuv_rgb.c b/modules/arm_neon/yuv_rgb.c
index d12619b220f..84b5328d768 100644
--- a/modules/arm_neon/yuv_rgb.c
+++ b/modules/arm_neon/yuv_rgb.c
@@ -125,11 +125,11 @@ static void NV12_RGBA (filter_t *filter, picture_t *src, picture_t *dst)
nv12_rgb_neon (&out, &in, filter->fmt_in.video.i_visible_width, filter->fmt_in.video.i_visible_height);
}
-VIDEO_FILTER_WRAPPER2 (I420_RGBA)
-VIDEO_FILTER_WRAPPER2 (I420_RV16)
-VIDEO_FILTER_WRAPPER2 (YV12_RGBA)
-VIDEO_FILTER_WRAPPER2 (NV21_RGBA)
-VIDEO_FILTER_WRAPPER2 (NV12_RGBA)
+VIDEO_FILTER_WRAPPER (I420_RGBA)
+VIDEO_FILTER_WRAPPER (I420_RV16)
+VIDEO_FILTER_WRAPPER (YV12_RGBA)
+VIDEO_FILTER_WRAPPER (NV21_RGBA)
+VIDEO_FILTER_WRAPPER (NV12_RGBA)
static int Open (vlc_object_t *obj)
{
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index 26ee43dde3b..87e3b68c854 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -588,9 +588,9 @@ static void NV12_D3D11(filter_t *p_filter, picture_t *src, picture_t *dst)
dst->i_planes = 0;
}
-VIDEO_FILTER_WRAPPER2 (D3D11_NV12)
-VIDEO_FILTER_WRAPPER2 (D3D11_YUY2)
-VIDEO_FILTER_WRAPPER2 (D3D11_RGBA)
+VIDEO_FILTER_WRAPPER (D3D11_NV12)
+VIDEO_FILTER_WRAPPER (D3D11_YUY2)
+VIDEO_FILTER_WRAPPER (D3D11_RGBA)
static picture_t *AllocateCPUtoGPUTexture(filter_t *p_filter, filter_sys_t *p_sys)
{
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index 94065c431c7..ceb0ea8de34 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -362,8 +362,8 @@ done:
return NULL;
}
-VIDEO_FILTER_WRAPPER2 (DXA9_YV12)
-VIDEO_FILTER_WRAPPER2 (DXA9_NV12)
+VIDEO_FILTER_WRAPPER (DXA9_YV12)
+VIDEO_FILTER_WRAPPER (DXA9_NV12)
static int YV12_D3D9_Filter( filter_t *p_filter, picture_t *p_pic, struct vlc_video_sink * sink )
{
diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index 1da6f65d284..ccb8571ae84 100644
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -44,8 +44,8 @@ static int Activate ( vlc_object_t * );
static void GREY_I420( filter_t *, picture_t *, picture_t * );
static void GREY_YUY2( filter_t *, picture_t *, picture_t * );
-VIDEO_FILTER_WRAPPER2( GREY_I420 )
-VIDEO_FILTER_WRAPPER2( GREY_YUY2 )
+VIDEO_FILTER_WRAPPER( GREY_I420 )
+VIDEO_FILTER_WRAPPER( GREY_YUY2 )
/*****************************************************************************
* Module descriptor.
diff --git a/modules/video_chroma/i420_nv12.c b/modules/video_chroma/i420_nv12.c
index 9338dc6ab81..53e1364adfc 100644
--- a/modules/video_chroma/i420_nv12.c
+++ b/modules/video_chroma/i420_nv12.c
@@ -128,12 +128,12 @@ static void P010_I42010B( filter_t *p_filter, picture_t *p_src,
}
/* Following functions are local */
-VIDEO_FILTER_WRAPPER2( I420_NV12 )
-VIDEO_FILTER_WRAPPER2( YV12_NV12 )
-VIDEO_FILTER_WRAPPER2( NV12_I420 )
-VIDEO_FILTER_WRAPPER2( NV12_YV12 )
-VIDEO_FILTER_WRAPPER2( I42010B_P010 )
-VIDEO_FILTER_WRAPPER2( P010_I42010B )
+VIDEO_FILTER_WRAPPER( I420_NV12 )
+VIDEO_FILTER_WRAPPER( YV12_NV12 )
+VIDEO_FILTER_WRAPPER( NV12_I420 )
+VIDEO_FILTER_WRAPPER( NV12_YV12 )
+VIDEO_FILTER_WRAPPER( I42010B_P010 )
+VIDEO_FILTER_WRAPPER( P010_I42010B )
/*****************************************************************************
* Create: allocate a chroma function
diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 950b8248c62..c72bf7b4eea 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -43,16 +43,16 @@ static void Set8bppPalette( filter_t *, uint8_t * );
#endif
#ifndef PLAIN
-VIDEO_FILTER_WRAPPER2( I420_R5G5B5 )
-VIDEO_FILTER_WRAPPER2( I420_R5G6B5 )
-VIDEO_FILTER_WRAPPER2( I420_A8R8G8B8 )
-VIDEO_FILTER_WRAPPER2( I420_R8G8B8A8 )
-VIDEO_FILTER_WRAPPER2( I420_B8G8R8A8 )
-VIDEO_FILTER_WRAPPER2( I420_A8B8G8R8 )
+VIDEO_FILTER_WRAPPER( I420_R5G5B5 )
+VIDEO_FILTER_WRAPPER( I420_R5G6B5 )
+VIDEO_FILTER_WRAPPER( I420_A8R8G8B8 )
+VIDEO_FILTER_WRAPPER( I420_R8G8B8A8 )
+VIDEO_FILTER_WRAPPER( I420_B8G8R8A8 )
+VIDEO_FILTER_WRAPPER( I420_A8B8G8R8 )
#else
-VIDEO_FILTER_WRAPPER2( I420_RGB8 )
-VIDEO_FILTER_WRAPPER2( I420_RGB16 )
-VIDEO_FILTER_WRAPPER2( I420_RGB32 )
+VIDEO_FILTER_WRAPPER( I420_RGB8 )
+VIDEO_FILTER_WRAPPER( I420_RGB16 )
+VIDEO_FILTER_WRAPPER( I420_RGB32 )
#endif
/*****************************************************************************
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index d0415070666..66c719d48a9 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -72,14 +72,14 @@ static void I420_IUYV ( filter_t *, picture_t *, picture_t * );
static void I420_Y211 ( filter_t *, picture_t *, picture_t * );
#endif
-VIDEO_FILTER_WRAPPER2( I420_YUY2 )
-VIDEO_FILTER_WRAPPER2( I420_YVYU )
-VIDEO_FILTER_WRAPPER2( I420_UYVY )
+VIDEO_FILTER_WRAPPER( I420_YUY2 )
+VIDEO_FILTER_WRAPPER( I420_YVYU )
+VIDEO_FILTER_WRAPPER( I420_UYVY )
#if !defined (MODULE_NAME_IS_i420_yuy2_altivec)
-VIDEO_FILTER_WRAPPER2( I420_IUYV )
+VIDEO_FILTER_WRAPPER( I420_IUYV )
#endif
#if defined (MODULE_NAME_IS_i420_yuy2)
-VIDEO_FILTER_WRAPPER2( I420_Y211 )
+VIDEO_FILTER_WRAPPER( I420_Y211 )
#endif
/*****************************************************************************
diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index dee82d406f0..be92a8f5aa4 100644
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -46,9 +46,9 @@ static void I422_I420( filter_t *, picture_t *, picture_t * );
static void I422_YV12( filter_t *, picture_t *, picture_t * );
static void I422_YUVA( filter_t *, picture_t *, picture_t * );
-VIDEO_FILTER_WRAPPER2( I422_I420 )
-VIDEO_FILTER_WRAPPER2( I422_YV12 )
-VIDEO_FILTER_WRAPPER2( I422_YUVA )
+VIDEO_FILTER_WRAPPER( I422_I420 )
+VIDEO_FILTER_WRAPPER( I422_YV12 )
+VIDEO_FILTER_WRAPPER( I422_YUVA )
/*****************************************************************************
* Module descriptor
diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 415e21eefd0..f646a5951b2 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -57,12 +57,12 @@ static void I422_IUYV ( filter_t *, picture_t *, picture_t * );
static void I422_Y211 ( filter_t *, picture_t *, picture_t * );
#endif
-VIDEO_FILTER_WRAPPER2( I422_YUY2 )
-VIDEO_FILTER_WRAPPER2( I422_YVYU )
-VIDEO_FILTER_WRAPPER2( I422_UYVY )
-VIDEO_FILTER_WRAPPER2( I422_IUYV )
+VIDEO_FILTER_WRAPPER( I422_YUY2 )
+VIDEO_FILTER_WRAPPER( I422_YVYU )
+VIDEO_FILTER_WRAPPER( I422_UYVY )
+VIDEO_FILTER_WRAPPER( I422_IUYV )
#if defined (MODULE_NAME_IS_i422_yuy2)
-VIDEO_FILTER_WRAPPER2( I422_Y211 )
+VIDEO_FILTER_WRAPPER( I422_Y211 )
#endif
/*****************************************************************************
diff --git a/modules/video_chroma/omxdl.c b/modules/video_chroma/omxdl.c
index 290300c623d..292fe950eab 100644
--- a/modules/video_chroma/omxdl.c
+++ b/modules/video_chroma/omxdl.c
@@ -54,7 +54,7 @@ static void I420_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbCr420ToBGR565_U8_U16_P3C3R (in, instep, out, outstep, size);
}
-VIDEO_FILTER_WRAPPER2 (I420_RV16)
+VIDEO_FILTER_WRAPPER (I420_RV16)
/*** Conversions from YV12 ***/
static void YV12_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
@@ -67,7 +67,7 @@ static void YV12_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbCr420ToBGR565_U8_U16_P3C3R (in, instep, out, outstep, size);
}
-VIDEO_FILTER_WRAPPER2 (YV12_RV16)
+VIDEO_FILTER_WRAPPER (YV12_RV16)
/*** Conversions from I422 ***/
static void I422_I420 (filter_t *filter, picture_t *src, picture_t *dst)
@@ -81,7 +81,7 @@ static void I422_I420 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbCr422ToYCbCr420Rotate_U8_P3R (
in, instep, out, outstep, size, OMX_IP_DISABLE);
}
-VIDEO_FILTER_WRAPPER2 (I422_I420)
+VIDEO_FILTER_WRAPPER (I422_I420)
static void I422_YV12 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -94,7 +94,7 @@ static void I422_YV12 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbCr422ToYCbCr420Rotate_U8_P3R (
in, instep, out, outstep, size, OMX_IP_DISABLE);
}
-VIDEO_FILTER_WRAPPER2 (I422_YV12)
+VIDEO_FILTER_WRAPPER (I422_YV12)
/*** Conversions from I444 ***/
static void I444_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
@@ -110,7 +110,7 @@ static void I444_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbCr444ToBGR565_U8_U16_P3C3R (in, instep, out, outstep, size);
}
-VIDEO_FILTER_WRAPPER2 (I444_RV16)
+VIDEO_FILTER_WRAPPER (I444_RV16)
/*** Conversions from YUY2 ***/
static void YUYV_RV24 (filter_t *filter, picture_t *src, picture_t *dst)
@@ -123,7 +123,7 @@ static void YUYV_RV24 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbYCr422ToBGR888_U8_C2C3R (in, instep, out, outstep, size);
}
-VIDEO_FILTER_WRAPPER2 (YUYV_RV24)
+VIDEO_FILTER_WRAPPER (YUYV_RV24)
static void YUYV_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -135,7 +135,7 @@ static void YUYV_RV16 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_YCbYCr422ToBGR565_U8_U16_C2C3R (in, instep, out, outstep, size);
}
-VIDEO_FILTER_WRAPPER2 (YUYV_RV16)
+VIDEO_FILTER_WRAPPER (YUYV_RV16)
/*** Conversions from UYVY ***/
static void UYVY_I420 (filter_t *filter, picture_t *src, picture_t *dst)
@@ -149,7 +149,7 @@ static void UYVY_I420 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_CbYCrY422ToYCbCr420Rotate_U8_C2P3R (
in, instep, out, outstep, size, OMX_IP_DISABLE);
}
-VIDEO_FILTER_WRAPPER2 (UYVY_I420)
+VIDEO_FILTER_WRAPPER (UYVY_I420)
static void UYVY_YV12 (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -162,7 +162,7 @@ static void UYVY_YV12 (filter_t *filter, picture_t *src, picture_t *dst)
omxIPCS_CbYCrY422ToYCbCr420Rotate_U8_C2P3R (
in, instep, out, outstep, size, OMX_IP_DISABLE);
}
-VIDEO_FILTER_WRAPPER2 (UYVY_YV12)
+VIDEO_FILTER_WRAPPER (UYVY_YV12)
/*** Helpers ***/
static int FixRV24 (video_format_t *fmt)
@@ -358,7 +358,7 @@ static void I420_I420_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (I420_I420_Scale)
+VIDEO_FILTER_WRAPPER (I420_I420_Scale)
static void I420_YV12_Scale (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -373,7 +373,7 @@ static void I420_YV12_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (I420_YV12_Scale)
+VIDEO_FILTER_WRAPPER (I420_YV12_Scale)
static void I420_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -388,7 +388,7 @@ static void I420_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
CNV, OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (I420_RGB_Scale)
+VIDEO_FILTER_WRAPPER (I420_RGB_Scale)
/*** Scaling from YV12 ***/
static void YV12_I420_Scale (filter_t *filter, picture_t *src, picture_t *dst)
@@ -404,7 +404,7 @@ static void YV12_I420_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (YV12_I420_Scale)
+VIDEO_FILTER_WRAPPER (YV12_I420_Scale)
static void YV12_YV12_Scale (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -419,7 +419,7 @@ static void YV12_YV12_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (YV12_YV12_Scale)
+VIDEO_FILTER_WRAPPER (YV12_YV12_Scale)
static void YV12_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -434,7 +434,7 @@ static void YV12_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
CNV, OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (YV12_RGB_Scale)
+VIDEO_FILTER_WRAPPER (YV12_RGB_Scale)
/*** Scaling from I422 ***/
static void I422_I422_Scale (filter_t *filter, picture_t *src, picture_t *dst)
@@ -450,7 +450,7 @@ static void I422_I422_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (I422_I422_Scale)
+VIDEO_FILTER_WRAPPER (I422_I422_Scale)
static void I422_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
{
@@ -465,7 +465,7 @@ static void I422_RGB_Scale (filter_t *filter, picture_t *src, picture_t *dst)
in, instep, insize, out, outstep, outsize,
CNV, OMX_IP_NEAREST, OMX_IP_DISABLE, XRR_MAX, YRR_MAX);
}
-VIDEO_FILTER_WRAPPER2 (I422_RGB_Scale)
+VIDEO_FILTER_WRAPPER (I422_RGB_Scale)
/*** Scaling initialization ***/
static int OpenScaler (vlc_object_t *obj)
diff --git a/modules/video_chroma/yuvp.c b/modules/video_chroma/yuvp.c
index 641ce9e11e3..f9dc3449310 100644
--- a/modules/video_chroma/yuvp.c
+++ b/modules/video_chroma/yuvp.c
@@ -54,7 +54,7 @@ vlc_module_end ()
****************************************************************************/
static void Convert( filter_t *, picture_t *, picture_t * );
static void Yuv2Rgb( uint8_t *r, uint8_t *g, uint8_t *b, int y1, int u1, int v1 );
-VIDEO_FILTER_WRAPPER2( Convert )
+VIDEO_FILTER_WRAPPER( Convert )
/*****************************************************************************
* Open: probe the filter and return score
diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index 0e538415bc6..6de353699f5 100644
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -45,9 +45,9 @@ static void YUY2_I420 ( filter_t *, picture_t *, picture_t * );
static void YVYU_I420 ( filter_t *, picture_t *, picture_t * );
static void UYVY_I420 ( filter_t *, picture_t *, picture_t * );
-VIDEO_FILTER_WRAPPER2( YUY2_I420 )
-VIDEO_FILTER_WRAPPER2( YVYU_I420 )
-VIDEO_FILTER_WRAPPER2( UYVY_I420 )
+VIDEO_FILTER_WRAPPER( YUY2_I420 )
+VIDEO_FILTER_WRAPPER( YVYU_I420 )
+VIDEO_FILTER_WRAPPER( UYVY_I420 )
/*****************************************************************************
* Module descriptor
diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index e3d078f2805..496a5de15d8 100644
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -45,9 +45,9 @@ static void YUY2_I422 ( filter_t *, picture_t *, picture_t * );
static void YVYU_I422 ( filter_t *, picture_t *, picture_t * );
static void UYVY_I422 ( filter_t *, picture_t *, picture_t * );
-VIDEO_FILTER_WRAPPER2( YUY2_I422 )
-VIDEO_FILTER_WRAPPER2( YVYU_I422 )
-VIDEO_FILTER_WRAPPER2( UYVY_I422 )
+VIDEO_FILTER_WRAPPER( YUY2_I422 )
+VIDEO_FILTER_WRAPPER( YVYU_I422 )
+VIDEO_FILTER_WRAPPER( UYVY_I422 )
/*****************************************************************************
* Module descriptor
--
2.26.2
More information about the vlc-devel
mailing list