Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/opencl: Store format in filter, remove query function

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/369/head
Andreas Rheinhardt 3 years ago
parent 94047d6aa5
commit be8bc645b6
15 changed files with 19 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavfilter/opencl.c
  2. 5
      libavfilter/opencl.h
  3. 4
      libavfilter/vf_avgblur_opencl.c
  4. 2
      libavfilter/vf_colorkey_opencl.c
  5. 8
      libavfilter/vf_convolution_opencl.c
  6. 2
      libavfilter/vf_deshake_opencl.c
  7. 4
      libavfilter/vf_neighbor_opencl.c
  8. 2
      libavfilter/vf_nlmeans_opencl.c
  9. 2
      libavfilter/vf_overlay_opencl.c
  10. 2
      libavfilter/vf_pad_opencl.c
  11. 4
      libavfilter/vf_program_opencl.c
  12. 2
      libavfilter/vf_tonemap_opencl.c
  13. 2
      libavfilter/vf_transpose_opencl.c
  14. 2
      libavfilter/vf_unsharp_opencl.c
  15. 2
      libavfilter/vf_xfade_opencl.c

10
libavfilter/opencl.c
Unescape View File

@ -25,16 +25,6 @@
#include "formats.h"
#include "opencl.h"
int ff_opencl_filter_query_formats(AVFilterContext *avctx)
{
const static enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_OPENCL,
AV_PIX_FMT_NONE,
};
return ff_set_common_formats_from_list(avctx, pix_fmts);
}
static int opencl_filter_set_device(AVFilterContext *avctx,
AVBufferRef *device)
{

5
libavfilter/opencl.h
Unescape View File

@ -236,11 +236,6 @@ do {
*/
#define CL_CREATE_BUFFER(ctx, buffer_name, size) CL_CREATE_BUFFER_FLAGS(ctx, buffer_name, 0, size, NULL)
/**
* Return that all inputs and outputs support only AV_PIX_FMT_OPENCL.
*/
int ff_opencl_filter_query_formats(AVFilterContext *avctx);
/**
* Check that the input link contains a suitable hardware frames
* context and extract the device from it.

4
libavfilter/vf_avgblur_opencl.c
Unescape View File

@ -347,7 +347,7 @@ const AVFilter ff_vf_avgblur_opencl = {
.uninit = &avgblur_opencl_uninit,
FILTER_INPUTS(avgblur_opencl_inputs),
FILTER_OUTPUTS(avgblur_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -386,7 +386,7 @@ const AVFilter ff_vf_boxblur_opencl = {
.uninit = &avgblur_opencl_uninit,
FILTER_INPUTS(avgblur_opencl_inputs),
FILTER_OUTPUTS(avgblur_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_colorkey_opencl.c
Unescape View File

@ -237,6 +237,6 @@ const AVFilter ff_vf_colorkey_opencl = {
.uninit = &colorkey_opencl_uninit,
FILTER_INPUTS(colorkey_opencl_inputs),
FILTER_OUTPUTS(colorkey_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE
};

8
libavfilter/vf_convolution_opencl.c
Unescape View File

@ -369,7 +369,7 @@ const AVFilter ff_vf_convolution_opencl = {
.uninit = &convolution_opencl_uninit,
FILTER_INPUTS(convolution_opencl_inputs),
FILTER_OUTPUTS(convolution_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -395,7 +395,7 @@ const AVFilter ff_vf_sobel_opencl = {
.uninit = &convolution_opencl_uninit,
FILTER_INPUTS(convolution_opencl_inputs),
FILTER_OUTPUTS(convolution_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -421,7 +421,7 @@ const AVFilter ff_vf_prewitt_opencl = {
.uninit = &convolution_opencl_uninit,
FILTER_INPUTS(convolution_opencl_inputs),
FILTER_OUTPUTS(convolution_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -447,7 +447,7 @@ const AVFilter ff_vf_roberts_opencl = {
.uninit = &convolution_opencl_uninit,
FILTER_INPUTS(convolution_opencl_inputs),
FILTER_OUTPUTS(convolution_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_deshake_opencl.c
Unescape View File

@ -2195,6 +2195,6 @@ const AVFilter ff_vf_deshake_opencl = {
.activate = activate,
FILTER_INPUTS(deshake_opencl_inputs),
FILTER_OUTPUTS(deshake_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE
};

4
libavfilter/vf_neighbor_opencl.c
Unescape View File

@ -280,7 +280,7 @@ const AVFilter ff_vf_erosion_opencl = {
.uninit = &neighbor_opencl_uninit,
FILTER_INPUTS(neighbor_opencl_inputs),
FILTER_OUTPUTS(neighbor_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -306,9 +306,9 @@ const AVFilter ff_vf_dilation_opencl = {
.priv_class = &dilation_opencl_class,
.init = &ff_opencl_filter_init,
.uninit = &neighbor_opencl_uninit,
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_INPUTS(neighbor_opencl_inputs),
FILTER_OUTPUTS(neighbor_opencl_outputs),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_nlmeans_opencl.c
Unescape View File

@ -436,6 +436,6 @@ const AVFilter ff_vf_nlmeans_opencl = {
.uninit = &nlmeans_opencl_uninit,
FILTER_INPUTS(nlmeans_opencl_inputs),
FILTER_OUTPUTS(nlmeans_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_overlay_opencl.c
Unescape View File

@ -320,6 +320,6 @@ const AVFilter ff_vf_overlay_opencl = {
.activate = &overlay_opencl_activate,
FILTER_INPUTS(overlay_opencl_inputs),
FILTER_OUTPUTS(overlay_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_pad_opencl.c
Unescape View File

@ -390,6 +390,6 @@ const AVFilter ff_vf_pad_opencl = {
.uninit = &pad_opencl_uninit,
FILTER_INPUTS(pad_opencl_inputs),
FILTER_OUTPUTS(pad_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE
};

4
libavfilter/vf_program_opencl.c
Unescape View File

@ -367,7 +367,7 @@ const AVFilter ff_vf_program_opencl = {
.activate = &program_opencl_activate,
.inputs = NULL,
FILTER_OUTPUTS(program_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};
@ -417,7 +417,7 @@ const AVFilter ff_vsrc_openclsrc = {
.uninit = &program_opencl_uninit,
.inputs = NULL,
FILTER_OUTPUTS(openclsrc_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_tonemap_opencl.c
Unescape View File

@ -546,6 +546,6 @@ const AVFilter ff_vf_tonemap_opencl = {
.uninit = &tonemap_opencl_uninit,
FILTER_INPUTS(tonemap_opencl_inputs),
FILTER_OUTPUTS(tonemap_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_transpose_opencl.c
Unescape View File

@ -279,6 +279,6 @@ const AVFilter ff_vf_transpose_opencl = {
.uninit = &transpose_opencl_uninit,
FILTER_INPUTS(transpose_opencl_inputs),
FILTER_OUTPUTS(transpose_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_unsharp_opencl.c
Unescape View File

@ -405,6 +405,6 @@ const AVFilter ff_vf_unsharp_opencl = {
.uninit = &unsharp_opencl_uninit,
FILTER_INPUTS(unsharp_opencl_inputs),
FILTER_OUTPUTS(unsharp_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

2
libavfilter/vf_xfade_opencl.c
Unescape View File

@ -431,6 +431,6 @@ const AVFilter ff_vf_xfade_opencl = {
.activate = &xfade_opencl_activate,
FILTER_INPUTS(xfade_opencl_inputs),
FILTER_OUTPUTS(xfade_opencl_outputs),
FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_OPENCL),
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
};

Write Preview
Loading…
Cancel
Save