From c4bac881be8f7501bf446b93bfcb6d0c7ed97094 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 3 Aug 2023 08:53:15 +0200 Subject: [PATCH] test: use filter module callback helpers So the callback signature is matching what is expected. --- test/modules/stream_out/transcode.c | 9 +++------ test/src/input/decoder/input_decoder.c | 3 +-- test/src/misc/image.c | 3 +-- test/src/video_output/opengl.c | 3 +-- test/src/video_output/video_output.c | 12 ++++-------- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/test/modules/stream_out/transcode.c b/test/modules/stream_out/transcode.c index f9f8a14883..d0c2e2d2f0 100644 --- a/test/modules/stream_out/transcode.c +++ b/test/modules/stream_out/transcode.c @@ -373,16 +373,13 @@ vlc_module_begin() add_shortcut("output_checker") add_submodule() - set_callback(OpenDecoderDevice) - set_capability("decoder device", 0) + set_callback_dec_device(OpenDecoderDevice, 0) add_submodule() - set_callback(OpenFilter) - set_capability("video filter", 0) + set_callback_video_filter(OpenFilter) add_submodule() - set_callback(OpenConverter) - set_capability("video converter", INT_MAX) + set_callback_video_converter(OpenConverter, INT_MAX) add_submodule() set_callback(OpenEncoder) diff --git a/test/src/input/decoder/input_decoder.c b/test/src/input/decoder/input_decoder.c index 235f8227ab..cd7f3e5aa1 100644 --- a/test/src/input/decoder/input_decoder.c +++ b/test/src/input/decoder/input_decoder.c @@ -305,8 +305,7 @@ vlc_module_begin() add_submodule() - set_callback(OpenDecoderDevice) - set_capability("decoder device", 0) + set_callback_dec_device(OpenDecoderDevice, 0) add_submodule() set_callbacks(OpenDecoder, CloseDecoder) diff --git a/test/src/misc/image.c b/test/src/misc/image.c index 2fdfe63139..798f4dff00 100644 --- a/test/src/misc/image.c +++ b/test/src/misc/image.c @@ -129,8 +129,7 @@ vlc_module_begin() set_capability("image encoder", INT_MAX) add_submodule() - set_callback(OpenConverter) - set_capability("video converter", INT_MAX) + set_callback_video_converter(OpenConverter, INT_MAX) add_submodule() set_callback(OpenIntf) diff --git a/test/src/video_output/opengl.c b/test/src/video_output/opengl.c index 3bd25e5fcd..7229aa2766 100644 --- a/test/src/video_output/opengl.c +++ b/test/src/video_output/opengl.c @@ -177,8 +177,7 @@ OpenOpenGLESOffscreen(vlc_gl_t *gl, unsigned width, unsigned height, * - opengl offscreen for generating video context and using decoder device **/ vlc_module_begin() - set_callback(OpenDecoderDevice) - set_capability("decoder device", 1000) + set_callback_dec_device(OpenDecoderDevice, 1000) add_shortcut("test_offscreen") add_submodule() diff --git a/test/src/video_output/video_output.c b/test/src/video_output/video_output.c index 5e2d273513..972d158a37 100644 --- a/test/src/video_output/video_output.c +++ b/test/src/video_output/video_output.c @@ -254,24 +254,20 @@ vlc_module_begin() set_capability("video decoder", INT_MAX) add_submodule() - set_callback(OpenDecoderDevice) - set_capability("decoder device", 0) + set_callback_dec_device(OpenDecoderDevice, 0) add_submodule() - set_callback(OpenFilter) - set_capability("video filter", 0) + set_callback_video_filter(OpenFilter) add_submodule() - set_callback(OpenConverter) - set_capability("video converter", INT_MAX) + set_callback_video_converter(OpenConverter, INT_MAX) add_submodule() set_callback(OpenWindow) set_capability("vout window", INT_MAX) add_submodule() - set_callback(OpenDisplay) - set_capability("vout display", 0) + set_callback_display(OpenDisplay, 0) /* Interface module to avoid casting libvlc_instance_t to object */ add_submodule()