From patchwork Tue Sep 21 06:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137102iob; Mon, 20 Sep 2021 23:28:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaRzKy7ZNZBwdv3euU/PnHMGlef9hrN9wIrprDaNq6kIQdz4bfZp9nxjMAE7dcq0xHZze7 X-Received: by 2002:a17:907:9854:: with SMTP id jj20mr34330218ejc.133.1632205710921; Mon, 20 Sep 2021 23:28:30 -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 w9si18505886edt.507.2021.09.20.23.28.30; Mon, 20 Sep 2021 23:28:30 -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=g2pksCm7; 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 81C7F68AFB7; Tue, 21 Sep 2021 09:28:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02A1368ADC6 for ; Tue, 21 Sep 2021 09:28:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GOolgmwTC69L4ZXbhqT5/yefEO3t0xt4+kfHhdfxNt62zuerMFJwxrVBRsprxj5TzV0Hc4Artyz803qgc9wVHYhh+gLm+ZbURbe+UzaBhFfLDm7yTCZ04gZpEhB6gMARIlOJPprLD2Gi+vfJUiVUV4CZOCO1LvFLHGa6J0YAZyIpjPzyGsbt6sbcgFaf6lPY3XT/uIGLvBKcBvsG+f/fpN26kEpShlVRmXB+AYNl+rzwiFSKISSfCDjUnJhlzpPeCxWCY2JD4392zfLDEKNogE5+wFunpZFpg1kJmayihsIcY7Sa9lK5A9RkUy26NiDNxsn60wqlAy/qPDBaoKP9aA== 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=FgqEesQ+EmoQhLG5YUL/FtVUuLYEFGCskYlRGJDUTfw=; b=UKjqZ0n9n414PCDa2csuJKIkoTXkQZ9V5OxIKTZR+fZHps30LVoXE8I0ImU2+uxKLwxHJr5z1/ACLHRN4wQWQ54syPLODr5YC4nTECbtDnhfjE0Owj9xZxP94t9VzIXxRBEMM+/oJdAEfpJxidaatvFZW4CznoaPjKmXJ42LFl8bww9iSgf1qjRUTzzWy0sJOWdgLVRX/pjlqyk+uowzln2li8lxsKKiP/D33B9zYRDO2/ID5LQDs/UicL0FJNCu4JQmPvAoVbD+A6I6e0Co5IR/xOcBPTmOUH+HSolLmgap8uA/Bab1pay4Yjl4K38ccUG22Acy+4bMnfgd5q/fuQ== 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=FgqEesQ+EmoQhLG5YUL/FtVUuLYEFGCskYlRGJDUTfw=; b=g2pksCm7NIRPsd9mSre4Aj7/uUVtS4z5Ekq/tlh8up7XisT+k6dYBUgxZwSv7JUXTtzoxsNh66/4TKBwpYYfYKa2IdsoquY5O1iI/PYAKn/CQVBdsvsU01kScjymWn9xRwbTgc0FK2TjUiv7gQy9BbiTO3zyyP3FuyRe5kASm/cHC3QFM4VyQyHpsybz0ivaFPF6K8EnnQ0ps9IwVjoy/DME/JJOZ6W9p0VqdghujoiTmawO2nkQbvHNwjq5fLdaGEsQYlCyDIc1Mr9sDVLaOvQqmaj64dYXg+7wGHL7Ggc6WOOldEPesK6j7WaitUfQHFG0WScWcijUIfreTml9uw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:09 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Tue, 21 Sep 2021 06:28:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QQ7HNPvNmEjmwNkXeVCeArv0C2gvTTXA] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6ae2c66-219f-4cdb-d0ab-08d97cc8faec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS4MapTpdkRlFvkoe4Rb82VoQwTr+xjNaqq7vI6OWicniI4CfkmUjjTQZZcCAQDQoyUcSnPwROHJfM9XCUESmSa8bfEKl9mcyTsFGtPPPU69yazIgZvQJU7DcTLLQ2m3gV2vH+FrmhFP5Bur70lH4+mTwKtti+CIm64ja/J07nPVCKrjGXNQT9EJYQJaWHm/06mFzubELZ1UQ1fWZqCaw9IFjN4h6AMCdfYco49YmajlCICweKDdkjyBT9uf0KSDtQ7/Ye7QzHcJECZi0Iv5+6I1JtYFSCQ2Sr7QTq2ZFpDxeUKXkPuP3kxYnn8R4D09+fzFm/xICOavqR3uz1+o25Qzcv1c/miUSRwJeyI73l+TdX2ro88SIj4c5B50zUK1e3F0TCUlZyLuC7MX5WDMrr0We+p/6UQwJlIT0eYePCRfRHJEkhlpzVVsDo4g7xTRL7pox7/hzaDb2N/3yd7El00FugyIU4gAVgpaPwNZupOEogpx6d5VnghUBtpb561gR3Hz+tdfwYl2FqKQf8098svlGLpaV6361Cmbgc3Yd9aG/5XaelaQYG6AJgmWv/HX+flGHr77OvTmkTaaLn3dHqacx1pRMC79P+Z+mrYSwc5mpM+Ej6lBIA72qXFMMmwy/uK6I1l0zOxDQMw5vDx3l4LVXbPin10fxumROGbNYAzqOmauAvjkCw7E1YX1Baa7xuPl1nQxxmtrSOFNaKhWRpw44mugnW/c3/QmDlwQF0jGY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6OuwRcAAWXYTTMikITLphpf5UqrpHxCFt9S17zy7M/pp0v0ly7bUQaJ3OInphc94Xyr2VS463wn1iBGtcGIxG0meAI8IZzo/y55LuUq4zZVPBPJ38f5kBHIpEzazS68e7soccywX3PmP9cjhpZIPwRg1w1nrlv2nlwJtXQ1PPGignz5t1vsUTvuhSIrLTLoKnAFtHpLqucCcvsU6m1Z9WdJw7sccvBkOrDR2zN0IYFEj9BvTU0bXE7u0lohswbDdKsQxLdRTH1v+Kj5Ofjz6OtmCkTIuSNl1xfPhAngBjDKJNWJ99vdYhHaao1ND6KWuCpcVvR+0r5EvxZl0BUq9EG/q7btl7L0l6ZajlHLOl732rwUv2cOfxioGp52E9F2vLztV84qoWHpnZtZtu8EnX2u9lzU6n5D2fvP/BUiK+uFCPnQkeXlba1eQ5cCY/DLA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UNaMssJAHWr0zlnNJO1pWCwcExaE2wKQpIeATh0F6A+pBwMelcG16469ftkvxw9V6Qemumw5Sco37p6FXT+od0ghea7VIt9LopwWX6jCQ2e/zLtkUm+Fp/07EqaT0zov6hxNAltZfUhDjox6DyzzFQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6ae2c66-219f-4cdb-d0ab-08d97cc8faec X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:09.7033 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 04/26] avfilter/af_agate: Remove always-false samplerate check 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: iLoaCCo+dWag This filter uses ff_set_common_all_samplerates(). Also don't overwrite outlink->sample_rate in config_output; it is harmless, because it is overwritten with the value it already had, but it is an API violation. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 8e5cca4228..5de2cc0f0e 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -357,15 +357,6 @@ static int scconfig_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AudioGateContext *s = ctx->priv; - if (ctx->inputs[0]->sample_rate != ctx->inputs[1]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in0 vs %d for in1\n", - ctx->inputs[0]->sample_rate, ctx->inputs[1]->sample_rate); - return AVERROR(EINVAL); - } - - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024);