From patchwork Wed May 22 08:57:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp214959vqf; Wed, 22 May 2024 01:58:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUm3R15y6aTfgHwpOAKtNtb4gkxiVmuw3M0tR9HBYp9Wwg5YuvKtPamg8Ppu0iq8lk6GJ2mxYvwIs24MuHjBlVz/0FoPwotSNsx4A== X-Google-Smtp-Source: AGHT+IHhqIZhHbw7iix3Tr9pW0qNm7jsWWXsl3sZf0RFO4YJLyHFv7rSjelydKhSN/mFUmPWyzZN X-Received: by 2002:a50:ab53:0:b0:56a:ae8a:acc0 with SMTP id 4fb4d7f45d1cf-57832a1e559mr899112a12.21.1716368292762; Wed, 22 May 2024 01:58:12 -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 4fb4d7f45d1cf-57824f9894dsi1398461a12.420.2024.05.22.01.58.12; Wed, 22 May 2024 01:58:12 -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=XygIKzhF; 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 B190D68D3E3; Wed, 22 May 2024 11:58:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2039.outbound.protection.outlook.com [40.92.59.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 432C868D16C for ; Wed, 22 May 2024 11:58:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EucgJURZU8ME7EPj7RydAcXmzGPGr3FPAGTGfFsrCXxcqc0G3kZR0T9GUXJMuciwbp8yHUb3MeNbzCKirXG6zrW/0ZbGe/GHPkCLb/r0x++l/ikvsWI/bXOSGS6y8+kzH/5VUNvbdopgPgjI6hPahUS68q9LztiaqT9KU5jb8oWf64DFoKNUQMYzXxkZennW2T2uIIImwP1TBSL/8PjMyavr6kwTuvKUtKu+0al0xPbJcz+Ddk6bq0a4vHoIXZ3gwJdMT9o+N6dAb3Xo7IShsInm8P8HgW36USWgCcRFXeWRsPx1eDHPmLdbHc/Fwr4HodB+aiUCKOiggL+ZHbo6Qg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2x1h0aUHjlglcgCXRtsIVGfgd78JCOmuxY1rJ1ScW30=; b=A/h1/7svD2DXU8dg84yYD6thnHL8VsedKUrJ1jECm7lC295nITkwWpR+DmpuHWSv376tN+0UnaYE073coUoTmfWdaOw4kUsZYBiShUC6esMHdyeHNr4cOzBR/Sy8CqnfCQo7X7Yw6V8AsNhCo5omR3tPy9iDBtxxs3HuFo3z7MdtGVN01tfkJVundT8HzPw6NMSf2bK7b6lJ1PgUFf3k3ZvvIbqzhlSdkIGAWLFaaZ4jfRhR5wXrKRpfozdiJkwmhTw6vLjihTn5VFx7tp409Znxb91NWlyveqqWzJfds/bZjPD7DJ2s7cSeiGqV5GLYOpI68esod5tUMVrj9TJuQw== 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=2x1h0aUHjlglcgCXRtsIVGfgd78JCOmuxY1rJ1ScW30=; b=XygIKzhFiocLQsCHPHx8QWh77SYiY3THkUNTuukWcur7HgXZR0+eK4TvK40ti/QR7uh8+L1N034EKFpDWSovXXZcstnVLU0A1wILug88csbN/8N5dNWW+uHY7oe5ZkEG+CqswzqHUryyNKsMN7PIuzQSp1CzHYf/uW7aYG0YfUX6WGpEYIQ/oWOJO28uL62mEZhDTk1S4AoRdmZk6HeC3hZAFklv3V/xjGKPlrVCD7kqivS5eO7QeYvgp2xalJzuxE0HHAN4ZUMkZeCcrwUUvJJEN730S3IvEEP1ZOWaJvfDzq/zh/LPmmImQ2tLOhchTxGERsrbOrrGTt7LtclV7w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0191.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Wed, 22 May 2024 08:58:00 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:58:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:57:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Zj064h5mWThY3GBBPuutj/7xigL880l0ZecMHCGrHH8=] X-ClientProxiedBy: FR0P281CA0253.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:af::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085752.3697753-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0191:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c7ad0d9-1bba-43cc-5ce1-08dc7a3d47c0 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: thLrsfg7RUTbGXmlMk3E6o69MVxIDMyIh/uFXEAB8QuW2NSPZOAP/2++I6HMeqqksoIjDa86xRXFPxG4IRtJG+edtBkcS+1nEZ8txrABAy/0VgdmN1lf+tcqPq+MKy5SnuJ4NlqQPF3MqVGYMxSKMurDG0IJPoX+dMDtvbxIi1zyZAEPZQKkpFvUHalXaKzNyuIJ55sym8Eq4sZWOs1uFfnsYRqVwt79RESbjNe7hJCDEfCFrUHv2OSnCg5WpMEwSPtCsJURQtkXTjJdyihApx5PdaLehWhXLU+OVQpwUrXMBZyvkkqWZYBQrM76LQsqlWd/CJ3SqlUBsiWogdSeZDdr37n3DUk31wz1caA5SeI5T7vwOvelnpmzrC8WhsjEnqSCyjSpn436OzoegJpf7pmsikxICWLZp8DIFmSdO59goLzcU676svKd81Tvn3n3fFHl4OKHP0PWc6yE2JoNOtUZP24hlWuClOXG1JYjIGBkAmOYfpIOlLioU/bW2oYuy1flzQm/5edSS4EmBPkF9jh83bxJOjlr2sCb3d8xTma7TVkwaaNSGLwYB18lm/ZRJCBOMKJINDEw9EIQvyH0HWmnsDtJ56FBeCFjPtMN6fyqJ7AEvThMMTTxt/FDuv/U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hmCZh9kmP7mP9C6Mb3hXC1hCsPPOWwkJaoiYulDD2eoVofoo07Uoa+qjJclzxmnVyx1wCYhOliTUwoPsF2yC3+F6JKdgdW3DJ4O/80DhEx6hKyBIS+sIIP8j/Pc9S/wrIib4wGStJJkbsR2CITBdm1nEjup5FMJHJP+afeCr+pBSOj4uSZ+EAPtV0S+kpw1X291KHAnNdCbxm9A0crycgYuicl3st1/NAUv0AJPnpTOxO/tAFasfAgFTm1zl6mop42h+pX1WmqA+l7BL+CnIdJlmrNdlIEvszZd/v392pakf/QJ2SXzuxj++pL2l7xe1pVa/J+y0VJ9g+WJVNfuZiLyZL0nNZln9zgdr199DEtUnLf0h1361X1kTObPaYXFC9un94ELbTR57eVLgXTKIGUgr2bxE32CWnp+Da7Ys3lAixkyJk35bmzRs+n69/NWPQOfTPiwiRUzMn/9HZQUonQZ7+ZU8gWPTZK30efz2qf2jsJ0equ+uAS3BC3zGP4WO94ntffIJU+/0SzAr/WYmj144ct66ikMo4t3EtBAmUaoxeQZ82x95Nd4r9wFBtUl7LPQQ/Z4IaT5AJzvDTdWP+QuB+5FbGmZTVC/ufNBWWGlcAjn//L4LO7drsmJlF1thOh1sMMhtUv4ksFlhPaPF04g0Lc2eSucdAHpPVixZbxaUQvYK+6fQfPiZCq//tWOB+qwaozMUpGND7Ny029FxyWi1Ua4rkLvAOajbXOTKtJHJA98vujOblF44CHF9/WGGBYB5fbHRl1wPYNIYCD0jvQclIDW3+Zf/C/PCiwXXROpVsFmCTUizX0tWGeHtkmve9Ntv8PekCO6D+S8E1n7e8mfMXLjUyxYT3/FFE7nb5YFA97Q0c/O/llT9JwRzAKBeGPLf6tnpvDR2qi7F4iHOxuseDGL00Ip/kMB5shgiZ7V2a71LuIZFtg5p12slKuPSl+667I+IZ9GEdFDg/Zglf1FoFSEiB0wX6NG+7WwOM0PmGqIERo2Uu1zQn4h4xw9IRq5VuCvr7NbSQxvqYQAThmk2O158uBRBwJf+AdKKaBcA8XPnJgsINQknkWWt/ftNpXsyRsLqUJ7W8KbAEF6vvJGiR1sCIA/3XekEEIdqp2mCSVnMaRdulXgeFDHEZI9vXgFbrT9dVzpN0OvMtwGCgBACPLe6Dy8D6yaiwDG0uBl0CCU08gDvvUQZ22t8Czad7LZp3PgZZE52Vqa9LdWF8iaBWYpeFH+qnk1vZUeU1HqDls5x25v+A8efxHyibKvcRc8BNnh7tyYKXCGZR5IO3Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c7ad0d9-1bba-43cc-5ce1-08dc7a3d47c0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:57:59.8020 (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: DU2P250MB0191 Subject: [FFmpeg-devel] [PATCH 1/5] avfilter/af_atempo: Properly check av_tx_init() 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: zC81Hwv9R+rP Fixes Coverity issue #1516804. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_atempo.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 0c36eb4dd7..1aedb82060 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -269,6 +269,7 @@ static int yae_reset(ATempoContext *atempo, uint32_t nlevels = 0; float scale = 1.f, iscale = 1.f; uint32_t pot; + int ret; int i; atempo->format = format; @@ -300,16 +301,18 @@ static int yae_reset(ATempoContext *atempo, av_tx_uninit(&atempo->real_to_complex); av_tx_uninit(&atempo->complex_to_real); - av_tx_init(&atempo->real_to_complex, &atempo->r2c_fn, AV_TX_FLOAT_RDFT, 0, 1 << (nlevels + 1), &scale, 0); - if (!atempo->real_to_complex) { + ret = av_tx_init(&atempo->real_to_complex, &atempo->r2c_fn, + AV_TX_FLOAT_RDFT, 0, 1 << (nlevels + 1), &scale, 0); + if (ret < 0) { yae_release_buffers(atempo); - return AVERROR(ENOMEM); + return ret; } - av_tx_init(&atempo->complex_to_real, &atempo->c2r_fn, AV_TX_FLOAT_RDFT, 1, 1 << (nlevels + 1), &iscale, 0); - if (!atempo->complex_to_real) { + ret = av_tx_init(&atempo->complex_to_real, &atempo->c2r_fn, + AV_TX_FLOAT_RDFT, 1, 1 << (nlevels + 1), &iscale, 0); + if (ret < 0) { yae_release_buffers(atempo); - return AVERROR(ENOMEM); + return ret; } RE_MALLOC_OR_FAIL(atempo->correlation_in, (atempo->window + 1), sizeof(AVComplexFloat)); From patchwork Wed May 22 08:59:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp215587vqf; Wed, 22 May 2024 01:59:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVY6l9jAhgiJQeXAQihxF+4LFccLPPVXo/NB6ogtkc9Re8WlnXGfAtt9LMGvgzpGXAVNwAV4XKC2+0adVNCLyd9RnbB2IRR+kddzQ== X-Google-Smtp-Source: AGHT+IH/t9oEkCwQcVG5GyXDzzmZossEWwp+FeINo0rM1jtiKfa/KX9vqQoaL0ZEbvtNlh4CIANV X-Received: by 2002:a17:907:3a45:b0:a59:da00:5acf with SMTP id a640c23a62f3a-a622802bb53mr78888566b.2.1716368381670; Wed, 22 May 2024 01:59:41 -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 a640c23a62f3a-a5a5221e104si1279569666b.566.2024.05.22.01.59.41; Wed, 22 May 2024 01:59:41 -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=m8ir90dL; 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 1968168D3FA; Wed, 22 May 2024 11:59:39 +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-vi1eur04olkn2097.outbound.protection.outlook.com [40.92.75.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EE3468D3D7 for ; Wed, 22 May 2024 11:59:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RCbTPw+B80Awd0TnbKresCcGkJxDA5TLbdSGcnBpKxka5Qht5EmNx2Kl/TFv3jEubtDTxplnb/kRCemZSpPECmbsLJEXM7rti0VBDNzB+MQX2GT/5qltWi2TgI1XRSlZ29kA3LudWNPtQiXWe/uyL1z4hlGTKT2qm3xiUYqH752UjyVgxQS21qBlXnod3ZX7RfIYEpr75VpsyDGJzue+F3g3CwgBYDuAgrXVXfJd+A1LzzBghT/ezjcNTFJcCLIh85s4AGrD9dA6rDS01kJVPYGHowLFTmJD2Gt3EvMjhyRZublHyvATUQw/rxFUUC0V5vDWuHNHeD3BhJqYnDSwUA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=z7NKWSo8tMKX2FeqZJ4jJ22FI2pXo3GULgnUEdjULhI=; b=XtVdkM4gteWQSwkrwmaEReEKkzNwwbGEmO7jAN96P28lAvdq7U/NZ9O/ALgAcCoqgwkzAKSP7FQ30kJunHcmRF6BKjcnVvciQ6pM0bulOGq3CTkvSNc6vzeevkZk+p0xNbKaRlujEG2Dpw38G7XsmlvrkVHYHixkWIecymlxgjaL/YvCb0bPGueJeQ2rIjs1K79hKSud5q5O/JGXfLfOLnOam7bonrxzWCIdLwTUsmYBlaJtbj+5fqLLlldDsPognknNHkBZyCgFYg1mRZnc4KrPvw+gyY+a2SKHslE7NCsiUkTeaVeGWhRwbBEkjqidn+hszRCaAYFjP3tf20Vz9Q== 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=z7NKWSo8tMKX2FeqZJ4jJ22FI2pXo3GULgnUEdjULhI=; b=m8ir90dLBxuP6s/R0nSA+00mFaPsEXNzy0QtIiDfuLm0Y1lkvLa8o4uA4Qe6pvqclHsbvS4iABUe1DNHyDhREOMACyVgwmJLmWyTuSNAKFJAHSQ+fO5HkpOa7eCuElMDc+YpTzZvDwvOp6jPSvwLvfFpnsCVMJ6W04fEnqpN5yayKZeUcnh8wM1O3rc4IWxA8VvCfFYhRsTox2CZhOuyB1x0JClNl7tOXdTWHkGnG3ygWZyngxZ++y6MTVhrmNFVtRaiK5wSx/n1QjnL67IFkA/vbHT5Ijx5ejpWytHaZWqAgfOEGv4zYEfeUGqAd1A11l/7vPxdk9UNk3UUY55jrA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0391.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 08:59:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:59:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:59:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [uUkvV4sY6+btMhqSNhAeKnYm6aPDvweRMtYTb+tSjzQ=] X-ClientProxiedBy: ZR0P278CA0183.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085923.3697837-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0391:EE_ X-MS-Office365-Filtering-Correlation-Id: 78e08558-4823-4f8b-f5dc-08dc7a3d7df3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: PKE2HCJq9inm1GILo9tbXenNkyZQdOO6c9YHifSyBFPBrjJKoFUWvr6mVjADdEOd6Ac0U7nTbdWE2TblI3zsmV9E4hNiYtR1jgfQXMtLyHYQEmT/euWxey0XcXVfmdMq1SBJOJsIyvYxdTdtnRnBKWa/CYjDS9YwPcmtyjQy1AkWskQTUx+fsp7X5f3YS1W/jQXZnaOzaUyAuUbf19DpCpJQYO6IvGJZa/MiTzkriqc/v/HqgNWOMhxDB5wMZCHVfV0eQrm7jjHWBEHvauFFJt/GY4Lqyrov8tpbEkUl/goco0rpbikthJ7RZxEuk1YiW8A9SoAmC2l4LCs5Mfagl6SEK614dHiPJK3YsYeDrRMgiWN+Pcy6qeGRZGC7+lJKkOUPqz+izuWoOM593qq5DDGgcfmtv5yRqyfKSZBCtF1n23zA4w+56bFHYa6M3lm2CFUS4YPuvzsUnphPRQEFutadAGyBV/qH4YcvY3/BE/LRnYhzfbLRP5GHZFMAuGsyf5hdm/aun9G8BH7VuX9u+YfdvPNSkWvcp343kmThyp9U+bD4Sg8X5TCw+R09LQ34UzA+IK/JkFRx1F5K45K24WHj3f3/s+0GYflu9Kx3oqSM8NDMVtcmZLX+aBDGRxPi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dh4/Ixe0qacJmtK7M4tem4Re2OIc6DWI2Z6K9/M7Xf2X+XZx7rGk8XvyVzN/rGtmJcJZ7/pLY8apdya1TMQZvVDWdWH4UxMZVPfxLKWCSFrqvcDaD9yMuSbcVic0uI/sQc813GrqEM87kI4EUe28hOGqplhUCen9dGsvcNgnIW3RA6aMibdteKDQdtDZgpq2rkOkE24jasmKpzqjqqW/7Wk7cMV+aa4ESKKjYGXiW0OH+iReIxeA/3Z1fIQj+YCgK/fguslnxAOUyQojkb9+kVZX9rzFqLoqePL/bkxpCtgQSldvgjzUPxYXY1v7aljffXa6Z8bAbYqYC92NdCqcoT/08ZjJR7Qy5TmSUYGpI2MxsT5ylLpK2vOGDNxEKdx5H14FJHzQomO+G2XcNv2A6QCKeKlob/N5LTUFT5f0hYmnsbFis4YCiaomKGDf/i94qewlceWHUoLwFhEUQSuivoK5bUIQ27cWp6+xziUqJjdJ6R8qI+C+2nbMhmOZ2qflIhJQWom6INfhV1LcoY5P/j7f3t1YYs2Z0BaGabl9ySYLuKvfSggAMBXwdk1SKDDYff/Mz7xs1ojvcxaaPCnZUIfiIjbnZMBm6hL6GZbEOetC4kfAVIbNke9n5AkJHA9DGbqDVmxJJTI550TJVNv99FPd7bLQfZe0czrp4QMVbbjUPVLBehVOxKjVtugcx6+eJ4c0HcTPUMo9v7JhLUxWJNVv0dKUL52iYg2NFc0v5u4yPHdJBjFmx8wcBJN2t2hKtNLWMoVXJjOVG5d1mThy7oQQ6O9ZpslsJ/nB8ElAurIPbDqYS7ug1r4CfNOQ+hyDfkCwh+NOxDNDJcyLBLqoYcqFz2d1qcCkkvNpOCnT0i1NoQTFHR2kgAjfDtctzaHIYzWl8687SXx6iAqWRXmbhi9xExwq9ZuFlYx8jwph5lAqcgcJvOMyImVqPlYCtCN7O5Pqgtk6Ukgk8pPuPcXQGiXTPSH5JzxRfYwGAzGg0X7h8cOUNZlpeqQcygdbc/IUoAHWGQUyxxRPF1kfGxOeFIVphiqjC52YJopGtNQ3lwZ/nyzVQYWkWE2flOdI5jPTJ6d3YPxfJO20tpG4Yyr0XNgLivD45wAV41bDk8XS//3P/g5/vE7Nw4M5dJmTnE9w6LijKRBdpL5cRzTGvlc9qzBIe3WKR3sAaUNh/+3jl9orf5s/4nHfE7e/2AY9KSTm9dpJQ3AMjgKAUY06s9E8vGt0ejOQyl1NzEQPuyjHNRWDemXEj7MbKbtNz3c9mEBFcV+uyU6c9fP3ILdGUBA22Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78e08558-4823-4f8b-f5dc-08dc7a3d7df3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:59:30.6486 (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: AM8P250MB0391 Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/af_atempo: Simplify resetting 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: rq7HRktoVbsV The earlier code distinguished between a partial reset (yae_clear()) and a complete reset (yae_release_buffers() which also releases the buffers); this separation existed to avoid allocations, as buffers were reallocated on reconfigs. Yet it is pointless since a5704659e3e41b7698812b89f67d9a7467a74d20, so simply use yae_release_buffers() everywhere. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_atempo.c | 69 +++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 1aedb82060..110f792eec 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -244,18 +244,6 @@ static void yae_release_buffers(ATempoContext *atempo) av_tx_uninit(&atempo->complex_to_real); } -/* av_realloc is not aligned enough; fortunately, the data does not need to - * be preserved */ -#define RE_MALLOC_OR_FAIL(field, field_size, element_size) \ - do { \ - av_freep(&field); \ - field = av_calloc(field_size, element_size); \ - if (!field) { \ - yae_release_buffers(atempo); \ - return AVERROR(ENOMEM); \ - } \ - } while (0) - /** * Prepare filter for processing audio data of given format, * sample rate and number of channels. @@ -289,40 +277,51 @@ static int yae_reset(ATempoContext *atempo, nlevels++; } + /* av_realloc is not aligned enough, so simply discard all the old buffers + * (fortunately, their data does not need to be preserved) */ + yae_release_buffers(atempo); + // initialize audio fragment buffers: - RE_MALLOC_OR_FAIL(atempo->frag[0].data, atempo->window, atempo->stride); - RE_MALLOC_OR_FAIL(atempo->frag[1].data, atempo->window, atempo->stride); - RE_MALLOC_OR_FAIL(atempo->frag[0].xdat_in, (atempo->window + 1), sizeof(AVComplexFloat)); - RE_MALLOC_OR_FAIL(atempo->frag[1].xdat_in, (atempo->window + 1), sizeof(AVComplexFloat)); - RE_MALLOC_OR_FAIL(atempo->frag[0].xdat, (atempo->window + 1), sizeof(AVComplexFloat)); - RE_MALLOC_OR_FAIL(atempo->frag[1].xdat, (atempo->window + 1), sizeof(AVComplexFloat)); + if (!(atempo->frag[0].data = av_calloc(atempo->window, atempo->stride)) || + !(atempo->frag[1].data = av_calloc(atempo->window, atempo->stride)) || + !(atempo->frag[0].xdat_in = av_calloc(atempo->window + 1, sizeof(AVComplexFloat))) || + !(atempo->frag[1].xdat_in = av_calloc(atempo->window + 1, sizeof(AVComplexFloat))) || + !(atempo->frag[0].xdat = av_calloc(atempo->window + 1, sizeof(AVComplexFloat))) || + !(atempo->frag[1].xdat = av_calloc(atempo->window + 1, sizeof(AVComplexFloat)))) { + ret = AVERROR(ENOMEM); + goto fail; + } // initialize rDFT contexts: - av_tx_uninit(&atempo->real_to_complex); - av_tx_uninit(&atempo->complex_to_real); - ret = av_tx_init(&atempo->real_to_complex, &atempo->r2c_fn, AV_TX_FLOAT_RDFT, 0, 1 << (nlevels + 1), &scale, 0); - if (ret < 0) { - yae_release_buffers(atempo); - return ret; - } + if (ret < 0) + goto fail; ret = av_tx_init(&atempo->complex_to_real, &atempo->c2r_fn, AV_TX_FLOAT_RDFT, 1, 1 << (nlevels + 1), &iscale, 0); - if (ret < 0) { - yae_release_buffers(atempo); - return ret; - } + if (ret < 0) + goto fail; - RE_MALLOC_OR_FAIL(atempo->correlation_in, (atempo->window + 1), sizeof(AVComplexFloat)); - RE_MALLOC_OR_FAIL(atempo->correlation, atempo->window, sizeof(AVComplexFloat)); + if (!(atempo->correlation_in = av_calloc(atempo->window + 1, sizeof(AVComplexFloat))) || + !(atempo->correlation = av_calloc(atempo->window, sizeof(AVComplexFloat)))) { + ret = AVERROR(ENOMEM); + goto fail; + } atempo->ring = atempo->window * 3; - RE_MALLOC_OR_FAIL(atempo->buffer, atempo->ring, atempo->stride); + atempo->buffer = av_calloc(atempo->ring, atempo->stride); + if (!atempo->buffer) { + ret = AVERROR(ENOMEM); + goto fail; + } // initialize the Hann window function: - RE_MALLOC_OR_FAIL(atempo->hann, atempo->window, sizeof(float)); + atempo->hann = av_malloc_array(atempo->window, sizeof(float)); + if (!atempo->hann) { + ret = AVERROR(ENOMEM); + goto fail; + } for (i = 0; i < atempo->window; i++) { double t = (double)i / (double)(atempo->window - 1); @@ -330,8 +329,10 @@ static int yae_reset(ATempoContext *atempo, atempo->hann[i] = (float)h; } - yae_clear(atempo); return 0; +fail: + yae_release_buffers(atempo); + return ret; } static int yae_update(AVFilterContext *ctx) From patchwork Wed May 22 08:59:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49140 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp215662vqf; Wed, 22 May 2024 01:59:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdzvF/BIcvjiwxUaft9v5lPJoZ4f0cMG2sC2PK5eOsYMsV3nlbSaHCzk6Pr12iT4xTA0VVGRvbJWCf+IV9vqUZY9ogV6IPHCzxtQ== X-Google-Smtp-Source: AGHT+IECNKTgTrA2JOT/0djLNLOzViJvtzghO/kK6qk1x67c4Ibn8QsqOdntGYsmcph6U35uotEj X-Received: by 2002:a17:906:e217:b0:a55:adec:7139 with SMTP id a640c23a62f3a-a62281636abmr88625166b.60.1716368390456; Wed, 22 May 2024 01:59:50 -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 a640c23a62f3a-a5ce823fb77si719803966b.361.2024.05.22.01.59.50; Wed, 22 May 2024 01:59:50 -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=bkNTNq2D; 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 5C0DF68D416; Wed, 22 May 2024 11:59:44 +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-vi1eur04olkn2097.outbound.protection.outlook.com [40.92.75.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6943268D3D7 for ; Wed, 22 May 2024 11:59:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bb/heFaRULn8/a/1+FmBA/afN/8ZDQryfcz4PuuPLzZG1xXBgxMSGGLWxoK8VJ/4WrIeumjg26mb0v8gNMmGiuEeJNLWlLuIBqBpTDJmfd/CBPdEv/PaDscsR1e2w9p3EjDG7W5DKpirM9aQB7tTWsH/L1DKPEqXcjM+BLkRMUZz449Csn2s4N3QAaM9+/edn2fuv3UqEuf2ZWiwxIEfpt0t9QnFkAshVzchudF9bfHO/+UVTOoNffxqDyYRLDkoGr1UdmRBOhc14qRFv2DtE4AIQHrKbIkn002ZYT3j/+Wjk9lhBjNtrQMhiRg7LG3uZyHzQ4N264+T856THmztxw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TK/BKeiWGbGnnD+ZhmrXhRqvtfhUBsmmLw8gpUvVH6E=; b=JyHsJ+N5I2wJdUFsqWjx9Oq0sOKd+1DExJSIF50WrcSWSNoLme+PmDpXr2TAU/tNU8bhIBrdOVYzjGP0Z0SKS6qA5G7kDQPfTXgbmiDOtnMXnNurOvd6p6Qnl3+rcLbL6Q7jMcTncqeS5Q5D39NUr5mdeEOOWQihl8CBRzgG2oXz/E0zeINO/mP6aql16cGXia238tEOFM76k+4Z031eZQ1RlGON/VNkJaNPrcm4AFISVvQYLhlPFAMEQ5CQyO9s5DZzGSwd24F/rM+19OdzRr+bAP5bypTy7UrQo47kXiNAE2qVdSyOO/lhsBkT2J1YSKN+ZmGA/JJ9DcJ5NGDOUw== 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=TK/BKeiWGbGnnD+ZhmrXhRqvtfhUBsmmLw8gpUvVH6E=; b=bkNTNq2DYFozvEG3EvlMgC4VYy2TRg913iWH5PQiKi/MAUjfxo9fQNdC36GkJbRWCXJBc9JbqvP82fGNJn5iD8ZOvjmGIB0mi5SKGHD7nf4qmX3S3cF9cDuD7GsPjqgtx+/rNKhbxAYTeS5g+Exbtkv0NBWJ5PmwoEIP2EBejR7Ho5lGvstqMGUL2Or7TzLn/eShqfUC9i80cruIRgTOQHS5KzidEnk2NjgVI0oezwJI757AIwrfX+0HjfFWCP+yh3a8cetCcPI71zDYAj/VMHoBvY4ywkwrtaCDhZ3k4Hk4F1pBQyN8De1GQyCXRZjpvG8HtDzQmDqJPBjLmpqDjw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0391.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 08:59:33 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:59:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:59:21 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Z6nYBUGg++7WGswl1+/7z9E10GGDBm67ujGCgZg+al4=] X-ClientProxiedBy: ZR0P278CA0183.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085923.3697837-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0391:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ba8390a-7c51-4ab7-aff7-08dc7a3d7f49 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: zuCGbW6vTItmggB7ioiykgOTG0bzU3ccBUWmapDDIEjZBQkZebTPTgc2fRgX38jbch43JUPoLZvWYc0uy4IpHacrFN8mTcnk8KbyDof5/MRBkIReBp77vf0Cx6qDIBD7FuWJ76gnJ/+VSVtL6hvmCzPQxc34HosmjvtD1aUwyh3m1tinXLmlBA8RDMR72I3SqxNOacgPckznguBu7wCvUhqj1grMMazWqKhUx9AYRnalTolkYB/10VSFEMY1r73O+T4zVWFj6pr9wvnt9kvCAsJ4k8WaOq7Je80cHmYS+g7ZkBqWhN6P8k9IlVR6dmvP0LSi0TWnMeoYHr5ZU9GthXyQhcT99JyNpOzPVLsETyN1UGzbyAUtzUYzkuMlyZWn0ZSftpsnJNtTc5VOdfjUk2QJuIuhcK3UsDGcYKApvCgorsUiXuPKVO0gBOkpxnAh+JTqm2juvNU8gWz3rHXkT9XiftYe9usW3Ikui4dbof95Mds1S/0hdVgjY8cvMS2+VEkFDsxEar5i4n+4HlflIS1YYBjTRr01iiaviNZjVrTtq7wWtRTELs6aWIQj8po2XYwT/D5aTaVsvM8ABkA5NRr1U+4TKVTwkyrPjGwY+NY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pzx0HQAJaiXS5x90P25NAKzGmExvITSTjbfN6WPk8mlVrFBvPlpGCu7BzSxjoXhvVa63HfYNIuXB3cjkJFQXS7C8htgI3SlQhqaCJG70m+LoWILrvWt2fxQPKY1mqzkSeW+NKjpwS5fpblvg4Rp9eIKelrN/T1ObhCq/Mpvo17jzYqcpWDuSCN6DPlBWI+lvQUTt2lfyU3p9vT6Y8EsoUFzQnMRrr1uZws9w5xTEHL3Bt6HTwLPuhqxzpRk5oMSHO5oE4J8Zka6yw5IVG5m6rKqHlxqVOrUP35lr5YbJXC7SAdws1pfivhfTnc/MAXrvRen/9NwDDty+jq2BcL4MEoc5bR9PKxtPIkYvK/pZTHetAdW+QR84J1jmAU+DC61h93bxgQ7T+2Hdw5yzfKYBaCG+A56/CgMmhBNGK+NuWcDXaJ0s74qDsTuQ1qEoRMpNbFoiS9RfPU2YppYYyWo5Bba2vdbkbKCkBjj3ivzF1hgXaqLBbkeQ6hNSyRsQkzLuITscbWTEh131NlKKyYkNsakm27DU82ByKhH5kNujgsX7z6/v4shqroCKQ3DgtEcIOL4WxyYU/sw//C5ZECgSAvkFrExbu4KBW1qWkvqWzPebYwog5M9IFkvhU6xUZNA8ikjPFz9FtWS9/lV9wbRzzahq+HDvQiwDUscVkZpSuXl6fOlfL+YM6/pxcN/VBwGbau6+eqwTHSYt6KV0F7egn7ZnWsCPpeN9y+H3dWjrNYkfaH3MH1uVvsnJ7y7V6aWOqyDIg1U9pvZnl0IlUNenHxwXSmeS2mWYNu/bUt2I2gSRmjHhDp0/TjywBsI4xnPt++b4+L1946kFzgoDZrc/eZxSO1aOUY8I4MM/RXRJeRPHzFgTvnQrpMcB7U2VYEQCIcq7PlSQmGlTdIGJNxN/XpmTPybP/ZDfC4kDTrkFHpe4GbD9dhB9wMzehHwnc28oq4FVpqtVh6siqgA2bnaAQGtb4dUBpVHy9ExE1keFwKOkDJo5bzX2RHuY66mQlnUCFWIEf/qiKizJQoOehDfYttx3hZY6or7LE1YGdAznIbDnmsl+87sk6FwYEKigS6XKM+emdbagEr9TCEvM+n/2A7DnsRKbYjQRx2PUxnl1cyzCP0loIlMGqglhdv3q7eAnOB3jthJCuBopLASCOxUXObnNKi9nuszoHvRe4+RJ+hzqrrrd+5PWJ30wJXehTFQ8SRTUAyFK5iT8DjvLmyWQs33Xqjw1kfbH1CREigDee5xn1iCJCr6qdWkoX3rOwnDq3RixNQQw2o0B+/n+dzosWg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ba8390a-7c51-4ab7-aff7-08dc7a3d7f49 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:59:32.9148 (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: AM8P250MB0391 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/af_atempo: Fix indentation 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: dCe0C+i6zSCT Forgotten after b8f74ee57a6e9e75a507adcddf30f84dd4a39d39. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_atempo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 110f792eec..3658348c45 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -998,20 +998,20 @@ static av_cold void uninit(AVFilterContext *ctx) yae_release_buffers(atempo); } - // WSOLA necessitates an internal sliding window ring buffer - // for incoming audio stream. - // - // Planar sample formats are too cumbersome to store in a ring buffer, - // therefore planar sample formats are not supported. - // - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_U8, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_FLT, - AV_SAMPLE_FMT_DBL, - AV_SAMPLE_FMT_NONE - }; +// WSOLA necessitates an internal sliding window ring buffer +// for incoming audio stream. +// +// Planar sample formats are too cumbersome to store in a ring buffer, +// therefore planar sample formats are not supported. +// +static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_U8, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_S32, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_DBL, + AV_SAMPLE_FMT_NONE +}; static int config_props(AVFilterLink *inlink) { From patchwork Wed May 22 08:59:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49141 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp215744vqf; Wed, 22 May 2024 02:00:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJSoR5jwORngeWVXop0H3LB/bRTbNxp5D9m03XkC6dG4L6QcMOH2eP23+W1F5EXpWBduwMSVynDkpI3CUw8fT6T7DtCNkf8keQXg== X-Google-Smtp-Source: AGHT+IGE+QEl/pQLvcyfumUuIVZVXuPA5OdbyVBV7A15ux0UGyd8AsL2YJFnpqQghUhVL2rjbEXH X-Received: by 2002:a17:907:cb29:b0:a62:18a8:1e7c with SMTP id a640c23a62f3a-a62280849fdmr64156166b.20.1716368400155; Wed, 22 May 2024 02:00:00 -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 a640c23a62f3a-a5a17b21ee5si1517081166b.313.2024.05.22.01.59.59; Wed, 22 May 2024 02:00:00 -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="lMRgk/gt"; 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 8625068D422; Wed, 22 May 2024 11:59:49 +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-vi1eur04olkn2097.outbound.protection.outlook.com [40.92.75.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8267F68D40C for ; Wed, 22 May 2024 11:59:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M8HDPwGBLAkSHAT44WMfjpcyU430kQPM2LNfisw5vILiB6HzjZAchZYs/TO5RErz2J9JU4In++pNxfCVmwhObQ78JNBnapU+2z1ojuFLw0BU1UvptiLejjOf3mwnlXu63DJvsUp0pvqbDnBxjLSf9/XdPHXiaLcDNBB1Ry2djV8ohtDLYM3Jj4tVjDdhIASbSguXuEkR2ZzvVobWEHT91+0IEFD+X1EvrZA9dyxtpnnLru2PMd7dcaF1VRmKHNa/QbeUWeds42vQ55YLVC8rhofobFA68HreGLCD/S+1mfaOxDQMeXKiURwrTpN3u3dTiLczFHW4fLAx4I0mUV8OLQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n6zoPNgQJta06Pc2PZ+IxRGI0b/AWLu8JfHACHKqFfo=; b=lLSPGqnOfUlJ6jvBfq2bzpaRRQyQLIMCudj8TOtcS8JXF6wBdmBTYmI2VbrQytI/Pvz3n0V2rVzQ9igaC/Y2Tmgcu8czg1ZI0bWD2dFdDZy8xLuNFZlGuso4uouCxU8ujmB7DmjHeURBBPBClyYokWa0yoJa1aHwLuFanZiR7qvWc2lAVepUVw0w2ZP+sOmCzoeHedfdJ74vQ4z8QGqFNgIT4n/VmYAWjGqk4E9Q5OxcSBbzk85VtRaIKwRRGzglNXRHtAX9gu89DZlP7RwIrho6ipTv6D1R/eLhZwSJxTO0aDiUEYZkmfuaDqL5jV5kgUgMXRsgEpTEuYWrE4vOgg== 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=n6zoPNgQJta06Pc2PZ+IxRGI0b/AWLu8JfHACHKqFfo=; b=lMRgk/gtYDCxYyBV5sdEbIGRzI1J1z5VlHbkYrueNX6YYFpPpbYnlbJsNCsSRJVMba6ERx0GdplzE74Rrg18VQQ42ayEEqNrb9ijbQyREoWxv0jUrAkPrMLqn4P3+/d2J7XVArXKCPlSvWy+AMWohNqM0m1YcEOrh6b+rLHVkmIK4tp7JbZYcrlCeAeCicPy579HHgjJqsc3EpZmrTHpPDXLC75/Vvj6nx3pNd5/kln+fCMr8uUFuwxuHpYu0plJvXOzqeCmJAxHvU8EbLrYiLbGYsb1LfM8TDCEAY7NsZLJtaQRXU32ZgBX2ycx7zUktIhWbXkm+zTomw/Mpmy5zA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0391.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 08:59:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:59:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:59:22 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [s3EdsKf9jJdwbJaFIeIzAgqaM1G4VcHmICnBopcRnZY=] X-ClientProxiedBy: ZR0P278CA0183.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085923.3697837-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0391:EE_ X-MS-Office365-Filtering-Correlation-Id: e91e056b-530a-4594-001e-08dc7a3d801c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: ESehgZskaBElMvMcKdjCvrpQBh0EA37iCT4XnHr73H9qUBh7KgiNoSPHq5tnFlX2ItVytGtL0XYIc9nnV4gpXTD+TVbInQx3FrloXILwAGOlZOLEmciVbpCeVlGztCIn6iw30SZnKONrMbRhZ6X4nB98yDNLRBjRtFF6jxSD0zP0Upl0E8A9tMUo2aNTxc7r82NZ2YjUtosDqi1OsjtgCpQrZ3VuMz6xSbH5AbIe59TGawdvTbty5jJpyTVAdi5dL044079IKBLvYHyvy/YpSsNmwbIoKgOvO2tMTYZzWlSYy3Od5SgzcPAotDAZ3Xk547SIMRFqsV0pow+NG0L3M5cOFd0HpJRn2h6Fg+DEAL+PE/5yrXtZ0Tf02+Yn6EV+8QXds/EVUyP9vOSvJ+s3bzYAx4jmPZi5JERB8ijzbnDdQOwuJGyIPe2x0GSEq2keSkE+A+A61c1OtK1IgGS8f/hYZ00CQrW8U8GVW2dgj3Ixz8jI4yTgjxeRNjA4S0tljwFHeOWp+c1EQLzaG0JQJznh/pcWuikItDXTVGjzk3xdsSLmu4T6LUSXEWw4EHeM8Rivq2jez7DxxUC/fhSIkg4MSFccQ47rIcHyquMQm3NJ4jlhvYeqUg948vthlIGx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8yzkwKU+YUmzI7d49GZsr7UtMiYd8dEGlKcCXc3NXh9xA6vg43WX6nFu7U8m1cfMjnuY6AuJlVoK5AkKgHQLwHIv/yRx9cktWJisDH2MC3xPp/nDJlVVIB5gOoDsrLamnkp9wEAdKyf7P65gIqZfEVQNU7BFjTeSbFH9NWdnzlqiaDEXpPQCE5p5vOos1mxKPxlXX5oE2YzEs4M/MrzT3X9QDB7BfhTATxi9RoMIQD4vwxDHSkpw9qybj/rehxyVt1jo0UvWfarJPPFAQv7I4khchwCyAizN/qxF8UxMykN2/GDn3zN+TaWrpjW23aDzxzKbGArzJ5h1TdFwDycqWWaIc2U+afjShec0UZ1bB1jWeM5mo2EaLCwvQrqnMZjsrDszu6MxrlHtG/yg51j3lzGU6bz9V11ve4MwTPdm5z0O4CPZ4TjiLWKWAmBv1BI+4n09QJ+s921Tooa3LQtcSwYV5gBzEE61O7vLxEzHSqak0Ro6o9Xkqi8mcnBUoNn1+HpuVPrGqhVbfjZCC3UdHVZtjY+i3dvjaYYVllCirRip/uV41HtqcvYsxVzzgKy6S8pPaqAJZRcgmmQqHygtoBgpmusm2kwjRyPcbNiPTNfTr7LTDtAchgKbDBReWp1mChYirURGwEKUdh4+EWXJIcWa6QpqipSW201Ig6wyksDha7WgdLlDDUMjF/ycSZ+2j0fzNXl/eqcip/EuBRdLHluZsRuf2HWuwPiw9GNDoOmq1iaZ13Zks3D400JfZq3I/9oQeYppTAIEGszzXvmjzI67QrVBMJld4QLb1AqOhhN5Tlr2mnlFugV01z0DHGuV50yoRRc5zlXZnjkqwk/9Q+vOELf8+GvzKHpqPuAycFdWPQb/3GsguODGuhie/hltaLFiqKO5B7BfHyDvcf6y0CsarPxeybgDBsmpbF0C5MQ/QIvlLugF7k0ikgmcDHfC8HFdYs2KP+jGbBVm8RibuQp9RKZ7KOqF1YDV8P/7nGIHEU0c2YG273gVVG7TC6sN08XojdkUQC+iz3qmxVOoZLWo7clnPElx1dYfx/PAOteX9ckjZTPycGfoZUzA7/T6z4xulggqI018IhwPcmpdcx8MxZMrH5OSNCkpF9z8XB1s5b9Mm2yzy55oY7iS4+hIqQHPK2hrzkvpbsbt+8fI8WWqxVCtjEfUALaEoFzPV/RebcbotU8f5t26/3xNqVGqKC0DVGMygdleM55569A2M86gCxOimgVVXQT0iMebdei19xfM2pCq8iVeo6m1LW7RtWGd4IABaujSzGRwzhCUAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e91e056b-530a-4594-001e-08dc7a3d801c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:59:34.3348 (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: AM8P250MB0391 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/matroskaenc: Check ff_put_wav_header() failure 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: DYOltOyPRxqg Fixes Coverity issue #1506706. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 63bae9fe1c..76c542d50b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1250,7 +1250,9 @@ static int mkv_assemble_codecprivate(AVFormatContext *s, AVIOContext *dyn_cp, par->codec_tag = tag; /* Same comment as for ff_put_bmp_header applies here. */ - ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); + ret = ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); + if (ret < 0) + return ret; #endif } From patchwork Wed May 22 08:59:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49142 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp215862vqf; Wed, 22 May 2024 02:00:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMkHYZe9/rrzne9R7pLXGQ/n7TcgkdulyFt9bCwsmHAFYwbH2BBLFTnQRkaYNV1z0NR51ioiSKMXhrvBdKgHxSgCWYk5JCghlf6g== X-Google-Smtp-Source: AGHT+IFUkZhUIjBiVQA48iGSe3/qRE20VB+qzjC2LsJ8gUdRnx0jIeyHgyrIq4MNjXNUcfHLTYtv X-Received: by 2002:a17:907:1312:b0:a59:bfab:b24f with SMTP id a640c23a62f3a-a62281a6e36mr81084766b.3.1716368411338; Wed, 22 May 2024 02:00:11 -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 a640c23a62f3a-a6219717e5fsi115183566b.791.2024.05.22.02.00.11; Wed, 22 May 2024 02:00:11 -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=YHoGD7Cb; 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 D61CB68D435; Wed, 22 May 2024 11:59:53 +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-vi1eur04olkn2097.outbound.protection.outlook.com [40.92.75.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A64468D41E for ; Wed, 22 May 2024 11:59:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WLrOr2bvdXZRwCALCcN7MuqYM0O5we8n3ulZDgxUAMcB9jhpEmtUq9MPW0Nxt2NmLfOhXPNiV6RTIVWY1ZrW5pWkpFGxTddcVHbukbtS2+qwohCj5XN8ooUiBsNaEsa+sFT65I2ZqMGXlFBydJb6zp3s4yfd4nW0xb+37pFvAQj89NevwqohSXWDz1QdkPJGj5dn3OJa0R+YnQ3p13w4lzDlX7+ZfaX8BluJWq6f5GDhIKik4rso0GEk4sHpANWk1jOfLyNjnhTPZH9pT1cHRPS+JZRstyQl+lP99FrJXrueH+pqqRtPb/xKjFoHWDNWmhANIf8klOVEggjx4BWZrA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=78FKaxdilkGXBASZYg8hdARashBJeG3t693DLQ97I7w=; b=k1sHA3MA3E5P+1CGnuOVO9pOA5Xc9doEXk/AeH14Hd0MIyE5NxjdNav3SQ34bIIrsvE/c7XpugpyCBrObxXp0pjuDjfDVD9toXVknh/s1chsh4cvBFJav6zw/wm0A4U7rIFWQvGxSqX2SOWj2Ukwg4wozbTdsMhBLzl+efiOMHyQ8v6AcgP4/lZlZDdtwhU9D+HD+jNPRobvxQsSSGdqETGph+7MM+yJVPXR2D1gnt6Stw8vbEdb+mWpRVheWi9ZCf7ksdP5JA/qE9EzZvb0Y9O7WOhDlUeyBLu+4+BobPGJRH9N1t9lNh0WfZyGUuk9Ba9cQgBG7oZ6tzG8UYFcGA== 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=78FKaxdilkGXBASZYg8hdARashBJeG3t693DLQ97I7w=; b=YHoGD7Cb3UMv5X259eY83xmyIo63ORqm844ejfaAAH8pIJugY7+hhfq2K+LBb3M5E7r+npGqQsZMUDfVCpooU9dO/fMoQrGwZy8dWEKz50XV+7gPJ0PKe8GLozQgXxIqHKzMBU3Fru976zGYZP2udz7pIXAAGhq1huJdIzcG3rMDOl8WFOFKnQP1H3o7P5wVdnD2XZynh6BcsqvA7MoNjsdHDaKPadnW3lL5pEaNPRn+jeie+NLzc3Azy+Hgdysm1AfvZzZzkzlZYb42GK1sJdReCJC6nujj+ZAQJllN1RJQh7UZgtb2bWZP2e1T0o0PMdl1u0VTbxDLbKmPFOp1bA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0391.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 08:59:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:59:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:59:23 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [kyara+PdHNEKh2m5+LrJHzj5P9Ly5StDBadWNqcdu3g=] X-ClientProxiedBy: ZR0P278CA0183.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085923.3697837-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0391:EE_ X-MS-Office365-Filtering-Correlation-Id: 54b3ffde-6930-43ef-4bb6-08dc7a3d80cc X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: RZE7JlzMT64eOTQx1JGcl/iHj9FFYhSdVnPX5avgXAJU2cnwmnG7YUWZV5gaTrTa5G0gXTAIwWU6y5P7rV54iDp8nkAecvj14Y0z5TYEtD5Vd1Fokk4R2NBpbhiV3ihqeEsyf3acwkc/xNGORL/R0egakLezK5zflsQqdAReHwhDAUQ8ckDDyKisEVhkaadL5QUvNwsiaOhZknaIPmv2xV6YlLKvQHk4emthb9BcATPkkaDuBM3Gt9N8/DgVZwkqGMXVELICtxYUlf1yIPVHNj4SGo2CyIeoS9Yjv5/iDUp4tDJL48tRu1Xc+1nbFJPmAZj/AuzPqfT1YYu2cBOI54q+mXRs+NwNWXe9ztZTA8f1pmmjre0R4Uiqd7pmWZXfUJCrO/7burZH339P0o1jdhFmT4FWTr1QoaHyeCtbE26j32HSgFd7P7O3zBZPnGiDAWv/gZCGZdfFR7vUut6GbKIZCR8QiU9bEGS5yCZxWbZSOTICPAsTRVYmHoC+W3RtBdGj/OBPRARYRsfCkoCKWhWjqTgwZJMmWCOmO1y2CiPqvoTbg+A9LnrQsRQOlJE6fPgTsdCs4bzhjnyozkEaML0ccB0dYjU8cG9dkwoc88/vhOoLv9FJZQ5rHAXw4Apy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0WcciNDyxVyjkmplX+d4v7yWaUHQfOMcvzl1qdMgz1dKrpCdlvKpSXz+z0L+YfkYHvPbQBEnRHVEtfRJDlDn9e0dvJBQMje5wjSb1qa/kgCq9PH18P7VBWG191Zrsm0utYpHD1kV4B3j/QfJnKIDDGtzx/gCu15wZjyfFFUGWOtlkEAMAPA0S+QSe6yrJi5odtz1YjA3Hs0twmKP0k32tnChsjnXTj6d44umuvb2eSD1QqVSigZ6uxOAAOe7C7oLM19uvyjOTnOmibSoiwCf/PoeOma+2OKORH/SdGFu2XmfwG6odziYyB5FaIjvt6DuG/LUxDI03oNMjwFhVrj1fLx8DuA0ID97fc1ucstvndUmWbQBIhg2lUa9tHf7sR35nKSVqLW2TcxvgjowGDcdCINtCuun0zSZGJP/hN0So+rZ/L0oAjsowrVdrWQGiirVIhzUzb74Xh1lB10TD+fomfzgP9h8Fq/4DTKCTQU2IpW3zSy4QH45gVJmGRQi/MN684Lwi3PBrj8ZHtGJylYja0vzLXeEa72O/3qtB4ljeX02ZYcsBdWtadh8K7aL4vKolYkzLKIYPvQZ6yrgaDHCkEkvITUGGnASZkzmc2wlhLAXkSSdxg2zjj8pAN27CtZvXmBLUzDtWYifXEmNRqD3a3iwyuFtNJEwZvx0ZFuOMgGU/x3QCd5Il6FAnp9reOdT99WE7IZhb0PGZexoCRSxhGyYvqac9b9YaVj//JWlt7Clk+fiVqQziCnCaMqUnGdhuXadYhk/bXgCk1uioZgMrAHOn1UQ2xgfcea/UhjKfN/22C0NR1t6AoULULhS1yfw/mYvbLR8E8bKZrmirYbGKU7jugynfLy9dOIdtH4xU/P3T7K7K5GwcxeWcXZrnpCMruDT8qgfYid7tlobXpzwWoYkGkQuw5EEyRREIlNxZ2LOyYaXTbDZURbAb+wpIrCWFzdqoVnm1QxAmY/sGbpvCEu4On/ItO7twoaAVis0WA0oAF30YawmQQYu7oQ6zzDlLR8MlD91SGIcuG3mKUTk59nVnD+MYLgQGvEekDRzCAQ+0T2Yf1MMaVAqLBclGoF53PMqAqvo2TSJK88QOj+8QG4gZKtfknbs8InWqM6P0FbLC9nBN2eW8SOXPdhNtfzHSOVsqR+i/YtYey8J4/RJPQkjZauH+39PsF7P4dlqK2HALBNDkZ77dCrzQ60LIoK2WQ2Rr5NsYBi5mDUg5TlQnQiGHD4qh0nQun2xNXKa51/W/Od6R9As5NClYKx613xPb+EIo0DOW1pqRILlxTcDuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54b3ffde-6930-43ef-4bb6-08dc7a3d80cc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:59:35.5535 (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: AM8P250MB0391 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/riffenc: Fix outdated comment 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: XxmJVZdaLcck Signed-off-by: Andreas Rheinhardt --- libavformat/riffenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 8accb69541..59c9932c36 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -72,7 +72,7 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, } /* We use the known constant frame size for the codec if known, otherwise - * fall back on using AVCodecContext.frame_size, which is not as reliable + * fall back on using AVCodecParameters.frame_size, which is not as reliable * for indicating packet duration. */ frame_size = av_get_audio_frame_duration2(par, par->block_align);