From patchwork Wed Aug 11 01:17:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp955837iod; Tue, 10 Aug 2021 18:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfglk72Hq051mSiwGciE8OJb4jKGyoG8Fn0TKAgx4Q1r77m6E3VtAdrzQU/ljleKJhrhPJ X-Received: by 2002:a17:906:1d41:: with SMTP id o1mr1252882ejh.232.1628644716636; Tue, 10 Aug 2021 18:18:36 -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 dz19si25242858edb.116.2021.08.10.18.18.35; Tue, 10 Aug 2021 18:18:36 -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=DwZYEVYZ; 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 A436268A3B7; Wed, 11 Aug 2021 04:18:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2156A68A2B2 for ; Wed, 11 Aug 2021 04:18:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WLgmJsKNsARoiRUU3e95/sh+gtoWnnA9lWv4m8vmXbqjJ7zsfEiOsSTvWJ4W/179phDGDwHHuYKDZm4EZfwjyY9Mo5r4f5UH3vcjGgS+IHY3FE5bgaf/iE7K1MTW7OfwgcyykwkZjRUNCiqb+WXSm4Jng8Q2SZI8uRYJpvooEpyOC1KwZQl0Ay5gFywTkWWf0bzGYtCkbwnpqo4yWC7Z3iwOVo2eYsj+pV+8ubozXZmR5c43kfvAL++d/mCwoa2PMnLQIlpUki2W8SzNC2DVf+j+mF/kgdLO7GXU1aORhciv9gUq9YqNnINrp/DYXHlTFPX0HgFi+8uxLbG9Ci7u0g== 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:X-MS-Exchange-SenderADCheck; bh=YGuMtfOi9xQbBG3dfgzqhbyBStjQkBu7LMHsWiWg+J0=; b=e7A0w2VVakgSrc0B7ilCEWvnTXnY6CiUMTVA4yJNaWPDIwcaD3EdDG312LkIDLz44RFaBAT+INMBJWYPx43bBaJS8a8mVNMOcWIDUYU+b7VGRAthFEGLq35v//iI7/vmJ8bV5yIoPNw2rb3SBZycC9bqx/C2C0WGCeaV91WithCB4zEQ/9G8y6xCZBCWWTSvT5PjKQoW/gld9aBeb8j6BQGwxut1fd24kFlbHxBAmgC4c4GOiKoiqEAc4uB7Fk/Y3rQFz1yv+H9mhAsZ8/Y2guOBbC2Pj3iFL90Xx35atV+7ERWzKmUADnJnwk1n3gv8ufQYfXxInaOMGEOp+xPWoQ== 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=YGuMtfOi9xQbBG3dfgzqhbyBStjQkBu7LMHsWiWg+J0=; b=DwZYEVYZBXoSNIKtbW0Ym7MF5OjIgC+fotz2L5fOkIn/hkugAcFMG0QP1yOBVBMGJ0RtfHqzXddBlHy8yZv0try6IoW2O/RZC2slE0rQaLZdlQSus+/cPHcN/o1se6RQGvcSw3aJhZ5C+xtuabZAGoHIY4eayHFCCWQZ4bJXBo2qC7DHUrGEHVOnNwcttUGjzy6TnQYbIRhHVnNEIKgjSodHRXJCS/bFa/2QEOUtbhCX09SQ2QSV+QxHvHAEnIOqxclmPG1YPImN/Tjh91uCia5ey4D7HqhZG0wCDWIqolR+u78Aha6YRKTuPus7LQh9ECXuzdCou5HDi0HCOC5Few== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6886.eurprd03.prod.outlook.com (2603:10a6:20b:23c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Wed, 11 Aug 2021 01:18:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.023; Wed, 11 Aug 2021 01:18:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 03:17:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6+mH5vDlN2+SI1b7TMhbKGFiac/2zXLY] X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210811011753.739659-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.5 via Frontend Transport; Wed, 11 Aug 2021 01:18:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c81ca61-12d6-4964-aa88-08d95c65e4d4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbQcOlzes5P/phF1luC8e2uokYTwG5bTha04Q5QcnfatgJnI+XyW58HM6FutNIKpqpFRcQV8tbd26hzMZ5AVscT7bNymEvsDZRtfzCSRrBjW8eF7ro2z2NVwo0YJBSWZD17iAyEmOc/w2L8Vfq8I7LTF4IH609a5t1cjifv+C/d2lAzVpR1dfTaNDMHWlU/CunxR+sSDuIhJq1GbMWa2dirt7PkQU7qe+CI/yUybexR+y9O0H4fljX2zSRuFWzHgFZMhOxTRWUz9RIrUzekdxwM69hLIj/JTUdk3c+Qfq9CRPGYqV9Qs8XbSIw73CSEKU6diUajBdVFB/KWfw61dPe39wNGzRDkEUz6GHX1TT9DojBWXJgJ2mASYft68+KeeafieFR50uISVnQ1jliban6bOsN0moP55OZlDMmfY14o9CSQSJzFJ1c8+DmCKpe+mc5t7I/c7p9KQw3vYTKU2Pr6k++X4R2sh3URGNnpwNW0YWRrjm11ulmIy3U6Eph4q6+PdX4/s6dziT8MNZvCpF7ZWvFP3bDH01L+s3jUFCrzFPhV5CL/8+ykslQFF1bfFAMbD+YDWR5wf9oXMnHIap5ckgwtqtoEphALlbxyg+TAPTEp0dSvbzsJZIQ0AcCIX8tj64TSpRJ5CYqCn6Ojepn0Nnor6CSIZyNM9bzGjTj8zZeyXfYnO547A804x2GuhwGW8ddYCAxYQx5xRDZkzp4O0= X-MS-TrafficTypeDiagnostic: AS8PR03MB6886: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oByev7LgNsM6vZGdRm/wJWo6sZs0vYqmgKH7jHP6hu4n/VOvYc26t7OapCsuQNWwX43FWj2jDD+q6G2fvwpheiaFiPDrqPxmFMmPa01VNA05U2C2rMtzHeWa1P7Q8NituDHpIKvjNrp7Ld+YeN0cW2gc+83iDIPGKA10PEDMwJcWuBvXSJe77pGty7qAlhscbLS06iEVI0uetDX1ur/nOjVzll/kJuw7ZfBa19jd1KjxwHW04qZSp9NsS7HaPc2fMIQrHxDpMNwBhMn5eSYINbFOpC8RqlpsjQf1MV5Cfpzf7z1Gh4A979t94xc2zlgjRCf+BsePG1LwFtLrUoHZgLQ4P3hgOUQqVHhXGg7UPIIxGVua/D4uv244Rb++F/P0EFsS6GgldB0BCNhqVzW7t26L8+dRfZoIZ7ohMNJxWNGfGdycBS7TRtVGeCb5tsaD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oPYHVtg48zoAEgvDGDjt0nvUHSX6iDMYo8UsQ7GQ+3s+zMaUn4oRrscwt3zGnIynw6hY3o9M6rQDvtFJLItNrPA2kXLr/noTC1NVQZIY6QfPI9itRdD3+ilDPpVrJpxBU+Wxsw7iokToMdxF1C151Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c81ca61-12d6-4964-aa88-08d95c65e4d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 01:18:15.2570 (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: AS8PR03MB6886 Subject: [FFmpeg-devel] [PATCH 05/10] avfilter/af_loudnorm: Simplify setting common samplerates 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: 1rdC0jYvpO46 This filter has only one input and output, so what it does can be more easily achieved by using ff_set_common_samplerates(). Signed-off-by: Andreas Rheinhardt --- libavfilter/af_loudnorm.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index 54a58bb9a1..8bfb5ccc74 100644 --- a/libavfilter/af_loudnorm.c +++ b/libavfilter/af_loudnorm.c @@ -684,9 +684,6 @@ static int request_frame(AVFilterLink *outlink) static int query_formats(AVFilterContext *ctx) { LoudNormContext *s = ctx->priv; - AVFilterFormats *formats; - AVFilterLink *inlink = ctx->inputs[0]; - AVFilterLink *outlink = ctx->outputs[0]; static const int input_srate[] = {192000, -1}; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, @@ -701,13 +698,7 @@ static int query_formats(AVFilterContext *ctx) return ret; if (s->frame_type != LINEAR_MODE) { - formats = ff_make_format_list(input_srate); - if (!formats) - return AVERROR(ENOMEM); - ret = ff_formats_ref(formats, &inlink->outcfg.samplerates); - if (ret < 0) - return ret; - ret = ff_formats_ref(formats, &outlink->incfg.samplerates); + ret = ff_set_common_samplerates_from_list(ctx, input_srate); if (ret < 0) return ret; }