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

avfilter/bwdif: move filter_line init to a dedicated function

Browse Source
This commit is contained in:
James Darnley 2023-02-20 20:55:08 +01:00
parent 90488e1440
commit b503b5a0cf
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/bwdif.h
View File

@ -37,6 +37,7 @@ typedef struct BWDIFContext {
int parity, int clip_max, int spat); int parity, int clip_max, int spat);
} BWDIFContext; } BWDIFContext;
void ff_bwdif_init_x86(BWDIFContext *bwdif); void ff_bwdif_init_filter_line(BWDIFContext *bwdif, int bit_depth);
void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth);
#endif /* AVFILTER_BWDIF_H */ #endif /* AVFILTER_BWDIF_H */

13
libavfilter/vf_bwdif.c
View File

@ -340,7 +340,14 @@ static int config_props(AVFilterLink *link)
yadif->csp = av_pix_fmt_desc_get(link->format); yadif->csp = av_pix_fmt_desc_get(link->format);
yadif->filter = filter; yadif->filter = filter;
if (yadif->csp->comp[0].depth > 8) { ff_bwdif_init_filter_line(s, yadif->csp->comp[0].depth);
return 0;
}
av_cold void ff_bwdif_init_filter_line(BWDIFContext *s, int bit_depth)
{
if (bit_depth > 8) {
s->filter_intra = filter_intra_16bit; s->filter_intra = filter_intra_16bit;
s->filter_line = filter_line_c_16bit; s->filter_line = filter_line_c_16bit;
s->filter_edge = filter_edge_16bit; s->filter_edge = filter_edge_16bit;
@ -351,10 +358,8 @@ static int config_props(AVFilterLink *link)
} }
#if ARCH_X86 #if ARCH_X86
ff_bwdif_init_x86(s); ff_bwdif_init_x86(s, bit_depth);
#endif #endif
return 0;
} }

4
libavfilter/x86/vf_bwdif_init.c
View File

@ -42,11 +42,9 @@ void ff_bwdif_filter_line_12bit_ssse3(void *dst, void *prev, void *cur, void *ne
int mrefs2, int prefs3, int mrefs3, int prefs4, int mrefs2, int prefs3, int mrefs3, int prefs4,
int mrefs4, int parity, int clip_max); int mrefs4, int parity, int clip_max);
av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif) av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth)
{ {
YADIFContext *yadif = &bwdif->yadif;
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
int bit_depth = (!yadif->csp) ? 8 : yadif->csp->comp[0].depth;
if (bit_depth <= 8) { if (bit_depth <= 8) {
if (EXTERNAL_SSE2(cpu_flags)) if (EXTERNAL_SSE2(cpu_flags))