History

avfilter/vf_median: add radiusV option

Paul B Mahol committed 7 years ago

Commit b414cff1 parent 86a42e94 files · +21 −12Browse files

Unified · Split

4 files
  1. doc/filters.texi +6 −1
  2. libavfilter/median.h +1 −0
  3. libavfilter/median_template.c +8 −7
  4. libavfilter/vf_median.c +6 −4
doc/filters.texi+6−1
@@ -12919,11 +12919,16 @@ This filter accepts the following options: · 12918 unmodified lines
12919 12919
12920@table @option12920@table @option
12921@item radius12921@item radius
12922Set horizontal and vertical radius size. Default value is @code{1}.12922Set horizontal radius size. Default value is @code{1}.
12923Allowed range is integer from 1 to 127.12923Allowed range is integer from 1 to 127.
12924 12924
12925@item planes12925@item planes
12926Set which planes to process. Default is @code{15}, which is all available planes.12926Set which planes to process. Default is @code{15}, which is all available planes.
12927
12928@item radiusV
12929Set vertical radius size. Default value is @code{0}.
12930Allowed range is integer from 0 to 127.
12931If it is 0, value will be picked from horizontal @code{radius} option.
12927@end table12932@end table
12928 12933
12929@section mergeplanes12934@section mergeplanes
libavfilter/median.h+1−0
@@ -30,6 +30,7 @@ typedef struct MedianContext { · 29 unmodified lines
30 30
31 int planes;31 int planes;
32 int radius;32 int radius;
33 int radiusV;
33 34
34 int planewidth[4];35 int planewidth[4];
35 int planeheight[4];36 int planeheight[4];
libavfilter/median_template.c+8−7
@@ -57,6 +57,7 @@ static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_ · 56 unmodified lines
57 htype *ccoarse = s->coarse[jobnr];57 htype *ccoarse = s->coarse[jobnr];
58 htype *cfine = s->fine[jobnr];58 htype *cfine = s->fine[jobnr];
59 const int radius = s->radius;59 const int radius = s->radius;
60 const int radiusV = s->radiusV;
60 const int t = s->t;61 const int t = s->t;
61 const pixel *src = (const pixel *)ssrc;62 const pixel *src = (const pixel *)ssrc;
62 pixel *dst = (pixel *)ddst;63 pixel *dst = (pixel *)ddst;
@@ -69,16 +70,16 @@ static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_ · 6 unmodified lines
69 memset(cfine, 0, s->fine_size * sizeof(*cfine));70 memset(cfine, 0, s->fine_size * sizeof(*cfine));
70 memset(ccoarse, 0, s->coarse_size * sizeof(*ccoarse));71 memset(ccoarse, 0, s->coarse_size * sizeof(*ccoarse));
71 72
72 srcp = src + FFMAX(0, slice_h_start - radius) * src_linesize;73 srcp = src + FFMAX(0, slice_h_start - radiusV) * src_linesize;
73 if (jobnr == 0) {74 if (jobnr == 0) {
74 for (int i = 0; i < width; i++) {75 for (int i = 0; i < width; i++) {
75 cfine[PICK_FINE_BIN(width, srcp[i], i)] += radius + 1;76 cfine[PICK_FINE_BIN(width, srcp[i], i)] += radiusV + 1;
76 ccoarse[PICK_COARSE_BIN(i, srcp[i])] += radius + 1;77 ccoarse[PICK_COARSE_BIN(i, srcp[i])] += radiusV + 1;
77 }78 }
78 }79 }
79 80
80 srcp = src + FFMAX(0, slice_h_start - radius - (jobnr != 0)) * src_linesize;81 srcp = src + FFMAX(0, slice_h_start - radiusV - (jobnr != 0)) * src_linesize;
81 for (int i = 0; i < radius + (jobnr != 0) * (1 + radius); i++) {82 for (int i = 0; i < radiusV + (jobnr != 0) * (1 + radiusV); i++) {
82 for (int j = 0; j < width; j++) {83 for (int j = 0; j < width; j++) {
83 cfine[PICK_FINE_BIN(width, srcp[j], j)]++;84 cfine[PICK_FINE_BIN(width, srcp[j], j)]++;
84 ccoarse[PICK_COARSE_BIN(j, srcp[j])]++;85 ccoarse[PICK_COARSE_BIN(j, srcp[j])]++;
@@ -93,13 +94,13 @@ static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_ · 8 unmodified lines
93 htype fine[BINS][BINS] = { { 0 } };94 htype fine[BINS][BINS] = { { 0 } };
94 htype luc[BINS] = { 0 };95 htype luc[BINS] = { 0 };
95 96
96 p = srcp + src_linesize * FFMAX(0, i - radius - 1);97 p = srcp + src_linesize * FFMAX(0, i - radiusV - 1);
97 for (int j = 0; j < width; j++) {98 for (int j = 0; j < width; j++) {
98 cfine[PICK_FINE_BIN(width, p[j], j)]--;99 cfine[PICK_FINE_BIN(width, p[j], j)]--;
99 ccoarse[PICK_COARSE_BIN(j, p[j])]--;100 ccoarse[PICK_COARSE_BIN(j, p[j])]--;
100 }101 }
101 102
102 p = srcp + src_linesize * FFMIN(height - 1, i + radius);103 p = srcp + src_linesize * FFMIN(height - 1, i + radiusV);
103 for (int j = 0; j < width; j++) {104 for (int j = 0; j < width; j++) {
104 cfine[PICK_FINE_BIN(width, p[j], j)]++;105 cfine[PICK_FINE_BIN(width, p[j], j)]++;
105 ccoarse[PICK_COARSE_BIN(j, p[j])]++;106 ccoarse[PICK_COARSE_BIN(j, p[j])]++;
libavfilter/vf_median.c+6−4
@@ -59,6 +59,7 @@ · 58 unmodified lines
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 },
61 { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS },61 { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS },
62 { "radiusV", "set median vertical radius", OFFSET(radiusV), AV_OPT_TYPE_INT, {.i64=0},0, 127, FLAGS },
62 { NULL }63 { NULL }
63};64};
64 65
@@ -119,8 +120,9 @@ static int config_input(AVFilterLink *inlink) · 54 unmodified lines
119 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);120 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
120 s->planeheight[0] = s->planeheight[3] = inlink->h;121 s->planeheight[0] = s->planeheight[3] = inlink->h;
121 122
123 s->radiusV = !s->radiusV ? s->radius : s->radiusV;
122 s->nb_planes = av_pix_fmt_count_planes(inlink->format);124 s->nb_planes = av_pix_fmt_count_planes(inlink->format);
123 s->t = 2 * s->radius * s->radius + 2 * s->radius;125 s->t = 2 * s->radius * s->radiusV + 2 * s->radius;
124 126
125 for (int i = 0; i < s->nb_planes; i++) {127 for (int i = 0; i < s->nb_planes; i++) {
126 if (!(s->planes & (1 << i)))128 if (!(s->planes & (1 << i)))
@@ -131,13 +133,13 @@ static int config_input(AVFilterLink *inlink) · 4 unmodified lines
131 return AVERROR(EINVAL);133 return AVERROR(EINVAL);
132 }134 }
133 135
134 if (s->planeheight[i] < s->radius * 2 + 1) {136 if (s->planeheight[i] < s->radiusV * 2 + 1) {
135 av_log(inlink->dst, AV_LOG_ERROR, "The %d plane height %d must be not less than %d\n", i, s->planeheight[i], s->radius * 2 + 1);137 av_log(inlink->dst, AV_LOG_ERROR, "The %d plane height %d must be not less than %d\n", i, s->planeheight[i], s->radiusV * 2 + 1);
136 return AVERROR(EINVAL);138 return AVERROR(EINVAL);
137 }139 }
138 }140 }
139 141
140 s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radius + 1), ff_filter_get_nb_threads(inlink->dst)));142 s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radiusV + 1), ff_filter_get_nb_threads(inlink->dst)));
141 s->bins = 1 << ((s->depth + 1) / 2);143 s->bins = 1 << ((s->depth + 1) / 2);
142 s->fine_size = s->bins * s->bins * inlink->w;144 s->fine_size = s->bins * s->bins * inlink->w;
143 s->coarse_size = s->bins * inlink->w;145 s->coarse_size = s->bins * inlink->w;

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