From patchwork Tue Sep 21 06:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137295iob; Mon, 20 Sep 2021 23:28:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpfWDcCo7FwDpjSbNdUZuNHzbFllE55VlVjBrbtbuBDKOe50QQSUVU+rVtFXA438AvwzsD X-Received: by 2002:a17:906:b094:: with SMTP id x20mr21392726ejy.273.1632205732790; Mon, 20 Sep 2021 23:28:52 -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 k24si7416095edk.120.2021.09.20.23.28.52; Mon, 20 Sep 2021 23:28:52 -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=R9rhaOa6; 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 9BC8C68AFFA; Tue, 21 Sep 2021 09:28:26 +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-oln040092075080.outbound.protection.outlook.com [40.92.75.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C83E68AFED for ; Tue, 21 Sep 2021 09:28:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P9PMosCpnhOqLNBaZkQAxt75iaEEMptBpM3WNHARzku2R6mY0X/Lq7yzpvtzlyBp8yMErwf+XiYOsNhBrLxWjbLAu6LFT92Yl1NEfSL7GXvEIa5Gc5qvlSR0pggDbQ1rg3+yf2rRY8frtWAUYGmmVAqnOH7Ldt4rTSsf2uykUSRBrZG2QyEQI3jn4AJVtT8QhYHjP5HsYYSEmpcu+F0Y8NLkHVBgq/hFYjFgICGKWcug+zmyqDSna+lSKXwpZB4Xd98ID34XN33P95dWOQNBoxuFh3bhcV/iaqeceV4DdonexQxinceFs1U1jRQfDB+s9dKmruXsOohrghVOmY4D2A== 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=H19TYzC6UAVuLz6J/aRc5gNQAGqzEKHZmVWwRMKupiw=; b=SWmDUcPAxLAd0AIJCHIUy74X49agGMxv/jRmJ8fi3KVsbnAo8KIrnEtw/uOflSbdKndAF7Z8wgjjY8JYYuPU9AuD+nNqy3G/BBJucBAVNVFV9MVb9hioE8CaeM10aqd6YzUCazD0eWdSfgR84ph3XWn6+z8qFEg8WA4jaKBZLVvStPUPjEhc3UFovC2biY/wiZDFdDXYhoFIZuzSErePohWcwEkG6Xt/HWOKJj9Ejzpq1qnAMj2PeUnN1RC7Q6S7jYuznkeeW4kgzUrvBQI0UX3rOex8bV2JhNVuBgp4ZNNg0YTIjEtWD8Iv0qunjXF7Y1QPmm6moR+UpAG/96oiyQ== 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=H19TYzC6UAVuLz6J/aRc5gNQAGqzEKHZmVWwRMKupiw=; b=R9rhaOa6BTdOWf/t01EltHIIpj+sj0Kc6GZ6Zw2s4VSkcwHnq0U6cK+JVuOQb9iW8EKFb2ngtPyNQDdo6exazRRY1K0/RBcDSjsWw8gZIpwPgv+yPLKjTl1iVCFZymsb/OFeMGFlw9SKFwx5oFVdmcGI7kAeAS2eVu9Uw+YWFepCStCNkoMv9rcncZymWoRv+41UemXR6Y1PsWhYuBFh2DpCnGbGcTM/5SNmyotzlYmX5ToIS4oyyI3BawsLQwm5jLVz+kaoB2wxV+gVOwKA2PgpthcVxxqOEUqGzt0WxY+hY3Y1OsnVGYB2GARWEowCAMgQQzy6VUGC+3S/QCJV6A== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [z06ThIJzf0UiAX+xd7mpY/05XglreTbf] 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-5-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:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c06b71e3-f69a-4c6c-d4f3-08d97cc902f7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSIwuVxCUjL1DegG+y1uwXweuFiT4DC3v/DkKoDFoX6XS8HBTwDEl9ck5worrmj5Go++i6hkvnaJtanLb73LxHujCMVfTUiTE958zObQ3v2NgnGEB65YqyUbx2OvcjE9l8tun1o6/cumSCAOMvbx7Ng6eG9oZvbpn/neCp4A+LNROj9On+izIJz4rEljysE//CbrzrpiZJUvBVX9ZXbrq5osITV3F6ZPWaJ2enB6PBp+Si7APaAxd+qJkVHnqJkyxP6msIfUUiDMtv4yUhh3LVd1p53bVbvGMocOk/grGlpRjTbduRs5XoMHY6IXBL5W4JZhXP+MnrBVASQHL938STl8qfqeyS/SM+dB6i8sWp3IqZLlL83cH9ddE7/9S3bu9Lt8+T6Oh8wnw4VyvXYfFD5Q1VDo22wlktbhfgN7O+rdoREz3mRiVMnbWVp/wm5wbnAnQE+dnNTNldCq7OCZrca72zegnwzBleSmq/rgv8v2uCta7hx1Ret83h430wjjy3E7hsK8hXPaX77sRvUqtoUSTof+sONNU0z7PP15AW4FWRYsA0HxabpWqMBgJevRoHM+F3LGS+Z7MHu5KxDh632OPdXAG2SURzHRaHYxSI0ikgijxXpG2GyrJL8O+hdETnds0KL9rVVV2zzABWBAsvVJmOTZ3HksAt/BuqFmBur/wbp5m017q4kJBdnMoftGw8spa/P+eVk1B3VyAs4XqVK7hPTFhIkRaUr8vSk68kBGs= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T/wYF2M1WhFTjdvvjUSryuN0isUcTeDPqkgyJ4kd9GvGwi73qwyPIVAU5/OHCUowYG4MJohxHoSQ1GqJPfJEmh1sRUibibbBytFiaGTuuWQ2j2dhLQEwpJdvUDT4co5ZT/Rtx8jnN3qYgKkuO9QdesKm/O6SEcquo7E5Pps6tEFldGzSyYMB6j8OsXJF1i5qDocqevPApht+2nF0zzG1XS0+oK80Kq9vbvjfrBhcJft1zjqtxxmre50g3u6AS4BQRL3C+tO4Hs4Y/b4Sn4jQOiFB0Xg9/SpY6xSqP2aamUH/amYTJ3PzxdMokPNtP4LrPLAhloazMP7BU3E14mARue0MB07/gqD8uP6KqwGJZNv/jNcRXPo+rFWUT71UhyJHFE5NEBrCwesdW3xeEFxnHovgQrah1aX9ydXszwJoeIYBiVn/8dOC805TtqZ1D7vv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4UxmaYnZr6XB53vgg5/BHQzsx9CZKe6AyJEGG1ilJ70KLAWGVSYD0ALc8+0dBe5cnbATGLrTJGF1HFMzq/hlKQCZK9ViOs4O8DZOV7fQ63yc9IhR3M0ihAV3rewzHqj1cEpp1Fa8bRqVAusugAUwQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c06b71e3-f69a-4c6c-d4f3-08d97cc902f7 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:23.1803 (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 06/26] avfilter/af_sidechaincompress: 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: +CvHx8YYooUb 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_sidechaincompress.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index af4a90ea09..22a86ae2a7 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -323,15 +323,6 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; SidechainCompressContext *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);