History

avfilter/vsrc_testsrc: Deduplicate AVClasses

Andreas Rheinhardt committed 5 years ago

Commit 4906a451 parent f8047181 file · +16 −31Browse files

Unified · Split

libavfilter/vsrc_testsrc.c+16−31
@@ -409,10 +409,9 @@ const AVFilter ff_vsrc_haldclutsrc = { · 408 unmodified lines
409};409};
410#endif /* CONFIG_HALDCLUTSRC_FILTER */410#endif /* CONFIG_HALDCLUTSRC_FILTER */
411 411
412#if CONFIG_NULLSRC_FILTER412AVFILTER_DEFINE_CLASS_EXT(nullsrc_yuvtestsrc, "nullsrc/yuvtestsrc", options);
413 413
414#define nullsrc_options options414#if CONFIG_NULLSRC_FILTER
415AVFILTER_DEFINE_CLASS(nullsrc);
416 415
417static void nullsrc_fill_picture(AVFilterContext *ctx, AVFrame *picref) { }416static void nullsrc_fill_picture(AVFilterContext *ctx, AVFrame *picref) { }
418 417
@@ -435,11 +434,11 @@ static const AVFilterPad nullsrc_outputs[] = { · 16 unmodified lines
435const AVFilter ff_vsrc_nullsrc = {434const AVFilter ff_vsrc_nullsrc = {
436 .name = "nullsrc",435 .name = "nullsrc",
437 .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."),436 .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."),
437 .priv_class = &nullsrc_yuvtestsrc_class,
438 .init = nullsrc_init,438 .init = nullsrc_init,
439 .uninit = uninit,439 .uninit = uninit,
440 .activate = activate,440 .activate = activate,
441 .priv_size = sizeof(TestSourceContext),441 .priv_size = sizeof(TestSourceContext),
442 .priv_class = &nullsrc_class,
443 .inputs = NULL,442 .inputs = NULL,
444 FILTER_OUTPUTS(nullsrc_outputs),443 FILTER_OUTPUTS(nullsrc_outputs),
445};444};
@@ -1124,9 +1123,6 @@ const AVFilter ff_vsrc_rgbtestsrc = { · 678 unmodified lines
1124 1123
1125#if CONFIG_YUVTESTSRC_FILTER1124#if CONFIG_YUVTESTSRC_FILTER
1126 1125
1127#define yuvtestsrc_options options
1128AVFILTER_DEFINE_CLASS(yuvtestsrc);
1129
1130static void yuvtest_fill_picture8(AVFilterContext *ctx, AVFrame *frame)1126static void yuvtest_fill_picture8(AVFilterContext *ctx, AVFrame *frame)
1131{1127{
1132 int x, y, w = frame->width, h = frame->height / 3;1128 int x, y, w = frame->width, h = frame->height / 3;
@@ -1283,7 +1279,7 @@ const AVFilter ff_vsrc_yuvtestsrc = { · 150 unmodified lines
1283 .name = "yuvtestsrc",1279 .name = "yuvtestsrc",
1284 .description = NULL_IF_CONFIG_SMALL("Generate YUV test pattern."),1280 .description = NULL_IF_CONFIG_SMALL("Generate YUV test pattern."),
1285 .priv_size = sizeof(TestSourceContext),1281 .priv_size = sizeof(TestSourceContext),
1286 .priv_class = &yuvtestsrc_class,1282 .priv_class = &nullsrc_yuvtestsrc_class,
1287 .init = yuvtest_init,1283 .init = yuvtest_init,
1288 .uninit = uninit,1284 .uninit = uninit,
1289 .query_formats = yuvtest_query_formats,1285 .query_formats = yuvtest_query_formats,
@@ -1418,10 +1414,9 @@ static const AVFilterPad smptebars_outputs[] = { · 128 unmodified lines
1418 },1414 },
1419};1415};
1420 1416
1421#if CONFIG_PAL75BARS_FILTER1417AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options);
1422 1418
1423#define pal75bars_options options1419#if CONFIG_PAL75BARS_FILTER
1424AVFILTER_DEFINE_CLASS(pal75bars);
1425 1420
1426static void pal75bars_fill_picture(AVFilterContext *ctx, AVFrame *picref)1421static void pal75bars_fill_picture(AVFilterContext *ctx, AVFrame *picref)
1427{1422{
@@ -1455,8 +1450,8 @@ static av_cold int pal75bars_init(AVFilterContext *ctx) · 27 unmodified lines
1455const AVFilter ff_vsrc_pal75bars = {1450const AVFilter ff_vsrc_pal75bars = {
1456 .name = "pal75bars",1451 .name = "pal75bars",
1457 .description = NULL_IF_CONFIG_SMALL("Generate PAL 75% color bars."),1452 .description = NULL_IF_CONFIG_SMALL("Generate PAL 75% color bars."),
1453 .priv_class = &palbars_class,
1458 .priv_size = sizeof(TestSourceContext),1454 .priv_size = sizeof(TestSourceContext),
1459 .priv_class = &pal75bars_class,
1460 .init = pal75bars_init,1455 .init = pal75bars_init,
1461 .uninit = uninit,1456 .uninit = uninit,
1462 .query_formats = smptebars_query_formats,1457 .query_formats = smptebars_query_formats,
@@ -1469,9 +1464,6 @@ const AVFilter ff_vsrc_pal75bars = { · 6 unmodified lines
1469 1464
1470#if CONFIG_PAL100BARS_FILTER1465#if CONFIG_PAL100BARS_FILTER
1471 1466
1472#define pal100bars_options options
1473AVFILTER_DEFINE_CLASS(pal100bars);
1474
1475static void pal100bars_fill_picture(AVFilterContext *ctx, AVFrame *picref)1467static void pal100bars_fill_picture(AVFilterContext *ctx, AVFrame *picref)
1476{1468{
1477 TestSourceContext *test = ctx->priv;1469 TestSourceContext *test = ctx->priv;
@@ -1502,8 +1494,8 @@ static av_cold int pal100bars_init(AVFilterContext *ctx) · 24 unmodified lines
1502const AVFilter ff_vsrc_pal100bars = {1494const AVFilter ff_vsrc_pal100bars = {
1503 .name = "pal100bars",1495 .name = "pal100bars",
1504 .description = NULL_IF_CONFIG_SMALL("Generate PAL 100% color bars."),1496 .description = NULL_IF_CONFIG_SMALL("Generate PAL 100% color bars."),
1497 .priv_class = &palbars_class,
1505 .priv_size = sizeof(TestSourceContext),1498 .priv_size = sizeof(TestSourceContext),
1506 .priv_class = &pal100bars_class,
1507 .init = pal100bars_init,1499 .init = pal100bars_init,
1508 .uninit = uninit,1500 .uninit = uninit,
1509 .query_formats = smptebars_query_formats,1501 .query_formats = smptebars_query_formats,
@@ -1514,10 +1506,9 @@ const AVFilter ff_vsrc_pal100bars = { · 4 unmodified lines
1514 1506
1515#endif /* CONFIG_PAL100BARS_FILTER */1507#endif /* CONFIG_PAL100BARS_FILTER */
1516 1508
1517#if CONFIG_SMPTEBARS_FILTER1509AVFILTER_DEFINE_CLASS_EXT(smptebars, "smpte(hd)bars", options);
1518 1510
1519#define smptebars_options options1511#if CONFIG_SMPTEBARS_FILTER
1520AVFILTER_DEFINE_CLASS(smptebars);
1521 1512
1522static void smptebars_fill_picture(AVFilterContext *ctx, AVFrame *picref)1513static void smptebars_fill_picture(AVFilterContext *ctx, AVFrame *picref)
1523{1514{
@@ -1584,9 +1575,6 @@ const AVFilter ff_vsrc_smptebars = { · 60 unmodified lines
1584 1575
1585#if CONFIG_SMPTEHDBARS_FILTER1576#if CONFIG_SMPTEHDBARS_FILTER
1586 1577
1587#define smptehdbars_options options
1588AVFILTER_DEFINE_CLASS(smptehdbars);
1589
1590static void smptehdbars_fill_picture(AVFilterContext *ctx, AVFrame *picref)1578static void smptehdbars_fill_picture(AVFilterContext *ctx, AVFrame *picref)
1591{1579{
1592 TestSourceContext *test = ctx->priv;1580 TestSourceContext *test = ctx->priv;
@@ -1676,8 +1664,8 @@ static av_cold int smptehdbars_init(AVFilterContext *ctx) · 83 unmodified lines
1676const AVFilter ff_vsrc_smptehdbars = {1664const AVFilter ff_vsrc_smptehdbars = {
1677 .name = "smptehdbars",1665 .name = "smptehdbars",
1678 .description = NULL_IF_CONFIG_SMALL("Generate SMPTE HD color bars."),1666 .description = NULL_IF_CONFIG_SMALL("Generate SMPTE HD color bars."),
1667 .priv_class = &smptebars_class,
1679 .priv_size = sizeof(TestSourceContext),1668 .priv_size = sizeof(TestSourceContext),
1680 .priv_class = &smptehdbars_class,
1681 .init = smptehdbars_init,1669 .init = smptehdbars_init,
1682 .uninit = uninit,1670 .uninit = uninit,
1683 .query_formats = smptebars_query_formats,1671 .query_formats = smptebars_query_formats,
@@ -1689,10 +1677,10 @@ const AVFilter ff_vsrc_smptehdbars = { · 5 unmodified lines
1689#endif /* CONFIG_SMPTEHDBARS_FILTER */1677#endif /* CONFIG_SMPTEHDBARS_FILTER */
1690#endif /* CONFIG_SMPTEBARS_FILTER || CONFIG_SMPTEHDBARS_FILTER */1678#endif /* CONFIG_SMPTEBARS_FILTER || CONFIG_SMPTEHDBARS_FILTER */
1691 1679
1692#if CONFIG_ALLYUV_FILTER1680AVFILTER_DEFINE_CLASS_EXT(allyuv_allrgb, "allyuv/allrgb",
1681 &options[NOSIZE_OPTIONS_OFFSET]);
1693 1682
1694#define allyuv_options &options[NOSIZE_OPTIONS_OFFSET]1683#if CONFIG_ALLYUV_FILTER
1695AVFILTER_DEFINE_CLASS(allyuv);
1696 1684
1697static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame)1685static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame)
1698{1686{
@@ -1751,7 +1739,7 @@ const AVFilter ff_vsrc_allyuv = { · 52 unmodified lines
1751 .name = "allyuv",1739 .name = "allyuv",
1752 .description = NULL_IF_CONFIG_SMALL("Generate all yuv colors."),1740 .description = NULL_IF_CONFIG_SMALL("Generate all yuv colors."),
1753 .priv_size = sizeof(TestSourceContext),1741 .priv_size = sizeof(TestSourceContext),
1754 .priv_class = &allyuv_class,1742 .priv_class = &allyuv_allrgb_class,
1755 .init = allyuv_init,1743 .init = allyuv_init,
1756 .uninit = uninit,1744 .uninit = uninit,
1757 .query_formats = allyuv_query_formats,1745 .query_formats = allyuv_query_formats,
@@ -1764,9 +1752,6 @@ const AVFilter ff_vsrc_allyuv = { · 6 unmodified lines
1764 1752
1765#if CONFIG_ALLRGB_FILTER1753#if CONFIG_ALLRGB_FILTER
1766 1754
1767#define allrgb_options &options[NOSIZE_OPTIONS_OFFSET]
1768AVFILTER_DEFINE_CLASS(allrgb);
1769
1770static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame)1755static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame)
1771{1756{
1772 unsigned x, y;1757 unsigned x, y;
@@ -1824,7 +1809,7 @@ const AVFilter ff_vsrc_allrgb = { · 51 unmodified lines
1824 .name = "allrgb",1809 .name = "allrgb",
1825 .description = NULL_IF_CONFIG_SMALL("Generate all RGB colors."),1810 .description = NULL_IF_CONFIG_SMALL("Generate all RGB colors."),
1826 .priv_size = sizeof(TestSourceContext),1811 .priv_size = sizeof(TestSourceContext),
1827 .priv_class = &allrgb_class,1812 .priv_class = &allyuv_allrgb_class,
1828 .init = allrgb_init,1813 .init = allrgb_init,
1829 .uninit = uninit,1814 .uninit = uninit,
1830 .query_formats = allrgb_query_formats,1815 .query_formats = allrgb_query_formats,

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