Showing the changes to libavfilter (3 of 4 files). Show all
Unified · Split
| @@ -30,6 +30,7 @@ typedef struct MedianContext { · 29 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | int planes; |
| 32 | 32 | int radius; |
| 33 | + int radiusV; | |
| 33 | 34 | |
| 34 | 35 | int planewidth[4]; |
| 35 | 36 | int planeheight[4]; |
| @@ -57,6 +57,7 @@ static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_ · 56 unmodified lines | ||
| 57 | 57 | htype *ccoarse = s->coarse[jobnr]; |
| 58 | 58 | htype *cfine = s->fine[jobnr]; |
| 59 | 59 | const int radius = s->radius; |
| 60 | + const int radiusV = s->radiusV; | |
| 60 | 61 | const int t = s->t; |
| 61 | 62 | const pixel *src = (const pixel *)ssrc; |
| 62 | 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 | 70 | memset(cfine, 0, s->fine_size * sizeof(*cfine)); |
| 70 | 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 | 74 | if (jobnr == 0) { |
| 74 | 75 | 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; | |
| 77 | 78 | } |
| 78 | 79 | } |
| 79 | 80 | |
| 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++) { | |
| 82 | 83 | for (int j = 0; j < width; j++) { |
| 83 | 84 | cfine[PICK_FINE_BIN(width, srcp[j], j)]++; |
| 84 | 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 | 94 | htype fine[BINS][BINS] = { { 0 } }; |
| 94 | 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 | 98 | for (int j = 0; j < width; j++) { |
| 98 | 99 | cfine[PICK_FINE_BIN(width, p[j], j)]--; |
| 99 | 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 | 104 | for (int j = 0; j < width; j++) { |
| 104 | 105 | cfine[PICK_FINE_BIN(width, p[j], j)]++; |
| 105 | 106 | ccoarse[PICK_COARSE_BIN(j, p[j])]++; |
| @@ -59,6 +59,7 @@ · 58 unmodified lines | ||
| 59 | 59 | static const AVOption median_options[] = { |
| 60 | 60 | { "radius", "set median radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, FLAGS }, |
| 61 | 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 | 63 | { NULL } |
| 63 | 64 | }; |
| 64 | 65 | |
| @@ -119,8 +120,9 @@ static int config_input(AVFilterLink *inlink) · 54 unmodified lines | ||
| 119 | 120 | s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); |
| 120 | 121 | s->planeheight[0] = s->planeheight[3] = inlink->h; |
| 121 | 122 | |
| 123 | + s->radiusV = !s->radiusV ? s->radius : s->radiusV; | |
| 122 | 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 | 127 | for (int i = 0; i < s->nb_planes; i++) { |
| 126 | 128 | if (!(s->planes & (1 << i))) |
| @@ -131,13 +133,13 @@ static int config_input(AVFilterLink *inlink) · 4 unmodified lines | ||
| 131 | 133 | return AVERROR(EINVAL); |
| 132 | 134 | } |
| 133 | 135 | |
| 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); | |
| 136 | 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 | 143 | s->bins = 1 << ((s->depth + 1) / 2); |
| 142 | 144 | s->fine_size = s->bins * s->bins * inlink->w; |
| 143 | 145 | s->coarse_size = s->bins * inlink->w; |