diff mbox series

[FFmpeg-devel,8/8] lavfi/af_aformat: convert to query_func2()

Message ID 20240829085052.533-8-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,1/8] lavfi: add query_func2() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov Aug. 29, 2024, 8:50 a.m. UTC 
---
 libavfilter/af_aformat.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Michael Niedermayer Aug. 30, 2024, 10:23 p.m. UTC | #1 
On Thu, Aug 29, 2024 at 10:50:52AM +0200, Anton Khirnov wrote:
> ---
>  libavfilter/af_aformat.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)

Breaks fate here:

Assertion !"Unreachable" failed at libavfilter/formats.c:1051
Aborted (core dumped)
threads=1
make: *** [tests/Makefile:311: fate-filter-atrim-samples] Error 134

[...]
Anton Khirnov Aug. 31, 2024, 7:47 a.m. UTC | #2 
Quoting Michael Niedermayer (2024-08-31 00:23:34)
> On Thu, Aug 29, 2024 at 10:50:52AM +0200, Anton Khirnov wrote:
> > ---
> >  libavfilter/af_aformat.c | 14 ++++++++------
> >  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> Breaks fate here:
> 
> Assertion !"Unreachable" failed at libavfilter/formats.c:1051
> Aborted (core dumped)
> threads=1
> make: *** [tests/Makefile:311: fate-filter-atrim-samples] Error 134

Should be fixed by v2 of 1/8 I just sent.
diff mbox series

Patch

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index dcedff7b70..a7d05a9ce8 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -104,25 +104,27 @@  static av_cold int init(AVFilterContext *ctx)
     return 0;
 }
 
-static int query_formats(AVFilterContext *ctx)
+static int query_formats(const AVFilterContext *ctx,
+                         AVFilterFormatsConfig **cfg_in,
+                         AVFilterFormatsConfig **cfg_out)
 {
-    AFormatContext *s = ctx->priv;
+    const AFormatContext *s = ctx->priv;
     int ret;
 
     if (s->nb_formats) {
-        ret = ff_set_common_formats_from_list(ctx, s->formats);
+        ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, s->formats);
         if (ret < 0)
             return ret;
     }
 
     if (s->nb_sample_rates) {
-        ret = ff_set_common_samplerates_from_list(ctx, s->sample_rates);
+        ret = ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, s->sample_rates);
         if (ret < 0)
             return ret;
     }
 
     if (s->nb_channel_layouts) {
-        ret = ff_set_common_channel_layouts_from_list(ctx, s->channel_layouts);
+        ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, s->channel_layouts);
         if (ret < 0)
             return ret;
     }
@@ -139,5 +141,5 @@  const AVFilter ff_af_aformat = {
     .flags         = AVFILTER_FLAG_METADATA_ONLY,
     FILTER_INPUTS(ff_audio_default_filterpad),
     FILTER_OUTPUTS(ff_audio_default_filterpad),
-    FILTER_QUERY_FUNC(query_formats),
+    FILTER_QUERY_FUNC2(query_formats),
 };