History

lavfi/vsrc_testsrc: switch to query_func2()

Anton Khirnov committed 2 years ago

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

Unified · Split

libavfilter/vsrc_testsrc.c+29−18
@@ -246,9 +246,11 @@ static av_cold int color_init(AVFilterContext *ctx) · 245 unmodified lines
246246 return init(ctx);
247247 }
248248
249−static int color_query_formats(AVFilterContext *ctx)
249+static int color_query_formats(const AVFilterContext *ctx,
250+ AVFilterFormatsConfig **cfg_in,
251+ AVFilterFormatsConfig **cfg_out)
250252 {
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));
252254 }
253255
254256 static int color_config_props(AVFilterLink *inlink)
@@ -303,7 +305,7 @@ const AVFilter ff_vsrc_color = { · 48 unmodified lines
303305 .activate = activate,
304306 .inputs = NULL,
305307 FILTER_OUTPUTS(color_outputs),
306− FILTER_QUERY_FUNC(color_query_formats),
308+ FILTER_QUERY_FUNC2(color_query_formats),
307309 .process_command = color_process_command,
308310 };
309311
@@ -927,9 +929,11 @@ static av_cold int test2_init(AVFilterContext *ctx) · 617 unmodified lines
927929 return init(ctx);
928930 }
929931
930−static int test2_query_formats(AVFilterContext *ctx)
932+static int test2_query_formats(const AVFilterContext *ctx,
933+ AVFilterFormatsConfig **cfg_in,
934+ AVFilterFormatsConfig **cfg_out)
931935 {
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));
933937 }
934938
935939 static int test2_config_props(AVFilterLink *inlink)
@@ -964,7 +968,7 @@ const AVFilter ff_vsrc_testsrc2 = { · 28 unmodified lines
964968 .activate = activate,
965969 .inputs = NULL,
966970 FILTER_OUTPUTS(avfilter_vsrc_testsrc2_outputs),
967− FILTER_QUERY_FUNC(test2_query_formats),
971+ FILTER_QUERY_FUNC2(test2_query_formats),
968972 };
969973
970974 #endif /* CONFIG_TESTSRC2_FILTER */
@@ -1410,7 +1414,9 @@ static const enum AVPixelFormat smptebars_pix_fmts[] = { · 439 unmodified lines
14101414 AV_PIX_FMT_NONE,
14111415 };
14121416
1413−static int smptebars_query_formats(AVFilterContext *ctx)
1417+static int smptebars_query_formats(const AVFilterContext *ctx,
1418+ AVFilterFormatsConfig **cfg_in,
1419+ AVFilterFormatsConfig **cfg_out)
14141420 {
14151421 enum AVColorSpace csp;
14161422 int ret;
@@ -1421,11 +1427,13 @@ static int smptebars_query_formats(AVFilterContext *ctx) · 4 unmodified lines
14211427 csp = AVCOL_SPC_BT470BG;
14221428 }
14231429
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))))
14251432 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))))
14271435 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);
14291437 }
14301438
14311439 AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options);
@@ -1468,7 +1476,7 @@ const AVFilter ff_vsrc_pal75bars = { · 36 unmodified lines
14681476 .activate = activate,
14691477 .inputs = NULL,
14701478 FILTER_OUTPUTS(outputs),
1471− FILTER_QUERY_FUNC(smptebars_query_formats),
1479+ FILTER_QUERY_FUNC2(smptebars_query_formats),
14721480 };
14731481
14741482 #endif /* CONFIG_PAL75BARS_FILTER */
@@ -1509,7 +1517,7 @@ const AVFilter ff_vsrc_pal100bars = { · 34 unmodified lines
15091517 .activate = activate,
15101518 .inputs = NULL,
15111519 FILTER_OUTPUTS(outputs),
1512− FILTER_QUERY_FUNC(smptebars_query_formats),
1520+ FILTER_QUERY_FUNC2(smptebars_query_formats),
15131521 };
15141522
15151523 #endif /* CONFIG_PAL100BARS_FILTER */
@@ -1574,7 +1582,7 @@ const AVFilter ff_vsrc_smptebars = { · 58 unmodified lines
15741582 .activate = activate,
15751583 .inputs = NULL,
15761584 FILTER_OUTPUTS(outputs),
1577− FILTER_QUERY_FUNC(smptebars_query_formats),
1585+ FILTER_QUERY_FUNC2(smptebars_query_formats),
15781586 };
15791587
15801588 #endif /* CONFIG_SMPTEBARS_FILTER */
@@ -1675,7 +1683,7 @@ const AVFilter ff_vsrc_smptehdbars = { · 94 unmodified lines
16751683 .activate = activate,
16761684 .inputs = NULL,
16771685 FILTER_OUTPUTS(outputs),
1678− FILTER_QUERY_FUNC(smptebars_query_formats),
1686+ FILTER_QUERY_FUNC2(smptebars_query_formats),
16791687 };
16801688
16811689 #endif /* CONFIG_SMPTEHDBARS_FILTER */
@@ -2193,12 +2201,15 @@ static const enum AVPixelFormat zoneplate_pix_fmts[] = { · 511 unmodified lines
21932201 AV_PIX_FMT_NONE,
21942202 };
21952203
2196−static int zoneplate_query_formats(AVFilterContext *ctx)
2204+static int zoneplate_query_formats(const AVFilterContext *ctx,
2205+ AVFilterFormatsConfig **cfg_in,
2206+ AVFilterFormatsConfig **cfg_out)
21972207 {
21982208 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))))
22002211 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);
22022213 }
22032214
22042215 static const AVFilterPad avfilter_vsrc_zoneplate_outputs[] = {
@@ -2219,7 +2230,7 @@ const AVFilter ff_vsrc_zoneplate = { · 14 unmodified lines
22192230 .activate = activate,
22202231 .inputs = NULL,
22212232 FILTER_OUTPUTS(avfilter_vsrc_zoneplate_outputs),
2222− FILTER_QUERY_FUNC(zoneplate_query_formats),
2233+ FILTER_QUERY_FUNC2(zoneplate_query_formats),
22232234 .flags = AVFILTER_FLAG_SLICE_THREADS,
22242235 .process_command = ff_filter_process_command,
22252236 };

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