From patchwork Fri May 7 06:26:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp263830iof; Thu, 6 May 2021 23:27:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuPLBmNglfDskHw7aPTnWbtyMFSbTnd+c+Or1smZFmcWoxa7QxCInbcDkfHamc9M+ODH4l X-Received: by 2002:a17:906:364d:: with SMTP id r13mr8595011ejb.250.1620368848437; Thu, 06 May 2021 23:27:28 -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 z23si4170876ejf.679.2021.05.06.23.27.27; Thu, 06 May 2021 23:27:28 -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=ihXv6BAU; 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 ECF9F680825; Fri, 7 May 2021 09:27:23 +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-oln040092075084.outbound.protection.outlook.com [40.92.75.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7CD5680561 for ; Fri, 7 May 2021 09:27:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ksRxT1vUBFsx/W5GCAhwzNti8bH3UWDSqmipMZEbOx1tNocjE1py7IyiwqrRtic+g6coK1oBW5BsngpZgTNuHWi69vtY6Ff/0/cs511ugcBXtw+y/zAOoe9vZBMBhExID71dHRGRdRhJBeUiqPTAkRyxyaMAB2PgA8gEJIetDULrq4fkiHBT8fevd5hwo9Rn8UiE9bjBf91nz9ECA9PPUWcYGPKndK7KB4w9zhAphfEe2JM/mMu4v7Kz3TlPWLcvaVOcaqmlMUP3WEo0uukvyinnZNLBANw/bhHBHVK4NDU++y93hfaBaM1e0IesLO8nH5FjGOtuW23fb8JNSqViWQ== 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=349hdHyUxqgaC8fxVKK673iz4TXCoGsQ+fNmdSAXJkM=; b=HiAqErJ8pLMYP0cLmGHaYQ0exlTdKHq7DNKGq74BSL3OidHlxqstRhuT9gk7R1C+MbtQBl5eDc+HE242xqj0IXYMrlTlco7fHUq2RKiOA91JZ21RRfasYqrpatV6DcmbX7TmRKL/08XjPpQY7NLiQn4IjPm38ebndEduTSt8UIM1NDUSx7UsgenxBZXPwnzQRfKn+2OLe2BnNnQVbc7LpRLyFhuGMtRr9BLf+OiLZ78oXh6YtgsiM7DB/X1wmxAEt79TV+NU/al/uoMCcIFazFxeh4sX+6csbocXkcXjFwCsqT25bIEGKXAnTibFYo6jVfMGfj4z6CoBmy+/uLv1ag== 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=349hdHyUxqgaC8fxVKK673iz4TXCoGsQ+fNmdSAXJkM=; b=ihXv6BAU55BxPuuKTMpAJNga2/FwmkuRrh640O5A5mcsi5xVSkRaR/gXd98g6oEnc5Gr51Ou2aY7m9Ap1Ks8jl/25fNUgmnHNvTcdCDo5OOOpv0mMiZbt1HM9PHrrYZkivqSCXYaCu6sDsMpWptqN18qbKOYxMI/XSBCVGCbJlSKD6nAjdDNdYj8YMLw8Ycm+jvRIac6epj9uX8IHCVu5bMvCrTZQdzX/kKUlVADIs3HyFT2euybJXh61Pv0S+CgYTsPkyRAx7cMl0XOlhpsY7hlbDFnOOvATCr95zIiwuaH2zLJCew+5v/Znoj/GDoKvytiZSrIwjeCgeTBXGKxbQ== Received: from VI1EUR04FT043.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::50) by VI1EUR04HT057.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::444) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:27:15 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::47) by VI1EUR04FT043.mail.protection.outlook.com (2a01:111:e400:7e0e::299) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:27:15 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:018E18E47D3AEB2F56F2FA2434FA4C68BA1172F15E5A466DB748CC4DDDC034E0; UpperCasedChecksum:DCFB85317922E64B90F66150DF5AE900B6255F8937965F2CBAEECAD2989A0184; SizeAsReceived:7389; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:27:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:26:45 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [10hyAztPSpylQyxt94qLT1XWTtltEF5zjzq2S4cBzKU=] X-ClientProxiedBy: AM4PR0202CA0019.eurprd02.prod.outlook.com (2603:10a6:200:89::29) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507062704.362439-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM4PR0202CA0019.eurprd02.prod.outlook.com (2603:10a6:200:89::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:27:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0568c791-aec7-416f-42f5-08d911212752 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJp0x/TkBgtDYPJF93BKbTOFuRyzei5N6uU7/whs1hUJnimtpZ9uTi3dx40gKVDZOQuAp99JHX9WGTI8RbmXAPAK8kfSQAfRu47QLP7NhM/cmxxQexsVoDIBBy+fbRoa0E8ZALCIBXdCSvBOwuElWpXpIY4GEnA9V07HzlmHIKDbNJUjonOYj/k9l6WPpBlm5vRnkyzxi+jKyYt1Z1NBNaIkSOxhO5AwDcONUGsU1D4K9zW+xLPg/tTiTpv41RSEA1zA0Tt8kb3nUjOB95chEiZ/Lt1nDksBcMNOn+dPAzE0pONrSRhP/LzmYIpawxGmruhw+WxtZOXCHRxeESy6LSzzuzfZvdOMZ1DEXOxiYPb7qKkU/rIigM1ez4ng9AwxEKkJuhiBIaNw3v7ozNoeFvKkTlH8DvSveLc5REthOA3/WmcFszDakIsCgte8TvIZg/yGBrJowrxoVqVcOZ4t6bcxBRBiCtyZH5ktEQDL9RqsflVnYqdbZtFA8wVfEHeZkc2ZJ6U0vDnabjBeJzKTqGedTv+xszv5Yj6eI2w8jOOyuklZcHuGBxq/TBtm0N7pu52RQZjulsOfK9nXwuY1zqe/pG/rvP9SlAIEW/WPEXKEr+X3dQV2odcKxALsHPSCiViukoPWHegg0TKAdTB5BJWINt1OGobavu3LH+MlkXEZQLQXy5N+IZK8zAh2R6I5plDYDKuJIA5hg== X-MS-TrafficTypeDiagnostic: VI1EUR04HT057: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cepHez+Pl1P07XounmrrqCCUjRMqA+7+mUEfZeFrou1CEIka6fvPB3kgL6ZlNmEzCuUgrKcmOHoBCbP4vKL85o2Dqtgjouy8i8tQNufQ+qPWnOWZN1Wq1/tQNuz63OHKzwtrXtIvsDh3tecWLp7mwgr1WqlssaO5zZ55Qrll/ueZBxbmcFBP/0XrRl3jj2EGKViBH52nYb8ofiipMHpfdta4FiF4EujN3UplGeZX+5HTXw9Cp7RsUXD5zqyBkN7RbVG7J3xdGL6MvY+06Ni1gSLcNxqcdyeDwK7At7/2Vg2rFhwC0kF3eyIkbNtt7zxYx7YtmoCnzi6wd/90LGh7vOemXOEQQ5gBXQEIA+1JlNDlOZElrhgDT2xKZRCaBC4d5NQieoDxMuCAzhOSH/ynqw== X-MS-Exchange-AntiSpam-MessageData: YR8ystPwOu3M4KhOo1yENXSqd6tVofOe6QwGOCU65JrkjwTRlildoYDuNobnBUolFN2PLpIQdBXTdGoErf7UzB6W/jYI7fzrK5Gc+GH6lYZWnLjExOknoHeEQi79eEI5DkhmqOXsRMVu0Y75CDpM5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0568c791-aec7-416f-42f5-08d911212752 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:27:15.3695 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT043.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT057 Subject: [FFmpeg-devel] [PATCH 01/20] avcodec/wma: Remove nonsense volatile 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: pKObO5f+Z54i The address of this variable never leaks, so it cannot be modified by anyone else at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index cfa5fa3355..ee04ef725f 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -79,7 +79,7 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) WMACodecContext *s = avctx->priv_data; int i, ret; float bps1, high_freq; - volatile float bps; + float bps; int sample_rate1; int coef_vlc_table; From patchwork Fri May 7 06:46:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273164iof; Thu, 6 May 2021 23:47:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+HIty3p0X+Iuh9HrA+fjX/LJdebIjlO8BWqNkaD903lVTfa0MXEdeP3FXwVG27WsVZD1n X-Received: by 2002:a17:906:7c45:: with SMTP id g5mr8210195ejp.368.1620370026544; Thu, 06 May 2021 23:47:06 -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 w9si4029661edq.453.2021.05.06.23.47.06; Thu, 06 May 2021 23:47:06 -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=mdFoaenQ; 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 7696D68081F; Fri, 7 May 2021 09:47:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069079.outbound.protection.outlook.com [40.92.69.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB9D36804FC for ; Fri, 7 May 2021 09:46:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kN8VOMgAc3bbhb7GCouNOy5GgsRDnhEQoLZHRoe5rZOuWd83ggvK4yIjG5v7+47vnjGcjEjyMBmV8kMohKsLCPvF7xZALN3aDofyu6wNaUHmzpM1pDJXZn3xitmbemPODhi3PwR2o8nCP3/wMW3UBG/ol1lQe55j52sxDA4TaTPixwD6RuGuBvqS5YfTBRpwoH5/GQ8XCOldED2U4+9y6E6vaVFpVmCAlmZD7UqcIdCcFxxIa0S9WhnYNdBHFZ2CX6974c+atJNmI/zUI3iGU2pK5o2LYqxgmEMJ/WSmr58l+zliPf24qHLnqrOQ1V09Gi8hSO55TOhuZk4alBOpmg== 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=BmyTdkyvvg4/cC7w11CS6ulUXAFTpkTv3Su0h969OM4=; b=JiwhPQwXC0dPWu16/4NzA4cet6q6uy9Hv30jRWIOSHri8mDgUckRxXeulz6Zo3EiVbKb4WLXZaqv7C4n1ZJK/KYIkaJoDnmzyoYsoZ2teUAMU/ApPCRKscB45HNYg5EkO6FEgZ8DfmB/KV1T8Bq1susRss99V3XffP/YSROwMFubo/fG0JQJxhfgOXTZAiLvbOPTO0V5N95dAUklrnKKkt5QdJbGJrZUPrn/d7lpiGhjuWbWCD/mVZTVhZRUFwNfpPhh80vnqSjVBOvx0tEnFfpv5KJazGLXzsbVOzQ0W/hfPem55gAsH07qn+BFJIHI81JTq6iIkYvo0PZhl5DQmg== 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=BmyTdkyvvg4/cC7w11CS6ulUXAFTpkTv3Su0h969OM4=; b=mdFoaenQw4Krizi4KC5cnTFZns3+jQl/eYxJbzL1+Buu4Hf3Vvc2qbIYeQV8I8th9w7+R1kxD8trwse1auiXlDK0bNS7ZLbhKtmE4izodp63z32rWsCFbljN5v1B6pW0OkTitoxY67lYP8LzvumAjmrAuRgTomkXl3dm+ifhLYWhRNm48sxNsxliZX43WX4DYpcCgH/23X/2hgmU85lBx6Qx3HMNwLKdlYDI8UwwVuVgqbmSnaNo35WlV4tx+PJQHHTRl+KypSEXh3h99Ji2te6rh4ymQ6IP1FqaRq+Bq7ZnF50QGgFNva/frYQeJBlITcIdavSkpoaiHLLIbkwfIA== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::44) by HE1EUR02HT138.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::443) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:46:55 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:55 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5458639A8D8443FCA785F9C977C5786D5C2BD2C63B74DEDBF12F0D91E98B8199; UpperCasedChecksum:A14DE50CAA4CEBD6F82486138E2DA4573C8ABB27E293B9535684197E720389C8; SizeAsReceived:7602; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:46:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Y8C0QyZqLsDzRERYpRTehQSHUVgcveBgNthii5jgpG8=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0d3446e8-f923-4ae8-533d-08d91123e75a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJp0x/TkBgtDYPJF93BKbTO5LtfwWXT+/TB5f/qgz8iIx5VUcj3/IEycI/MM/zcnKq2z8eIaEb2/R6N+mw8EadwwL/Bx08WOwozUY6ErHfFZNlJguRntu7R+0Vfpn5DaoHv6KHmc1Dm9O+Cw+PGfsxfJLHT+fjRB1ethtOVGMJUs7SXsDvFrgJvPFbFfQD2nFXjzlI2CSHotU7CSw8TrE9G3wDLwXOyip8fIz/jiWmdNu5cu0gbB4hLNHyzWhGNM2AuuWFggVylMcV0eLx7h32wMWxb4ryr9rNB1yedQ7NkNl2roKjtJopb54G0BM8hLIPDMhXddqzeaz6PVpVBN37CQ+L+jtx3YvLpG+wDf4EXFrcLGyFx0QUktldO5GEu2QBJcF7xL0Rxi34iUh8pmPU1Qfzd5hkIdTwBFrwtAsy0ncbl1VMPCI4EmvdZnFfOUlTAM3olY3ug/YXw/3ZSYXgLJGkjxh3f/ATP0VYmcYQuWGDlDRokXo6k2RqnFAj72c0ysFzdpa/JBdWib9sKLnyUUdXB5psra5mEakFgpOyWy9q9hmyd1TePJc2oSCyRd73M9MVK1PrG1h4pQ9+Nf6eBsVM5mwlxbd10QtEawOCM4uZeVN6URaqRYkdAH3zl8RHnKBpTbXHCVDY2sfJhpz+iRVvz2f70jMzpxGpIyvPHyckoA0sCPDwbjUyzCxAtWMSdkbtcTXDO8Q== X-MS-TrafficTypeDiagnostic: HE1EUR02HT138: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lH254mdZIx6kvHTGfq+XQ1/QpgtFSR63yiFXhRq7Nwc2T1vmUhub5GEw0/EaLhRccGLwLgxbFC4rB71orVMra+gAYVJIvMgjRW5iLAazL59DCAdfUXooFVeH7ggs2FPLFW6QzH1v3PLIcDvNIpKKvQkuI4QRkWK1SItYb5Tm5I4B4bWXSzFRzqXeuzJ+nfGQCQ98Xd/JcQkuQFOs0LAQGUbFI5xND/z359pTrlIyDdLRR2tPJhYGOqY8Y+iB8EAkef5vzl6sbJEnsAURLUZCvSqJ1+M2So64ovcfMU5i1BE1L2MQcIilF5zVl4qK0b1vrTLLPO7dQ77FjfAXBtZgW/+dSihfJGipkIFfrH5yBmjjXi3sN7HqMv/HRI/mP5jFCv4mrF+2GQ2QJ0vqdMH2Fw== X-MS-Exchange-AntiSpam-MessageData: lZhlRcaQj419T6r2ueeFb9RBlHKSH6kAE86WNuvwWQZEiDF9QCtZGcheAmhQ5kbbgfSq5yfsl3B4fSdR863a9bqlOW4oEoPXYyWufMBGWH0vCVdpuFvXKd0X9pDviUWgvztsYdEvV3bRj+nteJ1Tdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d3446e8-f923-4ae8-533d-08d91123e75a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:46:55.4808 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT138 Subject: [FFmpeg-devel] [PATCH 02/20] avcodec/wma(dec|enc): Fix memleaks upon allocation error 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: Mui8cqnTJgCm ff_wma_init() can fail without freeing everything it has allocated; so add the FF_CODEC_CAP_INIT_CLEANUP to the codecs using it. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 2 ++ libavcodec/wmaenc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9081f35a16..b63ce66b23 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -977,6 +977,7 @@ const AVCodec ff_wmav1_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_DECODER @@ -993,5 +994,6 @@ const AVCodec ff_wmav2_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 89273ba978..2a78325298 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -436,6 +436,7 @@ const AVCodec ff_wmav1_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_ENCODER @@ -450,5 +451,6 @@ const AVCodec ff_wmav2_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif From patchwork Fri May 7 06:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273208iof; Thu, 6 May 2021 23:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyyHjkwPRC8eZty9tfQBi7onfcYkIE001kpxxUVMJQT0CboBkcjTdtEvNeCcab7znsIy/F X-Received: by 2002:a17:906:170f:: with SMTP id c15mr8294709eje.358.1620370035341; Thu, 06 May 2021 23:47:15 -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 m3si4408169edc.293.2021.05.06.23.47.14; Thu, 06 May 2021 23:47:15 -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=MBEznBZE; 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 75B2E680839; Fri, 7 May 2021 09:47:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068073.outbound.protection.outlook.com [40.92.68.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E92AC680802 for ; Fri, 7 May 2021 09:46:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bGhGH7jx0MC1ceOP4+Qy59zD2GZWePjov3a762pw15kU9aDJuLxZr1yzkmDgqnpPGe92MzKv4xMPuOpulox6tC/cat3ktfeegVJ8+k9DuzetO0szYNSkdLHmRTo40HPpvcMccDHRE2dQ9FR8RdA1vCM+lGJ7+rk9a8kSYkl3GS1pDsquTiGyQ2A1/7IDkV88+C4giULBBVzn0tjgG4qjP9VI+/pJ9sSz6lc5g+GXO5gUZPYdiPZyQWOZwXVt/c0/ueoy80LKr7ySCiDbYhQG1xTI3yXquDEWAn4TZWsve6b2YpZJZvk9FJ8/oFYtrKocu7Wro6+G/+eT9A4MmZyeGg== 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=mx9vagOX4vH0PBSJTiQBAx/QTS67rqjKEfYAg4+Yd7g=; b=PWvr/NLC8HOqgESLhpMOwNC69ooydXHr3aUHmaqYi1b4FpbC0i8kp0ElfgYKyUlNNbZBUh/FqhpBVKkeG2Y1pLAUeVIefoOBbOrE0Nyx7zzahMbdjV9KEclWPwY3NDUqA2oSbyhLBTSiN9mDDpLbAG63SufD4gEDIue7NqbJnC6lRKVtn8tzhXdG16NkkYRJCAIJB4nK3BR7gBloLPshIlxzvELsq7hBfiMEfa0oNCNxR+D8ttrbz5HEOWx3V1VMw4FGFy/AnSciiJ1sJDeu3+hdCfG3/W+U8ioTI4Y6mmKU8IifYa/WwUFqvJmtwAGq7YSutFQQwb/Dt4uQTlRdcw== 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=mx9vagOX4vH0PBSJTiQBAx/QTS67rqjKEfYAg4+Yd7g=; b=MBEznBZEP2ZESBlsZt8qirOSuKDJFCB0oc0LFNi/rnGFCZRRS5gLjEcdyBhZSFpDaswaEACR45ISOFruBgOMxNhQrOrHhmA/xk/lR9KbMqdFel1miqv+2LFHjpxfY4LXcAHGwJXSaEJmqiKqoSDlobOjsieWm4Mcuf3Mszgkjw9z8dc56kToXkLZADl4H8wKZWxFALi1wBakCWlZ3arWC3Lc3fkv5fIYb47NZqJZRxdanrrOcrE7FOpwpP/ON3w40UsnBSG8x/n2983BIhhxd4A5EQcxYzdW9qkAac9P8JmElJ7b9sqhu7WvWys68zJoy8tsD81dgRVKJVFry3pSLA== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::53) by HE1EUR02HT006.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:46:58 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DB877D7805F69CE71756140262451C7195B33848B7FA2A60C75B39563258DB9A; UpperCasedChecksum:C3523F6968D9955D0068CDFAFCD485CCD238AAD3B2E6384E73A193A708B34B33; SizeAsReceived:7589; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:46:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:30 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nPMb4SIMy0CPX97fQfWdf1Gg2HvgF+rIwEL4e+1J6xA=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4ad82384-fd78-429f-7997-08d91123e941 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPF6QekWiAaCqbmrjvzNgwcIsj32yEppnNDUwOXPDrQwPcZUjbU7mjOwkkpTb2u+/KM7CQ1BRwFa9WTSr3Dp1L1yH5np0RAvMN2blu31XWaZKgo0hLTl7Dmzd+31rOFO/iVfQ21Z7ozv4ZYG/UwWfdXgIydKVonfjmUinMgr4Xm4jsueZAd+Dm/qqlBYofqZseVp0+oQfRMG6WFAgdeIgVuwYWHG1GqCcd64HGUlGpuPtbVzShH/wCUIe3Q40hi1rbLTHcHDy5QCce0tIeJGlgNTwFlcF4e641MCC8Z6QfM9HO8kHJfr1bnUyqEaC2PX19Uc/EnVmXUjoP3iyIy3bSV4FGAU1e9mn0njPWDXK+cSACBly7AGSou1PYgL5kUHIQM562NROyDt4+YlKoUoTngvEoV0vWG9I3OwivD8uB88+LVdGT+gAPb5ZdHj73YppwNLzgG5syLt0Hiu/FFmfdyFoaY3X8xcIMoqDMeF/LjiE90jMNNmR4mFwCn4OsZQUzJOCGgvnEJdIfqpLmY4NbamqKmUxOJMHrvj1KtN1MYgaRjRsXPPvq3ffRXyVWSqEXg+/4EnEcI6mWwMSP4WpD572/lDrbAeOXr6NjotLPi/pJqpxKpkgFGM+vcnSAloRNBuLLte6djLxxH/k5SARiuauPeultrWWE906ZjdJbT9E6JmK0fDj4cPQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT006: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JUt5kGnG5ZDnTTtDKa+6CXkuN2o1wqoxT3wcYLg5nN+jg+ahlqgBe6+jT1rIl/wl6MYC1z1dIfeEONLv03550Y7H4YFsF4VWjmqx8CWbXpDSsUZwmWZdj/B/X4wUYG+zwo0jyvLvBgisRr7gBakg5VuqURVTkNknLF9SJKWc9qrNoBD+M3YYlmCPyJH53psyYvhlvRzM5pHQ7MmYzLfxKoQbJmWhbtg8mACW9wdUOfNeZLgORBilh/AuwDd8j7wpJUq1oC1z1B8qZTsXWjembuk1rCswkXfAyLyBADRSU4vkEZkUeb+7s5Phl3aKYhaqBvb09csAcWzuEjNTsUFT/tbZbje5/EzHKPEFg+JM2ynP5RHqgfabhQshWQK1txcFTreAO+B8/iTVNrJaFCvXQQ== X-MS-Exchange-AntiSpam-MessageData: FijwOxzOBDwbo9F95JAnO2ih7RRxuO0ioTLl6mYtMTSM81EyZZ3QtpditxXU7pXk+wHP2XH22UL1f9gp+NlULYlbzaw8DmusgeZzZlC4MuVNul7Hudr5beOiemXZ4agJkUMSpJ80ZQVklePPrSwpTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad82384-fd78-429f-7997-08d91123e941 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:46:58.8383 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT006 Subject: [FFmpeg-devel] [PATCH 03/20] avcodec/wma: Check initializing VLC 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: y6VcXvsK3VjV Initializing a VLC entails implicit allocations which may fail. Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index ee04ef725f..004ffb5515 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -41,9 +41,11 @@ static av_cold int init_coef_vlc(VLC *vlc, uint16_t **prun_table, const uint16_t *levels_table = vlc_table->levels; uint16_t *run_table, *int_table; float *flevel_table; - int i, l, j, k, level; + int i, l, j, k, level, ret; - init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); + ret = init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); + if (ret < 0) + return ret; run_table = av_malloc_array(n, sizeof(uint16_t)); flevel_table = av_malloc_array(n, sizeof(*flevel_table)); From patchwork Fri May 7 06:46:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273292iof; Thu, 6 May 2021 23:47:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnZ5pU30PovrHQRjQGoj446yU8ONbgrVarDS3FvYajI7YMyfKP8AB8CZ88kMra348hZKhf X-Received: by 2002:a05:6402:451:: with SMTP id p17mr9641943edw.223.1620370045189; Thu, 06 May 2021 23:47:25 -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 ds10si5359013ejc.709.2021.05.06.23.47.24; Thu, 06 May 2021 23:47:25 -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=LDEJLzRK; 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 A75766808AA; Fri, 7 May 2021 09:47:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069107.outbound.protection.outlook.com [40.92.69.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D1DB680563 for ; Fri, 7 May 2021 09:47:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=miBh8oMkpC6vMBJZuVddZxZcOEG2wtbxHU4orCXL0nHVOvmF3aDInNGFn7FXoHuxkH5YopSt6ghFNRTr1ciaMStrXbczZNFmZKqKagniDpo8ckeWmP/FgFT328j2ude/mKQwhSQeb4WtF7qBSEB59Tx75B5iO3jhX4y4z9VACEMG3dnDvZ2qTjXYkf0xsm693wR6G32+WmOGjqyq/j89ZVWn2VM3jeStlunqRbjsRnL7w7/Z7eCVIZ0fgJe6sleUdIXdji0106QeZeWf4Z+6fCvjdCJEJG1IbV9TBWCJQIztUyj3rV5ToVq0lD5tKlV7kbplNB8ujG475ILeUcmJsw== 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=BcaYjCLX0Ai1+1juPklM2QmhiK0QiWF49kL8xfELozA=; b=gBL3VKsMkJBbqhwUwuLFllpM3Krf7WJ4J3GC/ZNi1O0YfnTZ1ZlIdE3KxqJeokORjmh68GM+BdzW+2DvGQOGX0lwgwMKvY0JHupvP5qIZ7C25bTK94tnoKp9dz1sbrnuiHZoUP23uEk6N7ve9AYHpadzT3x6Ba84fAIFgQmTRdAUxQcxOUztpRvgDNp7lfhBPNNFgtvZ4JOQMfD0MvQDZKqg4OWj1DBgN+Ra0L8GAu2qVOxcL7IL2VWwjapgkPuE3CxuPSQFe4XEMRrR9fS51HRBsq/jLDM7N0gT9Q5711MTnZpATTl+Cm9ZIh7F9XL4TFXn9gmTrd1XmWYrE5Iszg== 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=BcaYjCLX0Ai1+1juPklM2QmhiK0QiWF49kL8xfELozA=; b=LDEJLzRKLYmdUhMgGfzv5EuWj8hyyQF2FIuefY8L5hHCAMGovyAk8w0JX8uRzNcF5m3fcenvBgCBhUBfCuMbnRvAlAQ4DduQi0ddmhdirc8PFuFHsZk7osrTofEhXnJr3vIKuHkSC/W9PYWJQ4+Eaa9pceUvsOSqfinqorFI7gIEhsIHrLpIr7HqhzPQRBN+BzuyVHc3nd4f6PgMU01qnvXRWBNgCrfFHdaoR6ywYodxl/yb2WH7dV+2nfNS2maC3HoBvYr37eZETpmOiVzPSKZ+SBCAEAVtg88GIKJuXqfqz8KtIjVz+j25uyUIFbyTHGyLApTo809UeBYUzQfwsw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT151.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::382) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:06 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C8884E293383C3B08C9448977CC941FEF049CFFF4ED83190BD959A1A87B56F46; UpperCasedChecksum:167C270CC34A17056BC330E471AB00FBA7222615DA87B613B094AAC8EFA5DA60; SizeAsReceived:7605; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [m+R+5IqHBd6PYEENeBzEf1jdBL6Ej6tYOB5ywNSr4Xo=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c07a3ebe-3d51-4390-46c1-08d91123edb3 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8k436AIPM2iNNzGuhM1MMnvCwAwfeCVtNEXIY/WAuKDhcTqEYoqPdtFOa71bYnzHXLy/TLfBkNouR68DtBtGlHQU+puc6IjtXJs/LJ/kGX1YmRA0Hmy4svHdmzy8zQN4/syDQ3x7o3C5dY+vobGOzCCecE91EqWOSeHqB7ENOZz1vTicFQvQO2YWc/NY9ac7R+buaUQChF6nRonfLq4ByqWSEo3lBHIdSrQOBBUY6AyRX8zeDR1ZKPFXaNJa1mJ8SKBEoHg9q2fBDJRtYd0qAmGqa3UeJqIzf2FnxREJj0w7TXwuFnVQz9OLGaqOXK1Ic/Qaxv7O3uX7xnBRmgl6H3ao3v9THmwaZRY0yzbm3dHKi7OqGLIg+T0p398SI+9lX+CbD1txMZIA3Ir4qbsTa8/b7hVg9OCvVKYY+zRrZLRLEdOtsmB3uadMZgVZo1i0lgRvqxZs5dOkzF5uDa/UdHQ2arxL23UID0CMXQngj4UZL32lFwd61jKupyVjtQVWwRIL7R/wprjNwqZuX/A0Pje3vsxw9q5XOZa5hWBuVMIW2DIQfaIVAlYbsHWzTFXCogrK7gA8u5Sfku80iTcMSXkxm9dDCc/JPLbraHv5ahpfjw0EbWzYpR1Io7MKTPPG+sPDOknJmWwHmUdVo7Dcv6HVcNDX5WNdt/iMuNjPjbsAQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0fdZmhxXZTJrEUfK4dVga0kq+HBGDA7h5T+8wmvDn8pa+x84ZJX863gMeP28goVVH8o37/hG4erS9AIx00EtJCPbDUnqrs8hXGnVebS1q1bGDQROrjWw9H2zjvWLh35amsr1uVNzwASlUpEhktNxwCbXnF3CANcT1p752Fa3uF1QHxADVqXbyzjo1aZCX3ppIA19ImGR3xcA15A5Ymv7DE2VrM93O48CcskLWPkZlv0zlrt3fZI84wquIxyKtFfogEBuCqH9cYc0rED/3BpwUM+odckmBod7uJxz9dD8Oo/78OkqWnGGF8RY89yQZcYnSnGzY5j8hWCIzIqX66t7QjJUIMSyk2rvqDLWQBZYjsSfW5R1z4Wp+yGhg0iUsriqYbnkRzG+ptuOnpj4Uoalug== X-MS-Exchange-AntiSpam-MessageData: fjZe4HuCxuPIISdx4U8Dql4piyNDg9e5HH7hfsmE7TF1KKTsXewQpO32jdJf6KbxHs2iJakhc2pvJjfxhD9otnyO6XAPjQYNHI8I7m5lFjXQKNUyLLRe7IG/ifjgyGoBlm3Qxg/FJt3/UCAaYoacWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c07a3ebe-3d51-4390-46c1-08d91123edb3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:06.1911 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT151 Subject: [FFmpeg-devel] [PATCH 04/20] avcodec/wmadec: Forward error instead of return -1 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: bEF06LnoAKOF Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index b63ce66b23..6eec85e59a 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -70,7 +70,7 @@ static void dump_floats(WMACodecContext *s, const char *name, static av_cold int wma_decode_init(AVCodecContext *avctx) { WMACodecContext *s = avctx->priv_data; - int i, flags2; + int i, flags2, ret; uint8_t *extradata; if (!avctx->block_align) { @@ -102,8 +102,8 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) for (i=0; imax_exponent[i] = 1.0; - if (ff_wma_init(avctx, flags2) < 0) - return -1; + if ((ret = ff_wma_init(avctx, flags2)) < 0) + return ret; /* init MDCT */ for (i = 0; i < s->nb_block_sizes; i++) From patchwork Fri May 7 06:46:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273364iof; Thu, 6 May 2021 23:47:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1QlewtZ+Z6d/yhw9WfMzmyLR1VZDW56cVbnZoXqeCX4qxtaTEJ5tMwBqQUGEgSaap+8U8 X-Received: by 2002:a17:906:c57:: with SMTP id t23mr3105114ejf.355.1620370056184; Thu, 06 May 2021 23:47: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 g24si4519553ejd.476.2021.05.06.23.47.35; Thu, 06 May 2021 23:47: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=MJnIN0bT; 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 990D86808E1; Fri, 7 May 2021 09:47:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C0C8680843 for ; Fri, 7 May 2021 09:47:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B89MhsvdPM7TFjn/gPnTXjXA/0QyzG5+dPAU7K4FptmE9T/em+a3fXaYUphYqV+XqZ7UTY59AeavEK6/xIGeFI4Pom7MKw9lkRQrQAzttpdPzrT1pz5OkjxmhC5E6D1344Iq//0ILekFlJg2cQttIhXZfNhnAAAUuZl/Q25iLzieSnNLyzmO3SXU8aQZddutA7b+foch1VCJoHUottVj464ewg/fwVUGk2s7sSlw0exDp0GQZJymFEn5MEMCF/94jWRjaqQHx9ZAxUxwLtNqBeZi9H9Itz+b5OImHaqQIv70UOxv5E5UZLaD3pvOMNpve5SrPMSD+dAfUHHN0qJ0aA== 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=22UvtTfL87FJ2FpXq05uDr8ulVjfaM72TwJKwdOgwDQ=; b=CmWi/63C1872dU863b72P1VPi3E4HRMKfUPPe8k0PxprbsBcf1Fa66f+J8O3CL1WYE9ws5p32950eN63LgFSNTXyyooxIzQQtP8Md868KjWhmr0oLooN5Vvnm+66obzlELcAeDLZIxfSc60iyJa5IR5I+xkRPKGZf4ko4JJnAx/C1MW18S+XVyYI0DLIOqyaiYEHHSYJo29xEeHHJ+iCWfCKSYGBXgzK0mt39uy2spnFKrqUOyJoDZ4qbYcRV2wfuOcAhYytvfXbD2xOteXkXhzHJSO4vCKskq3BwAWosFy2IawbWHVwXkx0iE9YAZkL64mikxb/hRK4jjs/424oIA== 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=22UvtTfL87FJ2FpXq05uDr8ulVjfaM72TwJKwdOgwDQ=; b=MJnIN0bTnFFMwbXK9TUEacfEbzjbtpu3XeTlMgWjEtUMHvT04PqLefb6haQdOdY+GtXo9+TFuKDg2iNDTPNd6qaCsXmlrHwNyQFen1y/0ww8IIz+aNGZdbMSzL5IlpM2OZA/hLL6hj4iwIhAr5fwRQYUyFxxCbCLF7qWFH8vKRU6hq65/g7G63CwrDIVsHRZTlkD8IwYKsX3jpE7vorT1fPy4FKQe1L1t0DKRaSPHsZgVuskBJhbJeZzCDqsfXWRX/dC3O/FIsMPmh+Qb3W4lEtfGDteDJLPawfgdqA9YhREAaMqeFQgd++tJZZGZFofeI59W5tykmiWAOXoyIv6FQ== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::42) by HE1EUR02HT021.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::472) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:07 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BC20439B700A6EED366ECAA4953402A672A1BABADC17C9166393724AD2B20F6C; UpperCasedChecksum:52F19CD3D4882936C00C4B6394A095E0992A87A5AE799FEBDB0E0D3394F40371; SizeAsReceived:7601; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:32 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [KP1FGlr8uHqNhaRQxcxis+sFs51S2fB0BDRFNLUZ4yE=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 41bbbb0d-316c-4fe0-4383-08d91123ee80 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHCD+F4/lZYPJetHrna7t1eaTbM6RQc4LZB69d7wPP7fuJv//vKKHBAGV8s80hfPJrJBfVD6g8bRVd8en7o7E6ijJLnbBHkQQIyk2HuhsDXEQxROUNDCsBy823IJVK31oJBDO5cLo8v/SqZxE1oW/uLTXGneRNEh4PWjzAinCRHscfDqZOBRFG/5oljCtWptNhF36/nT2oxKDJ3Ohcl5Fsbo9t4sm256jZkUTzNk8XMzcgW1Jid+sZOo8xzduxUMFoAHGZYMjLzzA47KmMuAIUfFxW7HYJTv6XTLUJ9Kqp3dlRbNgxfBZFw+tEEoJHP93YJmHDxdPQFna8g2rX8bb4AKluHe/dinBdSRy8EE4qR//C6NhgezDa0DH5RRrSDtXa0vVGtTL3b0B5jvxgWU3A+McOGfwlTr4KapPYCSWyDda+xUcaH22u1okCrgOlT4Vn0DxARyRBLouYQMMN77wmvfJGy/1chSSeQTjRTWG1uGOoXOqtphFIon94Y5X28LAtN7+NcPs9DHKTPJ9pCKbDF5x+3bOcsrXzP0pkPh4/nwCfS9rSwzdjKlZzfvA1JPFq62EPSCyJu0GvIcRJKDMupaio2q31q62dKJUX14YVzZopga70FtHZxFTzYHTN6yz0Gb/bjZ1E9kHjZq0axCsnD2uY2JoDFOExarnTFKsda4JYYSC0uBUbrh85Fr2K8K3ia00/Bwsm3EQ= X-MS-TrafficTypeDiagnostic: HE1EUR02HT021: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G7I+LrYSnmglml6X5YNPVu8x7CgEoV3OKXM56PNdishdrjCLaZksjVxUTAOtUr2u/vjasH8eDqo9921Fqdc9upqZ41aEgdYdKjjtLPLy2vfLhOfDur+aDAV2nzDKsGEqx+2PX3Dwi0F7lJdifHzRLh/8gcpncJ4mFLCL35Kn4M0dr6/gfrR2jfjmFmqDHLHLgCoVjSZqANM9hPHGp3eEfI5TUdGc9xt03qkQgT0UntFE77hvh7qRu4XVHdffNc0uZLXeNbgjWBzGsvDg1NSSkWPL+iGHxydLxQK40Z8ytw0vIFobjEp0BAJPGr50oyB54WkHlnESXGbCQWtY4Wfr8BQ7CGqNb6wHpCpOo/z003hY3UAi4E3nFZTjTp9p+FKgbKX+EoEUPVDgDF2If2H80A== X-MS-Exchange-AntiSpam-MessageData: EN2CoAJbLVkLJJ+7CyN2OJ4zUiVJAknJJoJx7MuhzHO8BrITRI1XtRVs8Hd+x2Oqva5PMwP5KC4/Warc9QKOgO4nnikbAowl5EPvfY7IBFOUlrBr6aH9ZFPKu+QZFmT/+WK1eIgCWmA0Z0DmWOwkNg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41bbbb0d-316c-4fe0-4383-08d91123ee80 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:07.4925 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT021 Subject: [FFmpeg-devel] [PATCH 05/20] avcodec/wmadec: Check operations that can fail 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: Q1nSjuY1ptBb Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 6eec85e59a..47abcecc9c 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -106,20 +106,31 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) return ret; /* init MDCT */ - for (i = 0; i < s->nb_block_sizes; i++) - ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1, 1.0 / 32768.0); + for (i = 0; i < s->nb_block_sizes; i++) { + ret = ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, + 1, 1.0 / 32768.0); + if (ret < 0) + return ret; + } if (s->use_noise_coding) { - ff_init_vlc_from_lengths(&s->hgain_vlc, HGAINVLCBITS, FF_ARRAY_ELEMS(ff_wma_hgain_hufftab), - &ff_wma_hgain_hufftab[0][1], 2, - &ff_wma_hgain_hufftab[0][0], 2, 1, -18, 0, avctx); + ret = ff_init_vlc_from_lengths(&s->hgain_vlc, HGAINVLCBITS, + FF_ARRAY_ELEMS(ff_wma_hgain_hufftab), + &ff_wma_hgain_hufftab[0][1], 2, + &ff_wma_hgain_hufftab[0][0], 2, 1, + -18, 0, avctx); + if (ret < 0) + return ret; } - if (s->use_exp_vlc) - init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_aac_scalefactor_bits), // FIXME move out of context - ff_aac_scalefactor_bits, 1, 1, - ff_aac_scalefactor_code, 4, 4, 0); - else + if (s->use_exp_vlc) { + // FIXME move out of context + ret = init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_aac_scalefactor_bits), + ff_aac_scalefactor_bits, 1, 1, + ff_aac_scalefactor_code, 4, 4, 0); + if (ret < 0) + return ret; + } else wma_lsp_to_curve_init(s, s->frame_len); avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; From patchwork Fri May 7 06:46:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27671 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp130753yba; Thu, 6 May 2021 23:48:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTwJuW5s8rlssgysreE+xJpjfWQx0y6sRSNkuC5l/bDmuLH0IydM0gtWneRiA6N/Tmx6NW X-Received: by 2002:a17:906:1dd3:: with SMTP id v19mr8243060ejh.4.1620370129693; Thu, 06 May 2021 23:48:49 -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 n23si4516632eje.216.2021.05.06.23.48.49; Thu, 06 May 2021 23:48:49 -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=GscRBu5q; 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 DDD1F680B17; Fri, 7 May 2021 09:47:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069062.outbound.protection.outlook.com [40.92.69.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1367E68010D for ; Fri, 7 May 2021 09:47:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nShtTOnP9EAE9tt1CML8nH7rGBkdwwB093D3xyMMvk1vCmEgMrvNvUySF0E9XHMYm131n5hb9guIcy7zvNu8G4NqrSPLaqFzmeY34rytNblPo1p0lzgKo35QCPeJW7vXadow/ZnsKxUcH09j1X/w1ZW5xmUthDUkHcI7ngCS7AUDGlrhnQtF7FrNW07Ziud78TR1XbI23c/YAFCb/oOf97v7Bsng689GEY2+qSuHbTxuyFnemdQ8RcHYOA7yq0hVAZy++8MRpReI4XXVR6QVzxCi3taH2Mt9n4I6NdfZ742Pc1LmMeHVpG+HVj22wfZ9mxBTmCvozkjYv+oesRPuJQ== 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=Fl0C6BCeI1Qe4cQQNQkSs4Ki5vL/SRlXFaIZqycrJaA=; b=DhIbXZAWxoxG/0bdGwqzWcc/972z1BXJvNA4xpEN/9uk3hJQ5qk5aTuRz56rqdZuk8rKMfxr3l8KcetzjbKILUe5D8Yr/AMCN2+mqY13fLvYk4LeavEkhKMqKxVUopTvGM++AXc+/Il8aPo/KYTBQPlESWAjZEIXX7vy6VT+vpYaRUOeRw1EUZA6Od5CZ1lUTuA8l/xQcmp+dehJL3yW7F1oKyezYsVEi0FrEwWggVSMbQ93AGy5HP7YU7cURNSH6tuV3EpL0UtR920wtUtLkk2gtn6Rjb/3fk11je91dFk0savxp16C8wgFelvXvV8NAUAUtF3EGjxEvIWh6tVLsg== 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=Fl0C6BCeI1Qe4cQQNQkSs4Ki5vL/SRlXFaIZqycrJaA=; b=GscRBu5qz8HEHvrXIEgQOJ2U4M/uB8XQ6iZcFtst7odE/QmW/gitVfgrjS42hcPa3LjSPyPkrevhtX1RSVzmdsovC0rEYq4HerOVqDw2o2V0tLpEr8/YEKWxPy8vdJ2BW6ACSG7tY+5Ird5b340+LQ6Uvue6E3YFaTi5bmm9TPQgdVYE9pB+KPFF6L8euu1piLAhFkVIibTTq4Mu00kpx78+sqyJZFRPnRHLhztNx+x2ne4MVRM8VmoskSosOtetZ/eqkTqaAAkfhz/JQ4I6+nHamvhUdV1lpBXSaFSfUor6okPwY2TnbG9wFW8Tsim3/y6vKfe5YS8wSRlitrMnAg== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::42) by HE1EUR02HT021.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::472) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:08 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:53B3D227CBC2F5BA8191E3A94FBAC5B863CD7AB387F059A6E8D3F8E6099EA102; UpperCasedChecksum:D0C912E38E4374029E0711E592CE302193A936062664D4A048CBB6E6759A3792; SizeAsReceived:7593; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:33 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [BRA6DOI38nBx3Ufv1cblVo2jk75aO5oeYbHdFfwGDMw=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:08 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dceba17a-54b3-49cb-2776-08d91123ef2c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoVb1eIH22myR6eeU1BHITsDwoZJf7UvCiXVqYA3/jgCl5+5idkecdTwqc6yr/nb59JXMA5flRVBH9M5sBFsBUl9um9ykHA/D4+yqsThULWOaICdZ0clmMQ2ZdXty2POXBG8O5uMV/gMODb3CesmOco1mcDdEXMlFmQlD2vRhZs19YIxyGlGk0N6e/cDD2OG9UYc9jRZpJL49aJcotqHXyrQgdftWq4/+15Qc3SDnsjHLFuDDpbcOsp5AyVaz0NNC95fE28doaWO/zwYdM+sVqIv/54E2bYiZCy27xkjDTvgz6KopFnE7x3nIG07OWOp2FHH3lJHaYHr0O7PT7CacbXHoXXRE80t2as3VIv3SuNyRDCj0daaBdjyMtS0SVQNS+RQhBpzSp+5yPiIPa0wIhPNHd8v1lD67FtMbttktB4py790oGWrhLYB3Q2j4e6wCir4v/46de9IxbO4GIuEQN0QTmsztS/ctxJDGHAYGVXbsGmeWHaMuyy1u7pyH8/XvDmI0UExMlDEZcxSFiBn0lT80DLaPHbfIk9iewt1H+FVxvue27r4ZTou0B8sjRtYrDQa/aBEc51ZT1Ag8n/KtVNZpvAcruSB0UlRgac2ytgnvOw/EgAEOMSnXqc6s9gYIB+BZIhkSJIgX3e7qMDuPEKNN9fK7oPFdPKsPVRWWHdoBeJMdQSWluINvAUOawcCF6ocp0ahDCfIo8CR4d+Ik73dtdwHG3U1KkxMkndB+Fw+unTZMmDyqutI= X-MS-TrafficTypeDiagnostic: HE1EUR02HT021: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: khrmT3Ec5xkJW+DWCQ/lbUuvsTQqNFDYWLj2dbpjGcpojEvkpFud9ictQeY+0PD/QlY1nKEm3FvPmbQqWKJfuytCDlrdXaGocZAb3EGvTSzqgs5kSx6phykb+bA1JpDOG8q7G5f/4lCF6xFKQ8r/HG+Es1JTcM+0PWTNqWVBqnGfTIKIdX91WeeA95IJ1/HIqYN3InXYPviYaLT+U0loMFyAcIjK/wv+mW6OgNfkjRUDStjiBld0ApjnC9OCDiKCJy/CIgvDFspfY5qtxjZjTbdy0qVvGM7F1k5twqbdZAzeUuiQq9K0eTuZfCKPSW9iFLkxQiHVs5dmAYvx3Q1Hl12b/spawmLYMmF68jYToCIzQY8bQW/AzE0sJ1SDCt/SrIAFHfRN23qae90P3PGBRg== X-MS-Exchange-AntiSpam-MessageData: odk2XfIf0hpq7LlUbH4jjL41YWcijN1bdmRiwb6HOplTsv0sUo8ZPcbpTeAHIAhkofpoisuCiU8FLoK93yGtvzlcrUqgVUlrpr5T3Bkz8WeEpbiJ0NzHOXQd4qPrNumKUAFtcbO/2wltFyOxC+xS0Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dceba17a-54b3-49cb-2776-08d91123ef2c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:08.6640 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT021 Subject: [FFmpeg-devel] [PATCH 06/20] avcodec/wmadec: Mark decoders as init-threadsafe 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: cvP2eXQ8F5FJ Content-Length: 1367 Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 47abcecc9c..d627bbe50e 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -988,7 +988,7 @@ const AVCodec ff_wmav1_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_DECODER @@ -1005,6 +1005,6 @@ const AVCodec ff_wmav2_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif From patchwork Fri May 7 06:46:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273603iof; Thu, 6 May 2021 23:48:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7zFQh5nYQNJfKMuPYXqtH39hxw5DIpUW/l/y4GzA+XWnrAzt8Y2qHkNiClGuXB57gK1/p X-Received: by 2002:a17:907:d25:: with SMTP id gn37mr8100927ejc.538.1620370093315; Thu, 06 May 2021 23:48:13 -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 s9si4381740ejv.428.2021.05.06.23.48.12; Thu, 06 May 2021 23:48:13 -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=KfSMZXVw; 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 60025680B73; Fri, 7 May 2021 09:47:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069107.outbound.protection.outlook.com [40.92.69.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BEBA680968 for ; Fri, 7 May 2021 09:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gWEKPzY+L5mg+uHcNxcRogsEOwfrPxWDz9SeFif5M5z+IRzj9ORkB48gweBbQfLTmlqFmEbdqRJ71jJcZ4E0Aj319h+r2GlUh5WLEiHeqoyBQyk+wbz+vsfI4gZ3HtCWqv0fot1g8SuFh/M9Ynzd6nQGPUwFpV5eC2SH3takhgZVG4zmFmIOXhwvclR+CSdGbu2IS9UdJLCb6+QMYmoUcAQMEsQ5VBCXaPTZR3BMo87h03+M9EKmSFKJAF8DmleRZn9TsUOSz/PJp+IYGETVtfpWLK36mp06fBQJo3w5v0Vb82/9dUxATR3RH0vjfdMnhqpsRMYo+cPGCjVOhQNW3g== 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=GVxApSTLytcMoGcmoba22oiC65zbg3GsVZ3A22WJNOk=; b=RPIEi6L5Vq2uJs7NOvD94547eciMNw2TwuMBh3tL0R3ZDnBU0nvJiWVgeeUen+ct6EuP4e18luihsU2cDzUAKqMhC3Za+IrqGI093F39JPURUOjxZVDJgKoAdf1dKBn+fwE0lwDOKbpH5Vzz2o2H65G4cZe9TMUqWvaQNSy2fd2lV1sYJQs7CxRvCcLFxJw6CVIUUJyMSDswYuCY6GrKPHY+nEUfE+F95YSJAjwXAtMz+G5RHHh2oj8UD0Cqmm4V4hK0p5naWxx80IsV5e0o/jiifzwplLHgcSCQteS9eZO6PtCcH/PqM4SOHlv6lMosigxk5DniXwcm44XL4DtvNQ== 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=GVxApSTLytcMoGcmoba22oiC65zbg3GsVZ3A22WJNOk=; b=KfSMZXVw0ywNHCLES0eU4XY2OmrjVOZo7rEHFu5Uu/O0QK25O4lLnRhQY1vjAdcRaK9ylRL23vyQaBFAtBz23KEXjYzsd2YDPeoWYkyztdsyDJMcmY2iLa0feRJpqibc6kaEG+evhyKar7Ubu9wt9ijQTUot1LTnL+GzsHuIVfBnOfluaA+uhxoEaRZ86clcjtoJAAMvDaI+P9NftHwLyf7UD+tt5fxxK0Oaht0lpWDD7DWx4dNjM/qJzFFzP0R+ZMljvxJ79vrvQth5YeGxow6O/+WKfid4/a1mOKD5I7bTKy+gZjHjrTohWXeCx3/vekywqdmuegetEHkoFSDovw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT151.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::382) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B34AF9090670515324B0319866486553C24287A584D98728E6CC64338A6A1F7E; UpperCasedChecksum:2455FF9A6730032AA9A4AFA3E268AD35938ECF95E773900A8ECACE0DF10D1808; SizeAsReceived:7600; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:34 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [iqK/RIi66YIm5+X3coj9IBf+2e4oXq4dO9sNDaQKLYI=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 88ceba97-dcef-494a-6a7c-08d91123efe2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPFz96JuuDMNUtrlqsH755890zamiwB0p5KYbbpCTeQ+fbGRwxZACYB2bSl5aM/vqBmni3QYqGZg1zHoyXNIlw1v8uvS0zYHAgXtEYZhfZNnkaCnU3f7cVCk6mxUjAnYitrIuDCaj8PdJdJzcelYD4IBbI3HWDIpDCpuNX/WUCwrPwq+M7SdhooT8O/D6WkXlohlntP31g0OTv6W4Fkms8qm9fCkE0pCcdUU0NUPFg+5NLFcI1b1kfOV/jdlwaY9FSEJd6PFALt0yaUtjM0chLo5G0MZ9DrHjw35n/ALXbsphP4iSNj+pJv7ca3cF95bf9tbzPWoTe8cT6cq9h/3jqDcUWrXNMqYgMLaqU9rC5cnwG6FroSf1bA2FTCV/98rlhhqG9CrcGeJCTQ9mVL0sFPKfTwqhVKA7Z9hNTXyt8lH39V99fJlRVkarFYPqjr1Zn+n+Td7IW1d99pSy6xP4yuh9FPXcu54SoMWll09hUKI4yqaKBcOSqBrrd63UiKpPw5JXwK9c/x+dL3tOGfO6vT1kuC/zdCkw20MA47kE0r4eV0SS/WIG7fGTl0h5T4fmCO80tjAz/XIGig2iUwN82ws52VW0AfGXBnyhdkU9xE74npDFuNzSdqONz+ldlTZjCg/4Y955snnjjFE0khHRANez5eChnWka5DOQm0PyV9mhK/1hHLzR0szQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZzrNxdCpRwHd7ThK7e/NE59Zgk5L9eQctFGkSALTnmv0uUsmFkfkaUxzAGlr+q6bwbe9rsG6WtkHVRuzy++HMWXxIawjcvyirh//Vv4fG8iDJEKFUHx2c1iu4DoAciZUX8B7oXGBxYJWv3QdDqxub4cQ/uLlYeUPgQYKu75uqwgX7WxBFUVBCa8dOwNRrFyEoJADxiF0JOTC2ghhqJfv9DC/aXrcTA3sDPf4LWdUpIrmyKKIyLYI2UerP5dCnaEwcEd82XsjXyCqCajdm/WDsYPlOsKN4DhjGGvZyQ6HAK464SJYfIRDUBGOS5DX/YDFrzQnpWqrqbcirLz/MEvcm8nSSqMCpNM5vd+vvvRbdHzM8JeUS++ig1ai4Z3sYOiaWq3aJNSmk3pXSzQW49j9Ew== X-MS-Exchange-AntiSpam-MessageData: /u7g1q99hyqCKq1iDXWe6HETHSZTxH0OHwIrPiPBX/NG4TX03qNSMLwfcLWuIUDlHf2B1PthGVs3KNKqiTGRP4c6JuG52LnI2Ohm1u3Wn5SdM6eLReyg69LwxlvEWeBQGy7J56fae3OwvYieF69ZXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88ceba97-dcef-494a-6a7c-08d91123efe2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:09.8555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT151 Subject: [FFmpeg-devel] [PATCH 07/20] avcodec/wmaenc: Check operations that can fail 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: xo4ExFbJYeOH Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 2a78325298..3035668487 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -88,8 +88,11 @@ static av_cold int encode_init(AVCodecContext *avctx) return ret; /* init MDCT */ - for (i = 0; i < s->nb_block_sizes; i++) - ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0); + for (i = 0; i < s->nb_block_sizes; i++) { + ret = ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 0, 1.0); + if (ret < 0) + return ret; + } block_align = avctx->bit_rate * (int64_t) s->frame_len / (avctx->sample_rate * 8); From patchwork Fri May 7 06:46:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273547iof; Thu, 6 May 2021 23:48:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBS30XpNJcVLYKBnNN58oXYrl7gYOfYSloY6i9i05gitewbrfJ5gnK+uW5fId8RUkScQOP X-Received: by 2002:a05:6402:17d7:: with SMTP id s23mr9584993edy.66.1620370084538; Thu, 06 May 2021 23:48:04 -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 n17si4229634edq.104.2021.05.06.23.48.04; Thu, 06 May 2021 23:48:04 -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=Vxj+Peor; 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 44A4368010D; Fri, 7 May 2021 09:47:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069061.outbound.protection.outlook.com [40.92.69.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46B2A680843 for ; Fri, 7 May 2021 09:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dj01nlTX1bodgW+WYsM0Qz8yEuR/fb7FvxVRh4k1Fa6s7ayIWG2d/m7i5MdQZf+nqhmDtWOPFGnumEdEtOY6pg71+tFB9+AQI+aTAVqflxlzRJOwdijISf/A1VZN7iQ7HKNN0NUs5l7SgxUH0sbUarPGv/2BySrllkvXQCH+XYMh8WMCA07kQKlujrpUwmc7/t8Bj0Ag1MIRlzHSGEEHU+b4DQ7+Xxxkg8haNVcnikXO38kOheJimcu2+WofbgWDzis1RNIUJvxTyGtKbezZobFUz1SLb6EVbNYozyb0ROqnKm9e4zmKhcMXG48KHhRQS7+hvOnFUoPLJlDkvMsnAw== 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=fKpkkWiF8VzLb+O7Y2IXLLXe7ljrjbe6nE4Dle+TNtg=; b=IVLZmYO4wt+0maQEyr2zd0ulUzdAla+VDRy9V67Og3ZBvOI0CECtNGku1JY1XhKz94jr9biS5wlj1/tyBICTpFBrxGl1nVjloEYQbSoYyqL2aVP62UDM4Wj9/6atVbKG1qX+7BtQjA/TB1hjLJqCbzYrypbI3GOXjy66+HPUPydlvZKokn95gjhadqxvpgpMYXp65Y/YXShNFGNvvnOrK5GMcklMEx0ZgMhR/HFLCdHWbk+W/j0cnCkyBwOn4Bwpb5kZTq7YCSv+cUcA0gBtQoUXrb0tQnwOpKAQSJr44mxJoUWC5USA+FEah795eNghfTjtmazGh98guDqLB2OlOw== 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=fKpkkWiF8VzLb+O7Y2IXLLXe7ljrjbe6nE4Dle+TNtg=; b=Vxj+Peorp9BTp6daf795YDLUuxXErfZDc6l9RQ8PfJan1+1nacmOUaSje6FrQuT2svm8PVZISTPsuk1Kcu1xeAedWGRlyhJnqiE6bB+7tGa/38x/0DffLMRVB/CBc6Y/i1gojK4kqXvvm8CHupcSlKAh+wKyT8qsspQDzjl5+x9aUIj5qkQFNcCPBUUcOQPENpsUyPPQ48SsN6yr9NSt7mzAV0q5rU5uDt/Ibfw/jQq2NeIS72Gy0SNPeXHnxjer62l3v+cuNWx0NN9SayYmJ5N/rDuQ0DeVvXEFSNVOfXzD6aXUP+71NVhGJDiFObJWIf2pa/513wnx5geSkEP/+w== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02HT080.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::343) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:11 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:11 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:39950BDAB88E70CDEED97288FA82B2C802B6D259CFFC8F3A9C7C824B39C6B46B; UpperCasedChecksum:952095877F5139B11518ACA496C34211FF6517D72B0A3E986B220FA2DAAE0369; SizeAsReceived:7603; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:35 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [OU3IF15po+KTTLjgGvQEG5iGfhcrp+Sa/ksWHpd8y00=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3bfe0ce9-19c6-4260-815f-08d91123f0ac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHydF4QxRb1n0rgZoEgrr7t+RPYzv8jl+iOTAYueJMxGVm1G9NlFOLWqWoY8NjSQoP0x3w50zcCACWwLcxjXHm7Xe0Abg0jRYAn53U57R0VxVTu6cGNuUTwkN9cNwHtQMmCa34ckUC6QoDc1IHKOzwDHup1wttzq908j8jLh+Pp5NQ35wD1VSaLIC6PQ7zbHN7vM+XEkR2M8Fmmlvx18m/0SKugdaz+FKMUAKU3WPCG3mB+bu/3FptwLfVB/+TaFrPZixia+pWmAmGiYIOReAZUkwsZkvCE3gUusakVQP9TeINIxQ/5gmuoULJtPPLauREvTstz38sXrUGMF/h3HvZ6nNxdwV5lH3ATKiUKwqyN74EyAOgtJx6mOeT/KRveyQCBzWMES5v9d6l5ADtwG0Jb04l1DR4PMaKh9ArYKtNZJ81Kw4jGfhBvY5g4uWfdu3NE+xU0PNRaaPBmbeF1NvrhBkxiyjEz2kqQarIIwCAp36SGvWZ11A5wmSuIytGvpDWF1MRF2iHdFpm4UoBwpxmk/ZPwRyKjwifIrgVCQKR7sMXdix65DAB6PKzWu0UjZWF/I0Igf3uM/qJD+JEDqe0xlWj5O4CWuJFrV5Fq6awhAzD5XjivtA9y46FAo2sY9EM47CuYG35bxbSr4JsCg7WZWj5NkilqrTJMYzb5sLTDMArpjcg0+NGfG1Q41sL72umNgZ+SUPoC6I= X-MS-TrafficTypeDiagnostic: HE1EUR02HT080: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M608gmmvBMpS53BIR1OCxKrufYI8Cd4net44+Q6rJJqQRTF8xrVQFvHYQPzRiLQ5JXcqdxDysNyn9KE+vefBCVAWbv0br5SRn+oVfYakT7QUPuZcoVv+mwdjc8rYNaYKKitIVT2eRvQ7RjB6SMeHlgel0X23pHaTzc7juADXmW3hk3XB/GA2gVNIGg8pGZcVxhQSYAxKMJBMfIK3WONmOXELvBo2pVHmJ9j+PnxK2vY4joYbB9N6OOlSthjqH+JQw8yvDe1UPbCljsLjDh9M6OT2bwVVG4LTXwWVdLxq3QPiAZt1Y7S4oOqYe5yDO8fkXnMLjFvWLAfsWwwkq+WTPkUDNLVIGsCDAW930bOFx2xEIubuu+BabQPD9POnLWjnf2AW0qwxau5pnlWzIrF6+g== X-MS-Exchange-AntiSpam-MessageData: WJ8Pkyny2jlIJwSpC6mHP4S4V0bGkotJmDhChgLRO1PynJqvMTv0aUlEOt5aaBMlwRSuMc9ABFaeOlPqJeoCIGLfvvR7VwgZGhNWgp8ODsFH9WHIUTmY0N1/n6IG2J/iyMKvgtJ8JWFXw6kwW3VuBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bfe0ce9-19c6-4260-815f-08d91123f0ac X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:11.1889 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT080 Subject: [FFmpeg-devel] [PATCH 08/20] avcodec/wmaenc: Mark encoders as init-threadsafe 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: IXseEX5O8k8u Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 3035668487..cf42aeaca0 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -439,7 +439,7 @@ const AVCodec ff_wmav1_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_ENCODER @@ -454,6 +454,6 @@ const AVCodec ff_wmav2_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif From patchwork Fri May 7 06:46:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27641 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273681iof; Thu, 6 May 2021 23:48:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzp0m4e10k7IvlgiTTF16nE1D9ZZsiaEM++QOV56IBeeBgvyP78Lzg6yu1zVN4G72vTfrfR X-Received: by 2002:a17:906:2da1:: with SMTP id g1mr8432578eji.47.1620370102517; Thu, 06 May 2021 23:48:22 -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 b3si4032907ejc.453.2021.05.06.23.48.22; Thu, 06 May 2021 23:48:22 -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=M+zkYnLk; 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 504BF680BD5; Fri, 7 May 2021 09:47:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068081.outbound.protection.outlook.com [40.92.68.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EBFD680A0B for ; Fri, 7 May 2021 09:47:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VYATsRGBnJzyItv4mfFQFuc9MH3jxclAqDzwMPRhhs1Qa+eFpr+OZmFgNhMjqoRwk4viR+NASvR13m644BuHwCDPQiHHt/85g804xWWoN3fk13x1QfGOJRlCz7HJv+rsTIQGJBnaDKbWktn8h7U5n8656w6H+IHPt2Ut9BOSo5vPWoFPSYalS4dxMzdu/DCDWk2OKd3nI/iLo68JgwSRjCYayLoOH8wVhQJzgbMvNvZeeyG0qDu2ffN6640g4pzOw4u1jnZdXUkc1S4akF1wbfJL7FcxqdO82iQanFDY6ua0pfQC1zQFirHyBI5Z6CC21KVsHgFrPpakxb6IY6EEuA== 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=neh81zAJoqUIafHFrlNiLoPeCceFAHW6BRXt73dGlgY=; b=FQLZns87e64K23eN9evWEUoPzTdrYA+GYaQSIhcLo8jkEq40CGHYUD0UqhsudQ8gc7CaStauwzCyh9n7OenbKyKYfE0p1JEYEo37wfrrm22VUR/ci/4l4If9rTajskO89yddQtbbZ+FN49ceXdrJ3Wj8TQCBge8fCzKHhafhvQcZ1AG541/BqS+DapkMe9DSwuqGheFQacEfLRITXnoMIWDIxMfi2pA9JqFr/m2mOK3gkoH4knb2Wk5CLln9wQ9cjEz93fYqsS9FmW62h94BRhtaCRdEJDf/Y0I6hXTdLLxBxr7Xb9vdEDJmkUnzqMcOiiVfhkPvcf1IREMisBbKGw== 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=neh81zAJoqUIafHFrlNiLoPeCceFAHW6BRXt73dGlgY=; b=M+zkYnLk0vq5XUpuLyi9ryhgVJ2h8T4TXu119LFp2auoD/tUXt9CFrLObzA2XuFGhew/tyzof+G2/H3sCfBgGdqYy+gtM7J0LQtx9ZVfv3Llfaz6nhSxuwxmOocSVN7DhY2OzMp2lu0DhfzOFkCpkiuCxr2cgTCl1NUnMj4xYeyJTrqN+LR5bZqgseKAnA+1Gu29IUFcNQqOtlbDguFaEdPVQjZkdefRZCfTbyolxFdCliX0uG41VTC2SJPl3bDUme4hdzB6jgjhdvKs9zRwUuGuG8V+t7n51R7/bKLJqBei8oAPZe5etYfCqCWf7/5/QzQNbhp4LOGycK+8Ug988A== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT088.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::407) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:12 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F5E5AD7DE14B9565B6F30A398CECF1AA18BE7952E8E92B348FE5578D27F68CD8; UpperCasedChecksum:17239DBD6771F7BFEDA84E8AC7FD1CFC8CACF6D4D9AE59A71DE22265BC960BD2; SizeAsReceived:7606; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:36 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [KUaHGZfSBvGwb5jdBvPgMWAl6Jz1ARqWEcSZJRK43X8=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:11 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 18f74af7-2dfb-4aee-b77c-08d91123f15f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoVb1eIH22myRQIoCwijEdyhVYjlA0zDJ2EedPMPgtciQrSNTbO8VfuLC/Fwa0cC96Ay+Fvbz66lT3DrQde2HDrfs44egVlecpZobbBuh4ouXXm0/RIsJdRklgauEcqc3iKach6s+zgGbYUUACx/qHDiQRoNL9+pv35XlK8+F9oCRvHfBIu9bea//THj1L9h1/xBrl2dvbYIkSIoJ6x6y8yY5wOU6fqzSO8HQ0ypQdddnDgLMEmQe76qRxUjPbrZIraz6FyANfwa6FsUMLL0sZAtIUHZ+L8EElUkUB0ii3qYrcq5z5AMavDoFM12JEGBl+HfoMR0qGLTDZ5yuAexa8XQLM0cyCSAqxIaZjB/wSnVBjga4TlEXZtR/0UYrtKjMjX6L2ATYq62Vzvk5gWMtH+IYzADMUhvT7AQfjWTpGCrEwfuhu5jJBWYtjqWZ+Ptyj10WjPkWs/1kcIpsPW31lspfBlIY2IhkRjKGHRuZ41l0qUVvBeOZklDnc+9r9YOK7IWZ83Y0zZ0tTW7/mw0xNZ7sQiUYtvrRlZ1svLJ0tc+axhIHMleCXiic9wZIAvPc/1dVL3yMJOMJwW8kNyYgxumMjPeafpZ8sq4pIM4PjV2YJcL6p6VwaLa3gQi19gcRWwgs1myRPAw+1gGpGKfBnduVErxb2YXU4ARGFC7IkXylWXsx0pZJDInsb+j0NajzJ72Kv0g8VNUYtchScWHVoc6Il3K6ktEiY1HsVGzOD5XaQBvLBYuxeso= X-MS-TrafficTypeDiagnostic: HE1EUR02HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2NhsWVPrZ6t9358mQ8+qcRtj0j9ZerU6rdLKyKF3+STZk29a3rLdtkXIdjgDvXCh7vjAozPIwGtYL6pZaBSW6Bic+D5SJesCD/rq+SDyFR//CfYxjlPBadkgVmLimDRv110CX2/hfrmpem2Jr/VUTx1wrEr4C+G7B/jCKVxJ720aLTuZ0lh5w7Y6gzOUbIRenq1ZoBYO8SZ+QlYXttrjQNoY/DkGN0Rb5J5k7PBT9hYxZyoLr+uBAlZn9uUinMP0HZEOldrSFaDms6hbdN9+AdeaDFbdBzAe7lHHkp/zN6ysHfe+2ZX35bE7j8OE4C4Qa9UaOznmQUnP8ZxVC6886yiybwqv+D1mdDjpYlDSugaes69Ee0B5tft6fRYy22QC5Mla0DCFirQ4AaSshT0R6g== X-MS-Exchange-AntiSpam-MessageData: CaFnVBa61xWvcFBYhjiEJ5iAK2xUe3ooK/XIviU18OuSp1xjUXIIW5noDxsz/lrZAfyc73OMYHbtxPAdBVS+VpvzqycY4r1p+XhhPlm3jhHP8PDiK0g5murKQWr8bpZ1PLEKP71jj1SmrClfW6pHQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18f74af7-2dfb-4aee-b77c-08d91123f15f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:12.3014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT088 Subject: [FFmpeg-devel] [PATCH 09/20] avcodec/vorbisenc: Don't free uninitialized pointers 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: Xztog6DPlQrv The Vorbis encoder allocates several arrays destined to contain pointers to separately allocated arrays; yet these arrays are allocated without initializing them: They are only uninitialized until their final values are stored in them; so if allocating one of the earlier subarrays fails, all of the remaining pointers to subarrays are still uninitialized. But their are used for freeing, resulting in crashes. Fix this by zero-initializing the arrays with subarrays. Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbisenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 1f7e9b3c91..dc54919f64 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -279,7 +279,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11; venc->ncodebooks = FF_ARRAY_ELEMS(cvectors); - venc->codebooks = av_malloc(sizeof(vorbis_enc_codebook) * venc->ncodebooks); + venc->codebooks = av_mallocz(sizeof(vorbis_enc_codebook) * venc->ncodebooks); if (!venc->codebooks) return AVERROR(ENOMEM); @@ -318,7 +318,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, } venc->nfloors = 1; - venc->floors = av_malloc(sizeof(vorbis_enc_floor) * venc->nfloors); + venc->floors = av_mallocz(sizeof(vorbis_enc_floor) * venc->nfloors); if (!venc->floors) return AVERROR(ENOMEM); @@ -335,7 +335,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]); } fc->nclasses++; - fc->classes = av_malloc_array(fc->nclasses, sizeof(vorbis_enc_floor_class)); + fc->classes = av_calloc(fc->nclasses, sizeof(vorbis_enc_floor_class)); if (!fc->classes) return AVERROR(ENOMEM); for (i = 0; i < fc->nclasses; i++) { @@ -375,7 +375,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, return AVERROR_BUG; venc->nresidues = 1; - venc->residues = av_malloc(sizeof(vorbis_enc_residue) * venc->nresidues); + venc->residues = av_mallocz(sizeof(vorbis_enc_residue) * venc->nresidues); if (!venc->residues) return AVERROR(ENOMEM); @@ -409,7 +409,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, return ret; venc->nmappings = 1; - venc->mappings = av_malloc(sizeof(vorbis_enc_mapping) * venc->nmappings); + venc->mappings = av_mallocz(sizeof(vorbis_enc_mapping) * venc->nmappings); if (!venc->mappings) return AVERROR(ENOMEM); From patchwork Fri May 7 06:46:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27644 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273951iof; Thu, 6 May 2021 23:49:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzT0riZs0tyQMZvQJ34SjqdM5t5nVp5BeJvobSy/ejOihYgxWwe6KFXGZCxjqjhtmaVvHNZ X-Received: by 2002:aa7:cd90:: with SMTP id x16mr9502265edv.182.1620370140997; Thu, 06 May 2021 23:49: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 b9si4238372edx.429.2021.05.06.23.49.00; Thu, 06 May 2021 23:49: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=sHQRz7gp; 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 88520680C7B; Fri, 7 May 2021 09:47:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067050.outbound.protection.outlook.com [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1FC1680968 for ; Fri, 7 May 2021 09:47:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FeME2WPmZ++E8PehDig0oD7IUSQ20fECQvwVKmPtH0WHsxm9ztrtdvKJZJrt6RDoeV/QuNtkQ/+Z1ZKJ0nVxcVuG2lSHv9d2UvpuRagXFD3YG1fN1t5sTi8NzLk9ve24SiNScncmFtsVFsfJns81r+S7WGkKDpOvWRuy37SL3M8HQt5KP9RZvPKTDBeqK44IEGl6DhZDUbgehYU+0xYLdKWfLrzlx0roPORfX+MWtTDr/l0GmC3ZTa1J/32217Z5Kv78R19ogul6yoMyl8YktLwIMcrYHKYqu7+nRNaYbdU03BStruMoCnqGFXI0agG6LJzuZL781dQD3k3W7PmZFw== 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=r6MK+9AcpzBmWdVhojsE6PONoNp1noZPMFq6TBqjzvw=; b=JGF6lFtx0n+jUfER9oB9rHmCrg7RCFVfXuSMewDwD7H1oIutszrXrNPkvLep9qwBL2N5+wgO+No26N/ndOiWClJAVnwhMINMlUNf9/lAvyPxQE+s6D/AgrQ36GMBCE36r5r2+Gcqk0NdsO/kWBAadXMaKMSwTRwOeZnRjpq6DjecoCszOXDWRc1UH1Er2547Qid3itdHElN5zWE464uk2n+E6I8v6NbOEq2SQo0YCVbhOmD1NaH0XEiC3/BXnDffBSXmpvQxhZgyDldWtAwYGwTE59LX7QjXJXqoJGHtgQW0NU5sDC6zl9bd4DvRQWBYU8X0JKlZkntsaRVQ7HaZyQ== 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=r6MK+9AcpzBmWdVhojsE6PONoNp1noZPMFq6TBqjzvw=; b=sHQRz7gpjGh9cWAMKw8dhtAjsFFwU2R4WLC0zuHa13Q7hRsgRGjxUVHxKDxfrMOZIOup5i0bhnvkreSBmsa3rJZh1H+11a6C1qxKgFfwM/gq1uww1AYDcyB49T1sFHbkKnX0J59FlKZ3gyms0f6FohtHw9pm1GqZZbS/2LecSpPg2/9bHNImMdR+L4CLDvWcrTddvlo+NecwIwcWZYnYm7yBx490EKXoavJMM9xV/XCgZhS/T9n1ABLIPBkDICyfPutW4exxRQySSRFNahjT4mv5ceddXBTLwN1PejN6YtBnMvLrq780cyojUl1A7LvbFJvD08yUDcF3WlIx1ACX1A== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::44) by HE1EUR02HT161.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:13 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:13 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BC67CCFCD6350EEA8BAF53EAA4174B0673423C512C552CB4F645C8B590A4CD8A; UpperCasedChecksum:84AA1362B544777D79A179EF9BEFFC5ADF6768EA758946CC80FBB4191650A204; SizeAsReceived:7634; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:37 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [t8kcVF5msNDogS3Z20TswA4ozoSmwGDnAaWw1jiLtGM=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 28aa29d0-5d02-45b1-6819-08d91123f1f6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHj4WOo5z35Ea2UMr42d/dOBTQhSAlr3xztWIPr+5of+REjJV9pALF0plZsRL9FubPaTRe5qZf/RbcEtq5FrS0QfA/DX/YPK02GEEZVTHHk2m5fvmxhpOi06Qm5omwIDq62up9fmDpVIs4GpG15u5mv8aRKnyTE6SY+QQynd+A7JY+er1TNFAYAJPBkCP0FdSucHWthOb35Rszd+Q+taLnBdKwUxluEXf3d0NF60PSm3WcqIE7WSdS3QbQ7XquTjByNwEV9XNQVUe6UHxFsATacVUJKq7fMbmK5jQKhQQpp03WLZ76ZDNZ3Og2IE2DNlWsfiaI1hfBEVZ925HAlVZwOMuD0lmGvl3KvDOFgGLBXedKP4kuR1reW1spykLkVY8i/Y6g84Tv0m7Cnxz0819mENQJz0gc5MCGwQsfCeEp+hr95yTYiG1EduswtxFqa8riArPUq4bASfWrX6ZP+9hoEo6eQNY1SAlJoC6cwdfBAij+ZuvgZnNQWt0oDlGTvO6G2zkkwNTkPwz1rfc2erhEghNkjxbcU439R7eGNE0B6cuR3UOtJ04IY581c11CFi3HAQUpqafgAPCQ1q38rEJOc5Y8zo1GpO7yv29ZGdi7yBqXwd26AulGst5m5J79UKdcvu2kJ/NnVHbtz2V+Z4PJHiV9blFn499Y7PxV751Bnp+WNAq7KQ4sHq2gL5S24EPaTUeYOOMNmm0= X-MS-TrafficTypeDiagnostic: HE1EUR02HT161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zjbPHPnNk/hboH2LQGyo6WGXALtHygXJsRAw5POcnIQ6yL2Nc06Vb2LrTMEPmGrKeb1yp8ZLYvxlhNzwcPAW0a0VmnmlHxrKv/v+FHJ/y/tbdpuT8j8WAT75ipHT+j41GatJiR8RaVYR6URO3nID6Fk0AMQIBsQTXGSmAcwuLmuwi1psT6lP5clpG7+hS03qBDUMGXlHJXwI4T3FtkDW9f+myVh99JQgbi3913Y0XUxY2qa9cc4C4jad+iruZN3/rC3dBTWMiokfV+X9Jzr/kx5Nc4oKvXy7Av5pFbR+ropeUmICDvyEsW9F5z8Ia7K+exKnM0o7zEcm6pr64AZ+4YoH6F+8sdxpBT1A8fZp50ulUEUrfg7FqxhzAeNuqY8YhQkpva1RNP5Br7K7XMGSKA== X-MS-Exchange-AntiSpam-MessageData: J+6wuHEUpskZj2SdPGMITu+9wMKKupd8PYWl30OJjQvD0b+kU+P88Dweh9gS2r1M3ELXtRQqL07qmqvz5l52mjut12XNkVEp9mnw+V9j7prwGyVoUrJ6rcLgdTFd7U2YZ5QXLwhpOuGlF4OptTXrLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28aa29d0-5d02-45b1-6819-08d91123f1f6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:13.4859 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT161 Subject: [FFmpeg-devel] [PATCH 10/20] avcodec/vorbisenc: Mark encoder as init-threadsafe 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: 0gKNk3ebpehm Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbisenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index dc54919f64..5c10e49b3f 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1303,4 +1303,5 @@ const AVCodec ff_vorbis_encoder = { .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Fri May 7 06:46:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273430iof; Thu, 6 May 2021 23:47:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFmnldIBUhxD5YMn/d1Ixu2xqRlxhMfimvxsU8WFHA4iHs24R65WwvLEK+zR5+ze7szkMW X-Received: by 2002:a17:906:b0cb:: with SMTP id bk11mr8496903ejb.310.1620370066739; Thu, 06 May 2021 23:47:46 -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 p5si2906399edi.291.2021.05.06.23.47.46; Thu, 06 May 2021 23:47:46 -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="jAY82ws/"; 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 7F73E680A0F; Fri, 7 May 2021 09:47:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068080.outbound.protection.outlook.com [40.92.68.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B434168094F for ; Fri, 7 May 2021 09:47:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=df9hpk8OZX5hDWwUUX4xPUyMgRw7Rkr9cvWzc2w942QPUIlQlVPKSrkzk6Da/wZqNsgFM/o+B4jIkzPM5FN2PrvTuawEnw20nx1IYzu/p41mOyjxbCHuA998z/1iuQMTLl+qH628Qe3/elqxMOKLvG1J8Ns/qXZeUA5K8ViNdaZblp2nVWiClGBI/RWkpTdvhdRJa9rTti52tpw/oSIG+Pv3/oeBypWpjTx+tKFBLprquSmqVNCcO4q+UwjduXtmO11Z5jvm0vR2mWM/laIVelIQm50I67p6saD+JUJxPcyDStDNpK6WrtHYKk/V+1eyCKK7mVsUxfv7dWct8VF82g== 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=/ogdTkja29FJ9h9iwMdJUWzNl9Uw5QAUCYzd7nSJj2A=; b=YWbE3S0+N0WG6DMxPNsnACAEn4oVkS7T8fCLkJi676erypPq3CSj63xByF6f+Py+ZEfEsWDY1PTYYZEk/pZambS9T7rnR6JDwIxESorJ0Sm9soHJH42TCBiu3vJ+ZizQzr9uUs3HA89LTQN9DNOhzaQxUROpVOqXV1hiZdZI06sLgRnumNX84jxRJQZVZrBkkYIxCtry1rUMh2oM4EMf3SR0vk3lSE5qpgeB5A+CUB8g9HOQbCMHSdNIXuFa3gWcDqFQ3emIL8vL0OSTzllXfoBVkPxqcqsX/oJY47TxG7EXI6ldgTH+PSYdyQ0gSko06Bo08gsnoJU9lOAhF3o10g== 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=/ogdTkja29FJ9h9iwMdJUWzNl9Uw5QAUCYzd7nSJj2A=; b=jAY82ws/7whT0KzYNPHkrjil1zMU6NrTZvOpdtOv30fnBmSQBWyX2nhUdgGNyp6fLjQIrxwNEI/Lnvj850S54svJTUuheznepIoiDc6A2VeoONfxVkMc/3GNuc8shbvZcjRWSjHkz6OuWhh2SrLmgtsTpR+NAfAXs4Aw9YqE1Kbnj9y05hh1upZwlL5bl5HNybASQUw1VAp8/NtoMErM9v3Ja/gxP4QNJ7TTRT2wmzBJ0WB46UQlAV6rO9f2YrQTFg8ds90a1Rbo+q8eIQpe/F6H2XwiPbDPBFCo3zyrC64E/TrC0fICXiOuL10V6QdcGGmxZajeAw+oJggjrf0e/Q== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::4e) by HE1EUR02HT079.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::371) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:14 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:744B6B95B6D4F9B68826C0D8899D2EFDBD38E96C906294F6477E0628C0AE9D98; UpperCasedChecksum:0C49CF5997F4F59CB53C4322B98EF00ACE2017FAD2B790DF12F35142EA21B851; SizeAsReceived:7602; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:38 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [OWk6qcx2MNzgX07tDy0QiRp497jnatnRRXAqEXosVJk=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:14 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 685d8443-13e6-47e0-d0d5-08d91123f2d0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLH9lhJPzcSP1IRERdunlh0aR9Gg8OSZEDuLSZlAzG68nak7rhDJM3bON0HKy6kFiazHItFv2UETMHi3bx1xKk87sdvY/VVF/Rsctxq6zOKGx71ilU8wn6pnGMO9+KW/SRGvLZLAEZ95dujwSfYBrA+mBbgdruLmr2BlNKd4yluozcbeb+Z15jPag8FQfujE+7/oNLMVoEccKvvHfHbTPlz0xrspyAhypGh8bKmp4VNfJhRkoFKWakaNjGicYLixqvEElyMNrp144R1tCPhrQiu9zx41FlU+Gpmxf6u5TcdBG8uhSmE97h1y2mfix93f2Y2FQtBfAL8tmnC/qr+W5zcQwj5uKf49lggf446bAS2BVdjHlH7GTY0FqWDE1vFCFQx62ybZntDnmUFCXrNhVGMLlB0bpd1VGLmDpIwygHJFXdk6pCPM7YZU1ObPgQ+7a8R3ySBGVYoEQvAeYbz2Sa2NZ2LUfD2+qT8eLLudK91NuBdgPlIjTL8tAKVOto3dEK/hw3g+LA5xowVvxn67aM7g4WDn7DMGtgPWGpWql9IGxxyuKffVJRGKc4dCsY83j/6fXAhMn1cYHuzIHuFSJMzSjD0sq7JJ7iv4psKjBUqq0mBQVnaNaEZFMWU+aeSVtAgS2zgcZYyMly0tJ0WqOCrIbOMyZfOc/Kpkdb9YlmGZXHgpnQlebYEES+YefLEwapeLMJKO+zeEgI= X-MS-TrafficTypeDiagnostic: HE1EUR02HT079: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iW3rpwxIkyNTIsrONidWIIpcJDkheJ3G7DptwLyzRUfQWTtmWQRq2woMk7fd1M7l4Vz6tUh8vLXCdDqoZb7PSqw7yXShkfeueU8F9ctVx6ZdLGxiDezKisjjKAHovWUUN4nhYpy5Bh3cHG0O75HbY7KEWNh5zwrEbGcfvRfqiO9+HM+IiIP+cvEAjaZPsuG0U0qdevqIbtUWtzx88gRqWewLFShvtbLKS5JSBrn9qkHAzwF71SmKzzZHAYb7rATFJB09YEnHj94+HjyXnWrY+SMYygqQxUEZiJC3967NMVlE6fMuqcqBCWxgba9TUga6Z6NNG21Lcql3ltuboK7TZqhG5ptx6xVp1tEI1TdSqlBgD3C22Wiwfx5NB6vuXtod1FS5Ys4+hjLsykTQ4E/EXA== X-MS-Exchange-AntiSpam-MessageData: q+7GR0s6O7+3ASWQk3viEMnSQktYv5YaNFDeKlyj7Ky9iKr4/o+NM13jtT1S2PsLDP8kCqdoYT31pmGY5wRNf6QSEPLVJLCB4dSkMd2vGYQebdtsi9AqI+g8OOOS47kK31LPjyaASSvGCrnswpByDw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 685d8443-13e6-47e0-d0d5-08d91123f2d0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:14.7133 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT079 Subject: [FFmpeg-devel] [PATCH 11/20] avcodec/vorbisenc: Combine codebooks, avoid relocations 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: mFlLNVBvZ30B The Vorbis encoder has an array of a structure containing all the ingredients for a codebook; this includes a pointer to the actual codebook and some even have a pointer to an array containing quant values. Each of these real codebooks is an array of its own. These pointers lead to relocations and therefore the array will be placed in .data.rel.ro and not in .rodata. This commit avoids the pointers altogether by combining all the actual codebooks into one big array; the actual codebooks are now accessed consecutively by incrementing the pointer used to access them by the length of the actual codebook that has just been dealt with (said length is contained in the structure describing the codebook). There is no downside to this given that these codebooks are already only used once during init. Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbis_enc_data.h | 216 +++++++++++++++-------------------- libavcodec/vorbisenc.c | 8 +- 2 files changed, 100 insertions(+), 124 deletions(-) diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h index a51aaec978..eab8adbb76 100644 --- a/libavcodec/vorbis_enc_data.h +++ b/libavcodec/vorbis_enc_data.h @@ -23,15 +23,12 @@ #include -static const uint8_t codebook0[] = { +static const uint8_t codebooks[] = { + /* Codebook 0 - 16 elements */ 2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 13, -}; - -static const uint8_t codebook1[] = { + /* Codebook 1 - 8 elements */ 1, 4, 2, 6, 3, 7, 5, 7, -}; - -static const uint8_t codebook2[] = { + /* Codebook 2 - 256 elements */ 1, 5, 7, 21, 5, 8, 9, 21, 10, 9, 12, 20, 20, 16, 20, 20, 4, 8, 9, 20, 6, 8, 9, 20, 11, 11, 13, 20, 20, 15, 17, 20, 9, 11, 14, 20, 8, 10, 15, 20, 11, 13, 15, 20, 20, @@ -50,17 +47,13 @@ static const uint8_t codebook2[] = { 19, 18, 20, 15, 16, 20, 20, 17, 17, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, -}; - -static const uint8_t codebook3[] = { + /* Codebook 3 - 64 elements */ 2, 3, 7, 13, 4, 4, 7, 15, 8, 6, 9, 17, 21, 16, 15, 21, 2, 5, 7, 11, 5, 5, 7, 14, 9, 7, 10, 16, 17, 15, 16, 21, 4, 7, 10, 17, 7, 7, 9, 15, 11, 9, 11, 16, 21, 18, 15, 21, 18, 21, 21, 21, 15, 17, 17, 19, 21, 19, 18, 20, 21, 21, 21, 20, -}; - -static const uint8_t codebook4[] = { + /* Codebook 4 - 128 elements */ 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, 10, 6, 10, @@ -70,15 +63,11 @@ static const uint8_t codebook4[] = { 14, 11, 14, 12, 14, 13, 14, 13, 14, 14, 15, 16, 15, 15, 15, 14, 15, 17, 21, 22, 22, 21, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, -}; - -static const uint8_t codebook5[] = { + /* Codebook 5 - 32 elements */ 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, -}; - -static const uint8_t codebook6[] = { + /* Codebook 6 - 96 elements */ 8, 5, 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 8, 4, 8, 4, 9, 5, 9, 5, 9, 5, 9, 5, 9, 6, 10, 6, 10, 7, 10, 8, 11, 9, 11, @@ -86,15 +75,11 @@ static const uint8_t codebook6[] = { 15, 15, 16, 16, 15, 16, 16, 16, 15, 18, 16, 15, 17, 17, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -}; - -static const uint8_t codebook7[] = { + /* Codebook 7 - 32 elements */ 1, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8, 10, 9, 10, 9, -}; - -static const uint8_t codebook8[] = { + /* Codebook 8 - 96 elements */ 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5, 7, 5, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 9, 8, 9, 9, 9, 9, 10, 10, 10, 11, 9, 12, 9, 12, 9, 15, 10, @@ -102,49 +87,35 @@ static const uint8_t codebook8[] = { 11, 14, 12, 13, 13, 14, 14, 13, 14, 15, 14, 16, 13, 13, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 15, 15, -}; - -static const uint8_t codebook9[] = { + /* Codebook 9 - 17 elements */ 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 4, 5, 5, 5, -}; - -static const uint8_t codebook10[] = { + /* Codebook 10 - 32 elements */ 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 5, 7, 5, 8, 6, 8, 6, 9, 7, 10, 7, 10, 8, 10, 8, 11, 9, 11, -}; - -static const uint8_t codebook11[] = { - 3, 7, 3, 8, 3, 10, 3, 8, 3, 9, 3, 8, 4, 9, 4, - 9, 5, 9, 6, 10, 6, 9, 7, 11, 7, 12, 9, 13, 10, 13, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, -}; - -static const uint8_t codebook12[] = { + /* Codebook 11 - 78 elements */ + 3, 7, 3, 8, 3, 10, 3, 8, 3, 9, 3, 8, 4, 9, 4, + 9, 5, 9, 6, 10, 6, 9, 7, 11, 7, 12, 9, 13, 10, 13, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, + /* Codebook 12 - 17 elements */ 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 5, 4, -}; - -static const uint8_t codebook13[] = { + /* Codebook 13 - 32 elements */ 4, 2, 4, 2, 5, 3, 5, 4, 6, 6, 6, 7, 7, 8, 7, 8, 7, 8, 7, 9, 8, 9, 8, 9, 8, 10, 8, 11, 9, 12, 9, 12, -}; - -static const uint8_t codebook14[] = { + /* Codebook 14 - 78 elements */ 2, 5, 2, 6, 3, 6, 4, 7, 4, 7, 5, 9, 5, 11, 6, 11, 6, 11, 7, 11, 6, 11, 6, 11, 9, 11, 8, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, -}; - -static const uint8_t codebook15[] = { + /* Codebook 15 - 100 elements */ 5, 6, 11, 11, 11, 11, 10, 10, 12, 11, 5, 2, 11, 5, 6, 6, 7, 9, 11, 13, 13, 10, 7, 11, 6, 7, 8, 9, 10, 12, 11, 5, 11, 6, 8, 7, 9, 11, 14, 15, 11, 6, 6, 8, 4, @@ -152,9 +123,7 @@ static const uint8_t codebook15[] = { 10, 7, 7, 8, 6, 5, 5, 7, 9, 9, 11, 8, 8, 11, 8, 7, 6, 6, 7, 9, 12, 11, 10, 13, 9, 9, 7, 7, 7, 9, 11, 13, 12, 15, 12, 11, 9, 8, 8, 8, -}; - -static const uint8_t codebook16[] = { + /* Codebook 16 - 1641 elements, real length 6561 */ 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -265,9 +234,7 @@ static const uint8_t codebook16[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 8, 8, 0, 0, 0, 0, 0, 0, 8, 9, 9, 0, 0, 0, 0, 0, 0, 8, 9, 8, -}; - -static const uint8_t codebook17[] = { + /* Codebook 17 - 443 elements, real length 625 */ 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 10, 10, 0, 0, @@ -298,9 +265,7 @@ static const uint8_t codebook17[] = { 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 8, 10, 10, 0, 0, 0, 9, 9, 0, 0, 0, 9, 9, 0, 0, 0, 10, 10, -}; - -static const uint8_t codebook18[] = { + /* Codebook 18 - 105 elements, real length 625 */ 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -308,26 +273,20 @@ static const uint8_t codebook18[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 7, 9, 9, -}; - -static const uint8_t codebook19[] = { + /* Codebook 19 - 68 elements, real length 81 */ 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 9, 9, -}; - -static const uint8_t codebook20[] = { + /* Codebook 20 - 81 elements */ 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 7, 8, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8, 10, 10, 0, 0, 0, 8, 8, 8, 8, 10, 10, 0, 0, 0, 9, 9, 9, 9, 10, 10, 0, 0, 0, 9, 9, 9, 9, 10, 10, 0, 0, 0, 10, 10, 10, 10, 11, 11, 0, 0, 0, 0, 0, 10, 10, 11, 11, -}; - -static const uint8_t codebook21[] = { + /* Codebook 21 - 289 elements */ 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 10, 10, 11, 10, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, @@ -348,18 +307,14 @@ static const uint8_t codebook21[] = { 0, 0, 0, 0, 0, 0, 0, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 12, 13, 13, 13, 13, -}; - -static const uint8_t codebook22[] = { + /* Codebook 22 - 81 elements */ 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7, 10, 9, 9, 11, 9, 9, 4, 7, 7, 10, 9, 9, 11, 9, 9, 7, 10, 10, 11, 11, 10, 12, 11, 11, 6, 9, 9, 11, 10, 10, 11, 10, 10, 6, 9, 9, 11, 10, 10, 11, 10, 10, 7, 11, 11, 11, 11, 11, 12, 11, 11, 6, 9, 9, 11, 10, 10, 11, 10, 10, 6, 9, 9, 11, 10, 10, 11, 10, 10, -}; - -static const uint8_t codebook23[] = { + /* Codebook 23 - 121 elements */ 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 10, @@ -369,9 +324,7 @@ static const uint8_t codebook23[] = { 10, 10, 10, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10, 9, 9, 8, 8, 9, 8, 10, 10, 10, 10, 10, 8, 8, 8, 8, 8, 8, -}; - -static const uint8_t codebook24[] = { + /* Codebook 24 - 169 elements */ 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9, 10, 10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9, 11, 10, 0, 8, 8, 8, 8, 9, @@ -384,14 +337,10 @@ static const uint8_t codebook24[] = { 11, 11, 11, 11, 12, 12, 13, 13, 0, 0, 0, 0, 0, 12, 12, 12, 12, 13, 13, 14, 13, 0, 0, 0, 0, 0, 13, 13, 12, 12, 13, 12, 14, 13, -}; - -static const uint8_t codebook25[] = { + /* Codebook 25 - 25 elements */ 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, -}; - -static const uint8_t codebook26[] = { + /* Codebook 26 - 169 elements */ 1, 4, 4, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 4, 9, 8, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 2, 9, 7, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, @@ -404,9 +353,7 @@ static const uint8_t codebook26[] = { 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, -}; - -static const uint8_t codebook27[] = { + /* Codebook 27 - 225 elements */ 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9, 10, 10, 10, 10, 6, 5, 5, 7, 7, 8, 8, 10, 8, 11, 10, 12, 12, 13, 13, 6, 5, 5, 7, 7, 8, 8, 10, 9, 11, 11, 12, 12, 13, 12, @@ -422,9 +369,7 @@ static const uint8_t codebook27[] = { 17, 18, 18, 17, 18, 13, 12, 13, 10, 12, 11, 14, 14, 14, 14, 17, 18, 18, 18, 18, 15, 16, 12, 12, 13, 10, 14, 12, 14, 15, 18, 18, 18, 16, 17, 16, 14, 12, 11, 13, 10, 13, 13, 14, 15, -}; - -static const uint8_t codebook28[] = { + /* Codebook 28 - 289 elements */ 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 10, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, @@ -447,45 +392,72 @@ static const uint8_t codebook28[] = { 9, 10, 10, 10, }; +static const uint8_t quant_tables[] = { + /* Codebook 16 */ + 1, 0, 2, + /* Codebook 17 */ + 2, 1, 3, 0, 4, + /* Codebook 18 */ + 2, 1, 3, 0, 4, + /* Codebook 19 */ + 4, 3, 5, 2, 6, 1, 7, 0, 8, + /* Codebook 20 */ + 4, 3, 5, 2, 6, 1, 7, 0, 8, + /* Codebook 21 */ + 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15, 0, 16, + /* Codebook 22 */ + 1, 0, 2, + /* Codebook 23 */ + 5, 4, 6, 3, 7, 2, 8, 1, 9, 0, 10, + /* Codebook 24 */ + 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12, + /* Codebook 25 */ + 2, 1, 3, 0, 4, + /* Codebook 26 */ + 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12, + /* Codebook 27 */ + 7, 6, 8, 5, 9, 4, 10, 3, 11, 2, 12, 1, 13, 0, 14, + /* Codebook 28 */ + 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15, 0, 16, +}; + static const struct { int dim; int len; int real_len; - const uint8_t *clens; int lookup; float min; float delta; - const uint8_t *quant; } cvectors[] = { - { 2, 16, 16, codebook0, 0 }, - { 2, 8, 8, codebook1, 0 }, - { 2, 256, 256, codebook2, 0 }, - { 2, 64, 64, codebook3, 0 }, - { 2, 128, 128, codebook4, 0 }, - { 2, 32, 32, codebook5, 0 }, - { 2, 96, 96, codebook6, 0 }, - { 2, 32, 32, codebook7, 0 }, - { 2, 96, 96, codebook8, 0 }, - { 2, 17, 17, codebook9, 0 }, - { 2, 32, 32, codebook10, 0 }, - { 2, 78, 78, codebook11, 0 }, - { 2, 17, 17, codebook12, 0 }, - { 2, 32, 32, codebook13, 0 }, - { 2, 78, 78, codebook14, 0 }, - { 2, 100, 100, codebook15, 0 }, - { 8, 1641, 6561, codebook16, 1, -1.0, 1.0, (const uint8_t[]){ 1, 0, 2, } }, - { 4, 443, 625, codebook17, 1, -2.0, 1.0, (const uint8_t[]){ 2, 1, 3, 0, 4, } }, - { 4, 105, 625, codebook18, 1, -2.0, 1.0, (const uint8_t[]){ 2, 1, 3, 0, 4, } }, - { 2, 68, 81, codebook19, 1, -4.0, 1.0, (const uint8_t[]){ 4, 3, 5, 2, 6, 1, 7, 0, 8, } }, - { 2, 81, 81, codebook20, 1, -4.0, 1.0, (const uint8_t[]){ 4, 3, 5, 2, 6, 1, 7, 0, 8, } }, - { 2, 289, 289, codebook21, 1, -8.0, 1.0, (const uint8_t[]){ 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15, 0, 16, } }, - { 4, 81, 81, codebook22, 1, -11.0, 11.0, (const uint8_t[]){ 1, 0, 2, } }, - { 2, 121, 121, codebook23, 1, -5.0, 1.0, (const uint8_t[]){ 5, 4, 6, 3, 7, 2, 8, 1, 9, 0, 10, } }, - { 2, 169, 169, codebook24, 1, -30.0, 5.0, (const uint8_t[]){ 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12, } }, - { 2, 25, 25, codebook25, 1, -2.0, 1.0, (const uint8_t[]){ 2, 1, 3, 0, 4, } }, - { 2, 169, 169, codebook26, 1, -1530.0, 255.0, (const uint8_t[]){ 6, 5, 7, 4, 8, 3, 9, 2, 10, 1, 11, 0, 12, } }, - { 2, 225, 225, codebook27, 1, -119.0, 17.0, (const uint8_t[]){ 7, 6, 8, 5, 9, 4, 10, 3, 11, 2, 12, 1, 13, 0, 14, } }, - { 2, 289, 289, codebook28, 1, -8.0, 1.0, (const uint8_t[]){ 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15, 0, 16, } }, + { 2, 16, 16, 0 }, + { 2, 8, 8, 0 }, + { 2, 256, 256, 0 }, + { 2, 64, 64, 0 }, + { 2, 128, 128, 0 }, + { 2, 32, 32, 0 }, + { 2, 96, 96, 0 }, + { 2, 32, 32, 0 }, + { 2, 96, 96, 0 }, + { 2, 17, 17, 0 }, + { 2, 32, 32, 0 }, + { 2, 78, 78, 0 }, + { 2, 17, 17, 0 }, + { 2, 32, 32, 0 }, + { 2, 78, 78, 0 }, + { 2, 100, 100, 0 }, + { 8, 1641, 6561, 1, -1.0, 1.0 }, + { 4, 443, 625, 1, -2.0, 1.0 }, + { 4, 105, 625, 1, -2.0, 1.0 }, + { 2, 68, 81, 1, -4.0, 1.0 }, + { 2, 81, 81, 1, -4.0, 1.0 }, + { 2, 289, 289, 1, -8.0, 1.0 }, + { 4, 81, 81, 1, -11.0, 11.0 }, + { 2, 121, 121, 1, -5.0, 1.0 }, + { 2, 169, 169, 1, -30.0, 5.0 }, + { 2, 25, 25, 1, -2.0, 1.0 }, + { 2, 169, 169, 1, -1530.0, 255.0 }, + { 2, 225, 225, 1, -119.0, 17.0 }, + { 2, 289, 289, 1, -8.0, 1.0 }, }; static const struct { diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 5c10e49b3f..d8d7d4d4eb 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -272,6 +272,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, vorbis_enc_floor *fc; vorbis_enc_residue *rc; vorbis_enc_mapping *mc; + const uint8_t *clens, *quant; int i, book, ret; venc->channels = avctx->channels; @@ -286,6 +287,8 @@ static int create_vorbis_context(vorbis_enc_context *venc, // codebook 0..14 - floor1 book, values 0..255 // codebook 15 residue masterbook // codebook 16..29 residue + clens = codebooks; + quant = quant_tables; for (book = 0; book < venc->ncodebooks; book++) { vorbis_enc_codebook *cb = &venc->codebooks[book]; int vals; @@ -300,8 +303,9 @@ static int create_vorbis_context(vorbis_enc_context *venc, cb->codewords = av_malloc_array(cb->nentries, sizeof(uint32_t)); if (!cb->lens || !cb->codewords) return AVERROR(ENOMEM); - memcpy(cb->lens, cvectors[book].clens, cvectors[book].len); + memcpy(cb->lens, clens, cvectors[book].len); memset(cb->lens + cvectors[book].len, 0, cb->nentries - cvectors[book].len); + clens += cvectors[book].len; if (cb->lookup) { vals = cb_lookup_vals(cb->lookup, cb->ndimensions, cb->nentries); @@ -309,7 +313,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, if (!cb->quantlist) return AVERROR(ENOMEM); for (i = 0; i < vals; i++) - cb->quantlist[i] = cvectors[book].quant[i]; + cb->quantlist[i] = *quant++; } else { cb->quantlist = NULL; } From patchwork Fri May 7 06:46:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27642 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273488iof; Thu, 6 May 2021 23:47:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUatglRm5kKwcLd1Y7VShoFMdE1GIFOx5++IqyNs+peG9LlBHAUFhewrCcWxN3zy6CiYvL X-Received: by 2002:a17:906:a18e:: with SMTP id s14mr6913266ejy.311.1620370076059; Thu, 06 May 2021 23:47:56 -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 cx25si4256113edb.167.2021.05.06.23.47.55; Thu, 06 May 2021 23:47:56 -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=iVmPTuX3; 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 5CC57680843; Fri, 7 May 2021 09:47:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068080.outbound.protection.outlook.com [40.92.68.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1B3A680843 for ; Fri, 7 May 2021 09:47:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UJiSApojF2ycyHpwZA8W0MgT6KJQ1G+a650SNiq/F7AisW2bG6uKeFqoISrXk/OjeaLNSryHUl6iW46/G03o6PP0I+tCAPE68ynn0t82Pty66ygPPv2f1DKhlSWUxO6x6uiYJqxpkcsQQTrn+AAF9O6qZlqendYlv+xSy3JrcPQGx6P+uSNKQRVQZ8onO87/pgLUwIvA6gL2O6Mbeh9J5PYQ2FCN0So1ScdunX1JNuiDs9FMZwyuMjJ7zcR3rVjIBE54ekwItsvApZAbYHblFFOGGCFKfvJp6fWSRCDKObUGYBk6NPZhL2U452mto57weDtNdLvkGOo6CL+sSMYYlA== 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=pwVkpV4PN/DH6CMf5qunj2ANijjYl8Fss7vZViopjDE=; b=ETdc0LHSTZQeZYjtT2aHFTJLKnO3zf4LoTfEQagVROizeSPTCQq9dSTxM3Hl65KwKJ+ENEIXH9C0ZgjIMxoJc9ZpqXJ2766+zzzDS+0iBOr93ejI/L1ozCnckbJVp+u0iZDaehpI+gBL/jwSRjLwLJChC1S1P3w4JvmJrpirTj/54LbXmkyCmRCxAvUZH0wPsltUU4RsZGSYZh2SrGC7CWuUXvIkMfkhJsmUj6ETOk9Y/dWLKliFS5crIckeEMoJvoJsgzvXUvSsFCOQv5Yi4Hsbgvl067jCZDXsOrdfwzCK85i2aYHzDnPnMQbGzQjCtedavHU+M721TmBCsn0V5g== 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=pwVkpV4PN/DH6CMf5qunj2ANijjYl8Fss7vZViopjDE=; b=iVmPTuX3PwUq2VJ0An3MA+YGmsWCqytAOu+KFmlEVrMDUJMkWHfAcOKnTwEcYQ1gxcuWmz75i0XuR+0eadT0k1iI/98l5oKeN1dNabVKo35VkA42pjcB4IZjJy6R6nTCD0cMQ/vA7DOrQPSHDA0kGz5w/nBFqUAs1x8r7oB8pd+A9hsEvlFBsGH5HW1RSQ5ndjCqQz4WpMzhcyK4oKo21xWHHzYvNdMHGhDeSGHA6p7OOe0/3NLCQw9N128X0aHZO83nNPRBYR/QGHygDWHFCxsXjjCKF/TPImklYUJloRXdYJaV6CcKX6zdpB+h0hEig19RBbyTewLTZXgulEwNfw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::4e) by HE1EUR02HT079.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::371) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:15 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:15 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:824FBDE5AF787CD8B26454140D8FE76E886D66E0C3367946D3E02AC63C0548BE; UpperCasedChecksum:6454FC0EB30C0FAB76E438C1CE0903121F3D3940C7E697C79F703CF23E20C8EF; SizeAsReceived:7597; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:39 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [QP6J6tNgM2z3vsH78mD0NKHgm3iAvwfj+q/GQuv2nIk=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 31b640e7-bfac-40ac-2ea8-08d91123f372 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPFLyNJT+PTaEQmHvqUT3FL5DUfWU1VVZ+epmLHJcSb9t46pIfMEC9MZb9zAUftGwzxMLp1y3gtSY/wzizUIJ3CUCFlt6i0gl2BWdWrtp4DffO6TJQW5f1bPGeLhpluJQtGaTsDVaWWK/29J/PIzcGAx23xq48DDJWTqRGb6IEAtgNSfwEf3GE0raaBiDp8eki144rH8o8jjAGNUTa0t1R1iYzPbwdjw1/yCdd7tOE8IpkOXncjkxVXPmJdOsEq3piCen+44BpyHn5mVXiQUdHtvQy91EBHGMN7iqkepZtmXrAuHYdjE+cu1vHgZ2lAOjwgfv4Gh8brsMFGiGrvA9Aan39oyJuCABq4OQ/pHjwn8DucIXh5FuV2GrF6dNjjKLv/jVsguZNNPy8wiIQaywJhyF66l82aKTpfXVTDqQhdCCYiRrp5K4fTqhxr8O9TnlF6DIn9cjYiq+XOlqk8lNkQdfAm/NUFoN42tPwEIudoXCOehkVW/Gdc+2vUOpYHhMAMlHAj6Znce8c7nmhMM4DMtrBrlyi9TobdPtbzMvABedOWYNFySmt4fiP/qg3+KECtP9JSkZ7cVktfDqeiBZAJh6O6zjUAAPQqvAIi8Ng54Vc0wJkz9OunSO1KV+Kv5ttLT0IvDB6lGlJmvpe/zCBPNZ7PBMTGI1wWLQcDxKLFGw6ZHZxoXiMJyg== X-MS-TrafficTypeDiagnostic: HE1EUR02HT079: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2VxYeBKP5iYpc3QS8GWc4HIBGq/VTPoRWDELzTusWNxEGJIatyQd3LdO8AgRW5Lx2rKo4Jj/n9jcDiBS5Q2qYxSjS1449cL2D/l1uUiSxgod2W0PjTpKHbvlWx48okdrsOWbMqQH+qrKxWyywzaHVd3y2E9MOqj4u/ub7BP+RuIfCA/CsHthJVgHU6nAh6WEHRtdI6ad6WZF6KbQXrM6fK+g9FKX6vDx5ZswN0R/2wDcDya6swuqbwVB/Ujw98ixBEYrzhIveOKe9WQr1u9j4qashPaI4UsyJf40+juvtcISb34Fh3aS98lxUHLJKs9sa93c8eoNEgZZRmQ2ZQTMHEsWTNjuppy8zfkdaP9ZGHZ96HdxAaFPMDLAw2a7hLyeQm0uupuw79yvNJ25FgEiFA== X-MS-Exchange-AntiSpam-MessageData: qheHgyr2dtki9rPTkerMVWD2XDmD2QmtvXaI8u0K9G/0EkgYVtTfxQgpGG3NiVbaoMRsxze8a7ACiyHwIXhnXaMCs3n3Rmx9or4oG2lgEk1K1VmYqnn0N1NXKcmh9eyoxv99Zs6yC6M/w14+BgZy8Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31b640e7-bfac-40ac-2ea8-08d91123f372 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:15.7778 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT079 Subject: [FFmpeg-devel] [PATCH 12/20] avcodec/mqc: Hardcode tables to save space 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: cQb+F16zdxNf mqc currently initializes three arrays at runtime; each of them has 2 * 47 elements, one is uint16_t, two are uint8_t, so that their combined size is 8 * 47. The source data for these initializations is contained in an array of 47 elements of size six. Said array is only used in order to initialize the other arrays, so the savings are just 2 * 47B. Yet this is dwarfed by the size of the code for performing the initializations: It is 109B (GCC 10.2, x64, -O3 albeit in an av_cold function); this does not even include the size of the code in the callers. So just hardcode these tables. This also fixes a data race, because the encoder always initialized these tables during init, although they might already be used at the same time by already running encoder/decoder instances. Signed-off-by: Andreas Rheinhardt --- libavcodec/j2kenc.c | 1 - libavcodec/jpeg2000dec.c | 1 - libavcodec/mqc.c | 105 +++++++++++---------------------------- libavcodec/mqc.h | 11 ++-- 4 files changed, 32 insertions(+), 86 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index c51adadd13..17eb959d73 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1780,7 +1780,6 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) } ff_jpeg2000_init_tier1_luts(); - ff_mqc_init_context_tables(); init_luts(); init_quantization(s); diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5364631432..1295c96305 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2476,7 +2476,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) static av_cold void jpeg2000_init_static_data(void) { ff_jpeg2000_init_tier1_luts(); - ff_mqc_init_context_tables(); } static av_cold int jpeg2000_decode_init(AVCodecContext *avctx) diff --git a/libavcodec/mqc.c b/libavcodec/mqc.c index f2d1e3b838..6f7088ec48 100644 --- a/libavcodec/mqc.c +++ b/libavcodec/mqc.c @@ -28,85 +28,38 @@ #include #include -#include "libavutil/attributes.h" - #include "mqc.h" -/* MQ coder context state structure */ -typedef struct MqcCxState { - uint16_t qe; - uint8_t nmps; - uint8_t nlps; - uint8_t sw; -} MqcCxState; - -static const MqcCxState cx_states[47] = { - { 0x5601, 1, 1, 1 }, - { 0x3401, 2, 6, 0 }, - { 0x1801, 3, 9, 0 }, - { 0x0AC1, 4, 12, 0 }, - { 0x0521, 5, 29, 0 }, - { 0x0221, 38, 33, 0 }, - { 0x5601, 7, 6, 1 }, - { 0x5401, 8, 14, 0 }, - { 0x4801, 9, 14, 0 }, - { 0x3801, 10, 14, 0 }, - { 0x3001, 11, 17, 0 }, - { 0x2401, 12, 18, 0 }, - { 0x1C01, 13, 20, 0 }, - { 0x1601, 29, 21, 0 }, - { 0x5601, 15, 14, 1 }, - { 0x5401, 16, 14, 0 }, - { 0x5101, 17, 15, 0 }, - { 0x4801, 18, 16, 0 }, - { 0x3801, 19, 17, 0 }, - { 0x3401, 20, 18, 0 }, - { 0x3001, 21, 19, 0 }, - { 0x2801, 22, 19, 0 }, - { 0x2401, 23, 20, 0 }, - { 0x2201, 24, 21, 0 }, - { 0x1C01, 25, 22, 0 }, - { 0x1801, 26, 23, 0 }, - { 0x1601, 27, 24, 0 }, - { 0x1401, 28, 25, 0 }, - { 0x1201, 29, 26, 0 }, - { 0x1101, 30, 27, 0 }, - { 0x0AC1, 31, 28, 0 }, - { 0x09C1, 32, 29, 0 }, - { 0x08A1, 33, 30, 0 }, - { 0x0521, 34, 31, 0 }, - { 0x0441, 35, 32, 0 }, - { 0x02A1, 36, 33, 0 }, - { 0x0221, 37, 34, 0 }, - { 0x0141, 38, 35, 0 }, - { 0x0111, 39, 36, 0 }, - { 0x0085, 40, 37, 0 }, - { 0x0049, 41, 38, 0 }, - { 0x0025, 42, 39, 0 }, - { 0x0015, 43, 40, 0 }, - { 0x0009, 44, 41, 0 }, - { 0x0005, 45, 42, 0 }, - { 0x0001, 45, 43, 0 }, - { 0x5601, 46, 46, 0 } +const uint16_t ff_mqc_qe[2 * 47] = { + 0x5601, 0x5601, 0x3401, 0x3401, 0x1801, 0x1801, 0x0ac1, 0x0ac1, + 0x0521, 0x0521, 0x0221, 0x0221, 0x5601, 0x5601, 0x5401, 0x5401, + 0x4801, 0x4801, 0x3801, 0x3801, 0x3001, 0x3001, 0x2401, 0x2401, + 0x1c01, 0x1c01, 0x1601, 0x1601, 0x5601, 0x5601, 0x5401, 0x5401, + 0x5101, 0x5101, 0x4801, 0x4801, 0x3801, 0x3801, 0x3401, 0x3401, + 0x3001, 0x3001, 0x2801, 0x2801, 0x2401, 0x2401, 0x2201, 0x2201, + 0x1c01, 0x1c01, 0x1801, 0x1801, 0x1601, 0x1601, 0x1401, 0x1401, + 0x1201, 0x1201, 0x1101, 0x1101, 0x0ac1, 0x0ac1, 0x09c1, 0x09c1, + 0x08a1, 0x08a1, 0x0521, 0x0521, 0x0441, 0x0441, 0x02a1, 0x02a1, + 0x0221, 0x0221, 0x0141, 0x0141, 0x0111, 0x0111, 0x0085, 0x0085, + 0x0049, 0x0049, 0x0025, 0x0025, 0x0015, 0x0015, 0x0009, 0x0009, + 0x0005, 0x0005, 0x0001, 0x0001, 0x5601, 0x5601 +}; +const uint8_t ff_mqc_nlps[2 * 47] = { + 3, 2, 12, 13, 18, 19, 24, 25, 58, 59, 66, 67, 13, 12, 28, 29, + 28, 29, 28, 29, 34, 35, 36, 37, 40, 41, 42, 43, 29, 28, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 92, 93 +}; +const uint8_t ff_mqc_nmps[2 * 47] = { + 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 76, 77, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 58, 59, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 90, 91, 92, 93 }; - -uint16_t ff_mqc_qe [2 * 47]; -uint8_t ff_mqc_nlps[2 * 47]; -uint8_t ff_mqc_nmps[2 * 47]; - -void av_cold ff_mqc_init_context_tables(void) -{ - int i; - for (i = 0; i < 47; i++) { - ff_mqc_qe[2 * i] = - ff_mqc_qe[2 * i + 1] = cx_states[i].qe; - - ff_mqc_nlps[2 * i] = 2 * cx_states[i].nlps + cx_states[i].sw; - ff_mqc_nlps[2 * i + 1] = 2 * cx_states[i].nlps + 1 - cx_states[i].sw; - ff_mqc_nmps[2 * i] = 2 * cx_states[i].nmps; - ff_mqc_nmps[2 * i + 1] = 2 * cx_states[i].nmps + 1; - } -} void ff_mqc_init_contexts(MqcState *mqc) { diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index 73604d5efe..ad80fe9228 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -33,9 +33,9 @@ #define MQC_CX_UNI 17 #define MQC_CX_RL 18 -extern uint16_t ff_mqc_qe[2 * 47]; -extern uint8_t ff_mqc_nlps[2 * 47]; -extern uint8_t ff_mqc_nmps[2 * 47]; +extern const uint16_t ff_mqc_qe[2 * 47]; +extern const uint8_t ff_mqc_nlps[2 * 47]; +extern const uint8_t ff_mqc_nmps[2 * 47]; typedef struct MqcState { uint8_t *bp, *bpstart; @@ -79,11 +79,6 @@ int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate); /* common */ -/** - * MQ-coder Initialize context tables (QE, NLPS, NMPS) - */ -void ff_mqc_init_context_tables(void); - /** * MQ-coder context initialisations. * @param mqc MQ-coder context From patchwork Fri May 7 06:46:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273738iof; Thu, 6 May 2021 23:48:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlQfKl8sgVoRNQRQEILQi39OKrLKZzPoNDfz1u9WBI2BUCZAUBUIymQaSZ0lZD6IELwsGd X-Received: by 2002:a17:906:c1c9:: with SMTP id bw9mr8493277ejb.239.1620370112187; Thu, 06 May 2021 23:48:32 -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 s25si5053636edy.17.2021.05.06.23.48.31; Thu, 06 May 2021 23:48:32 -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=pwIS+SbW; 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 4834F680BFE; Fri, 7 May 2021 09:47:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067011.outbound.protection.outlook.com [40.92.67.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90479680968 for ; Fri, 7 May 2021 09:47:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oPHTCrsrpCYwr0u43j1Mc+8RolXEhqcnOZHvGOSkO/tFomEPI6NS5Dt+8SfNIzQsPkZPl+bXgu//hDUbBxoMKtIfouIeoe29ccCKUQnuIPQdWGE2AfKWIMHQ1UqiPLp2yq2FsdBCyPJzSzVyQRmfvQHydG9idsI5uCh2aIHvo7DwKnzuhE3tOFL8sMiUuKy3V7QRJswoy+nyQlRFdYzcElbLUIad5hspm8BOLA1ttv1KtVQn7c0RTmBU1fIXJOXFPL3VU7cxk0Yvbfjp8FjtlTMfqIfUpUqsn7RYsvXGHchtXnUpBOlQf0NiPXxb9RjAzzvLhEspJkWa3AzDZOIjuw== 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=ud7/EnffHS6qTjZAknRXYi0JcmMqyuI5nW+yLW35vWo=; b=BAt0zGUi3Sp4uYcMJ4dtiBNC0D0H0VpX9CEuTQPrN6IW+jlleP35MWX4JntxGJqY6cOyjfp5snB8kzV0CzZJPGNsWl7O1CtSnxP8tvb6U6g7S5hOcNT5r14ivlLamudihG912+0q/neOSU2uUpB8odDFiLpFrNmX1pacroVPFo3L4THIfbICyecQcjsrtenkoV7wlReV7xknptqfCAyjzWVVHKmCfEvsJAalYFLX6b6pwJJ/vmIKJJTDUtuucZAAMIe691p3BKuac77JpevyU75GKt4aDPX8wWCwYYljk5P1QBKubQb+x8MIqkXpGTEswgSI5G9e4tcfHgP7RI2aYw== 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=ud7/EnffHS6qTjZAknRXYi0JcmMqyuI5nW+yLW35vWo=; b=pwIS+SbWtoBNXkzNUrz+agb4vjG7kxKbbBslDJ/Azt7x8AkMVOV8RH/PufvcndQ11+nZGVIRjYQn5pg0znR9DxrdBcyAc6lFRLE2iUFgIy1yn8Bjx2gaOLmVz84f6g7zD9UDNGnhvS/B4yE9bvFGLQ9cp/c8zcLX1gXsP1vOhTiZHdT+/FHNWZNxqTQM5NcTJxiwtqUqw5sAvJm24JjHwYjZfC1rcsyDhScX6JN2tqQsE/qmdMgSIj0I9WvjJNsjATXSjoTosZRKNp4hhItlorWyjsSlGlkp2nMYM96bjclVpCfbjDmCin+7lfh8Zxd7/a0kJ9/6tQ3EAf0BdkvkNg== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::43) by HE1EUR02HT199.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::347) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:17 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:17 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C0B574BEF7D140338DF03A2D1F0E87D613ACD2D9E97B00542E279B50E8EE10E1; UpperCasedChecksum:E646574038844F12670A6C871698D39A008B626B2C6D137AD314AE1076B70637; SizeAsReceived:7605; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:40 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [ACOu0rvNsBf2k24KrVyi3tS15ZIuNuaqSDQKzuwJqls=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:16 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5b12cb21-33bb-456c-692e-08d91123f423 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoVb1eIH22myRV32oymBW/b7dyMShpyEB33bdJiDhypC9OZufnf1HzyO6W0qGPws8+4IZ0JNRcSn88nbeHHKwTxdIQasTV4DLHLsfiqSoN2BRglRZsOj87mLHgy+LbSPE7rUK2UB7odBWr0JnvEV+C6957zfq7EbqvgB8TpKdS/qVdvbL9pp8T8rb5/Hnt2W60blRfLZO8Z/guG71dfNRK90aLuGNzIc5IXo6//flFjQvq8oA8pVyXeWNNH6yn9aB0PAeZjA7yjFsqfeCV0Jcv9j/+v//PQYliLQvIi72j/n++H2+mao1lYsoXOBtEWI7tr87AMquyMZkxDRe38y0pq01u6zNisfJJkcwALFiAqYBsvceM0uRTnrxd7FDkZtbz+r0woaVDHEDyzajuTmJSspzq7J/400+gDp1tk5ydDc1qNWiV5vSQW92edQ94aUWT1pU9TjlQdQLvQuUpM5XF3T++T+Lr65qMoEA7bji5lWVN8ZAZGqBwzSR2+dcmzwM0rkdnillt8dUCSWYj6hBWQTbi2TS3jI5aDsXpDmcXHUcVViwbS59jTnz8GQJ7xVKtJVaI9StsCReMoGXsQSiAHBNI1HuyHbKOr5uBXuik0OcnMnDCuO8WVFRItl+SlixGYxPv5p6A3EA9CJYp9cZfVaiuMHDZNhhkjQXe27yu6/Sv16r0FJl63ZVSlX7g/Ig1s8WOojFa5wDMnPE69vN37RL/Hm7cCJmn+OpYKZNkhbjoywTaMN+gJY= X-MS-TrafficTypeDiagnostic: HE1EUR02HT199: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6FZo459y6CONcmanyOke/RfnrhV7tQgt1M9gNlzDIhNRa7/MH2TVKk/vcOcgmCMzQauwv/Cqj8Xxi8DejXm3gMYQhuYeG4Gf4wCVMPTUIlF5Tfk4RcENpsvl5dd4hh473X4P14oXeMTVufEj2wu6Tz6eDf1OV+KVjDqZVA1pBjF6JH4SFk3MjpRiePgkmwOQ6f/ENafO2V70OjOoQ6yTLeYdEJXWx3m/LjJtat4nLzS59QWwJH1TUBwSe3F8p8jLNGZuRfYetXELwPZ+0gaFOlFVOjL746jZh1Dtmfwtjn3p3V5FhOGPkvPjrrfqpQYYyyB6Kbdhmt+s9SmJceLuVezwQdwpZZ13YdLsmW8r154hOKlt28KrGCO4paIPcyBkNPNo7vWepfTRuE9iHcxq0A== X-MS-Exchange-AntiSpam-MessageData: XMoxdWWpjbwdqqHUuJc/YIogjWsAd6d+3NH08mmRLWOrRdbRQqyqoFldwGW2qZe7dBGQYxbM6K5LcxEB7Vj0FogkVAHxRYKeFlntlxqE+NJwltXYY9t5Md3vxzdVvq5nP/5FnmW4/b8bcuYF1rWefg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b12cb21-33bb-456c-692e-08d91123f423 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:16.9683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT199 Subject: [FFmpeg-devel] [PATCH 13/20] avcodec/jpeg2000dec: Make decoder init-threadsafe 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: Ot0JOjQItw4P The JPEG-2000 decoder and encoder share common luts; the decoder initializes them once, guarded by a dedicated AVOnce, whereas the encoder initializes them always during init. This means that the decoder is not init-threadsafe; in fact there is a potential data race because these luts can be initialized while an active decoder/encoder is using them. Fix this and make the decoder init-threadsafe by making the initialization function guard initialization itself with a dedicated AVOnce. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000.c | 9 ++++++++- libavcodec/jpeg2000dec.c | 12 +++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 56d98c8a89..324908d833 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -30,6 +30,7 @@ #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "internal.h" #include "jpeg2000.h" @@ -157,7 +158,7 @@ static int getsgnctxno(int flag, uint8_t *xorbit) return ctxlbltab[hcontrib][vcontrib]; } -void av_cold ff_jpeg2000_init_tier1_luts(void) +static void av_cold jpeg2000_init_tier1_luts(void) { int i, j; for (i = 0; i < 256; i++) @@ -169,6 +170,12 @@ void av_cold ff_jpeg2000_init_tier1_luts(void) getsgnctxno(i + (j << 8), &ff_jpeg2000_xorbit_lut[i][j]); } +void av_cold ff_jpeg2000_init_tier1_luts(void) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + ff_thread_once(&init_static_once, jpeg2000_init_tier1_luts); +} + void ff_jpeg2000_set_significance(Jpeg2000T1Context *t1, int x, int y, int negative) { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 1295c96305..e62f7b19e6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -34,7 +34,6 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/thread.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" @@ -2473,18 +2472,12 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) return 0; } -static av_cold void jpeg2000_init_static_data(void) -{ - ff_jpeg2000_init_tier1_luts(); -} - static av_cold int jpeg2000_decode_init(AVCodecContext *avctx) { - static AVOnce init_static_once = AV_ONCE_INIT; Jpeg2000DecoderContext *s = avctx->priv_data; - ff_thread_once(&init_static_once, jpeg2000_init_static_data); ff_jpeg2000dsp_init(&s->dsp); + ff_jpeg2000_init_tier1_luts(); return 0; } @@ -2588,5 +2581,6 @@ const AVCodec ff_jpeg2000_decoder = { .decode = jpeg2000_decode_frame, .priv_class = &jpeg2000_class, .max_lowres = 5, - .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles) + .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles), + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Fri May 7 06:46:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273800iof; Thu, 6 May 2021 23:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwaKYV0bo1YUslzpcUmegCUUvFOdKl1tGHETmP/36lpkoRBWw1b0D5cs9jXBORfIFi2sk3 X-Received: by 2002:aa7:c789:: with SMTP id n9mr9696276eds.352.1620370122090; Thu, 06 May 2021 23:48:42 -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 v3si4103808edw.61.2021.05.06.23.48.41; Thu, 06 May 2021 23:48:42 -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=t1M5+UtK; 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 39145680946; Fri, 7 May 2021 09:47:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068081.outbound.protection.outlook.com [40.92.68.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BCA9680A25 for ; Fri, 7 May 2021 09:47:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l8vW2uUx+YT7PA/iZVfma6Sx4BSEdrBw3KSa5/KyFJClhGTCTh0mS9tOzg4Jv596coFgM48JQ919wdH1sUN8Hhy2nI8iGgX+z8ed7Velk+aO8nqBcGZWS/pGTNrYTiVWLaOLOtfp1YTMs29ErNqIciHlGIyl21C7Ud84vTqakjGEhBVN1Z6ZBDd2UvTz3IYY8f35EMGADxoxnwUsowKOlSF9o7vUVHRwxN7MaK4Ih2u/PJAM3AncXar5Pj/+fIVON0g90CLrxIolYci0TXDt0qiZqxhdTMEc4yamV7xP3HApNIbqKEg8qMSq8iBMmqKegeqOVEcZjjdoP7gH4MW46w== 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=Y4H91e6FoFAwXdT6pCJRf5qk012oqtyWB/cfpJo/mac=; b=H5V+ZjH6LuEXN/xiLRLV3u4SKhuQm3j+XSCwFLm9u7CJjyyNxYC8LNKBxqs+PFarPV7I5aiUW2sAKbd51BzS45stFIwf2dNqc5JrQrsaZxT9gMxZ0Ag5jZS/Q57ld0L+qq5RgdKt4L8NedGDGUDnuWzvegwunemsO7HAaaZAiAMWNHJkzR5F7PYTlrx0jIeXpjOwInPKWTOi5h8AR8u3ZIh9NHRCWbHrOIfH1OGoKR5biQ6ihhP1R9Xe/c6Z6hZk2zogOwyhzUJF5MakKcmaiWy3M1iHMNOh67Qt1E4M3Xo2lhUlipzkQc71ELPfkr1Pu2he4fBenQDXEFN5guSSWg== 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=Y4H91e6FoFAwXdT6pCJRf5qk012oqtyWB/cfpJo/mac=; b=t1M5+UtKvl3VcU8+4ULD1WsPDItaMMHR0tgkEf6aRDHxYbnjACZx7fqLtG9DBTYmNSTQbs2XwWth0jZoad+Mll7bbHSxw9ZikIdlgMGQ6XmxwRZA+vjvYLbfCKwRytPKm0BG1uwy3uhPAGMwI7gUmMSeo5PaF4RJ6lYDOt7mpsAc7ii5iuBfunhSI/W9YC5AedMka7N+kS0LlfbsBLOjSr7Te5LfrqbpIFocwffUwHf7q+68ofY0pJqqItCAdKF6asMWpMFk6aGyk1IpSrc3u/wxRpoojH6OubpSv2c0wrOmHhOzSVSYYawxM/JeMN4wN6hi4O6py2vg897U/ZQs6A== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT088.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::407) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:18 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:18 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1E9BE6C7F86C5EDEED194EFBC67362381CAD7FB178533A64A15464A4E8ED1D98; UpperCasedChecksum:4560A97D7F7F37D9583CEDC92A70AF2BA0B978EC20699B21C9DDADC8FA7CD9A1; SizeAsReceived:7600; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:41 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nsTQTIYCwH7qmDyKv81I71wNl3AcZWonDryCzrfJw/w=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:17 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3f23f433-25f5-42c6-380f-08d91123f4be X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHcaioXj2CBaPu7JLJyotgC+Qsgk5iLv+k8U/Bpm2YEbGA2QE7JVxYygUODajTA3Kv0sjLLA2sjoWskwBTvY9bO8it2xADoEPkYJiAhvztVR5WBHolWZEUQZyDtGKPXSJcOMj1Dh5oJ1XZhPG5zXguA/d0dLL3NjKu7S+gTg3N3STTz58WGcM8NVqU8haan3S2oiAQMRGQjFvMZ2TYDHStMzkOc8da953mObi1nemJVzf6i1zAJJ/aU6SvY99TlRWb8lAWGEXHydZSjEm8k9trlK3chqZgfkv+mkOqck488S9ciewhary9Ku7kg5zkXBWtMtzjnLOB/ecygs6Too7wDW5RGeMOGVqDMLZVYGauVTfW2PFeijwaR8QDjo7vcLFR+RlXgTnOuQXfwoDdhpY9+4t+a9oILHJioqZTo+46g9q2pcWa7MsNRlb2cEYr2+xzSE7X9vVzUIvvH9q5i95f/W3+2pHOPPzgHnJXX266x0JyVuVkQpyOX7jzncV+AMSXxz3kPlhP1whaI4p6EN4VBdGEGIsWRapczZaqdOv341F6E3kO0CUkMDdipfjfwtoJT5iisGyeO1XFELAiGzy/Td4GpVyMvjdxBiOKoJMm3vlLPLieKSa1BA/GVXIiagSUzHdXtG4evgaJpLdaA+Ohrg409fONDRgagNkhPfxWApr6mMfrIPM0Pen9JzQ6gTVTENQN9NZ3dsM= X-MS-TrafficTypeDiagnostic: HE1EUR02HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JmTxA7aQpn0vqoMIuArBtZpoL98FSAgRy9PDp7uciBQfwUR1pi+5fcI4Il/Othoek7wZJYv7N2zu8gIUfeXojga4p/Pv38DGAQ4IDGx/6X1zjj6GI4vIMdO6SNhJ9wF2ydEwgaqVjNoCANEhJRZTiU1340O1vB1EFTDmvqE6hchok9hdlLpcWyqa1reYF1CHUCF72M2GsR57Q3gzki3R3FhVBwDw2cg5GglQNzGNDr+x/EGv3kQBHGoiy+WBT1ff3vV/vGyYVIUv0U6xz1JvFlSZ1PAZeEqUK624EIIIAQOfQ/zpHXqIGJKAYMIHq+19HjKwoAqAkgP4SxmVfqHVWfGdl4pORl1wdBqwd622l5nI8cQEHYPfjat5fyI7H+Q/jRWNsl0cL7jQJ1RxOpXL6Q== X-MS-Exchange-AntiSpam-MessageData: NmoCgFiUF7pXXoBVxiTiSEIPUgG7R9ArKwRwE9WO+Nz/H/vp2P6N3eoqnhTQmsYq+cJpZxF4yRCpXOaT1yRwVJkbFIS3wtUxycq7KrRjHirE9FqECiIiK0xCV/+tqdQBZUjHtOUuHFtgOG2ZUqAJFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f23f433-25f5-42c6-380f-08d91123f4be X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:17.9569 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT088 Subject: [FFmpeg-devel] [PATCH 14/20] avcodec/j2kenc: Make encoder init-threadsafe 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: FM/w4IJW2XbJ Signed-off-by: Andreas Rheinhardt --- libavcodec/j2kenc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 17eb959d73..82ad3284b5 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -74,6 +74,7 @@ #include "libavutil/opt.h" #include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" +#include "libavutil/thread.h" #define NMSEDEC_BITS 7 #define NMSEDEC_FRACBITS (NMSEDEC_BITS-1) @@ -591,6 +592,7 @@ static void init_luts(void) lut_nmsedec_ref0[i] = FFMAX(((i * i - (i << NMSEDEC_BITS) + (1 << 2 * NMSEDEC_FRACBITS) + (1 << (NMSEDEC_FRACBITS - 1))) & mask) << 1, 0); } + ff_jpeg2000_init_tier1_luts(); } /* tier-1 routines */ @@ -1713,6 +1715,7 @@ static int parse_layer_rates(Jpeg2000EncoderContext *s) static av_cold int j2kenc_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; int i, ret; Jpeg2000EncoderContext *s = avctx->priv_data; Jpeg2000CodingStyle *codsty = &s->codsty; @@ -1779,8 +1782,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) return ret; } - ff_jpeg2000_init_tier1_luts(); - init_luts(); + ff_thread_once(&init_static_once, init_luts); init_quantization(s); if ((ret=init_tiles(s)) < 0) @@ -1849,5 +1851,5 @@ const AVCodec ff_jpeg2000_encoder = { AV_PIX_FMT_NONE }, .priv_class = &j2k_class, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Fri May 7 06:46:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27661 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp130961yba; Thu, 6 May 2021 23:49:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2qg7NKvtTJfiaQBy4LBfH8RPyf0fzToRAMQGm2UMnUzAu9VnUarYX/22hwFzI2cNzOGis X-Received: by 2002:aa7:d7c7:: with SMTP id e7mr9271610eds.132.1620370150060; Thu, 06 May 2021 23:49:10 -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 b17si4326102ejp.314.2021.05.06.23.49.09; Thu, 06 May 2021 23:49:10 -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=eqANK0Um; 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 107F1680AEC; Fri, 7 May 2021 09:47:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069042.outbound.protection.outlook.com [40.92.69.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8E56680B68 for ; Fri, 7 May 2021 09:47:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gtvqKLsPKo+DM9mzm85PYIrzQQgCcf79YCP1K9Xt4orMANFmWseNYmDST7sY+gjB/dLbSzPGsm8P81Zn8gwN06iOYIu7bNEZWolFlEl0IV0EzdHVBe82m87Ey9YzNT3g4vWJ70zXtjPrdAJXnPhluebk0FoYptaqZEf+Neq1cMEGehC526LWdMmIKdr5ko9mlfxnv3vF3DUr251KGCwOStrhzI6X5GZugC0/3fKn4VcfRm7aT7aDyl12C7P3jdALKvF94TJAIE7VUukNvlZWg+pZQMl549FDUo8XF5cFbNnzvru80fEh3RIffi4Pb2Qg4D0Pk+tFxzYeOnuGn/Ykkw== 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=naMz2P++VVdIuV3atbItNeNgCf1XfV3ZUHg5f+7u/dM=; b=NAlSA01bzYqrg+wSejRxj7NfUtIQI4HFzG6QbUr4wFPuQ8a1SDNC6sPJeVqMBXS+s4ljVcG+qXdQIooQ3cCJR/rOjVgA1zRcdhy1cYC+DKPyAHtTHmtb8SMjVYbYJiv+e3E7TgLdn5xD/JILqicNkceqPb68SB3IuR2TRoycfTsmliAZsUjrIjDju+DLnYt5cxtx7UJgcjWmKHlWunDbjp/pxG2FFUnbjnee+k/oQGmxoNXiDDEmQVPNrVy25GgReu63ngM4nvADIPgudl5M8nThk1ItND7gg5BiFRUARI+z6rboWayNxw4Qgb1tZrz5EbGFmvaqLlbGE0N/rQyA0Q== 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=naMz2P++VVdIuV3atbItNeNgCf1XfV3ZUHg5f+7u/dM=; b=eqANK0UmpgbdBEr7kNPThUlfLOPjxFQ/tIvHVYa/W+K3JDF/w2gnla6MwRGl8j8O7fVLMSAl06iqdafysUCp2FjNertgd18xrN6gReT12HeeHvo0fjPzNK3Ib60DCPCDPwvm61E3tkFLR9o80mBM2n99poftDg0yU90dLsbI36I79DuNzgyFlBKQP51e/2bFRVr/+kOqoSYNzBnjIiXLOcDvAXd6mb8Krz0Mgyc1nso2s7WzZa9s90y90MaYJdIWmIo5lSsQuy9qiZdw8uCtkxmHPjJgN/3CoqQExUTZ3hZb1fJpFxobBTp2flNTbmtv04OOqWvXWsFC1t6U/+3fkQ== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT088.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::407) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:19 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:19 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2EC5019A0B16CE6CFB06083B65E791BA7410716C6F823D83086EC1C61C6B4FDF; UpperCasedChecksum:4900DBE69E59AFBD4FC05F0471109475B52AACEF72F99DD967748971648CF8AA; SizeAsReceived:7600; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:42 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [fzUL6tLVkGoTZdYL63+U+2gLw8qKGpbKBuHQpbMKlvA=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: aca277df-3507-4a88-f544-08d91123f560 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPFVqe1lkkH7/R0jW6xiEXRaa+YaItCoISp8yze5scUcKOMf8Qyj7ZJwSuVQP2YQpAVq3rkby0eTCr3cx5s23DDhT3jWF8p0aX0PYjfXrHkGEGuYzIK1VB3xUTE0jhdT9IcOSGWxYuy1RDJ0AIk73ESaGoMDkp1nAe8n9QSQlF0AHhKNnwi3g6LT1KrB/bE+qkQJaviStznVinnGkFqLMYTACKRyv9L1PwOTUqGTZmEWboavhWBIemWYvP5U5p9/MSWFk9d0zWfNKF02hDnP+MY3P0PgyrCMilsXBbcDlkwbLwAnILpm5KvlSfn+JNpgAu9RcbMUdM/lfUpdq4Hf0dP+RyNulQYsmcYgRohS+SvhVzIu0HkqSfaZgjVf9JEPmotIZnvNYiK6B9Nd5BMV6CydEvEof9wZbx9jCHw1EEY7UIbiVVhYvWXe7MF4NBltZKrzAJxydQV8njsBZg4PBgTpAL/wo7sPmHPlyKzW/xuy0QivvM1UeLnub0W+7PbhNelu6Cyh/kFhW5+eOLsMZlGi9Cdc/9W6EMKOxeqrHAE35wVpcKE5THKtT5sIsyWxrOaHxg8e6gtGVDwYllL7CTnNfw2W7Lt5NGvEJeK1leQ1Gt9eeYaq7SIghusdRlrnCHhsqV3PnknoCYEKzvr0rA/GXSSj9fU5jzScmkFFw5MIVYiQLwGq9hYfg== X-MS-TrafficTypeDiagnostic: HE1EUR02HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Re8jB2aefTnyUl2notoMphQ9QcW7mdrl9Q46guxgPcA3kEBAFwqVCJCOzNnxQzAPhy1GfQQbxSPydOPfZBxlSa3RxAQj0fy9pqil6ZD5u/rsjfnQHwgVd2M+ma94ukAM6eBF3nt59h0LcIC5kqN4GkUdpk2rIQnjWYEO0beeflEBnue9n4xpbDeD2NQwrkU+n9yRKPZIAPQy+M7dgr4Sdmxa4eaf01/+KRfhXkEjiX5J/DYrnTGfXnocH/Q0DmUnfsx9uo0VWNr8RR2gHbJuXUNgebplGC5k+yGZzFe0HNaSQO1WDxwzl3qU+wpeu9Q6wN03qJ2dZA6L7TON3CR9VTtFG1xSLfOGIIxRYcTcoRsBSk4nU08g0oKtyr90Jo9MAbFx5uYy8rHwnRcG2vbn/w== X-MS-Exchange-AntiSpam-MessageData: Bh9oiETB/1oRJnsoelQjsTX67h12kU7e0rfam3VQVVbG0XYu4gQAIOcQXNBBSMeJtAI2CHWDY0CFrmNk20iC/JmpK5OWkpwZ6ZywyKa1V5HmnGTIoi2jJ+GMT/z/mKxDRroXcpbQUob+wOZ1bv6JvA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aca277df-3507-4a88-f544-08d91123f560 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:19.1214 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT088 Subject: [FFmpeg-devel] [PATCH 15/20] avcodec/webp: Mark decoder as init-threadsafe 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: 3pARCUZEJerh Content-Length: 794 Signed-off-by: Andreas Rheinhardt --- libavcodec/webp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 23558309c6..83371ef6fd 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1560,4 +1560,5 @@ const AVCodec ff_webp_decoder = { .decode = webp_decode_frame, .close = webp_decode_close, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Fri May 7 06:46:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27664 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp131027yba; Thu, 6 May 2021 23:49:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIK8bHVeCa0UWJWxaBaDU0NkC89Cpf7iHVrXDD9lb8QJd51TeqKRC3TqMhaCx0p1sashqz X-Received: by 2002:a17:906:c788:: with SMTP id cw8mr8255699ejb.190.1620370156106; Thu, 06 May 2021 23:49:16 -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 b15si4141323ejj.522.2021.05.06.23.49.15; Thu, 06 May 2021 23:49:16 -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=LZ65a3xQ; 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 8FBC0680CE9; Fri, 7 May 2021 09:47:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069065.outbound.protection.outlook.com [40.92.69.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E4FE680B74 for ; Fri, 7 May 2021 09:47:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iaekQ5zfaXABnXC+Xwp36NW5Dnaj3cwX/oOIJE5kyu4GWl5/GHtZ5drmqyRurkvjsrqoxqY31QVgIlwgAcdhgDdj4qs8gTqZ/hv7V38SPzKK5KlWK0lye9PTijkr3c1/Tn3xOtKdPUiWgYMdJApW6IbA35427ZLZzP1t1k+LVxnvt9fORdejOsjCUFiN7JOWWZ28xIAhvfluS0prlYGirIkxW/4TxrFFjgMdUazQN5sxT1Oog0iMAnaqsH9AmrYyA9XtpZCPrPsDWS8Ugf1Lo8sBRplJtbZbFs+y9HfRJ8lB0ClzjgoDqatYtbmYfp851rNXBpiNPwmTMtP1TzulRg== 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=PBVXG5ZV8q9AHUlA9T7XWh7Fb/gcLFw9oql3Aj2BvMw=; b=cUmxyDlmt/+XJoeFnS9yLFJ1y873a/CPP7/IuRFr+A1+BvbrVDkL+IeKt17EYIXmQaCRL11Dl3gxlbRT3IfUTzxRWYEmmMNasERnK1EjQBqPOeW3QfFEDvrA0mIAsfwj9lXN8KCu5mUrNqk5R7jWphTHhSMC71TJOlxK6Tg6+hLbpWfclnw9fCix2Gx4J7Ib1zWqRu2FsLRVWDUMcKCOInCJ5r1Wk209QA0YlG08TRE44IjFgpdu4NhBPB2RKtYvGPFg9t1IDhFPwE07FZprSnQ1jtD9ghMRXnwEZo8+yYueNywfTMD1jeiH+IhpUbUswBr4XpLTfM2nDJ+jWpijIA== 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=PBVXG5ZV8q9AHUlA9T7XWh7Fb/gcLFw9oql3Aj2BvMw=; b=LZ65a3xQVzTV3U7dSZTzduIDm9ixYk/8e1SAClKO8iAM05qi6ttEG93z3fX4IEZlCf3chrIIK7/fCnm1/8QFeJiHbigdVoPLDyAD+IoO2zu4m78Vha3EkMa5XQMUkZ5jInHn2kWReZLWIS2aiEgUEh2IxFEFwgRj03iTsrIykUa2GT4hkbH8bxEk1jbtcmKoSxhm07Ja0hbc1cL2d3His5hKlh+RjpC9G1V4AtIlwEWg9mNEF0IVP15d86CusrCF399WRY9uUFRDVo/b09ehqRjeH/NgG1JvDnerGfJJ3mXX8x3TDitT9j5nVAGLg8yQcElfR0vKOkdtsSCJvlcX9Q== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::4b) by HE1EUR02HT153.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::403) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:20 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CA58242EB1C2045275745542FB9A134E39A0DD3D830D63927A88B517D280564C; UpperCasedChecksum:439D6C3B2C6876E5707763885DEE04F08058699531099D396C3A6BD6B40ACA4D; SizeAsReceived:7591; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:43 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [1YDWZHq7rKgwwiz8RYTpL3Av7a7CMyrt9N8K2ZiXQsk=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:19 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 367c1661-7b9f-4a96-c4cb-08d91123f5e9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHXbyiBSGCnlTTNQza89SVOoZiPDiTc8y78jrrtxVjaLoL3Pq+Z5RIHLLSrnyQkmeIIs2Fa1iRqq8vZ2TfhL33nzDyJaZV8qFRFd+P2DQIPcFRH5SbCnzHkemzRPKDzz6kJdP9cmRfYgBxng85CIAO+4a4JvWQaptQl3h8x6ox3ee9G8UZlsuNpCmPnvtTcBdwnJ6SnaJ3zss/JWHQLN8gcxkYhKdoh9X4q5biH7Jc1aXMPK8H4IgMLMrES1cHrP75hX04sLHE6eTqGfqZ8E84Cipy3OF0j0o3TaezJBPgS5vESn8iPtR8QOzDSfmZS9ndeiwd5vprfEtFFjhcZlpWavZbqC5VDBdzkTDWt3FNKaZdieNGwMe8z0c/bA3qjroSglrqXSrjLycWwWlyvlHy/2BVRUjMNfIgDBRBXZ2X8Mif0UaNh8ucQIlOUeZlJ6RDblml1mO7gl2pbtyLEE/dyW8QFOKI/yVkr3SC4sO4wkbQjZxlUyfFr4OXbyxgySIVlWPSXdt0JniqZMbNHhl2j7BJs0u6wE+cAr32JYUVHjOhoObQKmuJ2GJRvQCqdzBVc9/E/G8OG72wnSkZaR8nCVboN7lY4wTeO/2+Duz2C+ImZ14PyfCkWebtwK4P3yIZ/yPGGIRxLsgzzgsVmP524TcOE8rjhXTkuSxrJqrNE46q2eC/7k5YijE7yLrj560VO0GK4ES2vgw= X-MS-TrafficTypeDiagnostic: HE1EUR02HT153: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6wXumBCYx+hkRgw8ZjVa+6+3jjH+nsb34ZDXxD2aJMMFLbMtH6lCFSx4tBtXlU0owjKO+l56tnlJxQ4DmBiq1GxkGmOW8sPlF+7AhPeP8w/WD2c/jG2uG+qtJsXnVfNap7B9/OQbQwTXLqumlcsCTKGH8d5Of8wevR8+tpx5XHdljx2iK5B3guQx4BO6fbddagJDeK6zjqF4jepdjtNmca7KebDoWQscQC54V5psK7sPO84yQR51O6BtkPB9kPHqLdhA+n8ROCd04ObEfEbBrLw36YsPzqv97lxHGH6HUSHCpXZ8tzQrH8oi0JkLwikNrdw0nyYK/DS5V6c0/V4yrwMwLG+V+rNSGReE4zNV4Y51fUuNigv0zG4w7m3rYc1nSVtuDQv10Vt6BJq1LYm/3w== X-MS-Exchange-AntiSpam-MessageData: ewlXxUhvy3C31XIx+B+kpJKJZJs4KbF6rM8h0kNvZvNIU+DTBdYjUUah/8WyPwdbG0xbYAnT4zLbq2jNecWmymJE4tbGm5okd9+XtQcBG9rZKyvb0k4EppPOFA08v0A9f8kFbXoOwyuGkgnptt3zKA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 367c1661-7b9f-4a96-c4cb-08d91123f5e9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:19.9930 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT153 Subject: [FFmpeg-devel] [PATCH 16/20] avcodec/nuv: Mark decoder as init-threadsafe 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: /T2CFagZzskc Content-Length: 839 Signed-off-by: Andreas Rheinhardt --- libavcodec/nuv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 3ba12fd8e6..089ce68338 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -372,5 +372,5 @@ const AVCodec ff_nuv_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Fri May 7 06:46:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27665 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp131089yba; Thu, 6 May 2021 23:49:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzosXCecknA93M7dUeB7ShQzn4yxZV+8HwAZXMhy/goihio1N6IeKCWlNltt6K3hx5HYBt1 X-Received: by 2002:a17:906:4a42:: with SMTP id a2mr8411399ejv.343.1620370165096; Thu, 06 May 2021 23:49:25 -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 c5si4217040eds.128.2021.05.06.23.49.24; Thu, 06 May 2021 23:49:25 -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=G0aAAE+J; 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 A7707680CF3; Fri, 7 May 2021 09:47:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069067.outbound.protection.outlook.com [40.92.69.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 067D5680BD5 for ; Fri, 7 May 2021 09:47:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=of6nGenJSlb3HbafE15h30z7Db+2fsW6z9q8fJVBrQunBlELEJFJi6WPpKMRTGT1/4ZBeuPiAZgKmJRv+EiLL0byGhVy/PY/AuO96dy2ULfPYVKnMST8iOgLKf8liVGjSNNztSYOKuAyVSj983sG5+H0ucd9b4c5HRhleY3ah7i9Tn3omZA/S1tgUIRNjCUV4zHspz0KL/ll/+2ZGPH2nH4J79EJWo1tTK0Hh9qrI2yuLyIN4E/7bCdVMbRNsJUNUKjmBfNSWHgCjLjBPf5rVR0Jt8UXIPOYNS5uKQdNxyUvy9YiubHZ307mFna+CWLdl5fpwH80wp1wPMk6lD48DQ== 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=toZihA6ATbUL7gz78kQg8inlHAkvyjVgLP9VYq9qpmw=; b=ia3FycXJ8oH47UVKlXtOBlXtV0JXW5CNdzCnXAW5XKEzG5sWKIX7uyeqitgSxi8Nb2Cog0a6jbtVsdEdWjoVlEyjWSlvD8KuOSzNL14AkQQUKGOuBZdkE88YBx5/uHeMHGsZ1UufBVgSIrPebOILTpBzNKwalIpnYBsrd20e6f+sL70wqxqTVJEpCu4i5ggOpv7qj1nEo3HR1fxetSQNDViotLWpMydkFfB8MeWlwn3MTHixQZnoghyLZMDM6zL2ro3jIyJQ5WMbht8NDnbuu2wkXdUK0wk6CZyBlMk0feMs5rt2wg05kl5Ru7PYD8Bo/vHTg7bSdkobNM/pm6B0rA== 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=toZihA6ATbUL7gz78kQg8inlHAkvyjVgLP9VYq9qpmw=; b=G0aAAE+JeN6njxZEPETPCiBmtNUcen8uCSlX7Ya5l90cWmWyOekW7fXWr5mEUgw9uEqOVi0Je4RZAC0o4oQabBc9FK8MGaJwA+rXs+jEXyfqLiu/xkQmubPkjKVGy4PdG+e52ZuMZkX9g36xbRSVWF/RRDfyJ4LiGqpMFyB8uYLUisVX3OTdBgQLJRJmBOwtu5pbOSbRFNtNBfU1+uaPIUG3lmYdBMPAQWVONOARFDK1ZG0MiqNz/FrjMU5pXhEwMIZx/X1C1kTFFmRDsca0SM/X4n8C50wTBPXfP9/qRqqcPcF2M4j5RCx7udCPlE7PB7yQy07zJiITtsV/II7RMA== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::50) by HE1EUR02HT212.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::292) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:20 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1146AAE4A56A38DEFC1A9EE149D0ADF78F02C7041F42F21068309EF8ECE2CD87; UpperCasedChecksum:52E4A4331A7B29CF63148891F2734EE3106A7C6A6FEA0B4F5EDFAF6F4E075098; SizeAsReceived:7606; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:44 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [j/+UzCPfaoC3ZwMmSQTQd0YS4xyJwfh5YiW0zanU7xY=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4927b1fa-44de-48d3-3958-08d91123f66f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoVb1eIH22myR5x6EykK69ryaevkU/Llj31hZFi59uykIiqmb8Gfd4OkCKM7YLwNpTbOAHH5GVnnbNLwdMYGlfEjA+JweROwQf37mST9rLlfLUT3K/ayNiRhm1OZB75moN41tazKljiIT6w6kPSdMSGL6CSi/zXMth7C8Y6FQZYFo84PlfxoLGW/WEdIKRm5b15qJLus1LfQMp7cKVbQsK1O2AKxBP+G0EqpRKMfob5hd+ijo1vWG2eFvrRue38JnhAhMz3GAp6E7xFIjlQYbP6J0YfLSgwD3ePi2au0SAxMt3+HQ59sccStqa04mlLIgfK33UbQBKmKdVnDDrvrY98AXbNDQu962UX02g02WLBDDjYdklU8he8X/9Wn7j6i91gsyB+hxqJjDFG1QIKYWxEHdNnugiVhj3QleQS+tJqgFdbPN178yUDMgqJzo45QPdZBNYziC8KZtH2gWn0kj11uOPEGCyzhssgl6QrN3+B/ZT5Zv5kKroHZ3r2xP5AAcaplTbJLTb9NRMnl/RJdrFHfwpfMXdnHdv0rvmQQPuk4n5syoLsie5fVOXRky31c5ledxsbudbR99Q2SGLnhRIDGL4pg5HGXQYQgZf+5EMMnFSSTVUxn/Pef1GPcsHmOTP6u1QIVbRF9Tiob7rlqr2q8JAOh/InKx4l1pEjiFeZTAP+nXlYuqjjs6Bq7/jlPSMDGOqve/h2JcwEBoL9NVZ84s2D/36a1FY7vgQxyuRpYJPYvcgFE+YFg= X-MS-TrafficTypeDiagnostic: HE1EUR02HT212: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lzW5Q+Xv4U6vxSibeHhf8pnGT4/daH/+pBEMWcxxlr2U9vLijAyPZbNAc1MEsHBa2PEXTlBgF9ORC3BDoYuGksMxyefNuCcaKksiiuaFd10wtwI+/nNStzcbUzKaHH5108lF6YHidXb6bJw+cr328f46wddC+mfQ/0uyOq9B7Xy/uCSJ8jqImNx2CxJyOwgzNFeG/t9wPau3NzC0qIayD+hXHP/csPNBYaFTvHSEck5z+JAp5GFaQiJU2bPFjYjqx385rTm/NhBf5gSMTFXo0rCKozKQD65du7pOfc79SGHCtL6K3Lb0wzslKx9DxosTQeSRL8c609yfslEDMUFN8OJ0QYU07GYSEpSUoKQwbP1Jr/HQNf90RKBVFX25iVXU5kDEQuDB1Veo+2YAmRYeDQ== X-MS-Exchange-AntiSpam-MessageData: d0HPDPQHkMmQOegoQ5855mf/vicn1BTjef65yIAerDrk3qDMD1c7vnauNcryxpqd3dOM6XWpluf9Q/x3+IsJRNccpLcxYD9eR1v995eKB1Cc8ibYg2Emeo4VkcVc5f+hAd6Uy3uaqcq926n1YmRqiQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4927b1fa-44de-48d3-3958-08d91123f66f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:20.8466 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT212 Subject: [FFmpeg-devel] [PATCH 17/20] avcodec/twinvqdec: Mark decoder as init-threadsafe 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: aruDvz3dfR7c Content-Length: 886 Signed-off-by: Andreas Rheinhardt --- libavcodec/twinvqdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index b972facfdd..1fbe0bc32e 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -426,4 +426,5 @@ const AVCodec ff_twinvq_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Fri May 7 06:46:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27658 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp131163yba; Thu, 6 May 2021 23:49:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzT3taIdu7Z8pEq67YnnlnzlJnIewE/1Fos0Vi4MEBYY0vseltakUYfJ10OkKI8ex2DD2Up X-Received: by 2002:a17:906:c0d6:: with SMTP id bn22mr8459819ejb.267.1620370174884; Thu, 06 May 2021 23:49:34 -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 a5si4013731ejj.325.2021.05.06.23.49.34; Thu, 06 May 2021 23:49:34 -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="Leap/133"; 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 8D707681871; Fri, 7 May 2021 09:47:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068106.outbound.protection.outlook.com [40.92.68.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8A6E680946 for ; Fri, 7 May 2021 09:47:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ja9cPjRemhoUDJKsJ/TZESs1F0FmhkPXvp7ODs83E09HIjR5p6cS6KbuIai4D6M/psYb99r/hLsTimtssbhIRMFuPu2w0nn1cH+ISvLgcU9EnDqsJOq3l3LDLgdoTqch9CdA2zsXX4MZEMc0DrSq3XWYHoKbbq7pkC7yz/lPh/52K48aV2B/QkJkZyfnDm2i1Axyg2VC/u39DvxdXNKmWhMVIzI21qybdckPABfgvkzpqfSO34nCn7zB8ocMnQw+WtLAXRL1xLR7v5yQjj/1lh/2EK9LnNwrCJqUwSR38rWaZ33f7mvbSy2qP87v1br0oQRd7+JPZ5MttyprEl0WPg== 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=q538VTCKwp6x/9+StKXJJRcQM+UsYRH2m9sNVhvunk4=; b=YDbu3jASFVyJyDgU/OETAQFB1aFjfOwDGOKkvUg0SuAcmEoEcize182U57gYMqyfgyJB/tbiXkMxHHaDexYlnZuxDOZN+7eQJIFVTFqYVKMUZ0qqhE2Ejg1HqNJ3VWC0++F+91eqWQaIyBHPLuNuwSJvr7DH9+L3B2TKhZQkrvUNG5OGprXls/O6EJqeoHPSYe8sTd/dEnVOk37XlqSK/etB6np0+9AX7r4ilLLFSCZtW0/4Fo0ueVR1gAvJ4cX5yz0p++T5vscwFuScooYONabrHL+zalKEtYUe6dlNqBQ9ebuVYe9/YUW+R0D0Xs8l9Gxzm3Czfy8R8kVPLoGPag== 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=q538VTCKwp6x/9+StKXJJRcQM+UsYRH2m9sNVhvunk4=; b=Leap/133i5tpF+4Ec2co0xGF/V4ZaJ9iU0Iztc6J9CNyXDHlp2+13NOdQ5T6NUIbCy8KYn8DKPzdNTTD3U0jRuY67/wVYzHceix4WI3fdoR3jrgpx4iJx2GRemHfWOhsBUaHQYO/dwwCM7SAFVO6gpqe+1xNJ6CKwrLHEfmlmxGIoRle3u82IGqHLRb0Z0hcDQ2IG9jrBeSiMU08lF7gVA5os6xVyVHEqq0j6ogO7AkeujxToBWvjFzxxFT8EAksRBHSkEsGVv1YsyJ3Ovna0ScepPq15MK1Afw0rPCoioWh61AJ1P5bBVIJptAnEta6JMjZWHPDSA9oTKUD3FEl1Q== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::4e) by HE1EUR02HT079.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::371) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:22 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:22 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B603359A990FBBB873BB9E347BB2707BBEBCAA135132D9A81FEF3133B588B5E3; UpperCasedChecksum:34225A0713CA0BD5AECF4D5F3DB019C17F6F99B55B66050481A28EF447C4B0CB; SizeAsReceived:7593; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:45 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [S/W1VEIbd90MrGwFRtugfkYGjSOPKPbX] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:21 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8ab0f9e0-6470-46e2-1586-08d91123f777 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcgwWwb6KluLHj4WOo5z35Eb+tSc3XG2TL5QbenmIZkC2f2hh8tncU21P1kHEuCPmxiOoCFDu3UAdUyrLQMchcGetP9NlvOmEjxLTPxpHOuJOOWmTCd79zfalgCz1baIalE3SInCKWAsf1LW2XrGnx0SeuPE8GG0drOqUeJKa0kq4t8UoVZLziW46mX31neGACxUJhFj9mxCCMALhNAd9AisFclQiP5Gw+S82G+gTIzkcBSF9qpcDPnRpImv9034i98FyrcmYLoKeso17z5mHxgsZUIrjERiXgMyoQ3Q7AZWfErOQ39PBlWbbJtXnU93TCN8IemnUoDsY/EiGAlbtMmS2/nQP9OkNIqiI6UqKwSIl8OsAcwi12xfNc504lgdNjZlyILogcwQsTdwIzGqR9w+ixwVVIkBR3IK2UHdd6amRRbmjqH8DFNj+qOEZcEk8CdNCCdrLzyabo3dV00IckPP3Wroa4oM+Rp67rjm6gXdME+8j2OgzHAGklEOON6Tcl3HstpaHAo8G5Dm5Ch9Hfd90VQ1LF+sBEqkCaXwCCP82SkSIkUaDOLkxNqToohkKTptrzqUzqW/kcBmeklKXN3EpOa5/pmnay0A5SQ6e5xDN33/xstZEV5iMKQe55weKOHANhTaStVIpJGeR4lGBfi0CubYxpJhr8s5tjGhvEJaejujSw+EleOpT1Ox7diG2Biqqkt5zjrAseQFb7WdvZW4= X-MS-TrafficTypeDiagnostic: HE1EUR02HT079: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wg2lHgO6GAb400CogWhTTWW+XyoXDaDGytOs/CrW6225OXNGLECABeebkZ1rPGfiFcLoHqm9zRcpVM5Shndcrg8Z0FfDF9UxDpWMI8f7kwCwMmq6GmGSlDjB4xiagMv1OIp1kJJWpAOCWFi6IRNybznKA1cL70o1q/L7jTM+FdXg1u3aB1E1XyLGODBwvvoCDLzit4IjpG0g3+upeXoNouLn8r+YU4hW2Y9SohvKe1x1XBz9yQ2igCUwB0hTIgg6rxDBfGq5SYqA7dWLTV10n2vsl/F44q4G8FwgXUUCOrD+GLgI3WoiZ2OFmJ6+JUmr4mfHh6b5lYJ4BMUCO56G0StDWi1+OQpwFtloZ0fsoAbBgJmTDeebvJKh1CRgSo4s+4Ob7qrFVSb4nHpFQ2RKFw== X-MS-Exchange-AntiSpam-MessageData: tOMWWE3lYiNkP5goyDoXYyreLYT0Kxd17KQJUZ1AdBRkKifrLCZldkB0uFUGcnurnzsCWUkpHbSZHm7GkoewqvE9AssPj0QkNcGkph5u9zM3js3zG0i/zuiW4+bk/AFDk7hm+rzlNJiQqfsbfstZtw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab0f9e0-6470-46e2-1586-08d91123f777 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:22.5508 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT079 Subject: [FFmpeg-devel] [PATCH 18/20] avcodec/metasound: Mark decoder as init-threadsafe 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: jrtz6ZMcQ3uU Content-Length: 889 Signed-off-by: Andreas Rheinhardt --- libavcodec/metasound.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index be47510d7a..57851a43c5 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -382,4 +382,5 @@ const AVCodec ff_metasound_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Fri May 7 06:46:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27668 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp131233yba; Thu, 6 May 2021 23:49:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW/pxbRFEcTVetFNm3fUKe/zNOxqWqhR0kxKEwK3Vz3cm9ocMT34CqhHvQNR0X1HpCPlDc X-Received: by 2002:aa7:db0c:: with SMTP id t12mr9455115eds.72.1620370185093; Thu, 06 May 2021 23:49:45 -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 r19si4339284ejz.474.2021.05.06.23.49.44; Thu, 06 May 2021 23:49:45 -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=ogEuyCLR; 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 75962687EBB; Fri, 7 May 2021 09:47:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069063.outbound.protection.outlook.com [40.92.69.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E4F4680C3F for ; Fri, 7 May 2021 09:47:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K6OE5ChmsUXTf+HQZ4wCIC1pKR6yZBAqCXewiopoRsOm+0G7s4w8a2pvNvU0AGG90e8wOM/zBuRhylc4a/T/FyHFx3RVaJxPBJiK+6HN12YWJd1paIw5+rF4iSYP10hO0HAIVzXepPiLISdkSW5S39h0Ve3Guuxi3QWJchdqVN5Cd9/jq6RIqh6cFEkmQrjgGfE2PCmpAHW7qpEP+rVfHVBQkEGoq32nO+EKszPd5AoID3mcHstTa19Wa3YXQgoKnZLTjpBvldwU4GveV2pxX0E2LC+VsG9y4QvX3m/0ZURosgJFlwCMHWEdI6o1hljiRT8+nWshX4R31PB+erG3pA== 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=JJZyYM/GDzExA4dUcKGIT7txDjvd7UAGGRasFOr5nro=; b=nG12j4peM3bfQ5mqQcBs8ZOW/IeecpIBSy6iGTRQ/8kQyPwlWS4M42pqmfACDa4Cy9Yk+Uxb6cipNCQOs4jpwsRlZIMqMkzAazHL8FhL6DA3+WoPQXS3VyfXnpTYAfUdt23kDqzr0sH2qtNUfxnM6nzLupaKzPGQ3XTILFx/D80AqNNc7bbl/RrqbDijivkVgbtOdjgMOc4d3JKwoSsFwBDRM1RWvLzkVua0gX47NPk2mn2J6/pvjQVoO9JSCp0LEQFEbRoI+BjQvXjAbfLAmU8N9UZEprxrAKPMfgxLs67v//FvCXkKZZ5mApACbrNDl/ym4i6ApKNbNdMQdI42BA== 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=JJZyYM/GDzExA4dUcKGIT7txDjvd7UAGGRasFOr5nro=; b=ogEuyCLRcNFZU3ebA0nkRijISDwa5KKmHhYretLubgDm1NfvMRmAQ/gV9OdtUh2zxoXvMBTE42QcajvzFsL008fLzy4v0gStAsU3wjcH4Bkshihl6oxUlVMig+Yfhuy4xFYDHmGA6FCvT8hOfjZVvRE+3yuNNrD2XJ//JDsxZhJr81KYdsz2BSDzS1Vz40noHmwGDhxFO0b5fplCZpfk0d2colzxQNZhbjajy46qmOKGRQXFx7EygrVH3RTwISfBuDMM50E3uYz7O82kvY5ZLh9XJr6fcxm6m4dSsEEWgxY3NUdexx+S1s7jPYmJ+Itp5IGQCJl0/Vj0RSGvnNQXyw== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::49) by HE1EUR02HT215.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::492) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:47:24 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:24 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CC76220F3FEEB3C8B79FD9BA4E1F5B4A49FE0BA9A8DAF1C15807985BD7C9BBD9; UpperCasedChecksum:C9FFA5EA4DB9BEAD534984AE260F50A682884189B95065F6C86AD641E288D0F7; SizeAsReceived:7643; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:47:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:46 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [tDDr/qBZKZs+SruecIUwG7uaFm/9Is1Y] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:47:23 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 739c9393-babc-43eb-4a53-08d91123f84e X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKDSr/w16Yq9FOBxSZ3+PPFb1IhI/nLPkWd7VvbBPH55Y6xdcfsd892fkIUbho35lJ1vGdGxfvYPrCv4uf2ziZns9CvnOkVIBZO2jPJp2n8gYC4ylb2SePvCxJlGcwcLk/swHtnOkPAsaWzA3UtytTUawUQZDMHhGCfdu5xmy3+KddnPEXSciem7ciVYIBkLi+QYVBs6EeHm/voXNSgWFzOfM3cS91MJgkPOaJI9T9VfvpexEAqf3RYgVprwUiQ32NNfJ71WuPuVgZAsbj75DKS9VPPPZ36gZ8kbhyHldkhRjeJ+xFRfkBcDQfcjLe62eGZz5hN6HWUF1yVa0o7+I51ZDwlnybGP6CA7R1vHu9IQkv9ASihycJC/DNNmPUSeOFQS7iGncGbwiKFYy9ARWptDPGeFwPWVtAOQv93JGO+RXVnC7TEfhJvZJSNIUoluH1plNUpdFnyilKwGpYH5MgGV0cNOSjt1jfsP9DhSZbKbLeTdpf8EuJtFp3z3gJMDqHJPum+wNXbM+k6BWFG42ZVUdymFcPosi5y722l4HNKHXFYq/Bs+SFEJoqTZIOXRGGOz9Fu0znUenCwgbQP99/XmVf24heHbNpJXlzjRPS10e1kJuw28I23w1AaYXZ2zUpjbMCmQVjJSZ93myB+Td6sQHsxFw9cpwV7JtHxncH86c8Dm5Zia0HeO1njM381BeRSaDWqqOXDeQ== X-MS-TrafficTypeDiagnostic: HE1EUR02HT215: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4gAqXphV6FzbeapGd017OAtr03oGIs+s/UFGIZdtYLJYJnQrgGY2MvoDYn0B0o9Iv2ZDKuj6gyYnLzxJWNIKdkmxWr4i1/48TiwrUkR2eEUWbKifXBHom9l6WgVsP+/PqPtjxCw+lDvmSzr+8CiGn4HEcaqQbK0FB8OJI1Bcg/2iEe4s6h0wVpe3h73lmIncq5v4y6/CZc6y6SGfeRi1mEh28+J6vjwvQQlm3JmpooIgjVM9JF7ILKRobYK1nIsLm2n5HrcezDiaDw0g0VpHcXWIkrkTEJcRk2g0Gtmk4nAZYwIu8Ecr2E6mwH5Gy4asDuYRK8OfdDNty55GDdVIXcybnbTmWIuAOM4z6415d80lnIglKLCU/soD5O8VRhUwcWXBDujf9bBk0RRUdu7RPA== X-MS-Exchange-AntiSpam-MessageData: XDY8oA/GeEYbXVswnAYxfkOYTb1iSg2ykiYfbJpTjWtWB2u2knR5mB7JJhU+5GR8WM89y1EB246IbBM4sX0o9w8hAX4dz5rwtQcq5jVCt5hsCRGEz6VCXaXEiqwVsvFsnRjf5xvSdKIygfWJzHkQCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 739c9393-babc-43eb-4a53-08d91123f84e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:47:23.9692 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT215 Subject: [FFmpeg-devel] [PATCH 19/20] avcodec/dvdsubdec: Remove unnecessary close 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: pwHlwh8YtlKk Content-Length: 1166 Signed-off-by: Andreas Rheinhardt --- libavcodec/dvdsubdec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index b0127951c5..e164745561 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -739,12 +739,6 @@ static void dvdsub_flush(AVCodecContext *avctx) ctx->buf_size = 0; } -static av_cold int dvdsub_close(AVCodecContext *avctx) -{ - dvdsub_flush(avctx); - return 0; -} - #define OFFSET(field) offsetof(DVDSubContext, field) #define SD AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { @@ -769,6 +763,5 @@ const AVCodec ff_dvdsub_decoder = { .init = dvdsub_init, .decode = dvdsub_decode, .flush = dvdsub_flush, - .close = dvdsub_close, .priv_class = &dvdsub_class, };