har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_spp: Use preinit instead of init_dict

Browse Source 
By using preinit, the AVDCT already exists directly after
allocating the filter, so that the filter's AVClass's child_next
becomes usable for setting options with the AV_OPT_SEARCH_CHILDREN
search flag. This means that it is no longer necessary to use
the init_dict callback for this filter.

Furthermore, the earlier code did not abide by the documentation
of the init_dict callback at all: Instead of only returning the
options that have not been recognized it always returned all options
on any av_opt_set() error and errored out in this case, even if it
is just an unrecognized option. This behaviour has been inherited by
avfilter_init_dict(), contradicting its documentation. This is also
fixed in this commit.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-13 16:54:58 +02:00
parent 0c34cf899d
commit a85d2de45f
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/vf_spp.c
View File

@ -338,6 +338,12 @@ static int config_input(AVFilterLink *inlink)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
const int bps = desc->comp[0].depth; const int bps = desc->comp[0].depth;
s->store_slice = store_slice_c;
switch (s->mode) {
case MODE_HARD: s->requantize = hardthresh_c; break;
case MODE_SOFT: s->requantize = softthresh_c; break;
}
av_opt_set_int(s->dct, "bits_per_sample", bps, 0); av_opt_set_int(s->dct, "bits_per_sample", bps, 0);
avcodec_dct_init(s->dct); avcodec_dct_init(s->dct);
@ -451,30 +457,14 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) static av_cold int preinit(AVFilterContext *ctx)
{ {
SPPContext *s = ctx->priv; SPPContext *s = ctx->priv;
int ret;
s->dct = avcodec_dct_alloc(); s->dct = avcodec_dct_alloc();
if (!s->dct) if (!s->dct)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (opts) {
AVDictionaryEntry *e = NULL;
while ((e = av_dict_get(*opts, "", e, AV_DICT_IGNORE_SUFFIX))) {
if ((ret = av_opt_set(s->dct, e->key, e->value, 0)) < 0)
return ret;
}
av_dict_free(opts);
}
s->store_slice = store_slice_c;
switch (s->mode) {
case MODE_HARD: s->requantize = hardthresh_c; break;
case MODE_SOFT: s->requantize = softthresh_c; break;
}
return 0; return 0;
} }
@ -508,7 +498,7 @@ const AVFilter ff_vf_spp = {
.name = "spp", .name = "spp",
.description = NULL_IF_CONFIG_SMALL("Apply a simple post processing filter."), .description = NULL_IF_CONFIG_SMALL("Apply a simple post processing filter."),
.priv_size = sizeof(SPPContext), .priv_size = sizeof(SPPContext),
.init_dict = init_dict, .preinit = preinit,
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
FILTER_INPUTS(spp_inputs), FILTER_INPUTS(spp_inputs),