History

avfilter: add Contrast Adaptive Sharpen video filter

Paul B Mahol committed 6 years ago

Commit 72b6c8c1 parent c6cc9d96 files · +318 −1Browse files

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

Unified · Split

4 files
  1. libavfilter/Makefile +1 −0
  2. libavfilter/allfilters.c +1 −0
  3. libavfilter/version.h +1 −1
  4. libavfilter/vf_cas.c +299 −0
libavfilter/Makefile+1−0
@@ -177,6 +177,7 @@ OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o boxblur.o · 176 unmodified lines
177OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) += vf_avgblur_opencl.o opencl.o \177OBJS-$(CONFIG_BOXBLUR_OPENCL_FILTER) += vf_avgblur_opencl.o opencl.o \
178 opencl/avgblur.o boxblur.o178 opencl/avgblur.o boxblur.o
179OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o yadif_common.o179OBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o yadif_common.o
180OBJS-$(CONFIG_CAS_FILTER) += vf_cas.o
180OBJS-$(CONFIG_CHROMABER_VULKAN_FILTER) += vf_chromaber_vulkan.o vulkan.o181OBJS-$(CONFIG_CHROMABER_VULKAN_FILTER) += vf_chromaber_vulkan.o vulkan.o
181OBJS-$(CONFIG_CHROMAHOLD_FILTER) += vf_chromakey.o182OBJS-$(CONFIG_CHROMAHOLD_FILTER) += vf_chromakey.o
182OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o183OBJS-$(CONFIG_CHROMAKEY_FILTER) += vf_chromakey.o
libavfilter/allfilters.c+1−0
@@ -168,6 +168,7 @@ extern AVFilter ff_vf_bm3d; · 167 unmodified lines
168extern AVFilter ff_vf_boxblur;168extern AVFilter ff_vf_boxblur;
169extern AVFilter ff_vf_boxblur_opencl;169extern AVFilter ff_vf_boxblur_opencl;
170extern AVFilter ff_vf_bwdif;170extern AVFilter ff_vf_bwdif;
171extern AVFilter ff_vf_cas;
171extern AVFilter ff_vf_chromahold;172extern AVFilter ff_vf_chromahold;
172extern AVFilter ff_vf_chromakey;173extern AVFilter ff_vf_chromakey;
173extern AVFilter ff_vf_chromashift;174extern AVFilter ff_vf_chromashift;
libavfilter/version.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
30#include "libavutil/version.h"30#include "libavutil/version.h"
31 31
32#define LIBAVFILTER_VERSION_MAJOR 732#define LIBAVFILTER_VERSION_MAJOR 7
33#define LIBAVFILTER_VERSION_MINOR 7633#define LIBAVFILTER_VERSION_MINOR 77
34#define LIBAVFILTER_VERSION_MICRO 10034#define LIBAVFILTER_VERSION_MICRO 100
35 35
36 36
libavfilter/vf_cas.c+299−0
@@ -0,0 +1,299 @@
1/*
2 * This file is part of FFmpeg.
3 *
4 * FFmpeg is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version.
8 *
9 * FFmpeg is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details.
13 *
14 * You should have received a copy of the GNU Lesser General Public
15 * License along with FFmpeg; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 */
18
19#include "libavutil/opt.h"
20#include "libavutil/imgutils.h"
21#include "avfilter.h"
22#include "formats.h"
23#include "internal.h"
24#include "video.h"
25
26typedef struct CASContext {
27 const AVClass *class;
28
29 float strength;
30 int planes;
31 int nb_planes;
32
33 int depth;
34 int planeheight[4];
35 int planewidth[4];
36
37 AVFrame *in;
38
39 int (*do_slice)(AVFilterContext *s, void *arg,
40 int jobnr, int nb_jobs);
41} CASContext;
42
43static inline float lerpf(float v0, float v1, float f)
44{
45 return v0 + (v1 - v0) * f;
46}
47
48static int cas_slice8(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs)
49{
50 CASContext *s = avctx->priv;
51 const float strength = -lerpf(16.f, 4.01f, s->strength);
52 AVFrame *out = arg;
53 AVFrame *in = s->in;
54
55 for (int p = 0; p < s->nb_planes; p++) {
56 const int slice_start = (s->planeheight[p] * jobnr) / nb_jobs;
57 const int slice_end = (s->planeheight[p] * (jobnr+1)) / nb_jobs;
58 const int linesize = out->linesize[p];
59 const int in_linesize = in->linesize[p];
60 const int w = s->planewidth[p];
61 const int w1 = w - 1;;
62 const int h = s->planeheight[p];
63 const int h1 = h - 1;
64 uint8_t *dst = out->data[p] + slice_start * linesize;
65 const uint8_t *src = in->data[p];
66
67 if (!((1 << p) & s->planes)) {
68 av_image_copy_plane(dst, linesize, src + slice_start * linesize, in_linesize,
69 w, slice_end - slice_start);
70 continue;
71 }
72
73 for (int y = slice_start; y < slice_end; y++) {
74 const int y0 = FFMAX(y - 1, 0);
75 const int y1 = FFMIN(y + 1, h1);
76 for (int x = 0; x < w; x++) {
77 const int x0 = FFMAX(x - 1, 0);
78 const int x1 = FFMIN(x + 1, w1);
79 int a = src[y0 * in_linesize + x0];
80 int b = src[y0 * in_linesize + x];
81 int c = src[y0 * in_linesize + x1];
82 int d = src[y * in_linesize + x0];
83 int e = src[y * in_linesize + x];
84 int f = src[y * in_linesize + x1];
85 int g = src[y1 * in_linesize + x0];
86 int h = src[y1 * in_linesize + x];
87 int i = src[y1 * in_linesize + x1];
88 int mn, mn2, mx, mx2;
89 float amp, weight;
90
91 mn = FFMIN3(FFMIN3( d, e, f), b, h);
92 mn2 = FFMIN3(FFMIN3(mn, a, c), g, i);
93
94 mn = mn + mn2;
95
96 mx = FFMAX3(FFMAX3( d, e, f), b, h);
97 mx2 = FFMAX3(FFMAX3(mx, a, c), g, i);
98
99 mx = mx + mx2;
100
101 amp = sqrtf(av_clipf(FFMIN(mn, 511 - mx) / (float)mx, 0.f, 1.f));
102
103 weight = amp / strength;
104
105 dst[x] = av_clip_uint8(((b + d + f + h) * weight + e) / (1.f + 4.f * weight));
106 }
107 dst += linesize;
108 }
109 }
110
111 return 0;
112}
113
114static int cas_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs)
115{
116 CASContext *s = avctx->priv;
117 const float strength = -lerpf(16.f, 4.01f, s->strength);
118 const int max = 2 * (1 << s->depth) - 1;
119 AVFrame *out = arg;
120 AVFrame *in = s->in;
121
122 for (int p = 0; p < s->nb_planes; p++) {
123 const int slice_start = (s->planeheight[p] * jobnr) / nb_jobs;
124 const int slice_end = (s->planeheight[p] * (jobnr+1)) / nb_jobs;
125 const int linesize = out->linesize[p] / 2;
126 const int in_linesize = in->linesize[p] / 2;
127 const int w = s->planewidth[p];
128 const int w1 = w - 1;;
129 const int h = s->planeheight[p];
130 const int h1 = h - 1;
131 uint16_t *dst = (uint16_t *)out->data[p] + slice_start * linesize;
132 const uint16_t *src = (const uint16_t *)in->data[p];
133
134 if (!((1 << p) & s->planes)) {
135 av_image_copy_plane((uint8_t *)dst, linesize, (uint8_t *)(src + slice_start * linesize),
136 in_linesize, w * 2, slice_end - slice_start);
137 continue;
138 }
139
140 for (int y = slice_start; y < slice_end; y++) {
141 const int y0 = FFMAX(y - 1, 0);
142 const int y1 = FFMIN(y + 1, h1);
143 for (int x = 0; x < w; x++) {
144 const int x0 = FFMAX(x - 1, 0);
145 const int x1 = FFMIN(x + 1, w1);
146 int a = src[y0 * in_linesize + x0];
147 int b = src[y0 * in_linesize + x];
148 int c = src[y0 * in_linesize + x1];
149 int d = src[y * in_linesize + x0];
150 int e = src[y * in_linesize + x];
151 int f = src[y * in_linesize + x1];
152 int g = src[y1 * in_linesize + x0];
153 int h = src[y1 * in_linesize + x];
154 int i = src[y1 * in_linesize + x1];
155 int mn, mn2, mx, mx2;
156 float amp, weight;
157
158 mn = FFMIN3(FFMIN3( d, e, f), b, h);
159 mn2 = FFMIN3(FFMIN3(mn, a, c), g, i);
160
161 mn = mn + mn2;
162
163 mx = FFMAX3(FFMAX3( d, e, f), b, h);
164 mx2 = FFMAX3(FFMAX3(mx, a, c), g, i);
165
166 mx = mx + mx2;
167
168 amp = sqrtf(av_clipf(FFMIN(mn, max - mx) / (float)mx, 0.f, 1.f));
169
170 weight = amp / strength;
171
172 dst[x] = av_clip_uintp2_c(((b + d + f + h) * weight + e) / (1.f + 4.f * weight), s->depth);
173 }
174 dst += linesize;
175 }
176 }
177
178 return 0;
179}
180
181static int filter_frame(AVFilterLink *inlink, AVFrame *in)
182{
183 AVFilterContext *ctx = inlink->dst;
184 AVFilterLink *outlink = ctx->outputs[0];
185 CASContext *s = ctx->priv;
186 AVFrame *out;
187
188 out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
189 if (!out) {
190 av_frame_free(&in);
191 return AVERROR(ENOMEM);
192 }
193 av_frame_copy_props(out, in);
194
195 s->in = in;
196 ctx->internal->execute(ctx, s->do_slice, out, NULL,
197 FFMIN(in->height, ff_filter_get_nb_threads(ctx)));
198 av_frame_free(&in);
199 s->in = NULL;
200
201 return ff_filter_frame(ctx->outputs[0], out);
202}
203
204static av_cold int query_formats(AVFilterContext *avctx)
205{
206 static const enum AVPixelFormat pixel_fmts[] = {
207 AV_PIX_FMT_GRAY8,
208 AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10,
209 AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16,
210 AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
211 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P,
212 AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P,
213 AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
214 AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ444P,
215 AV_PIX_FMT_YUVJ411P,
216 AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
217 AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
218 AV_PIX_FMT_YUV440P10,
219 AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12,
220 AV_PIX_FMT_YUV440P12,
221 AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV420P14,
222 AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16,
223 AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
224 AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
225 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
226 AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16,
227 AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA422P16,
228 AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16,
229 AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16,
230 AV_PIX_FMT_NONE
231 };
232
233 AVFilterFormats *formats = NULL;
234
235 formats = ff_make_format_list(pixel_fmts);
236 if (!formats)
237 return AVERROR(ENOMEM);
238
239 return ff_set_common_formats(avctx, formats);
240}
241
242static av_cold int config_input(AVFilterLink *inlink)
243{
244 AVFilterContext *avctx = inlink->dst;
245 CASContext *s = avctx->priv;
246 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
247
248 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
249 s->planeheight[0] = s->planeheight[3] = inlink->h;
250 s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w);
251 s->planewidth[0] = s->planewidth[3] = inlink->w;
252
253 s->depth = desc->comp[0].depth;
254 s->nb_planes = desc->nb_components;
255 s->do_slice = s->depth <= 8 ? cas_slice8 : cas_slice16;
256
257 return 0;
258}
259
260static const AVFilterPad cas_inputs[] = {
261 {
262 .name = "default",
263 .type = AVMEDIA_TYPE_VIDEO,
264 .filter_frame = filter_frame,
265 .config_props = config_input,
266 },
267 { NULL }
268};
269
270static const AVFilterPad cas_outputs[] = {
271 {
272 .name = "default",
273 .type = AVMEDIA_TYPE_VIDEO,
274 },
275 { NULL }
276};
277
278#define OFFSET(x) offsetof(CASContext, x)
279#define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
280
281static const AVOption cas_options[] = {
282 { "strength", "set the sharpening strength", OFFSET(strength), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 1, VF },
283 { "planes", "set what planes to filter", OFFSET(planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 0, 15, VF },
284 { NULL }
285};
286
287AVFILTER_DEFINE_CLASS(cas);
288
289AVFilter ff_vf_cas = {
290 .name = "cas",
291 .description = NULL_IF_CONFIG_SMALL("Contrast Adaptive Sharpen."),
292 .priv_size = sizeof(CASContext),
293 .priv_class = &cas_class,
294 .query_formats = query_formats,
295 .inputs = cas_inputs,
296 .outputs = cas_outputs,
297 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
298 .process_command = ff_filter_process_command,
299};

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