[vlc-devel] [PATCH v1 32/33] filter: rename pf_video_filter_into to pf_video_filter
Steve Lhomme
robux4 at ycbcr.xyz
Fri Sep 25 16:47:08 CEST 2020
---
include/vlc_filter.h | 6 +--
modules/arm_neon/chroma_yuv.c | 44 ++++++++--------
modules/arm_neon/yuv_rgb.c | 10 ++--
modules/hw/d3d11/d3d11_deinterlace.c | 2 +-
modules/hw/d3d11/d3d11_filters.c | 2 +-
modules/hw/d3d11/d3d11_surface.c | 14 ++---
modules/hw/d3d9/d3d9_filters.c | 2 +-
modules/hw/d3d9/dxa9.c | 10 ++--
modules/hw/d3d9/dxva2_deinterlace.c | 2 +-
modules/hw/mmal/converter.c | 2 +-
modules/hw/mmal/deinterlace.c | 4 +-
modules/hw/nvdec/chroma.c | 2 +-
modules/hw/vaapi/chroma.c | 2 +-
modules/hw/vaapi/filters.c | 8 +--
modules/hw/vdpau/adjust.c | 2 +-
modules/hw/vdpau/chroma.c | 4 +-
modules/hw/vdpau/deinterlace.c | 2 +-
modules/hw/vdpau/sharpen.c | 2 +-
modules/spu/audiobargraph_v.c | 2 +-
modules/spu/logo.c | 2 +-
modules/video_chroma/chain.c | 2 +-
modules/video_chroma/cvpx.c | 12 ++---
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 | 52 +++++++++----------
modules/video_chroma/rv32.c | 2 +-
modules/video_chroma/swscale.c | 2 +-
modules/video_chroma/yuvp.c | 2 +-
modules/video_chroma/yuy2_i420.c | 6 +--
modules/video_chroma/yuy2_i422.c | 6 +--
modules/video_filter/adjust.c | 6 +--
modules/video_filter/alphamask.c | 2 +-
modules/video_filter/anaglyph.c | 2 +-
modules/video_filter/antiflicker.c | 2 +-
modules/video_filter/ball.c | 2 +-
modules/video_filter/blendbench.c | 2 +-
modules/video_filter/bluescreen.c | 2 +-
modules/video_filter/canvas.c | 2 +-
modules/video_filter/ci_filters.m | 2 +-
modules/video_filter/colorthres.c | 4 +-
modules/video_filter/croppadd.c | 2 +-
.../video_filter/deinterlace/deinterlace.c | 4 +-
modules/video_filter/edgedetection.c | 2 +-
modules/video_filter/erase.c | 2 +-
modules/video_filter/extract.c | 2 +-
modules/video_filter/fps.c | 2 +-
modules/video_filter/freeze.c | 2 +-
modules/video_filter/gaussianblur.c | 2 +-
modules/video_filter/gradfun.c | 2 +-
modules/video_filter/gradient.c | 2 +-
modules/video_filter/grain.c | 2 +-
modules/video_filter/hqdn3d.c | 2 +-
modules/video_filter/invert.c | 2 +-
modules/video_filter/magnify.c | 2 +-
modules/video_filter/mirror.c | 2 +-
modules/video_filter/motionblur.c | 2 +-
modules/video_filter/motiondetect.c | 2 +-
modules/video_filter/oldmovie.c | 2 +-
modules/video_filter/opencv_example.cpp | 2 +-
modules/video_filter/opencv_wrapper.c | 2 +-
modules/video_filter/posterize.c | 2 +-
modules/video_filter/postproc.c | 2 +-
modules/video_filter/psychedelic.c | 2 +-
modules/video_filter/puzzle.c | 2 +-
modules/video_filter/ripple.c | 2 +-
modules/video_filter/rotate.c | 4 +-
modules/video_filter/scale.c | 2 +-
modules/video_filter/scene.c | 4 +-
modules/video_filter/sepia.c | 2 +-
modules/video_filter/sharpen.c | 2 +-
modules/video_filter/transform.c | 2 +-
modules/video_filter/vhs.c | 2 +-
modules/video_filter/wave.c | 2 +-
77 files changed, 183 insertions(+), 183 deletions(-)
diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index 7c67432e0de..8bc914cb3c1 100644
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -135,7 +135,7 @@ struct filter_t
union
{
/** Filter a picture (video filter) */
- int (*pf_video_filter_into)( filter_t *, picture_t *, struct vlc_video_sink * );
+ int (*pf_video_filter)( filter_t *, picture_t *, struct vlc_video_sink * );
/** Filter an audio block (audio filter) */
block_t * (*pf_audio_filter)( filter_t *, block_t * );
@@ -196,7 +196,7 @@ struct filter_t
/**
* This function will return a new picture usable by p_filter as an output
* buffer. You have to release it using picture_Release or by returning
- * it to the caller as a pf_video_filter_into return value.
+ * it to the caller as a pf_video_filter return value.
* Provided for convenience.
*
* \param p_filter filter_t object
@@ -229,7 +229,7 @@ static inline picture_t *filter_FilterSingle( filter_t *p_filter, picture_t *pic
{
picture_t *result = NULL;
struct vlc_video_sink sink = { &result, GetSingleResult };
- p_filter->pf_video_filter_into( p_filter, pic, &sink );
+ p_filter->pf_video_filter( p_filter, pic, &sink );
return result;
}
diff --git a/modules/arm_neon/chroma_yuv.c b/modules/arm_neon/chroma_yuv.c
index 78b690e841c..a62a24669e9 100644
--- a/modules/arm_neon/chroma_yuv.c
+++ b/modules/arm_neon/chroma_yuv.c
@@ -231,16 +231,16 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_YUYV:
- filter->pf_video_filter_into = I420_YUYV_Filter;
+ filter->pf_video_filter = I420_YUYV_Filter;
break;
case VLC_CODEC_UYVY:
- filter->pf_video_filter_into = I420_UYVY_Filter;
+ filter->pf_video_filter = I420_UYVY_Filter;
break;
case VLC_CODEC_YVYU:
- filter->pf_video_filter_into = I420_YVYU_Filter;
+ filter->pf_video_filter = I420_YVYU_Filter;
break;
case VLC_CODEC_VYUY:
- filter->pf_video_filter_into = I420_VYUY_Filter;
+ filter->pf_video_filter = I420_VYUY_Filter;
break;
default:
return VLC_EGENERIC;
@@ -251,16 +251,16 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_YUYV:
- filter->pf_video_filter_into = I420_YVYU_Filter;
+ filter->pf_video_filter = I420_YVYU_Filter;
break;
case VLC_CODEC_UYVY:
- filter->pf_video_filter_into = I420_VYUY_Filter;
+ filter->pf_video_filter = I420_VYUY_Filter;
break;
case VLC_CODEC_YVYU:
- filter->pf_video_filter_into = I420_YUYV_Filter;
+ filter->pf_video_filter = I420_YUYV_Filter;
break;
case VLC_CODEC_VYUY:
- filter->pf_video_filter_into = I420_UYVY_Filter;
+ filter->pf_video_filter = I420_UYVY_Filter;
break;
default:
return VLC_EGENERIC;
@@ -271,16 +271,16 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_YUYV:
- filter->pf_video_filter_into = I422_YUYV_Filter;
+ filter->pf_video_filter = I422_YUYV_Filter;
break;
case VLC_CODEC_UYVY:
- filter->pf_video_filter_into = I422_UYVY_Filter;
+ filter->pf_video_filter = I422_UYVY_Filter;
break;
case VLC_CODEC_YVYU:
- filter->pf_video_filter_into = I422_YVYU_Filter;
+ filter->pf_video_filter = I422_YVYU_Filter;
break;
case VLC_CODEC_VYUY:
- filter->pf_video_filter_into = I422_VYUY_Filter;
+ filter->pf_video_filter = I422_VYUY_Filter;
break;
default:
return VLC_EGENERIC;
@@ -292,10 +292,10 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = Semiplanar_Planar_420_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_420_Filter;
break;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = Semiplanar_Planar_420_Swap_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_420_Swap_Filter;
break;
default:
return VLC_EGENERIC;
@@ -306,10 +306,10 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = Semiplanar_Planar_420_Swap_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_420_Swap_Filter;
break;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = Semiplanar_Planar_420_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_420_Filter;
break;
default:
return VLC_EGENERIC;
@@ -320,7 +320,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = Semiplanar_Planar_422_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_422_Filter;
break;
default:
return VLC_EGENERIC;
@@ -331,7 +331,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I444:
- filter->pf_video_filter_into = Semiplanar_Planar_444_Filter;
+ filter->pf_video_filter = Semiplanar_Planar_444_Filter;
break;
default:
return VLC_EGENERIC;
@@ -343,7 +343,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = YUYV_I422_Filter;
+ filter->pf_video_filter = YUYV_I422_Filter;
break;
default:
return VLC_EGENERIC;
@@ -353,7 +353,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = UYVY_I422_Filter;
+ filter->pf_video_filter = UYVY_I422_Filter;
break;
default:
return VLC_EGENERIC;
@@ -363,7 +363,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = YVYU_I422_Filter;
+ filter->pf_video_filter = YVYU_I422_Filter;
break;
default:
return VLC_EGENERIC;
@@ -374,7 +374,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = VYUY_I422_Filter;
+ filter->pf_video_filter = VYUY_I422_Filter;
break;
default:
return VLC_EGENERIC;
diff --git a/modules/arm_neon/yuv_rgb.c b/modules/arm_neon/yuv_rgb.c
index 2d4acb00dd9..d12619b220f 100644
--- a/modules/arm_neon/yuv_rgb.c
+++ b/modules/arm_neon/yuv_rgb.c
@@ -150,7 +150,7 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_in.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = I420_RV16_Filter;
+ filter->pf_video_filter = I420_RV16_Filter;
break;
default:
return VLC_EGENERIC;
@@ -166,16 +166,16 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_in.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = I420_RGBA_Filter;
+ filter->pf_video_filter = I420_RGBA_Filter;
break;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = YV12_RGBA_Filter;
+ filter->pf_video_filter = YV12_RGBA_Filter;
break;
case VLC_CODEC_NV21:
- filter->pf_video_filter_into = NV21_RGBA_Filter;
+ filter->pf_video_filter = NV21_RGBA_Filter;
break;
case VLC_CODEC_NV12:
- filter->pf_video_filter_into = NV12_RGBA_Filter;
+ filter->pf_video_filter = NV12_RGBA_Filter;
break;
default:
return VLC_EGENERIC;
diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
index 835c56447ca..fa0fc9bcdae 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -350,7 +350,7 @@ int D3D11OpenDeinterlace(vlc_object_t *obj)
filter->fmt_out.video = out_fmt;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
- filter->pf_video_filter_into = Deinterlace;
+ filter->pf_video_filter = Deinterlace;
filter->pf_flush = Flush;
filter->p_sys = sys;
diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index 8e1856ba631..b3f0315ba1f 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -507,7 +507,7 @@ static int D3D11OpenAdjust(vlc_object_t *obj)
}
}
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
filter->p_sys = sys;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
d3d11_device_unlock(sys->d3d_dev);
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index 51db375d182..26ee43dde3b 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -680,34 +680,34 @@ int D3D11OpenConverter( vlc_object_t *obj )
case VLC_CODEC_YV12:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_YUY2_Filter;
+ p_filter->pf_video_filter = D3D11_YUY2_Filter;
break;
case VLC_CODEC_I420_10L:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE_10B )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_YUY2_Filter;
+ p_filter->pf_video_filter = D3D11_YUY2_Filter;
pixel_bytes = 2;
break;
case VLC_CODEC_NV12:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_NV12_Filter;
+ p_filter->pf_video_filter = D3D11_NV12_Filter;
break;
case VLC_CODEC_P010:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE_10B )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_NV12_Filter;
+ p_filter->pf_video_filter = D3D11_NV12_Filter;
pixel_bytes = 2;
break;
case VLC_CODEC_RGBA:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE_RGBA )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_RGBA_Filter;
+ p_filter->pf_video_filter = D3D11_RGBA_Filter;
break;
case VLC_CODEC_BGRA:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE_BGRA )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = D3D11_RGBA_Filter;
+ p_filter->pf_video_filter = D3D11_RGBA_Filter;
break;
default:
return VLC_EGENERIC;
@@ -754,7 +754,7 @@ int D3D11OpenCPUConverter( vlc_object_t *obj )
case VLC_CODEC_YV12:
case VLC_CODEC_NV12:
case VLC_CODEC_P010:
- p_filter->pf_video_filter_into = NV12_D3D11_Filter;
+ p_filter->pf_video_filter = NV12_D3D11_Filter;
break;
default:
return VLC_EGENERIC;
diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c
index 0709d0e82fd..2b263262725 100644
--- a/modules/hw/d3d9/d3d9_filters.c
+++ b/modules/hw/d3d9/d3d9_filters.c
@@ -448,7 +448,7 @@ static int D3D9OpenAdjust(vlc_object_t *obj)
sys->hdecoder_dll = hdecoder_dll;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
filter->p_sys = sys;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index b53ded16e12..94065c431c7 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -397,23 +397,23 @@ int D3D9OpenConverter( vlc_object_t *obj )
case VLC_CODEC_YV12:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D9_OPAQUE )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = DXA9_YV12_Filter;
+ p_filter->pf_video_filter = DXA9_YV12_Filter;
break;
case VLC_CODEC_I420_10L:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D9_OPAQUE_10B )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = DXA9_YV12_Filter;
+ p_filter->pf_video_filter = DXA9_YV12_Filter;
pixel_bytes = 2;
break;
case VLC_CODEC_NV12:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D9_OPAQUE )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = DXA9_NV12_Filter;
+ p_filter->pf_video_filter = DXA9_NV12_Filter;
break;
case VLC_CODEC_P010:
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D9_OPAQUE_10B )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = DXA9_NV12_Filter;
+ p_filter->pf_video_filter = DXA9_NV12_Filter;
pixel_bytes = 2;
break;
default:
@@ -453,7 +453,7 @@ int D3D9OpenCPUConverter( vlc_object_t *obj )
case VLC_CODEC_YV12:
case VLC_CODEC_I420_10L:
case VLC_CODEC_P010:
- p_filter->pf_video_filter_into = YV12_D3D9_Filter;
+ p_filter->pf_video_filter = YV12_D3D9_Filter;
break;
default:
return VLC_EGENERIC;
diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c
index bdd592d5e23..27a56a7f079 100644
--- a/modules/hw/d3d9/dxva2_deinterlace.c
+++ b/modules/hw/d3d9/dxva2_deinterlace.c
@@ -501,7 +501,7 @@ int D3D9OpenDeinterlace(vlc_object_t *obj)
filter->fmt_out.video = out_fmt;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
- filter->pf_video_filter_into = Deinterlace;
+ filter->pf_video_filter = Deinterlace;
filter->pf_flush = Flush;
filter->p_sys = sys;
diff --git a/modules/hw/mmal/converter.c b/modules/hw/mmal/converter.c
index c422e92d900..5ee25f238b4 100644
--- a/modules/hw/mmal/converter.c
+++ b/modules/hw/mmal/converter.c
@@ -967,7 +967,7 @@ retry:
}
}
- p_filter->pf_video_filter_into = conv_filter;
+ p_filter->pf_video_filter = conv_filter;
p_filter->pf_flush = conv_flush;
// video_drain NIF in filter structure
diff --git a/modules/hw/mmal/deinterlace.c b/modules/hw/mmal/deinterlace.c
index e363c4d0f8d..4a0fc2a3bae 100644
--- a/modules/hw/mmal/deinterlace.c
+++ b/modules/hw/mmal/deinterlace.c
@@ -498,7 +498,7 @@ static int OpenMmalDeinterlace(vlc_object_t *p_this)
if (sys->use_passthrough)
{
- filter->pf_video_filter_into = pass_deinterlace;
+ filter->pf_video_filter = pass_deinterlace;
filter->pf_flush = pass_flush;
return VLC_SUCCESS;
}
@@ -599,7 +599,7 @@ static int OpenMmalDeinterlace(vlc_object_t *p_this)
goto fail;
}
- filter->pf_video_filter_into = deinterlace;
+ filter->pf_video_filter = deinterlace;
filter->pf_flush = di_flush;
return 0;
diff --git a/modules/hw/nvdec/chroma.c b/modules/hw/nvdec/chroma.c
index 16aaef2abde..60b16256d86 100644
--- a/modules/hw/nvdec/chroma.c
+++ b/modules/hw/nvdec/chroma.c
@@ -137,7 +137,7 @@ static int OpenCUDAToCPU( vlc_object_t *p_this )
) )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = FilterCUDAToCPU;
+ p_filter->pf_video_filter = FilterCUDAToCPU;
return VLC_SUCCESS;
}
diff --git a/modules/hw/vaapi/chroma.c b/modules/hw/vaapi/chroma.c
index e69aafbf744..65047ea47d2 100644
--- a/modules/hw/vaapi/chroma.c
+++ b/modules/hw/vaapi/chroma.c
@@ -330,7 +330,7 @@ vlc_vaapi_OpenChroma(vlc_object_t *obj)
&pixel_bytes))
return VLC_EGENERIC;
- filter->pf_video_filter_into = is_upload ? UploadSurface : DownloadSurface;
+ filter->pf_video_filter = is_upload ? UploadSurface : DownloadSurface;
if (!(filter_sys = calloc(1, sizeof(filter_sys_t))))
{
diff --git a/modules/hw/vaapi/filters.c b/modules/hw/vaapi/filters.c
index 5e67034d85a..2161df85ce1 100644
--- a/modules/hw/vaapi/filters.c
+++ b/modules/hw/vaapi/filters.c
@@ -589,7 +589,7 @@ OpenAdjust(vlc_object_t * obj)
for (unsigned int i = 0; i < NUM_ADJUST_MODES; ++i)
var_AddCallback(obj, adjust_params_names[i], FilterCallback, p_data);
- filter->pf_video_filter_into = Adjust;
+ filter->pf_video_filter = Adjust;
return VLC_SUCCESS;
@@ -712,7 +712,7 @@ OpenBasicFilter(vlc_object_t * obj, VAProcFilterType filter_type,
var_AddCallback(obj, p_data->sigma.psz_name, FilterCallback, p_data);
- filter->pf_video_filter_into = BasicFilter;
+ filter->pf_video_filter = BasicFilter;
return VLC_SUCCESS;
@@ -1081,9 +1081,9 @@ OpenDeinterlace(vlc_object_t * obj)
goto error;
if (p_data->b_double_rate)
- filter->pf_video_filter_into = DeinterlaceX2;
+ filter->pf_video_filter = DeinterlaceX2;
else
- filter->pf_video_filter_into = Deinterlace;
+ filter->pf_video_filter = Deinterlace;
filter->pf_flush = Deinterlace_Flush;
for (unsigned int i = 0; i < METADATA_SIZE; ++i)
diff --git a/modules/hw/vdpau/adjust.c b/modules/hw/vdpau/adjust.c
index da7e714fc49..fa318ceaffd 100644
--- a/modules/hw/vdpau/adjust.c
+++ b/modules/hw/vdpau/adjust.c
@@ -157,7 +157,7 @@ static int Open(vlc_object_t *obj)
if (unlikely(sys == NULL))
return VLC_ENOMEM;
- filter->pf_video_filter_into = Adjust;
+ filter->pf_video_filter = Adjust;
filter->p_sys = sys;
config_ChainParse(filter, "", options, filter->p_cfg);
diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index 52fd664bee1..bcc16257b5c 100644
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -839,7 +839,7 @@ static int OutputOpen(vlc_object_t *obj)
sys->procamp.saturation = 1.f;
sys->procamp.hue = 0.f;
- filter->pf_video_filter_into = video_filter;
+ filter->pf_video_filter = video_filter;
filter->pf_flush = Flush;
return VLC_SUCCESS;
}
@@ -918,7 +918,7 @@ static int YCbCrOpen(vlc_object_t *obj)
return VLC_ENOMEM;
sys->format = format;
- filter->pf_video_filter_into = VideoExport_Filter;
+ filter->pf_video_filter = VideoExport_Filter;
filter->p_sys = sys;
return VLC_SUCCESS;
}
diff --git a/modules/hw/vdpau/deinterlace.c b/modules/hw/vdpau/deinterlace.c
index 45b4154a91e..9fd7dc651c2 100644
--- a/modules/hw/vdpau/deinterlace.c
+++ b/modules/hw/vdpau/deinterlace.c
@@ -118,7 +118,7 @@ static int Open(vlc_object_t *obj)
sys->last_pts = VLC_TICK_INVALID;
- filter->pf_video_filter_into = Deinterlace;
+ filter->pf_video_filter = Deinterlace;
filter->p_sys = sys;
filter->fmt_out.video.i_frame_rate *= 2;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
diff --git a/modules/hw/vdpau/sharpen.c b/modules/hw/vdpau/sharpen.c
index 32977127f57..806461fc01f 100644
--- a/modules/hw/vdpau/sharpen.c
+++ b/modules/hw/vdpau/sharpen.c
@@ -125,7 +125,7 @@ static int Open(vlc_object_t *obj)
if (unlikely(sys == NULL))
return VLC_ENOMEM;
- filter->pf_video_filter_into = Sharpen;
+ filter->pf_video_filter = Sharpen;
filter->p_sys = sys;
config_ChainParse(filter, "sharpen-", options, filter->p_cfg);
diff --git a/modules/spu/audiobargraph_v.c b/modules/spu/audiobargraph_v.c
index ea064ecd53d..9620a36dcb6 100644
--- a/modules/spu/audiobargraph_v.c
+++ b/modules/spu/audiobargraph_v.c
@@ -560,7 +560,7 @@ static int OpenCommon(vlc_object_t *p_this, bool b_sub)
if (b_sub)
p_filter->pf_sub_source = FilterSub;
else
- p_filter->pf_video_filter_into = FilterVideo;
+ p_filter->pf_video_filter = FilterVideo;
return VLC_SUCCESS;
}
diff --git a/modules/spu/logo.c b/modules/spu/logo.c
index fed371316c3..5f5ae9a118e 100644
--- a/modules/spu/logo.c
+++ b/modules/spu/logo.c
@@ -298,7 +298,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
}
else
{
- p_filter->pf_video_filter_into = FilterVideo;
+ p_filter->pf_video_filter = FilterVideo;
p_filter->pf_video_mouse = Mouse;
}
diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 98ec539e461..51d5dba902e 100644
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -213,7 +213,7 @@ static int Activate( filter_t *p_filter, int (*pf_build)(filter_t *) )
}
assert(p_filter->vctx_out == filter_chain_GetVideoCtxOut( p_sys->p_chain ));
/* */
- p_filter->pf_video_filter_into = Chain;
+ p_filter->pf_video_filter = Chain;
return VLC_SUCCESS;
}
diff --git a/modules/video_chroma/cvpx.c b/modules/video_chroma/cvpx.c
index 8735215b450..05f8ff16acf 100644
--- a/modules/video_chroma/cvpx.c
+++ b/modules/video_chroma/cvpx.c
@@ -257,9 +257,9 @@ static int Open(vlc_object_t *obj)
case VLC_CODEC_CVPX_##x: \
sw_fmt = p_filter->fmt_out.video; \
if (p_filter->fmt_out.video.i_chroma == VLC_CODEC_##x) \
- p_filter->pf_video_filter_into = CVPX_TO_SW_Filter; \
+ p_filter->pf_video_filter = CVPX_TO_SW_Filter; \
else if (i420_fcc != 0 && p_filter->fmt_out.video.i_chroma == i420_fcc) { \
- p_filter->pf_video_filter_into = CVPX_TO_SW_Filter; \
+ p_filter->pf_video_filter = CVPX_TO_SW_Filter; \
sw_fmt.i_chroma = VLC_CODEC_##x; \
} else return VLC_EGENERIC; \
@@ -267,10 +267,10 @@ static int Open(vlc_object_t *obj)
case VLC_CODEC_CVPX_##x: \
sw_fmt = p_filter->fmt_in.video; \
if (p_filter->fmt_in.video.i_chroma == VLC_CODEC_##x) { \
- p_filter->pf_video_filter_into = SW_TO_CVPX_Filter; \
+ p_filter->pf_video_filter = SW_TO_CVPX_Filter; \
} \
else if (i420_fcc != 0 && p_filter->fmt_in.video.i_chroma == i420_fcc) { \
- p_filter->pf_video_filter_into = SW_TO_CVPX_Filter; \
+ p_filter->pf_video_filter = SW_TO_CVPX_Filter; \
sw_fmt.i_chroma = VLC_CODEC_##x; \
} else return VLC_EGENERIC; \
b_need_pool = true;
@@ -474,7 +474,7 @@ Open_CVPX_to_CVPX(vlc_object_t *obj)
}
filter->p_sys = p_sys;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
filter->vctx_out = vlc_video_context_Hold(filter->vctx_in);
filter->fmt_out.i_codec = filter->fmt_out.video.i_chroma;
return VLC_SUCCESS;
@@ -651,7 +651,7 @@ Open_chain_CVPX(vlc_object_t *obj)
filter->vctx_out = vctx_out;
filter->p_sys = chain;
filter->pf_flush = chain_CVPX_Flush;
- filter->pf_video_filter_into = chain_CVPX_Filter;
+ filter->pf_video_filter = chain_CVPX_Filter;
/* Display the current conversion chain in the logs. */
msg_Dbg(filter, "CVPX conversion chain:");
diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index b3bdae92b2c..1da6f65d284 100644
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -82,10 +82,10 @@ static int Activate( vlc_object_t *p_this )
switch( p_filter->fmt_out.video.i_chroma )
{
case VLC_CODEC_I420:
- p_filter->pf_video_filter_into = GREY_I420_Filter;
+ p_filter->pf_video_filter = GREY_I420_Filter;
break;
case VLC_CODEC_YUYV:
- p_filter->pf_video_filter_into = GREY_YUY2_Filter;
+ p_filter->pf_video_filter = GREY_YUY2_Filter;
break;
default:
return -1;
diff --git a/modules/video_chroma/i420_nv12.c b/modules/video_chroma/i420_nv12.c
index b0e599f9d1a..9338dc6ab81 100644
--- a/modules/video_chroma/i420_nv12.c
+++ b/modules/video_chroma/i420_nv12.c
@@ -168,23 +168,23 @@ static int Create( vlc_object_t *p_this )
case VLC_CODEC_J420:
if( outfcc != VLC_CODEC_NV12 )
return -1;
- p_filter->pf_video_filter_into = I420_NV12_Filter;
+ p_filter->pf_video_filter = I420_NV12_Filter;
break;
case VLC_CODEC_YV12:
if( outfcc != VLC_CODEC_NV12 )
return -1;
- p_filter->pf_video_filter_into = YV12_NV12_Filter;
+ p_filter->pf_video_filter = YV12_NV12_Filter;
break;
case VLC_CODEC_NV12:
switch( outfcc )
{
case VLC_CODEC_I420:
case VLC_CODEC_J420:
- p_filter->pf_video_filter_into = NV12_I420_Filter;
+ p_filter->pf_video_filter = NV12_I420_Filter;
break;
case VLC_CODEC_YV12:
- p_filter->pf_video_filter_into = NV12_YV12_Filter;
+ p_filter->pf_video_filter = NV12_YV12_Filter;
break;
default:
return -1;
@@ -195,14 +195,14 @@ static int Create( vlc_object_t *p_this )
if( outfcc != VLC_CODEC_P010 )
return -1;
pixel_bytes = 2;
- p_filter->pf_video_filter_into = I42010B_P010_Filter;
+ p_filter->pf_video_filter = I42010B_P010_Filter;
break;
case VLC_CODEC_P010:
if( outfcc != VLC_CODEC_I420_10L )
return -1;
pixel_bytes = 2;
- p_filter->pf_video_filter_into = P010_I42010B_Filter;
+ p_filter->pf_video_filter = P010_I42010B_Filter;
break;
default:
diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 79ea309ba5a..950b8248c62 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -130,7 +130,7 @@ static int Activate( vlc_object_t *p_this )
{
/* R5G5B6 pixel format */
msg_Dbg(p_this, "RGB pixel format is R5G5B5");
- p_filter->pf_video_filter_into = I420_R5G5B5_Filter;
+ p_filter->pf_video_filter = I420_R5G5B5_Filter;
}
else if( ( p_filter->fmt_out.video.i_rmask == 0xf800
&& p_filter->fmt_out.video.i_gmask == 0x07e0
@@ -138,7 +138,7 @@ static int Activate( vlc_object_t *p_this )
{
/* R5G6B5 pixel format */
msg_Dbg(p_this, "RGB pixel format is R5G6B5");
- p_filter->pf_video_filter_into = I420_R5G6B5_Filter;
+ p_filter->pf_video_filter = I420_R5G6B5_Filter;
}
else
return VLC_EGENERIC;
@@ -151,7 +151,7 @@ static int Activate( vlc_object_t *p_this )
{
/* A8R8G8B8 pixel format */
msg_Dbg(p_this, "RGB pixel format is A8R8G8B8");
- p_filter->pf_video_filter_into = I420_A8R8G8B8_Filter;
+ p_filter->pf_video_filter = I420_A8R8G8B8_Filter;
}
else if( p_filter->fmt_out.video.i_rmask == 0xff000000
&& p_filter->fmt_out.video.i_gmask == 0x00ff0000
@@ -159,7 +159,7 @@ static int Activate( vlc_object_t *p_this )
{
/* R8G8B8A8 pixel format */
msg_Dbg(p_this, "RGB pixel format is R8G8B8A8");
- p_filter->pf_video_filter_into = I420_R8G8B8A8_Filter;
+ p_filter->pf_video_filter = I420_R8G8B8A8_Filter;
}
else if( p_filter->fmt_out.video.i_rmask == 0x0000ff00
&& p_filter->fmt_out.video.i_gmask == 0x00ff0000
@@ -167,7 +167,7 @@ static int Activate( vlc_object_t *p_this )
{
/* B8G8R8A8 pixel format */
msg_Dbg(p_this, "RGB pixel format is B8G8R8A8");
- p_filter->pf_video_filter_into = I420_B8G8R8A8_Filter;
+ p_filter->pf_video_filter = I420_B8G8R8A8_Filter;
}
else if( p_filter->fmt_out.video.i_rmask == 0x000000ff
&& p_filter->fmt_out.video.i_gmask == 0x0000ff00
@@ -175,21 +175,21 @@ static int Activate( vlc_object_t *p_this )
{
/* A8B8G8R8 pixel format */
msg_Dbg(p_this, "RGB pixel format is A8B8G8R8");
- p_filter->pf_video_filter_into = I420_A8B8G8R8_Filter;
+ p_filter->pf_video_filter = I420_A8B8G8R8_Filter;
}
else
return VLC_EGENERIC;
break;
#else
case VLC_CODEC_RGB8:
- p_filter->pf_video_filter_into = I420_RGB8_Filter;
+ p_filter->pf_video_filter = I420_RGB8_Filter;
break;
case VLC_CODEC_RGB15:
case VLC_CODEC_RGB16:
- p_filter->pf_video_filter_into = I420_RGB16_Filter;
+ p_filter->pf_video_filter = I420_RGB16_Filter;
break;
case VLC_CODEC_RGB32:
- p_filter->pf_video_filter_into = I420_RGB32_Filter;
+ p_filter->pf_video_filter = I420_RGB32_Filter;
break;
#endif
default:
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 5c7a4426e00..d0415070666 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -136,25 +136,25 @@ static int Activate( vlc_object_t *p_this )
switch( p_filter->fmt_out.video.i_chroma )
{
case VLC_CODEC_YUYV:
- p_filter->pf_video_filter_into = I420_YUY2_Filter;
+ p_filter->pf_video_filter = I420_YUY2_Filter;
break;
case VLC_CODEC_YVYU:
- p_filter->pf_video_filter_into = I420_YVYU_Filter;
+ p_filter->pf_video_filter = I420_YVYU_Filter;
break;
case VLC_CODEC_UYVY:
- p_filter->pf_video_filter_into = I420_UYVY_Filter;
+ p_filter->pf_video_filter = I420_UYVY_Filter;
break;
#if !defined (MODULE_NAME_IS_i420_yuy2_altivec)
case VLC_FOURCC('I','U','Y','V'):
- p_filter->pf_video_filter_into = I420_IUYV_Filter;
+ p_filter->pf_video_filter = I420_IUYV_Filter;
break;
#endif
#if defined (MODULE_NAME_IS_i420_yuy2)
case VLC_CODEC_Y211:
- p_filter->pf_video_filter_into = I420_Y211_Filter;
+ p_filter->pf_video_filter = I420_Y211_Filter;
break;
#endif
diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index 7a87ad16b40..dee82d406f0 100644
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -87,15 +87,15 @@ static int Activate( vlc_object_t *p_this )
{
case VLC_CODEC_I420:
case VLC_CODEC_J420:
- p_filter->pf_video_filter_into = I422_I420_Filter;
+ p_filter->pf_video_filter = I422_I420_Filter;
break;
case VLC_CODEC_YV12:
- p_filter->pf_video_filter_into = I422_YV12_Filter;
+ p_filter->pf_video_filter = I422_YV12_Filter;
break;
case VLC_CODEC_YUV420A:
- p_filter->pf_video_filter_into = I422_YUVA_Filter;
+ p_filter->pf_video_filter = I422_YUVA_Filter;
break;
default:
diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index db95d3d7387..415e21eefd0 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -116,24 +116,24 @@ static int Activate( vlc_object_t *p_this )
switch( p_filter->fmt_out.video.i_chroma )
{
case VLC_CODEC_YUYV:
- p_filter->pf_video_filter_into = I422_YUY2_Filter;
+ p_filter->pf_video_filter = I422_YUY2_Filter;
break;
case VLC_CODEC_YVYU:
- p_filter->pf_video_filter_into = I422_YVYU_Filter;
+ p_filter->pf_video_filter = I422_YVYU_Filter;
break;
case VLC_CODEC_UYVY:
- p_filter->pf_video_filter_into = I422_UYVY_Filter;
+ p_filter->pf_video_filter = I422_UYVY_Filter;
break;
case VLC_FOURCC('I','U','Y','V'):
- p_filter->pf_video_filter_into = I422_IUYV_Filter;
+ p_filter->pf_video_filter = I422_IUYV_Filter;
break;
#if defined (MODULE_NAME_IS_i422_yuy2)
case VLC_CODEC_Y211:
- p_filter->pf_video_filter_into = I422_Y211_Filter;
+ p_filter->pf_video_filter = I422_Y211_Filter;
break;
#endif
diff --git a/modules/video_chroma/omxdl.c b/modules/video_chroma/omxdl.c
index 9a2ef7b7bb2..290300c623d 100644
--- a/modules/video_chroma/omxdl.c
+++ b/modules/video_chroma/omxdl.c
@@ -265,7 +265,7 @@ static int Open (vlc_object_t *obj)
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = I420_RV16_Filter;
+ filter->pf_video_filter = I420_RV16_Filter;
return VLC_SUCCESS;
}
break;
@@ -276,7 +276,7 @@ static int Open (vlc_object_t *obj)
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = YV12_RV16_Filter;
+ filter->pf_video_filter = YV12_RV16_Filter;
return VLC_SUCCESS;
}
break;
@@ -285,10 +285,10 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = I422_I420_Filter;
+ filter->pf_video_filter = I422_I420_Filter;
return VLC_SUCCESS;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = I422_YV12_Filter;
+ filter->pf_video_filter = I422_YV12_Filter;
return VLC_SUCCESS;
}
break;
@@ -299,7 +299,7 @@ static int Open (vlc_object_t *obj)
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = I444_RV16_Filter;
+ filter->pf_video_filter = I444_RV16_Filter;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
@@ -310,12 +310,12 @@ static int Open (vlc_object_t *obj)
case VLC_CODEC_RGB24:
if (FixRV24 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = YUYV_RV24_Filter;
+ filter->pf_video_filter = YUYV_RV24_Filter;
return VLC_SUCCESS;
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = YUYV_RV16_Filter;
+ filter->pf_video_filter = YUYV_RV16_Filter;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
@@ -324,10 +324,10 @@ static int Open (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = UYVY_I420_Filter;
+ filter->pf_video_filter = UYVY_I420_Filter;
return VLC_SUCCESS;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = UYVY_YV12_Filter;
+ filter->pf_video_filter = UYVY_YV12_Filter;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
@@ -484,33 +484,33 @@ static int OpenScaler (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = I420_I420_Scale_Filter;
+ filter->pf_video_filter = I420_I420_Scale_Filter;
return VLC_SUCCESS;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = I420_YV12_Scale_Filter;
+ filter->pf_video_filter = I420_YV12_Scale_Filter;
return VLC_SUCCESS;
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
return VLC_EGENERIC;
- filter->pf_video_filter_into = I420_RGB_Scale_Filter;
+ filter->pf_video_filter = I420_RGB_Scale_Filter;
*conv = OMX_IP_BGR565;
return VLC_SUCCESS;
case VLC_CODEC_RGB15:
if (FixRV15 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I420_RGB_Scale_Filter;
+ filter->pf_video_filter = I420_RGB_Scale_Filter;
*conv = OMX_IP_BGR555;
return VLC_SUCCESS;
case VLC_CODEC_RGB12:
if (FixRV12 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I420_RGB_Scale_Filter;
+ filter->pf_video_filter = I420_RGB_Scale_Filter;
*conv = OMX_IP_BGR444;
return VLC_SUCCESS;
case VLC_CODEC_RGB24:
if (FixRV24 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I420_RGB_Scale_Filter;
+ filter->pf_video_filter = I420_RGB_Scale_Filter;
*conv = OMX_IP_BGR888;
return VLC_SUCCESS;
}
@@ -520,33 +520,33 @@ static int OpenScaler (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I420:
- filter->pf_video_filter_into = YV12_I420_Scale_Filter;
+ filter->pf_video_filter = YV12_I420_Scale_Filter;
return VLC_SUCCESS;
case VLC_CODEC_YV12:
- filter->pf_video_filter_into = YV12_YV12_Scale_Filter;
+ filter->pf_video_filter = YV12_YV12_Scale_Filter;
return VLC_SUCCESS;
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = YV12_RGB_Scale_Filter;
+ filter->pf_video_filter = YV12_RGB_Scale_Filter;
*conv = OMX_IP_BGR565;
return VLC_SUCCESS;
case VLC_CODEC_RGB15:
if (FixRV15 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = YV12_RGB_Scale_Filter;
+ filter->pf_video_filter = YV12_RGB_Scale_Filter;
*conv = OMX_IP_BGR555;
return VLC_SUCCESS;
case VLC_CODEC_RGB12:
if (FixRV12 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = YV12_RGB_Scale_Filter;
+ filter->pf_video_filter = YV12_RGB_Scale_Filter;
*conv = OMX_IP_BGR444;
return VLC_SUCCESS;
case VLC_CODEC_RGB24:
if (FixRV24 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = YV12_RGB_Scale_Filter;
+ filter->pf_video_filter = YV12_RGB_Scale_Filter;
*conv = OMX_IP_BGR888;
return VLC_SUCCESS;
}
@@ -556,30 +556,30 @@ static int OpenScaler (vlc_object_t *obj)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_I422:
- filter->pf_video_filter_into = I422_I422_Scale_Filter;
+ filter->pf_video_filter = I422_I422_Scale_Filter;
return VLC_SUCCESS;
case VLC_CODEC_RGB16:
if (FixRV16 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I422_RGB_Scale_Filter;
+ filter->pf_video_filter = I422_RGB_Scale_Filter;
*conv = OMX_IP_BGR565;
return VLC_SUCCESS;
case VLC_CODEC_RGB15:
if (FixRV15 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I422_RGB_Scale_Filter;
+ filter->pf_video_filter = I422_RGB_Scale_Filter;
*conv = OMX_IP_BGR555;
return VLC_SUCCESS;
case VLC_CODEC_RGB12:
if (FixRV12 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I422_RGB_Scale_Filter;
+ filter->pf_video_filter = I422_RGB_Scale_Filter;
*conv = OMX_IP_BGR444;
return VLC_SUCCESS;
case VLC_CODEC_RGB24:
if (FixRV24 (&filter->fmt_out.video))
break;
- filter->pf_video_filter_into = I422_RGB_Scale_Filter;
+ filter->pf_video_filter = I422_RGB_Scale_Filter;
*conv = OMX_IP_BGR888;
return VLC_SUCCESS;
}
diff --git a/modules/video_chroma/rv32.c b/modules/video_chroma/rv32.c
index c9b62190cd8..9875eed9905 100644
--- a/modules/video_chroma/rv32.c
+++ b/modules/video_chroma/rv32.c
@@ -68,7 +68,7 @@ static int OpenFilter( vlc_object_t *p_this )
|| p_filter->fmt_in.video.orientation != p_filter->fmt_out.video.orientation)
return -1;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index d4492d57d2e..47e44348e79 100644
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -193,7 +193,7 @@ static int OpenScaler( vlc_object_t *p_this )
}
/* */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
msg_Dbg( p_filter, "%ix%i (%ix%i) chroma: %4.4s -> %ix%i (%ix%i) chroma: %4.4s with scaling using %s",
p_filter->fmt_in.video.i_visible_width, p_filter->fmt_in.video.i_visible_height,
diff --git a/modules/video_chroma/yuvp.c b/modules/video_chroma/yuvp.c
index 84c1c623617..641ce9e11e3 100644
--- a/modules/video_chroma/yuvp.c
+++ b/modules/video_chroma/yuvp.c
@@ -77,7 +77,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
- p_filter->pf_video_filter_into = Convert_Filter;
+ p_filter->pf_video_filter = Convert_Filter;
msg_Dbg( p_filter, "YUVP to %4.4s converter",
(const char*)&p_filter->fmt_out.video.i_chroma );
diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index 2ef349aafd2..0e538415bc6 100644
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -84,15 +84,15 @@ static int Activate( vlc_object_t *p_this )
switch( p_filter->fmt_in.video.i_chroma )
{
case VLC_CODEC_YUYV:
- p_filter->pf_video_filter_into = YUY2_I420_Filter;
+ p_filter->pf_video_filter = YUY2_I420_Filter;
break;
case VLC_CODEC_YVYU:
- p_filter->pf_video_filter_into = YVYU_I420_Filter;
+ p_filter->pf_video_filter = YVYU_I420_Filter;
break;
case VLC_CODEC_UYVY:
- p_filter->pf_video_filter_into = UYVY_I420_Filter;
+ p_filter->pf_video_filter = UYVY_I420_Filter;
break;
default:
diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index 623ee262f62..e3d078f2805 100644
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -84,15 +84,15 @@ static int Activate( vlc_object_t *p_this )
switch( p_filter->fmt_in.video.i_chroma )
{
case VLC_CODEC_YUYV:
- p_filter->pf_video_filter_into = YUY2_I422_Filter;
+ p_filter->pf_video_filter = YUY2_I422_Filter;
break;
case VLC_CODEC_YVYU:
- p_filter->pf_video_filter_into = YVYU_I422_Filter;
+ p_filter->pf_video_filter = YVYU_I422_Filter;
break;
case VLC_CODEC_UYVY:
- p_filter->pf_video_filter_into = UYVY_I422_Filter;
+ p_filter->pf_video_filter = UYVY_I422_Filter;
break;
default:
diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index e01f55efeb6..1d9361a1e23 100644
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -166,7 +166,7 @@ static int Create( vlc_object_t *p_this )
{
CASE_PLANAR_YUV
/* Planar YUV */
- p_filter->pf_video_filter_into = FilterPlanar;
+ p_filter->pf_video_filter = FilterPlanar;
p_sys->pf_process_sat_hue_clip = planar_sat_hue_clip_C;
p_sys->pf_process_sat_hue = planar_sat_hue_C;
break;
@@ -174,14 +174,14 @@ static int Create( vlc_object_t *p_this )
CASE_PLANAR_YUV10
CASE_PLANAR_YUV9
/* Planar YUV 9-bit or 10-bit */
- p_filter->pf_video_filter_into = FilterPlanar;
+ p_filter->pf_video_filter = FilterPlanar;
p_sys->pf_process_sat_hue_clip = planar_sat_hue_clip_C_16;
p_sys->pf_process_sat_hue = planar_sat_hue_C_16;
break;
CASE_PACKED_YUV_422
/* Packed YUV 4:2:2 */
- p_filter->pf_video_filter_into = FilterPacked;
+ p_filter->pf_video_filter = FilterPacked;
p_sys->pf_process_sat_hue_clip = packed_sat_hue_clip_C;
p_sys->pf_process_sat_hue = packed_sat_hue_C;
break;
diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 6ef18d17fc0..ef44d4dc22c 100644
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -122,7 +122,7 @@ static int Create( vlc_object_t *p_this )
vlc_mutex_init( &p_sys->mask_lock );
var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
p_filter );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/anaglyph.c b/modules/video_filter/anaglyph.c
index e460a9e2f6d..6f73b26bc88 100644
--- a/modules/video_filter/anaglyph.c
+++ b/modules/video_filter/anaglyph.c
@@ -156,7 +156,7 @@ static int Create(vlc_object_t *p_this)
break;
}
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/antiflicker.c b/modules/video_filter/antiflicker.c
index 107e2bdcfc4..5f6196b8d27 100644
--- a/modules/video_filter/antiflicker.c
+++ b/modules/video_filter/antiflicker.c
@@ -121,7 +121,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
/* Initialize the arguments */
atomic_init( &p_sys->i_window_size,
diff --git a/modules/video_filter/ball.c b/modules/video_filter/ball.c
index 4885ca8080c..8d440e6735f 100644
--- a/modules/video_filter/ball.c
+++ b/modules/video_filter/ball.c
@@ -261,7 +261,7 @@ static int Create( vlc_object_t *p_this )
if( p_sys->p_image == NULL )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index e2f35691666..f5d2c4fc508 100644
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -162,7 +162,7 @@ static int Create( vlc_object_t *p_this )
p_sys = p_filter->p_sys;
p_sys->b_done = false;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
/* needed to get options passed in transcode using the
* adjust{name=value} syntax */
diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 15a40338295..c3eae670329 100644
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -143,7 +143,7 @@ static int Create( vlc_object_t *p_this )
p_sys->p_at = NULL;
#undef GET_VAR
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index 1fa135a86f7..8655c7ffeeb 100644
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -373,7 +373,7 @@ static int Activate( vlc_object_t *p_this )
i_canvas_width, i_canvas_height );
}
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/ci_filters.m b/modules/video_filter/ci_filters.m
index ede6b0241ec..ccf9fe38374 100644
--- a/modules/video_filter/ci_filters.m
+++ b/modules/video_filter/ci_filters.m
@@ -677,7 +677,7 @@ Open(vlc_object_t *obj, char const *psz_filter)
p_sys->psz_filter = psz_filter;
p_sys->ctx = ctx;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
filter->pf_video_mouse = Mouse;
return VLC_SUCCESS;
diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index c884e65d08d..07b92741fe1 100644
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -115,11 +115,11 @@ static int Create( vlc_object_t *p_this )
switch( p_filter->fmt_in.video.i_chroma )
{
CASE_PLANAR_YUV
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
break;
CASE_PACKED_YUV_422
- p_filter->pf_video_filter_into = FilterPacked;
+ p_filter->pf_video_filter = FilterPacked;
break;
default:
diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index 161abb06678..7231f8a9e43 100644
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -185,7 +185,7 @@ static int OpenFilter( vlc_object_t *p_this )
- p_sys->i_cropleft - p_sys->i_cropright
+ p_sys->i_paddleft + p_sys->i_paddright;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
msg_Dbg( p_filter, "Crop: Top: %d, Bottom: %d, Left: %d, Right: %d",
p_sys->i_croptop, p_sys->i_cropbottom, p_sys->i_cropleft,
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 885c9cb0c3a..f850d68aeaa 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -53,7 +53,7 @@
/**
* Top-level filtering method.
*
- * Open() sets this up as the processing method (pf_video_filter_into)
+ * Open() sets this up as the processing method (pf_video_filter)
* in the filter structure.
*
* Note that there is no guarantee that the returned picture directly
@@ -643,7 +643,7 @@ notsupp:
}
p_filter->fmt_out.video = fmt;
p_filter->fmt_out.i_codec = fmt.i_chroma;
- p_filter->pf_video_filter_into = Deinterlace;
+ p_filter->pf_video_filter = Deinterlace;
p_filter->pf_flush = Flush;
p_filter->pf_video_mouse = Mouse;
diff --git a/modules/video_filter/edgedetection.c b/modules/video_filter/edgedetection.c
index 436cead6f0a..091e30116ac 100644
--- a/modules/video_filter/edgedetection.c
+++ b/modules/video_filter/edgedetection.c
@@ -123,7 +123,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
/* Set callback function */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_filter->p_sys = sys;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index f585c1b164a..174c18044ee 100644
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -153,7 +153,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
p_sys = p_filter->p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index 873982f410e..61891ddbd6a 100644
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -142,7 +142,7 @@ static int Create( vlc_object_t *p_this )
var_AddCallback( p_filter, FILTER_PREFIX "component",
ExtractCallback, p_sys );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/fps.c b/modules/video_filter/fps.c
index 788838f32eb..05b72bd48ff 100644
--- a/modules/video_filter/fps.c
+++ b/modules/video_filter/fps.c
@@ -177,7 +177,7 @@ static int Open( vlc_object_t *p_this)
p_sys->p_previous_pic = NULL;
- p_filter->pf_video_filter_into = FilterPush;
+ p_filter->pf_video_filter = FilterPush;
/* We don't change neither the format nor the picture */
if ( p_filter->vctx_in )
diff --git a/modules/video_filter/freeze.c b/modules/video_filter/freeze.c
index 6d36734bef5..c880ec5681d 100644
--- a/modules/video_filter/freeze.c
+++ b/modules/video_filter/freeze.c
@@ -121,7 +121,7 @@ static int Open( vlc_object_t *p_this )
/* init data */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_filter->pf_video_mouse = freeze_mouse;
return VLC_SUCCESS;
diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index 731c02a01ff..7c03b5eb0a0 100644
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -155,7 +155,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->f_sigma =
var_CreateGetFloat( p_filter, FILTER_PREFIX "sigma" );
diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index cab9dfef77c..277abbf4ffd 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -158,7 +158,7 @@ static int Open(vlc_object_t *object)
cfg->filter_line = filter_line_c;
filter->p_sys = sys;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index b08b4022188..a86c8678ebc 100644
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -151,7 +151,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->p_pre_hough = NULL;
diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index ef4d4a4c054..b342f56ee2c 100644
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -419,7 +419,7 @@ static int Open(vlc_object_t *object)
var_AddCallback(filter, CFG_PREFIX "variance", Callback, NULL);
filter->p_sys = sys;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/hqdn3d.c b/modules/video_filter/hqdn3d.c
index 912e105b438..77571e4588e 100644
--- a/modules/video_filter/hqdn3d.c
+++ b/modules/video_filter/hqdn3d.c
@@ -155,7 +155,7 @@ static int Open(vlc_object_t *this)
sys->chroma_temp = var_CreateGetFloatCommand(filter, FILTER_PREFIX "chroma-temp");
filter->p_sys = sys;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
var_AddCallback( filter, FILTER_PREFIX "luma-spat", DenoiseCallback, sys );
var_AddCallback( filter, FILTER_PREFIX "chroma-spat", DenoiseCallback, sys );
diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index 7be53820e61..0892f480d18 100644
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -76,7 +76,7 @@ static int Create( vlc_object_t *p_this )
|| p_chroma->pixel_size * 8 != p_chroma->pixel_bits )
return VLC_EGENERIC;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index e7c4ba3cd55..ed45f2ddd6c 100644
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -129,7 +129,7 @@ static int Create( vlc_object_t *p_this )
p_sys->i_hide_timeout = VLC_TICK_FROM_MS( var_InheritInteger( p_filter, "mouse-hide-timeout" ) );
/* */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_filter->pf_video_mouse = Mouse;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/mirror.c b/modules/video_filter/mirror.c
index 07f6872571d..03ad045dc4b 100644
--- a/modules/video_filter/mirror.c
+++ b/modules/video_filter/mirror.c
@@ -155,7 +155,7 @@ static int Create( vlc_object_t *p_this )
var_AddCallback( p_filter, CFG_PREFIX "split", FilterCallback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "direction", FilterCallback, p_sys );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index cd184441c74..fb307b5f5d3 100644
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -113,7 +113,7 @@ static int Create( vlc_object_t *p_this )
}
p_sys->b_first = true;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index ffb50082460..d8b24aa8727 100644
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -106,7 +106,7 @@ static int Create( vlc_object_t *p_this )
(char*)&(p_fmt->i_chroma) );
return VLC_EGENERIC;
}
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
diff --git a/modules/video_filter/oldmovie.c b/modules/video_filter/oldmovie.c
index de5c782e585..6def4a00cfb 100644
--- a/modules/video_filter/oldmovie.c
+++ b/modules/video_filter/oldmovie.c
@@ -216,7 +216,7 @@ static int Open( vlc_object_t *p_this ) {
return VLC_ENOMEM;
/* init data */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->i_start_time = p_sys->i_cur_time = p_sys->i_last_time = vlc_tick_now();
return VLC_SUCCESS;
diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 81c2e9c6e00..4e20026aa11 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -108,7 +108,7 @@ static int OpenFilter( vlc_object_t *p_this )
p_sys->event_info.p_region = NULL;
p_sys->i_id = 0;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
//create the VIDEO_FILTER_EVENT_VARIABLE
vlc_value_t val;
diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index b38ae205a04..fd87de8051b 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -250,7 +250,7 @@ static int Create( vlc_object_t *p_this )
#endif
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/posterize.c b/modules/video_filter/posterize.c
index 01f70c82229..15845b84a4a 100644
--- a/modules/video_filter/posterize.c
+++ b/modules/video_filter/posterize.c
@@ -134,7 +134,7 @@ static int Create( vlc_object_t *p_this )
var_AddCallback( p_filter, CFG_PREFIX "level", FilterCallback, p_sys );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 02820610415..bb5cb682e3c 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -252,7 +252,7 @@ static int OpenPostproc( vlc_object_t *p_this )
var_AddCallback( p_filter, FILTER_PREFIX "q", PPQCallback, NULL );
var_AddCallback( p_filter, FILTER_PREFIX "name", PPNameCallback, NULL );
- p_filter->pf_video_filter_into = PostprocPict;
+ p_filter->pf_video_filter = PostprocPict;
msg_Warn( p_filter, "Quantification table was not set by video decoder. "
"Postprocessing won't look good." );
diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index cbfdea7b46d..f2d02c06758 100644
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -96,7 +96,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->x = 10;
p_sys->y = 10;
diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 5a65e7f0a45..b4a699c69a0 100644
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -202,7 +202,7 @@ static int Open( vlc_object_t *p_this )
var_AddCallback( p_filter, CFG_PREFIX "rotation", puzzle_Callback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "mode", puzzle_Callback, p_sys );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_filter->pf_video_mouse = puzzle_mouse;
return VLC_SUCCESS;
diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 1c0236d860f..85e6cae8f7e 100644
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -90,7 +90,7 @@ static int Create( vlc_object_t *p_this )
if( p_sys == NULL )
return VLC_ENOMEM;
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->f_angle = 0.0;
p_sys->last_date = 0;
diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index ded2a152a71..6be4a4455eb 100644
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -135,11 +135,11 @@ static int Create( vlc_object_t *p_this )
switch( p_filter->fmt_in.video.i_chroma )
{
CASE_PLANAR_YUV
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
break;
CASE_PACKED_YUV_422
- p_filter->pf_video_filter_into = FilterPacked;
+ p_filter->pf_video_filter = FilterPacked;
break;
default:
diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index f601ae5cb7d..5649bd4f3bb 100644
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -75,7 +75,7 @@ static int OpenFilter( vlc_object_t *p_this )
#warning Converter cannot (really) change output format.
video_format_ScaleCropAr( &p_filter->fmt_out.video, &p_filter->fmt_in.video );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
msg_Dbg( p_filter, "%ix%i -> %ix%i", p_filter->fmt_in.video.i_width,
p_filter->fmt_in.video.i_height, p_filter->fmt_out.video.i_width,
diff --git a/modules/video_filter/scene.c b/modules/video_filter/scene.c
index 1e733444fe3..69ef6d22d74 100644
--- a/modules/video_filter/scene.c
+++ b/modules/video_filter/scene.c
@@ -147,7 +147,7 @@ typedef struct
} filter_sys_t;
/*****************************************************************************
- * Create: initialize and set pf_video_filter_into()
+ * Create: initialize and set pf_video_filter()
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
@@ -196,7 +196,7 @@ static int Create( vlc_object_t *p_this )
if( p_sys->psz_path == NULL )
p_sys->psz_path = config_GetUserDir( VLC_PICTURES_DIR );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/sepia.c b/modules/video_filter/sepia.c
index 4489c5f5af0..f7664782b14 100644
--- a/modules/video_filter/sepia.c
+++ b/modules/video_filter/sepia.c
@@ -143,7 +143,7 @@ static int Create( vlc_object_t *p_this )
var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "intensity" ) );
var_AddCallback( p_filter, CFG_PREFIX "intensity", FilterCallback, NULL );
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
return VLC_SUCCESS;
}
diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 9d49f4f5e4b..579efca3ebf 100644
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -118,7 +118,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
p_filter->p_sys = p_sys;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 14f1a53ab08..3fb40bf9f63 100644
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -432,7 +432,7 @@ static int Open(vlc_object_t *object)
}
filter->p_sys = sys;
- filter->pf_video_filter_into = Filter;
+ filter->pf_video_filter = Filter;
filter->pf_video_mouse = Mouse;
return VLC_SUCCESS;
error:
diff --git a/modules/video_filter/vhs.c b/modules/video_filter/vhs.c
index 68cf85f5ed3..621a361ae18 100644
--- a/modules/video_filter/vhs.c
+++ b/modules/video_filter/vhs.c
@@ -143,7 +143,7 @@ static int Open( vlc_object_t *p_this )
return VLC_ENOMEM;
/* init data */
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->i_start_time = p_sys->i_cur_time = p_sys->i_last_time = vlc_tick_now();
return VLC_SUCCESS;
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index c483cb3be33..8ef95f34db3 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -90,7 +90,7 @@ static int Create( vlc_object_t *p_this )
if( !p_sys )
return VLC_ENOMEM;
- p_filter->pf_video_filter_into = Filter;
+ p_filter->pf_video_filter = Filter;
p_sys->f_angle = 0.0;
p_sys->last_date = 0;
--
2.26.2
More information about the vlc-devel
mailing list