History

avfilter/vf_median: add support for commands

Paul B Mahol committed 6 years ago

Commit 7ead0da1 parent b6571772 files · +55 −15Browse files

Showing the changes to libavfilter (1 of 2 files). Show all

Unified · Split

libavfilter/vf_median.c+48−15
@@ -54,7 +54,7 @@ · 53 unmodified lines
54#include "median_template.c"54#include "median_template.c"
55 55
56#define OFFSET(x) offsetof(MedianContext, x)56#define OFFSET(x) offsetof(MedianContext, x)
57#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM57#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
58 58
59static const AVOption median_options[] = {59static const AVOption median_options[] = {
60 { "radius", "set median radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, FLAGS },60 { "radius", "set median radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, FLAGS },
@@ -110,21 +110,8 @@ static int query_formats(AVFilterContext *ctx) · 49 unmodified lines
110 return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));110 return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
111}111}
112 112
113static int config_input(AVFilterLink *inlink)113static int check_params(MedianContext *s, AVFilterLink *inlink)
114{114{
115 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
116 MedianContext *s = inlink->dst->priv;
117
118 s->depth = desc->comp[0].depth;
119 s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w);
120 s->planewidth[0] = s->planewidth[3] = inlink->w;
121 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
122 s->planeheight[0] = s->planeheight[3] = inlink->h;
123
124 s->radiusV = !s->radiusV ? s->radius : s->radiusV;
125 s->nb_planes = av_pix_fmt_count_planes(inlink->format);
126 s->t = 2 * s->radius * s->radiusV + 2 * s->radius;
127
128 for (int i = 0; i < s->nb_planes; i++) {115 for (int i = 0; i < s->nb_planes; i++) {
129 if (!(s->planes & (1 << i)))116 if (!(s->planes & (1 << i)))
130 continue;117 continue;
@@ -140,6 +127,30 @@ static int config_input(AVFilterLink *inlink) · 9 unmodified lines
140 }127 }
141 }128 }
142 129
130 s->t = 2 * s->radius * s->radiusV + 2 * s->radius;
131
132 return 0;
133}
134
135static int config_input(AVFilterLink *inlink)
136{
137 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
138 MedianContext *s = inlink->dst->priv;
139 int ret;
140
141 s->depth = desc->comp[0].depth;
142 s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w);
143 s->planewidth[0] = s->planewidth[3] = inlink->w;
144 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
145 s->planeheight[0] = s->planeheight[3] = inlink->h;
146
147 s->radiusV = !s->radiusV ? s->radius : s->radiusV;
148 s->nb_planes = av_pix_fmt_count_planes(inlink->format);
149
150 ret = check_params(s, inlink);
151 if (ret < 0)
152 return ret;
153
143 s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radiusV + 1), ff_filter_get_nb_threads(inlink->dst)));154 s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radiusV + 1), ff_filter_get_nb_threads(inlink->dst)));
144 s->bins = 1 << ((s->depth + 1) / 2);155 s->bins = 1 << ((s->depth + 1) / 2);
145 s->fine_size = s->bins * s->bins * inlink->w;156 s->fine_size = s->bins * s->bins * inlink->w;
@@ -243,6 +254,27 @@ static av_cold void uninit(AVFilterContext *ctx) · 97 unmodified lines
243 av_freep(&s->fine);254 av_freep(&s->fine);
244}255}
245 256
257static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
258 char *res, int res_len, int flags)
259{
260 MedianContext *s = ctx->priv;
261 int radius = s->radius, radiusV = s->radiusV, planes = s->planes;
262 int ret;
263
264 ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
265 if (ret < 0)
266 return ret;
267
268 ret = check_params(s, ctx->inputs[0]);
269 if (ret != 0) {
270 s->radius = radius;
271 s->radiusV = radiusV;
272 s->planes = planes;
273 }
274
275 return 0;
276}
277
246static const AVFilterPad median_inputs[] = {278static const AVFilterPad median_inputs[] = {
247 {279 {
248 .name = "default",280 .name = "default",
@@ -271,4 +303,5 @@ AVFilter ff_vf_median = { · 22 unmodified lines
271 .inputs = median_inputs,303 .inputs = median_inputs,
272 .outputs = median_outputs,304 .outputs = median_outputs,
273 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,305 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
306 .process_command = process_command,
274};307};

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