virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vf_yadif: factorize initializing the filtering callbacks

Browse Source 
Do it all in config_props().
This commit is contained in:
Anton Khirnov
2013-02-09 08:28:37 +01:00
parent 3594554a06
commit ccd70d9c16
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavfilter/vf_yadif.c
View File

@@ -194,11 +194,6 @@ static int return_frame(AVFilterContext *ctx, int is_second)
yadif->out->video->interlaced = 0; yadif->out->video->interlaced = 0;
} }
if (!yadif->csp)
yadif->csp = av_pix_fmt_desc_get(link->format);
if (yadif->csp->comp[0].depth_minus1 / 8 == 1)
yadif->filter_line = filter_line_c_16bit;
filter(ctx, yadif->out, tff ^ !is_second, tff); filter(ctx, yadif->out, tff ^ !is_second, tff);
if (is_second) { if (is_second) {
@@ -374,17 +369,11 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
yadif->mode = 0; yadif->mode = 0;
yadif->parity = -1; yadif->parity = -1;
yadif->auto_enable = 0; yadif->auto_enable = 0;
yadif->csp = NULL;
if (args) if (args)
sscanf(args, "%d:%d:%d", sscanf(args, "%d:%d:%d",
&yadif->mode, &yadif->parity, &yadif->auto_enable); &yadif->mode, &yadif->parity, &yadif->auto_enable);
yadif->filter_line = filter_line_c;
if (ARCH_X86)
ff_yadif_init_x86(yadif);
av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n", av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n",
yadif->mode, yadif->parity, yadif->auto_enable); yadif->mode, yadif->parity, yadif->auto_enable);
@@ -393,11 +382,23 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
static int config_props(AVFilterLink *link) static int config_props(AVFilterLink *link)
{ {
YADIFContext *s = link->src->priv;
link->time_base.num = link->src->inputs[0]->time_base.num; link->time_base.num = link->src->inputs[0]->time_base.num;
link->time_base.den = link->src->inputs[0]->time_base.den * 2; link->time_base.den = link->src->inputs[0]->time_base.den * 2;
link->w = link->src->inputs[0]->w; link->w = link->src->inputs[0]->w;
link->h = link->src->inputs[0]->h; link->h = link->src->inputs[0]->h;
s->csp = av_pix_fmt_desc_get(link->format);
if (s->csp->comp[0].depth_minus1 / 8 == 1) {
s->filter_line = filter_line_c_16bit;
} else {
s->filter_line = filter_line_c;
if (ARCH_X86)
ff_yadif_init_x86(s);
}
return 0; return 0;
} }