History

avfilter/vf_hsvkey: Use formats list instead of query function

In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to.

Andreas Rheinhardt committed 5 years ago

Commit a26efeb1 parent 253dc9b1 file · +3 −11Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_hsvkey.c+3−11
@@ -244,9 +244,7 @@ static av_cold int config_output(AVFilterLink *outlink) · 243 unmodified lines
244244 return 0;
245245 }
246246
247−static av_cold int query_formats(AVFilterContext *avctx)
248−{
249− static const enum AVPixelFormat pixel_fmts[] = {
247+static const enum AVPixelFormat key_pixel_fmts[] = {
250248 AV_PIX_FMT_YUVA420P,
251249 AV_PIX_FMT_YUVA422P,
252250 AV_PIX_FMT_YUVA444P,
@@ -275,12 +273,6 @@ static av_cold int query_formats(AVFilterContext *avctx) · 22 unmodified lines
275273 AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16,
276274 AV_PIX_FMT_NONE
277275 };
278− const enum AVPixelFormat *pix_fmts;
279−
280− pix_fmts = !strcmp(avctx->filter->name, "hsvhold") ? hold_pixel_fmts : pixel_fmts;
281−
282− return ff_set_common_formats_from_list(avctx, pix_fmts);
283−}
284276
285277 static av_cold int config_input(AVFilterLink *inlink)
286278 {
@@ -333,7 +325,7 @@ const AVFilter ff_vf_hsvkey = { · 46 unmodified lines
333325 .priv_class = &hsvkey_class,
334326 FILTER_INPUTS(hsvkey_inputs),
335327 FILTER_OUTPUTS(hsvkey_outputs),
336− FILTER_QUERY_FUNC(query_formats),
328+ FILTER_PIXFMTS_ARRAY(key_pixel_fmts),
337329 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
338330 .process_command = ff_filter_process_command,
339331 };
@@ -374,7 +366,7 @@ const AVFilter ff_vf_hsvhold = { · 34 unmodified lines
374366 .priv_class = &hsvhold_class,
375367 FILTER_INPUTS(hsvhold_inputs),
376368 FILTER_OUTPUTS(hsvhold_outputs),
377− FILTER_QUERY_FUNC(query_formats),
369+ FILTER_PIXFMTS_ARRAY(hold_pixel_fmts),
378370 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
379371 .process_command = ff_filter_process_command,
380372 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t