avfilter/vf_convolution: improve runtime support for convolution filter

This commit is contained in:
Paul B Mahol 2021-10-23 14:47:11 +02:00
parent 9e8bb9efd9
commit 6c45d34e50

View File

@ -709,12 +709,14 @@ static int param_init(AVFilterContext *ctx)
if (!strcmp(ctx->filter->name, "convolution")) {
for (i = 0; i < 4; i++) {
int *matrix = (int *)s->matrix[i];
char *p, *arg, *saveptr = NULL;
float sum = 0;
char *orig, *p, *arg, *saveptr = NULL;
float sum = 1.f;
p = s->matrix_str[i];
p = orig = av_strdup(s->matrix_str[i]);
if (p) {
s->matrix_length[i] = 0;
s->rdiv[i] = 0.f;
sum = 0.f;
while (s->matrix_length[i] < 49) {
if (!(arg = av_strtok(p, " |", &saveptr)))
@ -726,6 +728,7 @@ static int param_init(AVFilterContext *ctx)
s->matrix_length[i]++;
}
av_freep(&orig);
if (!(s->matrix_length[i] & 1)) {
av_log(ctx, AV_LOG_ERROR, "number of matrix elements must be odd\n");
return AVERROR(EINVAL);