History

avfilter/vf_median: add radiusV option

Paul B Mahol committed 7 years ago

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

Showing the changes to libavfilter (3 of 4 files). Show all

Unified · Split

3 files
  1. libavfilter/median.h +1 −0
  2. libavfilter/median_template.c +8 −7
  3. libavfilter/vf_median.c +6 −4
libavfilter/median.h+1−0
@@ -30,6 +30,7 @@ typedef struct MedianContext { · 29 unmodified lines
3030
3131 int planes;
3232 int radius;
33+ int radiusV;
3334
3435 int planewidth[4];
3536 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
5757 htype *ccoarse = s->coarse[jobnr];
5858 htype *cfine = s->fine[jobnr];
5959 const int radius = s->radius;
60+ const int radiusV = s->radiusV;
6061 const int t = s->t;
6162 const pixel *src = (const pixel *)ssrc;
6263 pixel *dst = (pixel *)ddst;
@@ -69,16 +70,16 @@ static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_ · 6 unmodified lines
6970 memset(cfine, 0, s->fine_size * sizeof(*cfine));
7071 memset(ccoarse, 0, s->coarse_size * sizeof(*ccoarse));
7172
72− srcp = src + FFMAX(0, slice_h_start - radius) * src_linesize;
73+ srcp = src + FFMAX(0, slice_h_start - radiusV) * src_linesize;
7374 if (jobnr == 0) {
7475 for (int i = 0; i < width; i++) {
75− cfine[PICK_FINE_BIN(width, srcp[i], i)] += radius + 1;
76− ccoarse[PICK_COARSE_BIN(i, srcp[i])] += radius + 1;
76+ cfine[PICK_FINE_BIN(width, srcp[i], i)] += radiusV + 1;
77+ ccoarse[PICK_COARSE_BIN(i, srcp[i])] += radiusV + 1;
7778 }
7879 }
7980
80− srcp = src + FFMAX(0, slice_h_start - radius - (jobnr != 0)) * src_linesize;
81− for (int i = 0; i < radius + (jobnr != 0) * (1 + radius); i++) {
81+ srcp = src + FFMAX(0, slice_h_start - radiusV - (jobnr != 0)) * src_linesize;
82+ for (int i = 0; i < radiusV + (jobnr != 0) * (1 + radiusV); i++) {
8283 for (int j = 0; j < width; j++) {
8384 cfine[PICK_FINE_BIN(width, srcp[j], j)]++;
8485 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
9394 htype fine[BINS][BINS] = { { 0 } };
9495 htype luc[BINS] = { 0 };
9596
96− p = srcp + src_linesize * FFMAX(0, i - radius - 1);
97+ p = srcp + src_linesize * FFMAX(0, i - radiusV - 1);
9798 for (int j = 0; j < width; j++) {
9899 cfine[PICK_FINE_BIN(width, p[j], j)]--;
99100 ccoarse[PICK_COARSE_BIN(j, p[j])]--;
100101 }
101102
102− p = srcp + src_linesize * FFMIN(height - 1, i + radius);
103+ p = srcp + src_linesize * FFMIN(height - 1, i + radiusV);
103104 for (int j = 0; j < width; j++) {
104105 cfine[PICK_FINE_BIN(width, p[j], j)]++;
105106 ccoarse[PICK_COARSE_BIN(j, p[j])]++;
libavfilter/vf_median.c+6−4
@@ -59,6 +59,7 @@ · 58 unmodified lines
5959 static const AVOption median_options[] = {
6060 { "radius", "set median radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, FLAGS },
6161 { "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 },
6263 { NULL }
6364 };
6465
@@ -119,8 +120,9 @@ static int config_input(AVFilterLink *inlink) · 54 unmodified lines
119120 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
120121 s->planeheight[0] = s->planeheight[3] = inlink->h;
121122
123+ s->radiusV = !s->radiusV ? s->radius : s->radiusV;
122124 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;
124126
125127 for (int i = 0; i < s->nb_planes; i++) {
126128 if (!(s->planes & (1 << i)))
@@ -131,13 +133,13 @@ static int config_input(AVFilterLink *inlink) · 4 unmodified lines
131133 return AVERROR(EINVAL);
132134 }
133135
134− if (s->planeheight[i] < s->radius * 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);
136+ if (s->planeheight[i] < s->radiusV * 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);
136138 return AVERROR(EINVAL);
137139 }
138140 }
139141
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)));
141143 s->bins = 1 << ((s->depth + 1) / 2);
142144 s->fine_size = s->bins * s->bins * inlink->w;
143145 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