History

lavfi/vsrc_testsrc: switch to query_func2()

Anton Khirnov committed 2 years ago

Commit aad4d571 parent 28bde4a1 file · +29 −18Browse files

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

Unified · Split

libavfilter/vsrc_testsrc.c+29−18
@@ -246,9 +246,11 @@ static av_cold int color_init(AVFilterContext *ctx) · 245 unmodified lines
246 return init(ctx);246 return init(ctx);
247}247}
248 248
249static int color_query_formats(AVFilterContext *ctx)249static int color_query_formats(const AVFilterContext *ctx,
250 AVFilterFormatsConfig **cfg_in,
251 AVFilterFormatsConfig **cfg_out)
250{252{
251 return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));253 return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_draw_supported_pixel_formats(0));
252}254}
253 255
254static int color_config_props(AVFilterLink *inlink)256static int color_config_props(AVFilterLink *inlink)
@@ -303,7 +305,7 @@ const AVFilter ff_vsrc_color = { · 48 unmodified lines
303 .activate = activate,305 .activate = activate,
304 .inputs = NULL,306 .inputs = NULL,
305 FILTER_OUTPUTS(color_outputs),307 FILTER_OUTPUTS(color_outputs),
306 FILTER_QUERY_FUNC(color_query_formats),308 FILTER_QUERY_FUNC2(color_query_formats),
307 .process_command = color_process_command,309 .process_command = color_process_command,
308};310};
309 311
@@ -927,9 +929,11 @@ static av_cold int test2_init(AVFilterContext *ctx) · 617 unmodified lines
927 return init(ctx);929 return init(ctx);
928}930}
929 931
930static int test2_query_formats(AVFilterContext *ctx)932static int test2_query_formats(const AVFilterContext *ctx,
933 AVFilterFormatsConfig **cfg_in,
934 AVFilterFormatsConfig **cfg_out)
931{935{
932 return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));936 return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_draw_supported_pixel_formats(0));
933}937}
934 938
935static int test2_config_props(AVFilterLink *inlink)939static int test2_config_props(AVFilterLink *inlink)
@@ -964,7 +968,7 @@ const AVFilter ff_vsrc_testsrc2 = { · 28 unmodified lines
964 .activate = activate,968 .activate = activate,
965 .inputs = NULL,969 .inputs = NULL,
966 FILTER_OUTPUTS(avfilter_vsrc_testsrc2_outputs),970 FILTER_OUTPUTS(avfilter_vsrc_testsrc2_outputs),
967 FILTER_QUERY_FUNC(test2_query_formats),971 FILTER_QUERY_FUNC2(test2_query_formats),
968};972};
969 973
970#endif /* CONFIG_TESTSRC2_FILTER */974#endif /* CONFIG_TESTSRC2_FILTER */
@@ -1410,7 +1414,9 @@ static const enum AVPixelFormat smptebars_pix_fmts[] = { · 439 unmodified lines
1410 AV_PIX_FMT_NONE,1414 AV_PIX_FMT_NONE,
1411};1415};
1412 1416
1413static int smptebars_query_formats(AVFilterContext *ctx)1417static int smptebars_query_formats(const AVFilterContext *ctx,
1418 AVFilterFormatsConfig **cfg_in,
1419 AVFilterFormatsConfig **cfg_out)
1414{1420{
1415 enum AVColorSpace csp;1421 enum AVColorSpace csp;
1416 int ret;1422 int ret;
@@ -1421,11 +1427,13 @@ static int smptebars_query_formats(AVFilterContext *ctx) · 4 unmodified lines
1421 csp = AVCOL_SPC_BT470BG;1427 csp = AVCOL_SPC_BT470BG;
1422 }1428 }
1423 1429
1424 if ((ret = ff_set_common_color_spaces(ctx, ff_make_formats_list_singleton(csp))))1430 if ((ret = ff_set_common_color_spaces2(ctx, cfg_in, cfg_out,
1431 ff_make_formats_list_singleton(csp))))
1425 return ret;1432 return ret;
1426 if ((ret = ff_set_common_color_ranges(ctx, ff_make_formats_list_singleton(AVCOL_RANGE_MPEG))))1433 if ((ret = ff_set_common_color_ranges2(ctx, cfg_in, cfg_out,
1434 ff_make_formats_list_singleton(AVCOL_RANGE_MPEG))))
1427 return ret;1435 return ret;
1428 return ff_set_common_formats_from_list(ctx, smptebars_pix_fmts);1436 return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, smptebars_pix_fmts);
1429}1437}
1430 1438
1431AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options);1439AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options);
@@ -1468,7 +1476,7 @@ const AVFilter ff_vsrc_pal75bars = { · 36 unmodified lines
1468 .activate = activate,1476 .activate = activate,
1469 .inputs = NULL,1477 .inputs = NULL,
1470 FILTER_OUTPUTS(outputs),1478 FILTER_OUTPUTS(outputs),
1471 FILTER_QUERY_FUNC(smptebars_query_formats),1479 FILTER_QUERY_FUNC2(smptebars_query_formats),
1472};1480};
1473 1481
1474#endif /* CONFIG_PAL75BARS_FILTER */1482#endif /* CONFIG_PAL75BARS_FILTER */
@@ -1509,7 +1517,7 @@ const AVFilter ff_vsrc_pal100bars = { · 34 unmodified lines
1509 .activate = activate,1517 .activate = activate,
1510 .inputs = NULL,1518 .inputs = NULL,
1511 FILTER_OUTPUTS(outputs),1519 FILTER_OUTPUTS(outputs),
1512 FILTER_QUERY_FUNC(smptebars_query_formats),1520 FILTER_QUERY_FUNC2(smptebars_query_formats),
1513};1521};
1514 1522
1515#endif /* CONFIG_PAL100BARS_FILTER */1523#endif /* CONFIG_PAL100BARS_FILTER */
@@ -1574,7 +1582,7 @@ const AVFilter ff_vsrc_smptebars = { · 58 unmodified lines
1574 .activate = activate,1582 .activate = activate,
1575 .inputs = NULL,1583 .inputs = NULL,
1576 FILTER_OUTPUTS(outputs),1584 FILTER_OUTPUTS(outputs),
1577 FILTER_QUERY_FUNC(smptebars_query_formats),1585 FILTER_QUERY_FUNC2(smptebars_query_formats),
1578};1586};
1579 1587
1580#endif /* CONFIG_SMPTEBARS_FILTER */1588#endif /* CONFIG_SMPTEBARS_FILTER */
@@ -1675,7 +1683,7 @@ const AVFilter ff_vsrc_smptehdbars = { · 94 unmodified lines
1675 .activate = activate,1683 .activate = activate,
1676 .inputs = NULL,1684 .inputs = NULL,
1677 FILTER_OUTPUTS(outputs),1685 FILTER_OUTPUTS(outputs),
1678 FILTER_QUERY_FUNC(smptebars_query_formats),1686 FILTER_QUERY_FUNC2(smptebars_query_formats),
1679};1687};
1680 1688
1681#endif /* CONFIG_SMPTEHDBARS_FILTER */1689#endif /* CONFIG_SMPTEHDBARS_FILTER */
@@ -2193,12 +2201,15 @@ static const enum AVPixelFormat zoneplate_pix_fmts[] = { · 511 unmodified lines
2193 AV_PIX_FMT_NONE,2201 AV_PIX_FMT_NONE,
2194};2202};
2195 2203
2196static int zoneplate_query_formats(AVFilterContext *ctx)2204static int zoneplate_query_formats(const AVFilterContext *ctx,
2205 AVFilterFormatsConfig **cfg_in,
2206 AVFilterFormatsConfig **cfg_out)
2197{2207{
2198 int ret;2208 int ret;
2199 if ((ret = ff_set_common_color_ranges(ctx, ff_make_formats_list_singleton(AVCOL_RANGE_JPEG))))2209 if ((ret = ff_set_common_color_ranges2(ctx, cfg_in, cfg_out,
2210 ff_make_formats_list_singleton(AVCOL_RANGE_JPEG))))
2200 return ret;2211 return ret;
2201 return ff_set_common_formats_from_list(ctx, zoneplate_pix_fmts);2212 return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, zoneplate_pix_fmts);
2202}2213}
2203 2214
2204static const AVFilterPad avfilter_vsrc_zoneplate_outputs[] = {2215static const AVFilterPad avfilter_vsrc_zoneplate_outputs[] = {
@@ -2219,7 +2230,7 @@ const AVFilter ff_vsrc_zoneplate = { · 14 unmodified lines
2219 .activate = activate,2230 .activate = activate,
2220 .inputs = NULL,2231 .inputs = NULL,
2221 FILTER_OUTPUTS(avfilter_vsrc_zoneplate_outputs),2232 FILTER_OUTPUTS(avfilter_vsrc_zoneplate_outputs),
2222 FILTER_QUERY_FUNC(zoneplate_query_formats),2233 FILTER_QUERY_FUNC2(zoneplate_query_formats),
2223 .flags = AVFILTER_FLAG_SLICE_THREADS,2234 .flags = AVFILTER_FLAG_SLICE_THREADS,
2224 .process_command = ff_filter_process_command,2235 .process_command = ff_filter_process_command,
2225};2236};

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