History

avfilter/internal: Don't include video.h

internal.h does not depend on video.h (and should not depend on it) and therefore should not include video.h at all; instead all users of video.h should include it directly. Doing so also avoids unnecessary video.h inclusions in files that don't need it, like most audio filters.

Andreas Rheinhardt committed 3 years ago

Commit 6d156431 parent 50ea73860 files · +61 −3Browse files

Unified · Split

60 files
  1. libavfilter/af_afir.c +1 −0
  2. libavfilter/af_aiir.c +1 −0
  3. libavfilter/af_anequalizer.c +1 −0
  4. libavfilter/avf_showcqt.c +1 −0
  5. libavfilter/avfilter.c +1 −0
  6. libavfilter/f_ebur128.c +1 −0
  7. libavfilter/internal.h +0 −1
  8. libavfilter/vf_avgblur_vulkan.c +1 −0
  9. libavfilter/vf_blend_vulkan.c +1 −0
  10. libavfilter/vf_chromaber_vulkan.c +1 −0
  11. libavfilter/vf_dctdnoiz.c +1 −0
  12. libavfilter/vf_derain.c +1 −0
  13. libavfilter/vf_dnn_processing.c +1 −0
  14. libavfilter/vf_epx.c +1 −0
  15. libavfilter/vf_eq.c +2 −1
  16. libavfilter/vf_extractplanes.c +1 −0
  17. libavfilter/vf_fftdnoiz.c +1 −0
  18. libavfilter/vf_fftfilt.c +2 −1
  19. libavfilter/vf_fieldmatch.c +1 −0
  20. libavfilter/vf_flip_vulkan.c +1 −0
  21. libavfilter/vf_fspp.c +1 −0
  22. libavfilter/vf_gblur_vulkan.c +1 −0
  23. libavfilter/vf_geq.c +1 −0
  24. libavfilter/vf_hqx.c +1 −0
  25. libavfilter/vf_il.c +1 −0
  26. libavfilter/vf_kerndeint.c +1 −0
  27. libavfilter/vf_libplacebo.c +1 −0
  28. libavfilter/vf_mcdeint.c +1 −0
  29. libavfilter/vf_mergeplanes.c +1 −0
  30. libavfilter/vf_misc_vaapi.c +1 −0
  31. libavfilter/vf_nlmeans_vulkan.c +1 −0
  32. libavfilter/vf_overlay_vaapi.c +1 −0
  33. libavfilter/vf_overlay_vulkan.c +1 −0
  34. libavfilter/vf_owdenoise.c +1 −0
  35. libavfilter/vf_palettegen.c +1 −0
  36. libavfilter/vf_paletteuse.c +1 −0
  37. libavfilter/vf_pp.c +1 −0
  38. libavfilter/vf_pp7.c +1 −0
  39. libavfilter/vf_procamp_vaapi.c +1 −0
  40. libavfilter/vf_sab.c +1 −0
  41. libavfilter/vf_scale_vt.c +1 −0
  42. libavfilter/vf_scale_vulkan.c +1 −0
  43. libavfilter/vf_scroll.c +1 −0
  44. libavfilter/vf_smartblur.c +1 −0
  45. libavfilter/vf_spp.c +1 −0
  46. libavfilter/vf_sr.c +1 −0
  47. libavfilter/vf_tinterlace.c +1 −0
  48. libavfilter/vf_tonemap_vaapi.c +1 −0
  49. libavfilter/vf_tpad.c +1 −0
  50. libavfilter/vf_transpose_vaapi.c +1 −0
  51. libavfilter/vf_transpose_vt.c +1 −0
  52. libavfilter/vf_transpose_vulkan.c +1 −0
  53. libavfilter/vf_uspp.c +1 −0
  54. libavfilter/vf_vidstabtransform.c +1 −0
  55. libavfilter/vf_weave.c +1 −0
  56. libavfilter/vf_xbr.c +1 −0
  57. libavfilter/vf_xfade_vulkan.c +1 −0
  58. libavfilter/vf_yaepblur.c +1 −0
  59. libavfilter/vsrc_testsrc_vulkan.c +1 −0
  60. libavfilter/yadif_common.c +1 −0
libavfilter/af_afir.c+1−0
@@ -45,6 +45,7 @@ · 44 unmodified lines
4545 #include "internal.h"
4646 #include "af_afir.h"
4747 #include "af_afirdsp.h"
48+#include "video.h"
4849
4950 static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color)
5051 {
libavfilter/af_aiir.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "audio.h"
2828 #include "avfilter.h"
2929 #include "internal.h"
30+#include "video.h"
3031
3132 typedef struct ThreadData {
3233 AVFrame *in, *out;
libavfilter/af_anequalizer.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "avfilter.h"
2828 #include "internal.h"
2929 #include "audio.h"
30+#include "video.h"
3031
3132 #define FILTER_ORDER 4
3233
libavfilter/avf_showcqt.c+1−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "internal.h"
3333 #include "lavfutils.h"
3434 #include "lswsutils.h"
35+#include "video.h"
3536
3637 #if CONFIG_LIBFREETYPE
3738 #include <ft2build.h>
libavfilter/avfilter.c+1−0
@@ -43,6 +43,7 @@ · 42 unmodified lines
4343 #include "formats.h"
4444 #include "framepool.h"
4545 #include "internal.h"
46+#include "video.h"
4647
4748 static void tlog_ref(void *ctx, AVFrame *ref, int end)
4849 {
libavfilter/f_ebur128.c+1−0
@@ -43,6 +43,7 @@ · 42 unmodified lines
4343 #include "filters.h"
4444 #include "formats.h"
4545 #include "internal.h"
46+#include "video.h"
4647
4748 #define ABS_THRES -70 ///< silence gate: we discard anything below this absolute (LUFS) threshold
4849 #define ABS_UP_THRES 10 ///< upper loud limit to consider (ABS_THRES being the minimum)
libavfilter/internal.h+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
2828 #include "avfilter.h"
2929 #include "formats.h"
3030 #include "framequeue.h"
31−#include "video.h"
3231
3332 typedef struct AVFilterCommand {
3433 double time; ///< time expressed in seconds
libavfilter/vf_avgblur_vulkan.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "vulkan_filter.h"
2424 #include "vulkan_spirv.h"
2525 #include "internal.h"
26+#include "video.h"
2627
2728 typedef struct AvgBlurVulkanContext {
2829 FFVulkanContext vkctx;
libavfilter/vf_blend_vulkan.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "internal.h"
2929 #include "framesync.h"
3030 #include "blend.h"
31+#include "video.h"
3132
3233 #define IN_TOP 0
3334 #define IN_BOTTOM 1
libavfilter/vf_chromaber_vulkan.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "vulkan_filter.h"
2424 #include "vulkan_spirv.h"
2525 #include "internal.h"
26+#include "video.h"
2627
2728 typedef struct ChromaticAberrationVulkanContext {
2829 FFVulkanContext vkctx;
libavfilter/vf_dctdnoiz.c+1−0
@@ -33,6 +33,7 @@ · 32 unmodified lines
3333 #include "libavutil/mem_internal.h"
3434 #include "libavutil/opt.h"
3535 #include "internal.h"
36+#include "video.h"
3637
3738 static const char *const var_names[] = { "c", NULL };
3839 enum { VAR_C, VAR_VARS_NB };
libavfilter/vf_derain.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 #include "dnn_filter_common.h"
3131 #include "formats.h"
3232 #include "internal.h"
33+#include "video.h"
3334
3435 typedef struct DRContext {
3536 const AVClass *class;
libavfilter/vf_dnn_processing.c+1−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "dnn_filter_common.h"
3333 #include "formats.h"
3434 #include "internal.h"
35+#include "video.h"
3536 #include "libswscale/swscale.h"
3637 #include "libavutil/time.h"
3738
libavfilter/vf_epx.c+1−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #include "libavutil/opt.h"
2020 #include "libavutil/pixdesc.h"
2121 #include "internal.h"
22+#include "video.h"
2223
2324 typedef struct EPXContext {
2425 const AVClass *class;
libavfilter/vf_eq.c+2−1
@@ -27,12 +27,13 @@ · 26 unmodified lines
2727 * very simple video equalizer
2828 */
2929
30−#include "libavfilter/internal.h"
3130 #include "libavutil/common.h"
3231 #include "libavutil/imgutils.h"
3332 #include "libavutil/opt.h"
3433 #include "libavutil/pixdesc.h"
34+#include "internal.h"
3535 #include "vf_eq.h"
36+#include "video.h"
3637
3738 static void create_lut(EQParameters *param)
3839 {
libavfilter/vf_extractplanes.c+1−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929 #include "drawutils.h"
3030 #include "filters.h"
3131 #include "internal.h"
32+#include "video.h"
3233
3334 #define PLANE_R 0x01
3435 #define PLANE_G 0x02
libavfilter/vf_fftdnoiz.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/pixdesc.h"
2525 #include "libavutil/tx.h"
2626 #include "internal.h"
27+#include "video.h"
2728 #include "window_func.h"
2829
2930 #define MAX_BLOCK 256
libavfilter/vf_fftfilt.c+2−1
@@ -24,7 +24,8 @@ · 23 unmodified lines
2424 * FFT domain filtering.
2525 */
2626
27−#include "libavfilter/internal.h"
27+#include "internal.h"
28+#include "video.h"
2829 #include "libavutil/common.h"
2930 #include "libavutil/cpu.h"
3031 #include "libavutil/imgutils.h"
libavfilter/vf_fieldmatch.c+1−0
@@ -39,6 +39,7 @@ · 38 unmodified lines
3939 #include "avfilter.h"
4040 #include "filters.h"
4141 #include "internal.h"
42+#include "video.h"
4243
4344 #define INPUT_MAIN 0
4445 #define INPUT_CLEANSRC 1
libavfilter/vf_flip_vulkan.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "vulkan_filter.h"
2525 #include "vulkan_spirv.h"
2626 #include "internal.h"
27+#include "video.h"
2728
2829 enum FlipType {
2930 FLIP_VERTICAL,
libavfilter/vf_fspp.c+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
4242 #include "internal.h"
4343 #include "qp_table.h"
4444 #include "vf_fspp.h"
45+#include "video.h"
4546
4647 #define OFFSET(x) offsetof(FSPPContext, x)
4748 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
libavfilter/vf_gblur_vulkan.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "vulkan_filter.h"
2525 #include "vulkan_spirv.h"
2626 #include "internal.h"
27+#include "video.h"
2728
2829 #define CGS 32
2930 #define GBLUR_MAX_KERNEL_SIZE 127
libavfilter/vf_geq.c+1−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "libavutil/opt.h"
3333 #include "libavutil/pixdesc.h"
3434 #include "internal.h"
35+#include "video.h"
3536
3637 #define MAX_NB_THREADS 32
3738 #define NB_PLANES 4
libavfilter/vf_hqx.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "libavutil/avassert.h"
3232 #include "libavutil/pixdesc.h"
3333 #include "internal.h"
34+#include "video.h"
3435
3536 typedef int (*hqxfunc_t)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
3637
libavfilter/vf_il.c+1−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929 #include "libavutil/pixdesc.h"
3030 #include "avfilter.h"
3131 #include "internal.h"
32+#include "video.h"
3233
3334 enum FilterMode {
3435 MODE_NONE,
libavfilter/vf_kerndeint.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include "avfilter.h"
3535 #include "formats.h"
3636 #include "internal.h"
37+#include "video.h"
3738
3839 typedef struct KerndeintContext {
3940 const AVClass *class;
libavfilter/vf_libplacebo.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/parseutils.h"
2525 #include "internal.h"
2626 #include "filters.h"
27+#include "video.h"
2728 #include "vulkan_filter.h"
2829 #include "scale_eval.h"
2930
libavfilter/vf_mcdeint.c+1−0
@@ -55,6 +55,7 @@ · 54 unmodified lines
5555 #include "avfilter.h"
5656 #include "formats.h"
5757 #include "internal.h"
58+#include "video.h"
5859
5960 enum MCDeintMode {
6061 MODE_FAST = 0,
libavfilter/vf_mergeplanes.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "avfilter.h"
2727 #include "internal.h"
2828 #include "framesync.h"
29+#include "video.h"
2930
3031 typedef struct Mapping {
3132 int input;
libavfilter/vf_misc_vaapi.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "formats.h"
2525 #include "internal.h"
2626 #include "vaapi_vpp.h"
27+#include "video.h"
2728
2829 // Denoise min/max/default Values
2930 #define DENOISE_MIN 0
libavfilter/vf_nlmeans_vulkan.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "vulkan_filter.h"
2424 #include "vulkan_spirv.h"
2525 #include "internal.h"
26+#include "video.h"
2627
2728 #define TYPE_NAME "vec4"
2829 #define TYPE_ELEMS 4
libavfilter/vf_overlay_vaapi.c+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include "formats.h"
2828 #include "internal.h"
2929 #include "vaapi_vpp.h"
30+#include "video.h"
3031 #include "libavutil/eval.h"
3132
3233 enum var_name {
libavfilter/vf_overlay_vulkan.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "vulkan_spirv.h"
2525 #include "internal.h"
2626 #include "framesync.h"
27+#include "video.h"
2728
2829 typedef struct OverlayVulkanContext {
2930 FFVulkanContext vkctx;
libavfilter/vf_owdenoise.c+1−0
@@ -39,6 +39,7 @@ · 38 unmodified lines
3939 #include "libavutil/pixdesc.h"
4040 #include "avfilter.h"
4141 #include "internal.h"
42+#include "video.h"
4243
4344 typedef struct OWDenoiseContext {
4445 const AVClass *class;
libavfilter/vf_palettegen.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "avfilter.h"
3232 #include "internal.h"
3333 #include "palette.h"
34+#include "video.h"
3435
3536 /* Reference a color and how much it's used */
3637 struct color_ref {
libavfilter/vf_paletteuse.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include "framesync.h"
3535 #include "internal.h"
3636 #include "palette.h"
37+#include "video.h"
3738
3839 enum dithering_mode {
3940 DITHERING_NONE,
libavfilter/vf_pp.c+1−0
@@ -29,6 +29,7 @@ · 28 unmodified lines
2929
3030 #include "internal.h"
3131 #include "qp_table.h"
32+#include "video.h"
3233
3334 #include "libpostproc/postprocess.h"
3435
libavfilter/vf_pp7.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include "internal.h"
3535 #include "qp_table.h"
3636 #include "vf_pp7.h"
37+#include "video.h"
3738
3839 enum mode {
3940 MODE_HARD,
libavfilter/vf_procamp_vaapi.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "formats.h"
2525 #include "internal.h"
2626 #include "vaapi_vpp.h"
27+#include "video.h"
2728
2829 // ProcAmp Min/Max/Default Values
2930 #define BRIGHTNESS_MIN -100.0F
libavfilter/vf_sab.c+1−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 #include "avfilter.h"
3131 #include "formats.h"
3232 #include "internal.h"
33+#include "video.h"
3334
3435 typedef struct FilterParam {
3536 float radius;
libavfilter/vf_scale_vt.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "libavutil/pixdesc.h"
2727 #include "internal.h"
2828 #include "scale_eval.h"
29+#include "video.h"
2930
3031 typedef struct ScaleVtContext {
3132 AVClass *class;
libavfilter/vf_scale_vulkan.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "scale_eval.h"
2626 #include "internal.h"
2727 #include "colorspace.h"
28+#include "video.h"
2829
2930 enum ScalerFunc {
3031 F_BILINEAR = 0,
libavfilter/vf_scroll.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "avfilter.h"
2525 #include "formats.h"
2626 #include "internal.h"
27+#include "video.h"
2728
2829 typedef struct ScrollContext {
2930 const AVClass *class;
libavfilter/vf_smartblur.c+1−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "avfilter.h"
3333 #include "formats.h"
3434 #include "internal.h"
35+#include "video.h"
3536
3637 #define RADIUS_MIN 0.1
3738 #define RADIUS_MAX 5.0
libavfilter/vf_spp.c+1−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 #include "internal.h"
3939 #include "qp_table.h"
4040 #include "vf_spp.h"
41+#include "video.h"
4142
4243 enum mode {
4344 MODE_HARD,
libavfilter/vf_sr.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "avfilter.h"
2929 #include "formats.h"
3030 #include "internal.h"
31+#include "video.h"
3132 #include "libavutil/opt.h"
3233 #include "libavutil/pixdesc.h"
3334 #include "libavformat/avio.h"
libavfilter/vf_tinterlace.c+1−0
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "avfilter.h"
3333 #include "internal.h"
3434 #include "tinterlace.h"
35+#include "video.h"
3536
3637 #define OFFSET(x) offsetof(TInterlaceContext, x)
3738 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
libavfilter/vf_tonemap_vaapi.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "formats.h"
2626 #include "internal.h"
2727 #include "vaapi_vpp.h"
28+#include "video.h"
2829
2930 typedef struct HDRVAAPIContext {
3031 VAAPIVPPContext vpp_ctx; // must be the first field
libavfilter/vf_tpad.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "internal.h"
2727 #include "formats.h"
2828 #include "drawutils.h"
29+#include "video.h"
2930
3031 enum PadMode {
3132 MODE_ADD = 0,
libavfilter/vf_transpose_vaapi.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "internal.h"
2626 #include "transpose.h"
2727 #include "vaapi_vpp.h"
28+#include "video.h"
2829
2930 typedef struct TransposeVAAPIContext {
3031 VAAPIVPPContext vpp_ctx; // must be the first field
libavfilter/vf_transpose_vt.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "libavutil/pixdesc.h"
2727 #include "internal.h"
2828 #include "transpose.h"
29+#include "video.h"
2930
3031 typedef struct TransposeVtContext {
3132 AVClass *class;
libavfilter/vf_transpose_vulkan.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "vulkan_spirv.h"
2626 #include "internal.h"
2727 #include "transpose.h"
28+#include "video.h"
2829
2930 typedef struct TransposeVulkanContext {
3031 FFVulkanContext vkctx;
libavfilter/vf_uspp.c+1−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 #include "internal.h"
3838 #include "qp_table.h"
3939 #include "avfilter.h"
40+#include "video.h"
4041
4142 #define MAX_LEVEL 8 /* quality levels */
4243 #define BLOCK 16
libavfilter/vf_vidstabtransform.c+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/pixdesc.h"
2929 #include "avfilter.h"
3030 #include "internal.h"
31+#include "video.h"
3132
3233 #include "vidstabutils.h"
3334
libavfilter/vf_weave.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "libavutil/pixdesc.h"
2424 #include "avfilter.h"
2525 #include "internal.h"
26+#include "video.h"
2627
2728 typedef struct WeaveContext {
2829 const AVClass *class;
libavfilter/vf_xbr.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "libavutil/opt.h"
3232 #include "libavutil/pixdesc.h"
3333 #include "internal.h"
34+#include "video.h"
3435
3536 #define LB_MASK 0x00FEFEFE
3637 #define RED_BLUE_MASK 0x00FF00FF
libavfilter/vf_xfade_vulkan.c+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #include "vulkan_spirv.h"
2424 #include "filters.h"
2525 #include "internal.h"
26+#include "video.h"
2627
2728 #define IN_A 0
2829 #define IN_B 1
libavfilter/vf_yaepblur.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "libavutil/imgutils.h"
3232 #include "avfilter.h"
3333 #include "internal.h"
34+#include "video.h"
3435
3536 typedef struct YAEPContext {
3637 const AVClass *class;
libavfilter/vsrc_testsrc_vulkan.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "internal.h"
2727 #include "filters.h"
2828 #include "colorspace.h"
29+#include "video.h"
2930
3031 enum TestSrcVulkanMode {
3132 TESTSRC_COLOR,
libavfilter/yadif_common.c+1−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include "libavutil/avassert.h"
2323 #include "libavutil/imgutils.h"
2424 #include "internal.h"
25+#include "video.h"
2526 #include "yadif.h"
2627
2728 static int return_frame(AVFilterContext *ctx, int is_second)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t