From patchwork Thu Sep 30 13:39:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30708 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687058iob; Thu, 30 Sep 2021 06:46:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVPenRDXhcLJ+myjOdbw4UDRhmNkCfMTGVDf86EhcONQhRKi7mMc2rBi0pITzexbkTN5Tg X-Received: by 2002:a17:907:3e21:: with SMTP id hp33mr6952523ejc.205.1633009603436; Thu, 30 Sep 2021 06:46:43 -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 q6si2774453edd.367.2021.09.30.06.46.43; Thu, 30 Sep 2021 06:46:43 -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=ANGyU0qZ; 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 5372268A9DB; Thu, 30 Sep 2021 16:44:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070027.outbound.protection.outlook.com [40.92.70.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0ADC968A865 for ; Thu, 30 Sep 2021 16:44:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nZfyJ6MyzvQiLlQnEZV5MdeyhIyagrEt6ZB8GXxoyEcVRxrEKND1x+uYL5TL6jthoR3XbTp6SD/GayV/o96eMErl1zw+9OWIO38v8LbWEC54Qm4w6SudolXWzCZOVqB42qUwltG0T69vys94RvJRReU9K23cOX35TqMMYwlFQA0fYyJ9zDKu/KXnsQEzUPUHAn8AmzuSic2oDPnFR/doTluf49MuLSKNd/CgN6XxtRj9X88Nn8BiMt1b2WI0YXc5WXttbhVzxmiPTEOpbkDvS2D08D9ysac3ZL3P4wE/94X4k5xP7yuI9UUbSK+KiyM2xbOwp3LFWXoI1Es3KjT2Bw== 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=ip7XFuKDjacoGf6+p2BCSsLaBDR4cQ51htdZc09JlTs=; b=N0uecXAePbXy0DPwAw1Uz02AEjpVtqBW5yUz6nMxAZwTDGB7R2laIZs7TlHB4MZlE29BDMOiQ8vEoGyetIn3/VY+d/MjiRSXxJJMjh/uRb153amKmN+ibqut2GUlNatAquo3LCdVV2qIcJzagULfmRFIQ88KgMHK+FWwJV1IWvqmAKeZEg22EfF2o11YCSyiwC+TIddvMBbt15CUyP9OmRK9RbenZwBbOktK4KQbWE/Bf9V1GFpeMmPZS+QbVQbdVtlXFnByEBdRWh1ShKPPYuxtLArB8sRI+aMlYA7G2sCDswwkNxDIkTAvkZTyEgiLDvKjjkrZfRYaWgSb1lgKrA== 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=ip7XFuKDjacoGf6+p2BCSsLaBDR4cQ51htdZc09JlTs=; b=ANGyU0qZVs9unUKSE0iu53fgqNbjJ3Hp+2tFLJfjpeUBaHuRHvDyy4JXJ+UkYlBLKVa65GkizZDLi+t8GNAW5ZGy8xohkReJaoa/6CxRZTWk4z/TrcFv0pRrom95USsAvydGjL9o/GVi9jAglY6QATURX8Qj/vvrdL+3aYP+wLMBgcsKpr6Xn+qO1zK+fOCMAEc4jSyJ8Aurb4KN1EHt+tRDS4p0p16qLnxKCb9koOTkKA0huukiToD5bljnUHi2uLmxh3zyGASV+sKTOoiHqxC+4bfDCHFLKHRLXLpspxI/NiHQQcPCeYal8bw1zb833SR5pxbIKNnG9fsl53fcww== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7246.eurprd03.prod.outlook.com (2603:10a6:102:bc::15) 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:44:00 +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:44:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3gmV1WzoyLzigZ8TCTopuVcXI8+06kwg] 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-18-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:44:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07e5a0b8-c8f6-4bef-23ee-08d984185bda X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytwzHnd1I5O9VFILKgUEFyhDt7pGMw/T3BwheWXMMaGNCUpmQP9tn5qTw4wkXFoPQ+lyiwoe66whMJhLgwOswHnM2kdPO8yi/wuTm2ETDi89ez/uSuD2uMdSdv2mvX9HfEh/CxTfXy5q7JgnYwxLobed2jy1IhI5IlKlQv39C2wTkBccCJLDkX+tuTXb5RaOM4fnZ7oGbUyt6FJFWEdrZFJdOkPwNAcspa0WETENKb/ZdH/smyuAMGFPYNoTRAZNWyVvXThmnVmeTOCb+A+a/+mIxXEonT3f6gWa0jajR/BQRbW9MXvTY0KDPitPR0r7l4P5gDMO/0/+vLOJY2lgPzAcILywyr1P4nJAYYSoAOVadXA8oWaUWs+dy07Y8pqSqDt8iwAkP7xkb26OMQ8E2VJVcn0oAFJlYQYuUaXcO84uSE8EFHkE93ZiDfOIfqpkMwWnkWGz9qxs0NKATLoNx/cTqhxyxam6tjFZemxCZULD1NgwUKDvKlVAwrMZGctvRjRCQZFttytWwgG+N4/VyCSpPH+cbrNJf3YJr8njTEuuaFYwVYUKYL8XJvdHZmQEA3KYILVD/G2DsIlSbxJvdQORpoejys068ThFyotSYLZCjdxicZ6pR58hogR5vayd5Y+Sj5k/RMt+MPeV3y1N4C49mCGlu0k+d5MRSUfPFfvQ0Urhc0jSJTaUbw7csU5dFjNzwwzCQnrpzp+cSudOyU/L8= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Nphy9uuAxgitRfyGoE9MFg9jJX0FoS8XAkHeXXluSvsb41C6Xe6Unz2T4Mijdrw97tBkjPw30W0NfNEA5IP6Tvpum1CkF2X0v6Gg91emdyED10kCjthTKHEZ6IBlhiHvolngiZ8ykyFb+j8sjqUZWODMmK5f9kJsHYz7uqbHHcEHBeU7MFOz3v5/BfuaMIprAlhyCwGsCsrw2QNu7NB/aP0bGQuvqlexbU0k4vejqHiZ4g1AIezzbdgeOzNFKMRK6cvKyyq0QJ0G63sk0HH1cCMqO70VVoPSFR/5LaPUm081SEeTIA2iYG3RMaSbFhiQNInkS6uM9cgTBDC0GnMxGDBuzI0PfPjcaOPs4am8o1jCwemcKB6wMln3RWuzFQ0AI6sT2tsL1In3vys9uqY2bCiyGRLf+03ccgBP6Wvu62VzixwTcal1MqkLF77RCSb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: daK99ZuKXGriPV8haH5aGELYfPXQCwCs7gUoDN1+xCOfnM7wytUy1phApovigqhG89reKmf25LGWzWTD9GAAzJJGaauGY/oiqozf15+4X8w+yF2OLJF8fDLRzQ/s1MFfZvrhaRz1wNXj1OssBEPvpA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07e5a0b8-c8f6-4bef-23ee-08d984185bda 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:44:00.7557 (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: PA4PR03MB7246 Subject: [FFmpeg-devel] [PATCH 019/218] avfilter/af_afwtdn: Store format in filter, remove query function 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: dazI0OLa6xsi Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afwtdn.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_afwtdn.c b/libavfilter/af_afwtdn.c index 9235e6e28d..3aa9c7b429 100644 --- a/libavfilter/af_afwtdn.c +++ b/libavfilter/af_afwtdn.c @@ -461,23 +461,6 @@ static const AVOption afwtdn_options[] = { AVFILTER_DEFINE_CLASS(afwtdn); -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); -} - #define pow2(x) (1U << (x)) #define mod_pow2(x, power_of_two) ((x) & ((power_of_two) - 1)) @@ -1330,7 +1313,7 @@ const AVFilter ff_af_afwtdn = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SLICE_THREADS, };