har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_neighbor: Deduplicate options

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-01-03 16:41:39 +01:00
parent 096cb41624
commit d1de1d95a6
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libavfilter/vf_neighbor.c
View File

@ -371,60 +371,44 @@ AVFilter ff_vf_##name_ = { \
.process_command = ff_filter_process_command, \ .process_command = ff_filter_process_command, \
} }
#if CONFIG_EROSION_FILTER /* The following options are shared between all filters here;
* the de/inflate filters only use the threshold* options. */
static const AVOption erosion_options[] = { #define DEINFLATE_OPTIONS_OFFSET (CONFIG_EROSION_FILTER || CONFIG_DILATION_FILTER)
static const AVOption options[] = {
#if CONFIG_EROSION_FILTER || CONFIG_DILATION_FILTER
{ "coordinates", "set coordinates", OFFSET(coordinates), AV_OPT_TYPE_INT, {.i64=255}, 0, 255, FLAGS },
#endif
{ "threshold0", "set threshold for 1st plane", OFFSET(threshold[0]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS }, { "threshold0", "set threshold for 1st plane", OFFSET(threshold[0]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold1", "set threshold for 2nd plane", OFFSET(threshold[1]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS }, { "threshold1", "set threshold for 2nd plane", OFFSET(threshold[1]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold2", "set threshold for 3rd plane", OFFSET(threshold[2]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS }, { "threshold2", "set threshold for 3rd plane", OFFSET(threshold[2]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold3", "set threshold for 4th plane", OFFSET(threshold[3]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS }, { "threshold3", "set threshold for 4th plane", OFFSET(threshold[3]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "coordinates", "set coordinates", OFFSET(coordinates), AV_OPT_TYPE_INT, {.i64=255}, 0, 255, FLAGS },
{ NULL } { NULL }
}; };
#if CONFIG_EROSION_FILTER
#define erosion_options options
DEFINE_NEIGHBOR_FILTER(erosion, "Apply erosion effect."); DEFINE_NEIGHBOR_FILTER(erosion, "Apply erosion effect.");
#endif /* CONFIG_EROSION_FILTER */ #endif /* CONFIG_EROSION_FILTER */
#if CONFIG_DILATION_FILTER #if CONFIG_DILATION_FILTER
static const AVOption dilation_options[] = { #define dilation_options options
{ "threshold0", "set threshold for 1st plane", OFFSET(threshold[0]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold1", "set threshold for 2nd plane", OFFSET(threshold[1]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold2", "set threshold for 3rd plane", OFFSET(threshold[2]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold3", "set threshold for 4th plane", OFFSET(threshold[3]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "coordinates", "set coordinates", OFFSET(coordinates), AV_OPT_TYPE_INT, {.i64=255}, 0, 255, FLAGS },
{ NULL }
};
DEFINE_NEIGHBOR_FILTER(dilation, "Apply dilation effect."); DEFINE_NEIGHBOR_FILTER(dilation, "Apply dilation effect.");
#endif /* CONFIG_DILATION_FILTER */ #endif /* CONFIG_DILATION_FILTER */
#if CONFIG_DEFLATE_FILTER #if CONFIG_DEFLATE_FILTER
static const AVOption deflate_options[] = { #define deflate_options &options[DEINFLATE_OPTIONS_OFFSET]
{ "threshold0", "set threshold for 1st plane", OFFSET(threshold[0]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold1", "set threshold for 2nd plane", OFFSET(threshold[1]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold2", "set threshold for 3rd plane", OFFSET(threshold[2]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold3", "set threshold for 4th plane", OFFSET(threshold[3]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ NULL }
};
DEFINE_NEIGHBOR_FILTER(deflate, "Apply deflate effect."); DEFINE_NEIGHBOR_FILTER(deflate, "Apply deflate effect.");
#endif /* CONFIG_DEFLATE_FILTER */ #endif /* CONFIG_DEFLATE_FILTER */
#if CONFIG_INFLATE_FILTER #if CONFIG_INFLATE_FILTER
static const AVOption inflate_options[] = { #define inflate_options &options[DEINFLATE_OPTIONS_OFFSET]
{ "threshold0", "set threshold for 1st plane", OFFSET(threshold[0]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold1", "set threshold for 2nd plane", OFFSET(threshold[1]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold2", "set threshold for 3rd plane", OFFSET(threshold[2]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ "threshold3", "set threshold for 4th plane", OFFSET(threshold[3]), AV_OPT_TYPE_INT, {.i64=65535}, 0, 65535, FLAGS },
{ NULL }
};
DEFINE_NEIGHBOR_FILTER(inflate, "Apply inflate effect."); DEFINE_NEIGHBOR_FILTER(inflate, "Apply inflate effect.");
#endif /* CONFIG_INFLATE_FILTER */ #endif /* CONFIG_INFLATE_FILTER */