highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/unsharp: clarify invalid filter param constraints

Browse Source 
Clarify failure in case of x/y building a too big matrix.

Example:
$ ffmpeg -hide_banner -f lavfi -i color=c=white:size=640x360,unsharp=lx=5:ly=23 -f null -t 1 -
[Parsed_unsharp_1 @ 0x5650e1c30240] luma matrix size (lx/2+ly/2)*2=26 greater than maximum value 25
color=c=white:size=640x360,unsharp=lx=5:ly=23: Invalid argument

Fix trac issue:
http://trac.ffmpeg.org/ticket/6033
This commit is contained in:
Stefano Sabatini
2023-03-25 17:17:37 +01:00
parent 774d358e0f
commit 9d140ecaf8
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/vf_unsharp.c
View File

@@ -171,7 +171,10 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
return 0; return 0;
} }
static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, float amount) #define MAX_SCALEBITS 25
static int set_filter_param(AVFilterContext *ctx, const char *name, const char *short_name,
UnsharpFilterParam *fp, int msize_x, int msize_y, float amount)
{ {
fp->msize_x = msize_x; fp->msize_x = msize_x;
fp->msize_y = msize_y; fp->msize_y = msize_y;
@@ -181,20 +184,31 @@ static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, f
fp->steps_y = msize_y / 2; fp->steps_y = msize_y / 2;
fp->scalebits = (fp->steps_x + fp->steps_y) * 2; fp->scalebits = (fp->steps_x + fp->steps_y) * 2;
fp->halfscale = 1 << (fp->scalebits - 1); fp->halfscale = 1 << (fp->scalebits - 1);
if (fp->scalebits > MAX_SCALEBITS) {
av_log(ctx, AV_LOG_ERROR, "%s matrix size (%sx/2+%sy/2)*2=%d greater than maximum value %d\n",
name, short_name, short_name, fp->scalebits, MAX_SCALEBITS);
return AVERROR(EINVAL);
}
return 0;
} }
static av_cold int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
UnsharpContext *s = ctx->priv; UnsharpContext *s = ctx->priv;
int ret;
set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount); #define SET_FILTER_PARAM(name_, short_) \
set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount); ret = set_filter_param(ctx, #name_, #short_, &s->name_, \
set_filter_param(&s->alpha, s->amsize_x, s->amsize_y, s->aamount); s->short_##msize_x, s->short_##msize_y, s->short_##amount); \
if (ret < 0) \
return ret; \
SET_FILTER_PARAM(luma, l);
SET_FILTER_PARAM(chroma, c);
SET_FILTER_PARAM(alpha, a);
if (s->luma.scalebits >= 26 || s->chroma.scalebits >= 26 || s->alpha.scalebits >= 26) {
av_log(ctx, AV_LOG_ERROR, "luma or chroma or alpha matrix size too big\n");
return AVERROR(EINVAL);
}
s->apply_unsharp = apply_unsharp_c; s->apply_unsharp = apply_unsharp_c;
return 0; return 0;
} }