From patchwork Thu Sep 30 13:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685215iob; Thu, 30 Sep 2021 06:44:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxH2QVIXVEoXuh32u6rNDwkIFOIuzh0W9otSVcDT2x+6s1V2WfCOdsjGTKWW3M9pTkR0GwC X-Received: by 2002:a17:906:3192:: with SMTP id 18mr6763640ejy.246.1633009471915; Thu, 30 Sep 2021 06:44:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc43si6555931ejc.721.2021.09.30.06.44.31; Thu, 30 Sep 2021 06:44:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=RhKzIQ3M; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5507568A8C7; Thu, 30 Sep 2021 16:43:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064065.outbound.protection.outlook.com [40.92.64.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C4A968A867 for ; Thu, 30 Sep 2021 16:43:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDdKHpIom909bKE5aBcjVrcP5GObFrcU+63Rt9mjwyMAM97IVTAKjvE2SQ1Q4JY0IHaLJNzuF71xjNbfxU+5xH5crAxKQ9gHxXvRccke+txlYcLgYHRM+Wt0FEwt7KN/ImUjLhflAKAdJ4g7FQZWkl8gHP0M2XJgqS4SIl2sWkmEEsyOkvfY3lAcT0rRQAycuOTxj91gR0t/Jh37Gdk4/nAwS0nDVsg1F3r5dAmdFPz6mtHccGYuKQk50YfS9cSsYYerGLr5KuBrKXdWQr4goUOxUxLqD1Iw15bRznMaWeVCK0IU6cYr11P2LircCAjO4h3aPCuPcQFQh7FDtxMwQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4Dui1XeL57Jxih/hZZDQcP/VQI9KAuxJJ/nYahj7PY8=; b=D+jaJmSw65nXGq3mfPkI63aRN9s5dA4m1BtBFb1t0Cbu2n3sRhvWNjiGSLQCj8ADevSDNs7TsE55Vhu+J6waZ6B4STUKPJy4dyubBUy2ZgyVb5tJUZCTahCUyFzrmAnEaq/xiMVrNihmRClikYkUqGz007eh6ze5Lt0Ap6M9khx5ZAVq36j6HCChIrSkUt1YpfREmuzlknknyPdubosqE+uB1ygVV+VhHawY0QfiUFnp3jBAN7z5lnI4HoJhesEGOV08F5TocOGk4AjnWv1b7ckymoFtKOQoV3I5BqE2SKdPwBRlj0wuRRcskQeC+sI5DcY3lO6m6v3MZrYu/8tjBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Dui1XeL57Jxih/hZZDQcP/VQI9KAuxJJ/nYahj7PY8=; b=RhKzIQ3MfcpVBbyNfIEAqpw8Rq8RpGG68Za+cg29M6vtI7NO4sTuRNEI4AYdbHxIKeNzGS7P2B0o16DTSX5p3LYo02/p47+LarOQOC3YPzzmMQIQ2oNpMaavvVq6J6y2DhgmzDyOx+rcfnCpQlmgDEf/QNhJ9zPCM+1zpkUMtLgnhKNWnLhShJCxuSp4404gAGRf66NNUMOOKAI4etJXb5PXdUO2Ij+UwfpvtTOoLajHWeQ2ZWav1e7sn7o8b979spnSy/dB6xZmbtH3DEVX5mB5E+extzMMqBw8iWhGVlbFyW1L9L2btssBgFQElInQjRTBKVDmbq2XHGoW8Wljpw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 13:43:30 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:43:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rSS6pWRqS8kwQmvPHAPptXu4SMgUMjr7] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:43:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87e4f5d2-e1f0-481e-0420-08d984184985 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV7GPXw1na9nH97T3lNsxOfz6PuF4tbwznRBwAyryY5h7r+zElGQMoZNJ7a6ri/UolginTczTgu0tWR74CquTfg19dShBqflWm+A+h1zGVaUfmjYLNSwQ6Q5dh6JmkRNuTMDz7Eu7GRol4L9ubUsMkpM/oRNpLLJTNr7xuV24X1I2D5uBD4ymUO8sQdDteM3gXO13+5i7XhP41eZwxcW5CNXFCB+x0PnwrHsC+/7mbFZ66iGZH7Ntl3MXfYYyO8dieQlBOccAdrN5VmbilIcMgi5uhZQxYH/WsljMrGOe8zm7HCyDClRcpwV55dte3REUHvkxzjeAQY+on4FC3hJwGPoCkM3A/vGH3/J0HvCQBlYWXCQdyjgFZaleqRRcKbyhCwWMIPB5Jl+dg8M8mel0EiFlMlJ1guxChA8jdfPu+xcQeQIGRvG3hXJq+0LGYmof+EZoci2UC23E6IZHIN9LQVmu6O6mJciDoNauMavtXnjZjhy9AUHxQYQaOJ+ZuwR8peR6vpbuf+V8CamwthG9o366ZJ1NGSbT3IVH4itTPLZ9ir2Kg+MoqqVk/cGcu8BerTsvdRxsQfc1muUTawsqg/e2sel8DxaDZXn0FmrtsdmUbmK3WpphxQhi5iUx9eBjA7+xxDnLUNOOS6o0AMVJHe5nL2dpHVlXOP/9+57vt2Dx+b6U75HV9jE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: byXrC4ua6J8Ue86Geus2Q5E5olSzOYOfoJp/Cgy8Up8pQ/RQPpTd9A8P6Fs4O0/QMjpQBwaY8l2Fjyvt7PNggVhzpvf6hYHItlnM4AKeJOHnv3S8Kumy6pLpbUkFr1Yc9rtulMduy0aMxhB4tBbSgYrq3WBQeEx44/pVyt1YqR+3sVIg5WupUHp5Jqf14+kGkr70GovvVraAJlOoaxRxkzw8qvaUzeH31FP2kf28uDqMsViV+XV00VrK1zdzt0Pag+ywSNEC976AAwsxy6LGJfnqopuH2k2msD6tso17XF3WwhJ4LB7SaFeQK2lOJ6RaC6fxvyfCn6MejjhsdFZXDBdD8Z47nIjinVtLBSMsC9XoMDxHf3VFc5e+tJA/lai1WVWaXEItpX69CtL5v5D3U7Ik5O7JWtVvp09dXQloMgrDAbn2d03+2vXzzf4gFmj8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9S59i3DZmi0wlz49pbtUFHc0E3J+IpaXerZwWL4GjR7baMQT8JOorkQb810NacELlKVn7bqix3kKAG63C6vz6dhLzJQ2SEklbLNHX7CSu39IKJc/qDHkUkMfThN9Nlt2VITrpmljCGevf0Ul+9QJJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87e4f5d2-e1f0-481e-0420-08d984184985 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:43:29.9222 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 009/218] avfilter/af_adecorrelate: Store format in filter, remove query func X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o4RZHtQCCr72 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adecorrelate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_adecorrelate.c b/libavfilter/af_adecorrelate.c index e0731b0945..bac7937c10 100644 --- a/libavfilter/af_adecorrelate.c +++ b/libavfilter/af_adecorrelate.c @@ -55,23 +55,6 @@ typedef struct ADecorrelateContext { AVFrame *in, AVFrame *out); } ADecorrelateContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int ap_init(APContext *ap, int fs, double delay) { const int delay_samples = lrint(round(delay * fs)); @@ -262,7 +245,7 @@ const AVFilter ff_af_adecorrelate = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };