History

avfilter/vf_unsharp: add support for alpha formats

Paul B Mahol committed 4 years ago

Commit 84f55831 parent e1974623 files · +41 −9Browse files

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

Unified · Split

2 files
  1. libavfilter/unsharp.h +4 −1
  2. libavfilter/vf_unsharp.c +20 −8
libavfilter/unsharp.h+4−1
@@ -44,14 +44,17 @@ typedef struct UnsharpFilterParam { · 43 unmodified lines
44typedef struct UnsharpContext {44typedef struct UnsharpContext {
45 const AVClass *class;45 const AVClass *class;
46 int lmsize_x, lmsize_y, cmsize_x, cmsize_y;46 int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
47 int amsize_x, amsize_y;
47 float lamount, camount;48 float lamount, camount;
49 float aamount;
48 UnsharpFilterParam luma; ///< luma parameters (width, height, amount)50 UnsharpFilterParam luma; ///< luma parameters (width, height, amount)
49 UnsharpFilterParam chroma; ///< chroma parameters (width, height, amount)51 UnsharpFilterParam chroma; ///< chroma parameters (width, height, amount)
52 UnsharpFilterParam alpha; ///< alpha parameters (width, height, amount)
50 int hsub, vsub;53 int hsub, vsub;
54 int nb_planes;
51 int bitdepth;55 int bitdepth;
52 int bps;56 int bps;
53 int nb_threads;57 int nb_threads;
54 int opencl;
55 int (* apply_unsharp)(AVFilterContext *ctx, AVFrame *in, AVFrame *out);58 int (* apply_unsharp)(AVFilterContext *ctx, AVFrame *in, AVFrame *out);
56 int (* unsharp_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);59 int (* unsharp_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
57} UnsharpContext;60} UnsharpContext;
libavfilter/vf_unsharp.c+20−8
@@ -146,17 +146,18 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out) · 145 unmodified lines
146{146{
147 AVFilterLink *inlink = ctx->inputs[0];147 AVFilterLink *inlink = ctx->inputs[0];
148 UnsharpContext *s = ctx->priv;148 UnsharpContext *s = ctx->priv;
149 int i, plane_w[3], plane_h[3];149 int i, plane_w[4], plane_h[4];
150 UnsharpFilterParam *fp[3];150 UnsharpFilterParam *fp[4];
151 ThreadData td;151 ThreadData td;
152 152
153 plane_w[0] = inlink->w;153 plane_w[0] = plane_w[3] = inlink->w;
154 plane_w[1] = plane_w[2] = AV_CEIL_RSHIFT(inlink->w, s->hsub);154 plane_w[1] = plane_w[2] = AV_CEIL_RSHIFT(inlink->w, s->hsub);
155 plane_h[0] = inlink->h;155 plane_h[0] = plane_h[3] = inlink->h;
156 plane_h[1] = plane_h[2] = AV_CEIL_RSHIFT(inlink->h, s->vsub);156 plane_h[1] = plane_h[2] = AV_CEIL_RSHIFT(inlink->h, s->vsub);
157 fp[0] = &s->luma;157 fp[0] = &s->luma;
158 fp[1] = fp[2] = &s->chroma;158 fp[1] = fp[2] = &s->chroma;
159 for (i = 0; i < 3; i++) {159 fp[3] = &s->alpha;
160 for (i = 0; i < s->nb_planes; i++) {
160 td.fp = fp[i];161 td.fp = fp[i];
161 td.dst = out->data[i];162 td.dst = out->data[i];
162 td.src = in->data[i];163 td.src = in->data[i];
@@ -188,9 +189,10 @@ static av_cold int init(AVFilterContext *ctx) · 25 unmodified lines
188 189
189 set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount);190 set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount);
190 set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount);191 set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount);
192 set_filter_param(&s->alpha, s->amsize_x, s->amsize_y, s->aamount);
191 193
192 if (s->luma.scalebits >= 26 || s->chroma.scalebits >= 26) {194 if (s->luma.scalebits >= 26 || s->chroma.scalebits >= 26 || s->alpha.scalebits >= 26) {
193 av_log(ctx, AV_LOG_ERROR, "luma or chroma matrix size too big\n");195 av_log(ctx, AV_LOG_ERROR, "luma or chroma or alpha matrix size too big\n");
194 return AVERROR(EINVAL);196 return AVERROR(EINVAL);
195 }197 }
196 s->apply_unsharp = apply_unsharp_c;198 s->apply_unsharp = apply_unsharp_c;
@@ -198,6 +200,10 @@ static av_cold int init(AVFilterContext *ctx) · 1 unmodified line
198}200}
199 201
200static const enum AVPixelFormat pix_fmts[] = {202static const enum AVPixelFormat pix_fmts[] = {
203 AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
204 AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16,
205 AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA422P16,
206 AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16,
201 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P,207 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P,
202 AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,208 AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
203 AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,209 AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
@@ -242,6 +248,7 @@ static int config_input(AVFilterLink *inlink) · 38 unmodified lines
242 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);248 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
243 int ret;249 int ret;
244 250
251 s->nb_planes = desc->nb_components;
245 s->hsub = desc->log2_chroma_w;252 s->hsub = desc->log2_chroma_w;
246 s->vsub = desc->log2_chroma_h;253 s->vsub = desc->log2_chroma_h;
247 s->bitdepth = desc->comp[0].depth;254 s->bitdepth = desc->comp[0].depth;
@@ -325,7 +332,12 @@ static const AVOption unsharp_options[] = { · 77 unmodified lines
325 { "cy", "set chroma matrix vertical size", OFFSET(cmsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },332 { "cy", "set chroma matrix vertical size", OFFSET(cmsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
326 { "chroma_amount", "set chroma effect strength", OFFSET(camount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },333 { "chroma_amount", "set chroma effect strength", OFFSET(camount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },
327 { "ca", "set chroma effect strength", OFFSET(camount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },334 { "ca", "set chroma effect strength", OFFSET(camount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },
328 { "opencl", "ignored", OFFSET(opencl), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },335 { "alpha_msize_x", "set alpha matrix horizontal size", OFFSET(amsize_x), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
336 { "ax", "set alpha matrix horizontal size", OFFSET(amsize_x), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
337 { "alpha_msize_y", "set alpha matrix vertical size", OFFSET(amsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
338 { "ay", "set alpha matrix vertical size", OFFSET(amsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
339 { "alpha_amount", "set alpha effect strength", OFFSET(aamount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },
340 { "aa", "set alpha effect strength", OFFSET(aamount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },
329 { NULL }341 { NULL }
330};342};
331 343

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