From patchwork Thu May 6 05:07:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27606 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp978019iob; Wed, 5 May 2021 22:08:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlShl26Qb9REqMX458MUM5t8nA1/YcOLkfLA4LTqSboliv9nc2w/g2Kjyj1MI9aUMDZ6Lz X-Received: by 2002:a05:6402:2042:: with SMTP id bc2mr2954597edb.20.1620277682711; Wed, 05 May 2021 22:08:02 -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 j25si1471179edr.112.2021.05.05.22.08.02; Wed, 05 May 2021 22:08:02 -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=WTI8WFK1; 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 9632468068E; Thu, 6 May 2021 08:07:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073018.outbound.protection.outlook.com [40.92.73.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 941DE6802EA for ; Thu, 6 May 2021 08:07:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OmGOx3xNH3uJ3GUImrjAEoLyGTSfi3Kjrs1ELgHFLcNwxxKt4dpRiJwHhMFdAzNx7COs95Bdt0lGDlM9VGdvRFaC03jFlQJfUYWAxvzlNl4GvRUoQiMyhUPSl+Eqld9iuk7J/KLM5Q+1hi1nyTPPTfRVF7xyGQjZPMs0A5a5SzioEyTRhHd4gggTfHt9bZRaLOSUp7kuh2/KjY6gbi2cOX82Ssd3ZSU+1KWyOhv0jW+q2x4F2p79U4VQz2cUeR2okdZVLv+27xwpx1XQxlhgMw/bssMm9xW0nmHoA+dn6W88gYs+xrGMzT6e5toZsEMQ0Q9QZd90SNScfttenp9hQQ== 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=DduVGOv0TXLPeaz3FKUDkrMfS2Eygh8ITCnuUwGwhlg=; b=LEKZWy6Y2qGrnLBg4IRKsORiPFlP4MFvgZNKG/fxCNYhJ2mrxZnWj7V/YX1SF49hmx73qVz3mObC5LMuXTTjYdtCmH6AH1LuCbyyrV/ZFMF1kuXp5afjuj7kv8GEM8iA01xCNTCo9WZe6Sc+NoDIF/yETjZHPnRJrEXpuSU/ch2lGwO0xQVZXhAqhBXvFI/xkNhVrx4rq15T8Mfr+Zge+Ab0CqAtQKCs/mxDJE1lmgAHMXNhcOdEeg6uTJJfEmluDneaQMljkl68BNPACLDC/CDq4ENn3cUoVgJ8P8Gyv4izXW1+O0mskADpeCtpLpiK7GIPFCb+6eYo06gxjq/5uA== 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=DduVGOv0TXLPeaz3FKUDkrMfS2Eygh8ITCnuUwGwhlg=; b=WTI8WFK1Z02HNo6/dfUgGD2MRVN3MDO4/aGh2XOJVhY5gUIuEbzD4odH01h/Kt5TCWwtcVpj6d48NiPZqPKNclLYaegBP5EYq9FtVuNZH7q4Brdsip9va84AAfue/bZ9clKMxSAQg7gAZ1btLVtfuFw704mA7CWnaoqQYdiJay49FSoEW6v8wDvT5xNDt2TTc82NX1ZzNvy7vG0gezh4+gOBx84bGUYcjXSiiDQSOfIBZHwWJYtTXxrOX+H+Fs4Yrop9XDgaimf3JOd5+31OWo4OI6vsdwd3NB88MfktNQkDt0f8X5yEtfKIw9nNnpboCncpdLMk+f0Bil6oim/fIA== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::44) by DB3EUR04HT051.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::324) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:07:49 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:07:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7A9B230D1789D4C1ADD50771C686468E2087391D00F19EFE43F605A949B3D30F; UpperCasedChecksum:8BC31971700EACDFBE9C595AE08D3138274795E1098AD4AD39FD0BB0FE035A44; SizeAsReceived:7404; Count:46 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:07:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:07:14 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [Yxua0cmxZTBqF7WbEyoCniKsnlSOXy6F8BsQSz1MIUE=] X-ClientProxiedBy: ZR0P278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::12) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506050736.832752-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:07:47 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 7a805c42-b871-4151-2b50-08d9104ce3f0 X-MS-TrafficTypeDiagnostic: DB3EUR04HT051: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KnY+2z523qwdX2W6oSVI395oLm6K052hvp8AEus7oFSva432YLU9fLokUay2KASbx2pzyVD5mSRcvyELl8Pj7svllsFJucU3ukqNzuKv62Y0hL5ePCked/04R3VRTho/M34EnIuNRQRM+hmbrLe7hQP0adg0xqdshfgVITZfdL6zgVxMs6/ZwrcyMYzEf9DHwnEDRcVgG+3IwROw45DFjmH7DkfDOZJvj3hHXYtQe0ZYdk45jyFnedTs9Sf7Pm+RZ4g7wbQCgnKoBzRdUs2YJtaOE1kD36aiyxL59EtEBZbRYaSjqxsePhvz2KYSIm89/mXYgdJ2nau7OSI+9TpBIZSXTvnINAdhcq7bIohwjveBl1doZImNRS3+DNp/Iq7GBaVmqFFG6lEf+mSX2c2VKA== X-MS-Exchange-AntiSpam-MessageData: ZYCYJ1wuYI7uAcdAbTAIQBEusqDkGxHopw7pBel9DtCeIpQOW+vCEci+1qw4O3yZFoqX4xLrcckdAEG3xekoitcLa08R7a/Tmfpqtzz9RZwJkoW+2IWkde+vLGgpLpRMt9/9wxt4i/s2nckXr8vsbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a805c42-b871-4151-2b50-08d9104ce3f0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:07:48.5109 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT051 Subject: [FFmpeg-devel] [PATCH 01/23] avcodec/ljpegenc: 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: 6/IkWNZxEXa9 From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/ljpegenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 80b5e799ed..d820b9a0f5 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -337,4 +337,5 @@ const AVCodec ff_ljpeg_encoder = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE}, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Thu May 6 05:11:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27605 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp979922iob; Wed, 5 May 2021 22:11:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYcum1bba5clmMXqG6NjBupK8CQK8qCv0YMOkXdRM2bJi++zcu09qXD0qZKLQ46eCdLlof X-Received: by 2002:a17:907:8319:: with SMTP id mq25mr2347889ejc.441.1620277901049; Wed, 05 May 2021 22:11:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p5si1644004edt.42.2021.05.05.22.11.40; Wed, 05 May 2021 22:11:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ILIESAse; 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 E3BBA6806F0; Thu, 6 May 2021 08:11:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2631A6804B3 for ; Thu, 6 May 2021 08:11:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MM3p6DrZkCgpmMu2U3vAGHsuT4NiZ2GE4LY60Muj/WV8gj8JhzwAovAXgtKlgy4EZWvpIVFarhs+QpZS2WrfIGW7d5JIW5DG5GFwqa2v4zZ3wavcR2ECdgq83QSGvElh+w9Q1xcbC+icIZywLRgzqXwnw7Qgf2ellvoccD3rV7jCbF4t5DOj1ees9BGHeOGhZSYXAqN3udTUCgvia6/L1GjWaB8QQytEJcjowsovSk/sUTcBnLw2qPceA7BWU7aS6xe69Xj+qtOVJBjoofrqPUL3RHJWJ9/p+NVP/12gSwRMMpszghN3OxX7z3H9PGMht5dosPsa4/ZikSltMV/t2Q== 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=9bh0P7SFlkS8IxF2Wae6Rhs7M1aSjyNpbf/teQIe9wo=; b=XXTwUZjv5d8OsXYdX2B7rtw7GnK78+p34P8HHIni0LSRLaWBBcJ9T8uL5u2VOLGphx+sB56J6hZKuD4veDUKFPcKOjfpsBGY+vIcM8MKObzI3i/sPFeLVAHKJz7C2te2Tf1iIZ8axqo5AnMXBx8mVM+IV4wG0SMOktSPQ42LAbnQVHTYW+L8Ox88C6iOvcK6fYDaxStk2d/v/HkzXCQ5r1NnZYPvMy2B9uSA3n6PxcYgXyUsyKR2H9idv7rolDr654fGyqq1sLMknaK5TM+u6+xltlE/Mq3MsaCvXVAsLZ1tSdchlU+i5BlfarfEj319n4+Zj5QV4DS0pO/Qy307Jw== 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=9bh0P7SFlkS8IxF2Wae6Rhs7M1aSjyNpbf/teQIe9wo=; b=ILIESAseIWypyDxGK24xDbkJxNQ5GZAijOhNNtyIB5fhhWqUPdoVDAtuyh8F7aodRi921SpYBq9YmPb1IO0oR0eDCFTUzcAD3rtaLWzieT+IoSrk4l64q6Le9Ys5bg8Z/eF6UlVsX54GhNauXcF7wMZ82sIOnh39hZNdQuWwBArdFUAAXZ20LjUgqByvYAoO4arZDyhj4YnRThL9UkjzAthJayXdAu1UlrvyadtGMV2QWCpm4vbCexSvf9Njtrm3ETom/zA84JpGUnL72yLGu4veAYgDcZ/gZ3uLD1/IETdmZ+4SnqpCmZRoBkYXTf9toNF96EHEdSJhtPiSf5djJg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::43) by DB3EUR04HT052.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::325) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:29 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DFC8E4803F11DCBA0AA066C5D7ABDED09A1951B6CF2B2BB7F0D38BD99A93CB82; UpperCasedChecksum:66EA8350D6CB1431270C256746D514D9F38C27110A2AA5F71A31691315C8DA7B; SizeAsReceived:7602; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:00 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [qX/qLJWvIuKozIuBn6qIqpqk+9qxn1du7wLYfO82oJo=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 7042eb23-3f0f-4f51-bf8a-08d9104d6817 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0S/ll7i9GaYTF/78rCk/D+0U8IOOqTmRNa765gKrwK8IyUmKnDRnGugkjJDlGZfvPbJYy6/T0uLa2Usikpy8T5stRfh+xeM0jlNx6I66pNCUM1RDcqm6YTeaq9FWJtivmfsIfMVIE4b97RxLsOa/qnhr7b7/IKEq76a/1BgyPvLUM5rqOtyc5D3CMmXnqupNpyeufkGyoGTkC6jXmMmol8Y2uohODt9zoZ7+DUc+CMoJ2WYu6WjBiBOYx0gyBjwjyYbOeceqG16YTdYelg6jstB4TDNNN4+P9CEvNDpUKIXfTzLCPvSkllwsxuhjmcig1oGMGlvdH23JNLkF3YSVER2pQiHL3nupY4bblpGf6FotHX9EsyfMUf8x4Fa/eEMkDeDt8zjPWHxRpj4EIeCtEKx1TF3YfTHKjFSQDc8/mqqJQorNvOKXABvv9Q3+tYmbhYJK+XIrzAGu4nQpiS7aI36j/pTTB/vgctoZ19ovyId+z4xA2DhP+Az40OA6bEU2iqp5Md8wAdwUMSgD5MLsDi1LF1mbGZoYKXtL7Zrors1mEL792gYVTsR0sDW8K6kfvz+k5DRxW88Qd0C3ua7F4u0B/VZHqksxlqQda8xI57Rw/INFvjyG2Jr4VlmL01Dlu+5bng81MIRRu3TX2+zMDxDp8HyZtRzfFbaBylpd2Tr0aSAMVaxp9iIEnX+dMe5WCwlb9SXc0CGH8= X-MS-TrafficTypeDiagnostic: DB3EUR04HT052: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LRNXhntRR/kzI7BV8Bycw78wxcPyo0Z4yqpzqzzsrOq0lmLVO+tW3GNUHa/x/ZdS0fLCyq1YmrCNlxMaz689vuS79+JkT4/JDIPDGrVrKnclUx9JbIMUyp4UYtufGDKyIpcD3x88NzB1xf3ty7XO3Mxn8qyuCcFDkHvBGueBNa+G++BD1rykbrHe97l4HVFYdKXuZ6j0P2smnfqkLr/nxp4D7uCiy3NYDW7nQEVWAEJuxbjCLDqPy3KhclLwvIg3swsgpmTH84QGrR1wStrcOZs6A8dfohuQmIG7LpfoKIcKLdn5E9Lb/Jc9Xxml8/8ymzUOT+7CJHXhQbB5T5ZLODd0oGQPC3gdhVyw0KmP6aso4FSCILGjmqf7vUXUDC1OAXYIuX9WlaEMol4tqEmcEw== X-MS-Exchange-AntiSpam-MessageData: YfyDoJcu81xWP+TpjwTxERlg915pPleuePCEs3Q5d701BOVyS6OV0blWq2HPTTO8qUh3AtmxvjcjrR9GYNNK0u3yRtQ8CktbAbgoB2ikF4g5rv8efG4016m5H2zxpb1yLOPASnu6rsBF+8jY14dAgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7042eb23-3f0f-4f51-bf8a-08d9104d6817 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:29.7017 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT052 Subject: [FFmpeg-devel] [PATCH 02/23] avcodec/ttmlenc: 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: LdS7uVC7j8Ml Signed-off-by: Andreas Rheinhardt --- libavcodec/ttmlenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 09f2657cd6..60abf25ce1 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -392,5 +392,5 @@ const AVCodec ff_ttml_encoder = { .init = ttml_encode_init, .encode_sub = ttml_encode_frame, .close = ttml_encode_close, - .capabilities = FF_CODEC_CAP_INIT_CLEANUP, + .capabilities = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:11:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27601 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980017iob; Wed, 5 May 2021 22:11:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIzXYyA2Ff/ev7DvfesiB42SO5DCSnXCESouBdavsJsX7Og7h8qzK2OuDN+WERfQkXVP5n X-Received: by 2002:a17:906:7016:: with SMTP id n22mr2404848ejj.23.1620277909783; Wed, 05 May 2021 22:11: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 j5si1302269ejd.355.2021.05.05.22.11.49; Wed, 05 May 2021 22:11: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=cc3Pn0os; 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 E4A44680517; Thu, 6 May 2021 08:11:42 +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-oln040092075072.outbound.protection.outlook.com [40.92.75.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57051680517 for ; Thu, 6 May 2021 08:11:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PWgBPSho5vZL5VdrOMsn1EJiKaODb177uhIqekCXMoD19NE5MVDSqrlQ43T9Y/YJ21u1y19jLfHUAt0EMHL+wIf+jTnAS9m4FSVGfdtKv6kkKJ8xKe3qfQttI2GcaKZTTMGmnKOPUj8jHFnGtvgLzrsCNnw1vDBa43zuh5OLjMGLS8cCXg1S3+/6Umt3K+vMY4uNJVTx3netFoFGsm6eP5qwNjhE2WasEMmHLee+kD8ItmAb4reGzUU5rx0+0wxJdiz3vN+/PQxB5XM2b1TNQ14h/XivcI/IhzqA7TYZf0+YKa+SOulP86QQ5gJec/OOaz4BSLVqvVPJL0uaRH5wLw== 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=KrpQwn0lcMP/Xw8ey6VG9oAff3Qo4wHI8I2yYNfex8I=; b=TFzQW09gHO3YWaBNKX+EU1KNlI9WrkRJfAGZh6vz11S+naBqDDWRn1wUD8KgArK9+UK98CzXck//migBBM5aN/PzPKvSYk3y76L/qoT5vYswfghcItf6cgOtlCF8syqvdhP+wiAqbQPOlCciVvDPX/M2MOINn1WH40cHIy/GYZfMXGS8rBThyGCWi6uPp/aEn2fJ1666DEiygGXAhpfVbXH72416e83V3130XIdGAPina4etJKJ1eAkEI2coohS+DbPop/4FeeakfFKVw7gOlwnfnZNUjcb+172RxvvUUpOXD8xH7qD/FyroWr/fuS3WO1LzxzJiYaxkuD3U8tjSBg== 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=KrpQwn0lcMP/Xw8ey6VG9oAff3Qo4wHI8I2yYNfex8I=; b=cc3Pn0osL0z3X7wRRZZehcvuky611AE8ekwuEzrS0Yek7GjH1IJNqiLT+QaqLfdrG4t1xE5XYemmHk5Fj1f7VLZ9nmAkFf1Ji14/LVo5WjiN28uQYSgVkRY+1pv6CR7Vre1XZsXyxPEYlYCiNi4k6QJeAbhCn6scj161x/zojlqoWXD85tbzmPHD4NMqWvqryWVCwuunrgJzX9C2cv8BqQcffFiBvnh9d8Ub5QzaDB66wu68ompxS9cjfZlCFIwgW2R7KrAFRG8E6udbWzJRiij4mykOMlEyn+Mbfh9iO7xVNQ51l2u0D56A80ZCtZquM0wEQFhjj37l4F3faPP7HA== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::44) by DB3EUR04HT198.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:34 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DD5E8643A84A0A6D0E4C2225E51FDC166CE709123473557A0468FA850753A8AA; UpperCasedChecksum:F62F3610E9EA0DDB4C4DC70455F0182A0DD1E25243966C6BFD166FFBF837BB1A; SizeAsReceived:7601; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:01 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [8HEWpzm31RRz7wS71N9vS1K2xG6ClIDnG6dcQtKuDEg=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:34 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c76b25f9-43be-4b56-46ed-08d9104d6b1a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPThRU3ePgB81d4YPJKIatm94dpV5OOfmGrpiAAeL39jLHk7kzUbEhmHYEQvIo9KDdtVcB2P7KnBs2fjFddaZ8IYpYjslBBlMh57Y0cRWms8t8McBpgC07+LkVaJN/RF7mVMZhKIxSx+8rbRI6n67fresYhx2VnYGBOzbygPCO551a9uypdSKbsZ+I0mN34dp+CfVzSywnx2g+swtufoAoI8G/cdWvW8bSdbnaOYRB6oCdKlzqtptUvfX6MSEVX4Ga2hbqDL+QfWcel+yoLAZ1Q9bWAzQKthPKpbaJ+XnoNPeMD//0xLtIiKMxiuMee7pQFIMI0QyJEolmwTW2w7srMtYL1vsHJpx1ExSTRkOyhPME2GWKk46brtdkuiae8BJBTkskgZn5XuhgUhCBTbyLJ/Aj3EUMXO07fvQqAnmkSPnFfrVGSnhfy9F2ITcEiImIXGHCzyWSlPC/Cai8KZGSPziID2XE5DDtjM78COf5x522bTaI0rJKnhHYj09y6EeJvwToPJxQtGaH62vzgVC+BtbAn2bswKldpqMFF/3qOjzG2aEbiFGfIDh++9kFrZeJCu/sXFEPfVeBap5teHaALgLbdCWnR3/XPUE4iKjneo93ybsbuz61vGjH95iNoKX60bvQxxcezG7h064FLTKfCjoql/NHFNFUxwlNDmRPWnphE8hbillVQmr+o6faSR+ovBujVW/Sb4wmLscRxxKwDqHc6R8pqGMnwzQnwOjjb4Ws= X-MS-TrafficTypeDiagnostic: DB3EUR04HT198: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +segexn0S6bRWkvEX6fNkwb66HPAjVt8B3GWnMXSN4LUcLQBwHjekPGLHuZRExAdp9NZghk1C0sA5lh43PM8Lam540Vb/gSGjjd7M1FxrgcFgerdW1fHtk9UpCgD1ktx63Hr3xy6t1hqPxwGdaO8dtrOIZGpOe5KLqoyUCcPqibHNy78RUJjBcVFSxCVPs44RpI6DbVqI4SAtUGbJ6ttjKqsniawBPEoa7YZGJRnTPHHvQ5nXtsNor/rGW+A9GykP4tBjmR1Ernlux8uu0xGjparJxqyXMFWfRisf+ft7AVM+cZvAyzSBM3EQprrpBluel/T0v4hxAVTpg/2VMg447zANnQu/TGl6tMTWVCqyOVxRzomrGK/8ajy5fhlF9cv0hXuafQ5T5zRdG/W6MZkZA== X-MS-Exchange-AntiSpam-MessageData: mPwZMb1tNECkOTiUMpwwM4++TRCkeLm0L0T8LUfI8OcY31BGneyfbifROcGh9x6BEgISPUeaCPmwbFw0KgnN6e43rTWzkghzqH6LGXKNoLwTL/fBBOEd4Ishek0lNJK5qqkjamEr0ZLkl/J1w0cZcQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c76b25f9-43be-4b56-46ed-08d9104d6b1a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:34.6935 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT198 Subject: [FFmpeg-devel] [PATCH 03/23] avcodec/zmbv: Don't free uninitialized z_stream 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: fCu+IDcoqEaa It is not documented to be safe to call inflateEnd() on a z_stream that has not been successfully initialized via inflateInit(); so record whether it has been successfully initialized. Signed-off-by: Andreas Rheinhardt --- libavcodec/zmbv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index e1aba7f059..4cc0476f4d 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -56,6 +56,7 @@ enum ZmbvFormat { typedef struct ZmbvContext { AVCodecContext *avctx; + int zlib_init_ok; int bpp; int alloc_bpp; unsigned int decomp_size; @@ -611,9 +612,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->bpp = avctx->bits_per_coded_sample; - // Needed if zlib unused or init aborted before inflateInit - memset(&c->zstream, 0, sizeof(z_stream)); - if ((avctx->width + 255ULL) * (avctx->height + 64ULL) > FFMIN(avctx->max_pixels, INT_MAX / 4) ) { av_log(avctx, AV_LOG_ERROR, "Internal buffer (decomp_size) larger than max_pixels or too large\n"); return AVERROR_INVALIDDATA; @@ -637,6 +635,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return AVERROR_UNKNOWN; } + c->zlib_init_ok = 1; return 0; } @@ -647,9 +646,10 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&c->decomp_buf); - inflateEnd(&c->zstream); av_freep(&c->cur); av_freep(&c->prev); + if (c->zlib_init_ok) + inflateEnd(&c->zstream); return 0; } From patchwork Thu May 6 05:11:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980105iob; Wed, 5 May 2021 22:11:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+mVD4M9Vf+P02LJ/4qxD9FqTv+NC9DLN+9VnmTBBdzVTv8ZsNVr5zEz7cfSb9SNRaUGew X-Received: by 2002:a50:fc97:: with SMTP id f23mr2749638edq.311.1620277919682; Wed, 05 May 2021 22:11:59 -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 if8si1309384ejc.48.2021.05.05.22.11.58; Wed, 05 May 2021 22:11:59 -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="OougH2w/"; 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 09E796808E1; Thu, 6 May 2021 08:11:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074064.outbound.protection.outlook.com [40.92.74.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A56F68068E for ; Thu, 6 May 2021 08:11:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lgzRl0YoFnAHkGyW8sPuLS0g1CFkBwJHC3dbtS7NaZ/kFWKsVbh6bKdRAqw4iGaRU1DvbL/AQNCjEtae2FPlW1D7y7PxeWWcT/MOsxm2u8qLJtsCG7T7JFfNaFm++jHTGYTXYuPcxSMPLMBjh3C3hE8AZ9HjQCocYNy5DOFO8//+lC8f1hnpCnLIie2PtVLoIEpuozzB182iFID+WRa3yOyVqfOx5DLPfYtnlK7gmyc5ZqAgvrJni96k9N1MOzE9e4zfQD+vRVdZ/wrxdIHJL+zTQGo4PPYvOTbzHmFkwONAjXnC/TF4aKnRvkgeNqe7MJOuc5ZUPymYcwMpmIkoMA== 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=/R+XJKNwbaGy7iUqtNp7cLEvUtzIgRC7HWeQGGQaI2o=; b=m3mCn4nbdZyUkVN67JkRQZ6EwCO5VNm3XzIygiRvQpGOf0g2xhBKiOpVlkNh2zGenDVr9NTvP4gCh0FFB3otJLlav1SJcDfGWqBjnLf9hw95lyk0daOwyAE6nen3jIhSJzquweOMiOvzAkvSjPhMtEwj++5J+7n4lc/+AHswxzdHCoVjLJXuVoajXus64CdD83dF/ANg8A6ZYvx8Gg+ePiXE+S/i4Z/R0sQNm2JUdDW37RO5L80AKtja9zzgWQ6rLmk7hykUq57vUYaEoMjeTFLl35zrhBB2y6WyagEPkHW3ytcOhe6mhu7QMN/BR0V05q7n1ndV2ICAAfKhHYOXkA== 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=/R+XJKNwbaGy7iUqtNp7cLEvUtzIgRC7HWeQGGQaI2o=; b=OougH2w/8unwheSjtpis0FH7xF3fS4GAhim1i4gA/4QVZrusKFXqulFIJVLpa6kAqcUWl2xzMLKQaIoh8YPumVKYMp2wheT3eJEPWepP0+oN5bZ7dcPY4Th8qr0Jvi6cqzPcsJgm6yTPUXKISGdumzzJMKssASbqrff/1fQo0UFMFrVhAsPuf8IGR+EUySEtLZNfiI/nafchaz7mUcjlB7Q0qkf3n5AwGV66/HOGkYlPPCw4+LmhJltEvdIoSrn5A1Wc8iPVma0b9kN7PVaXvlafKl6QznS/4WIEqcMaJmSqkkaUcWRp7unTqpE8qBVSY+K98YAHFn32ht7HGpzHjQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4f) by DB3EUR04HT188.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::378) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:41 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:0C96AEF6E57BAAE31FB7CDBC4E8E38C4AB5957818E74BAC3D02954FC915CCE6C; UpperCasedChecksum:D089509078AA55183122EBD54349E39D00B1F23C92CB72A2C6EC102C634E9B64; SizeAsReceived:7599; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:02 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [5cZT99MXscbriudqQePpr8fVvdDlZ6Wh3Q2NZ6gmMZs=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:40 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: baeffd8b-06bf-4c72-1082-08d9104d6ee5 X-MS-Exchange-SLBlob-MailProps: KE5ywuOaN5hPds5nKO/bjhDtHg+Cdr339K1q6IU6iBTEbBHQwHqXSUlAKL3bgoY8FWUAT3twHmK4MfxMquoS2EyS58bGW4HnHy/vNeMuUuAjuog8XYuLEgrif9wsOdUoMSqcddyygQbbIKafs10sHioXN9iecEENF7Mo8GKZYdX00wCd43hbkvr9h4lv9HkF5nuxk6Bd6e1RVvBefll1O9QIstW3656o/BvKJcmUNiZI4TNoZj/SV5FNznCQmxCqS1Qk0hvyxqelpBCI2zX1jzIPul7XhVa2cpi21Td6EjLMJ2kSOtFAyF6ERu+vT/akGNQfpXNyezfKOPyPNmG2AhPS6yAVo5RmHFzLuozchiHW8Owjyi9qsFA2KCifSbQsX0TDwraNIIWvwiBboMaLuasLOuMulXx3CP0zzpMivEQYx0nIW/sLwiDXz4jRmxEHi1fU4b7fJ4GzJZ4Ei/zfJHo9SjF6LKE4Z5KqX2MDz1B9eTVo5NpfGUCl1eGRMew10gmRVCHeH1gvYs3gzMJQDS37V9zI7rMGCbvtOWNerxmiwF84LADWnhab8tojPc0ZtIt6HYvVp8GeY4HwovKTtAxp6NI6ikJKVEgnps77zYEy4g4p7mTTMx8DRv9e+6oAvMW7RDnFpA6UxLVa3tKHgeb2VOESmqJDxFhXBafS3PIJupwSw80MZXSw2s1ARmMCeiu3EBN9RFsCtFwF8W0vvC7dPKx32FWQs5lQAxclwC9nM5rmu+Ywx5XFWVVdaAzjo2/dITNY/vpOZEvKDwXFaqXecoISVJ847hjfxMgqS9YStE2+LruwSnGV39sa3cIKTVBCi2wxvwaQNZRFmjiaWzlxEzdV5q/PeYlRyKt/bY8bW+j5+FEVjWuplcPKRJPZnqvmUDLNyHOi403+CkWuHjGp/j5a/So3i6FJuzXoJX4wT9s+CXreN7GfuqHy/Nx9hSu2vUWHLxRziX6X6fjDPqMqV0EGjIDE X-MS-TrafficTypeDiagnostic: DB3EUR04HT188: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2iGQUV96JTzo1iAKjCmDcYYtvqLr8Mewdh+y6gXveV0rLqrxiqkTuEAQmJscdggIEAzI0/jkKzm36goQ9brI3YrWP0SprOXVfFnNfVeYp7O6Qj+iczfA1RGZxpXr338hqZ4VEPgUjV5xlg/3uDJ2zzKBz9Cxz4cBxt8aIbXRcSGnkuqz55RkrylqcQNgeq3kkhtFFTMQHOCw9ubFOo2FBjFPO7KkPnxXQHN4RJePa+RIgxT6K8t0DZXzoMEvTKwlH4FJPdScwAfP06dba/9oN2VX4sjymNarm7eCehtoT0Qh8lAkoEaA8QPFSLBThAVCBB0d5tTghV+SrOHwXn5q+PAWP4sh1lZst/1kNNpG5XZ1VExlHng/boGkM5Q6r36ZxyTGtgiLnRlvDt31182XcOOJ6VkLwsHnZ99MN+GnH1YkyUI4BHS4CPL/ZLlXybc9Is01G0w3CMFhEpmIHbmCRWbHCuty/zto2jTbfFUpr8k= X-MS-Exchange-AntiSpam-MessageData: /tBsxdGUmonYdpnDQ9DhnVtnL+Ewu3fzpvWAmMhctrQiz2kdhZ+MumrksrCEzdMvi2watHogSU+bAP3nHfiLIvGRq5yEpX8yaRPJg98Tyx8juZyPXDGqJx+yGwxBhtiJ1XnOyUBybxhQpTW6BD7GLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: baeffd8b-06bf-4c72-1082-08d9104d6ee5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:41.1096 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT188 Subject: [FFmpeg-devel] [PATCH 04/23] avcodec/zmbv: 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: pr7gZ/KWTRKx Initializing zlib in the way we do here is threadsafe, see https://www.zlib.net/zlib_faq.html#faq21 Signed-off-by: Andreas Rheinhardt --- libavcodec/zmbv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 4cc0476f4d..0a5bb40ad5 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -664,5 +664,5 @@ const AVCodec ff_zmbv_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 Thu May 6 05:11:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27602 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980188iob; Wed, 5 May 2021 22:12:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMN//hcexEDQv3F0qLp8gNT3nnVRNKZ+IJwXqL9nZY5v49eNzFQdasiU70XrMISasA+saX X-Received: by 2002:a17:906:1f88:: with SMTP id t8mr2306316ejr.383.1620277929522; Wed, 05 May 2021 22:12:09 -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 q27si1266863eja.25.2021.05.05.22.12.09; Wed, 05 May 2021 22:12:09 -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="tvZJK/1U"; 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 06AB9680910; Thu, 6 May 2021 08:11:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073043.outbound.protection.outlook.com [40.92.73.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CA9F6808E8 for ; Thu, 6 May 2021 08:11:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MelwCe00jH21cw5Ao1HF7CfRHJqALZgWB1+IXUhS8ATVTkXP8ICMPHetNos9Rx1DOMrHh+kAS8t9m1cpJvcUUeWy0NeSEHat9oG94pKVivgnK9+ovRMx3BqVZ8h4dYYrqNLE0Ab2BvNOXvZu9shTaIDEkMe5CStsDDiSPo8+Mg1pLOsRjB2Di8KTE24ve1mMmGEjtDVCd2CipDFwgndcXG5X8jQ9exFCAE6tiiBJDrsKSkSpSoNnFN2YCTFmH2ujwW0FRKd8iz6AAKS7LE4OK6E3UwdOlgd+b0iEX+UmlflYSuSgRPGUyxHUmYmaG0er4ZSVLgeAsvYsfV8S6+O++Q== 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=OpArLkWXpc+fpOByQFCAvxiy1tpJ236A+VFpYJ62r6U=; b=JjKyqFs6VSCnybBv0rFO2wV5zRhzTHS0hUVfzcWzQ/BqBUgU+f0pbQElCj0pURMV3diAseslfxxsLmmYzNIfSNNuLxPOg/KnX15IK2XsDTy9zcd2T6cQ9H0iNFB1yc5LbymwU7WuiJTwst5lUzvjEOQlgNdrYPcLxSKhPwFtxjDOtkyohyk3yKIWl8hAlNDXd2rN0jbmqCgFpgyjoxyLElcouJcTq+7u07KmL4e9IeBqltia30+2kyLOi4nOSwAph+phsCaw2ISH9P4Xn/EEDq5HnHI+URiRDYfKFu0lgOKsxHV93VjFLcyE+v8Spe2dcx1Bpd4zHAjVyXd39kVKwA== 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=OpArLkWXpc+fpOByQFCAvxiy1tpJ236A+VFpYJ62r6U=; b=tvZJK/1UeAKPpLVQUfw+GiOYBulkz5Toi7dsr3TTkqPV+aKerzUlLxbe1UT0nTU3qhrAkG6s7wXBRGIj6SO1rsKRo9EYXEiFiXAlTa18tCcxEmr7paubn9KLFpi5R5DoR4AK0nzxGAegB/L2X60gPq2CnwXnmNg8w5jmwVJUoy8G5xlbqVxqaX5poN33I1mBkv3Dezpblrlpg8K/kTDm/txNq5Tfjjkr57ZSCcBnGUcCaFBNwqBQWEkQ1kk/P10weM2Prk42D9Mwd3jVPARIdwKbTycCKkJUC0+/buYFFtHrLxtM0W3FRikNEuxin7knepG6BhNEaZBoZj6FNYtkug== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4b) by DB3EUR04HT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::321) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:43 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8979FECE1688F5BE33F08DC41C8199D0B7D35D25F4525913EDA52FD9B565C629; UpperCasedChecksum:2CBA3CAC7014971E3E4B6AD0F022D654348AC387FB064EB948F012E397F1BFB0; SizeAsReceived:7599; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:03 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [paOrmMk8S68ovrphEYiVr94rUrrElsdMdcX9AE6ZJ+E=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 547b6dc8-e7a8-41c3-6011-08d9104d7084 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTEg6DjnyLH3U63QWz69b6bf/gDmh6eM7PcpQwoaDnLOJLJ8noK7VCLTM9c9552tKuEiqO/IeBtNNU0Ciw1HWotc6gbzS5+Nv3b9FEWeKXd4I3GwL09S+RWU7ZrhlwxBq6oM2I4ZPPJM+Z47e7bP5rOeM1rjMCHscou2k9twVnB64pFvAr9MurY2pbS6gcBWSxKoubpoGbpCmMiz44EpvDKp+N4OM3m5+TVQdviRPz8X/w1tAdo5vYTNUVFrDy5hBqMR4H9JAyBUeI765OKvZ9yorplL9c2MfER311s73mr1Wa3IOg7ajceUXPe/gDQyl7xrdaMwURxeP5iQ/MYN8t/1Yuk5I0Jqe0hrZSq5o/pS0PfuvPBQS74Jiv93TiRqac9ollxHijN+Mng1ixqnDf8d8FESqH1ZJ/er3YMPkFtFuhTeu5rX2lXfmuXM13her54kWc9Ww4GjqAOTb4DeT/xG0/QMS9kFdmswyCCoMVBeQUQXwPutfviBMlrOd48/JzJq66R67tN3JyStfSsmN2/THIy6n/hxRTs0wcZyqo9PzWXAw7ZWKq0TpIesPc6kIkKP7ypbGoSePieQa1LXZwuPySJ61UJGSRRRwYEJd2w3p0l+0WcczJoROtzAu6w9E8Y1UUiUsdxtHyF6WEx+/HqrjmnUMspwI/dM2eF1waL9H/Uwl6NL53WMuGzQbTMXcdXw9cr+Kz9deOewUGwLExDj1qEQXFOK6yGKWbksd3okI= X-MS-TrafficTypeDiagnostic: DB3EUR04HT047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0yftZm74gEbU3w/pq6MpueKy56PdCeaZDGSUY8xBMH8VtXRuvOpsuPQWcTMBdurLLEzVyP75zkZG0cdyXBrP3dbx/CORW5BwnFL9c7wHO8Y1uc+04hAD6TpxlMJ2419xjHxeqIk37uTsDjwG9a7/X7+cPyHq/EYPWdcM3ITwSTGxf9KevATlDtHvAmQl+JA9U31UfwCgciNCJ5DIpj4IrQDD8bguANQf80agv+JuY7AXRnLrVXAjN+3F4eemcEPFhuAAaOQCq2MM3iTbNhZzCQRvcK1KR4nfLxUon+Shse5YH/EHro8e8EcXmGkJcNUrcyvU+WpZqHvWq3x338L7QaF5DRwfvgudVpumE54SCc0m6/7kyFMP3VsDtxxtExCyWNeRMh1xz/jPZyFQ1Y2vSQ== X-MS-Exchange-AntiSpam-MessageData: J/Zqx3wVdBLvHNXb3SKBVTZAfMCtwPp985I69UGxBVRCaEB5vXAjsRGHIGTUh/qLQe5fYYi1SuMO/OGhxtWcbhKgI0s1rxwqNalbgZ8YIp45dpQ99KDQOBMWrvJzqWhAAOEFvthSlPq4D9lh38UCtg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 547b6dc8-e7a8-41c3-6011-08d9104d7084 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:43.8074 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT047 Subject: [FFmpeg-devel] [PATCH 05/23] avcodec/zmbvenc: Fix memleak upon init 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: 2N6qUWy4WXoY Signed-off-by: Andreas Rheinhardt --- libavcodec/zmbvenc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 531559e264..d0c353d0df 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -74,6 +74,7 @@ typedef struct ZmbvEncContext { int keyint, curfrm; int bypp; enum ZmbvFormat fmt; + int zlib_init_ok; z_stream zstream; int score_tab[ZMBV_BLOCK * ZMBV_BLOCK * 4 + 1]; @@ -305,8 +306,9 @@ static av_cold int encode_end(AVCodecContext *avctx) av_freep(&c->comp_buf); av_freep(&c->work_buf); - deflateEnd(&c->zstream); av_freep(&c->prev_buf); + if (c->zlib_init_ok) + deflateEnd(&c->zstream); return 0; } @@ -376,8 +378,6 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - // Needed if zlib unused or init aborted before deflateInit - memset(&c->zstream, 0, sizeof(z_stream)); c->comp_size = avctx->width * c->bypp * avctx->height + 1024 + ((avctx->width + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * ((avctx->height + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * 2 + 4; if (!(c->work_buf = av_malloc(c->comp_size))) { @@ -419,6 +419,7 @@ static av_cold int encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return -1; } + c->zlib_init_ok = 1; return 0; } @@ -441,4 +442,5 @@ const AVCodec ff_zmbv_encoder = { #endif //ZMBV_ENABLE_24BPP AV_PIX_FMT_BGR0, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:11:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27598 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980380iob; Wed, 5 May 2021 22:12:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrvTKxeyizwql6vbbz0T3pHv/3AbOO92J6KwI1qBuVGv2G8U/MoBewUluGTKMA/aLt8pFY X-Received: by 2002:a05:6402:617:: with SMTP id n23mr2895787edv.45.1620277949251; Wed, 05 May 2021 22:12:29 -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 pg9si1240822ejb.22.2021.05.05.22.12.28; Wed, 05 May 2021 22:12:29 -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=g0Tvbiw5; 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 F1D3F680A25; Thu, 6 May 2021 08:11:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074045.outbound.protection.outlook.com [40.92.74.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D21F680835 for ; Thu, 6 May 2021 08:11:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bEWMciu6V43WEzsoDtqj+lVuiY4WMh0D5pUCdD/FwhR286HNcBpicm6tzDD024BkzvpGP3r0h+3TxSZdRw/yCu83xZ1/eN3vic6WUPpl6ks5FZp/FzrZajSeAcNfsZ2dFZ0YIiES4KaOYXwMOLZikRsEXRZ5lkB/VS2wUvVTtnHN7X/n2uPDIwR/k2hQHcscyueTn5VEPdLz3BjwgoKqrVQeaDqZwHCal1qu+GlBm7t2jQQ83J4rVb4gMsl1dWUPE0dphdJ/vS3tRWA5YvsOffbsDo7xQsa67naL0QU0BZawchj0v7tDIxXIUJI1aV4ZWOLy3rBOrXnaXGr6+BGJIw== 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=8iyujWJIOKcCbNu0c0UOuLlJWuF+atIV285xSWE1t0c=; b=Q+N6g0PN4UhjKh7GzHNyiqgZbeZiYh9olGSrMeEH0kAdktsDJbUazar96D1tKsqib08DuajIhaC2xrViXO43nVeGw7mUtN1iKb1ad2Gc0aKaOtLWFvChN/gnhp2NAk+1CCoKJF4EN54dgAzlZG7yMjpl+gT3lYA20/PP3rU1hwa1WsEwZ4CnKHB4JmE4ohAjP3UXaRHyD2YBYlQipjOHoCoocdxx28F7gjAXwREiIbOB+RXXBZdVS1BzJPFzK0Z14JtB6kF+rUtIUFbRS24vTtzA/eyTPLksbVC42NyDh6h5badu7AVxwxvCgKreDKTVdeU8PhQIdMnIKynD2lIcIQ== 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=8iyujWJIOKcCbNu0c0UOuLlJWuF+atIV285xSWE1t0c=; b=g0Tvbiw5eOjmpcocd9RGMnnueGhFoyesjn96qVSbEq5ri4tYy8nStmKGxG9FYQL+JtomEoT/15ZuYzEx7kVksAgFMxEPT6Bf1KQ9KfeuI/4NSp2kTSHr/PbljWGDzvWy5o7qtbGBOXItOEy+HV2JQ48v4gwJ7FbPA96MWb9ABxYuJYB+PuMuh3YpnnQPHvde32T/hITqFM/eqRHDcGucmerjoGo5VVYQcrgr5AK8aW+XT+zkLjPEs9JTLIyUZpI2KWjGrOzqHXcdzBPLLpSAx6Yc2wbt+nrjq+qwrb2kfpjgRAGev2C7TD+WXuOVSzw8r6j1r51vzq657nCdSGSjkQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::47) by DB3EUR04HT020.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::311) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:45 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:45 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8A323BCABDA3DCD48BB06B537722038D754BD93E9772787CBF712A720F8DB911; UpperCasedChecksum:653AB28FCF9CA267688B0D43F1C788132E354830762413D50602241B3A356937; SizeAsReceived:7609; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:04 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Tyx5PuKO/TphKN6zM7Lgl9REyQm9KxsQOd5slDnaAYw=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:44 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: a94a05b0-43a2-4cbd-abbe-08d9104d7136 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMUVAIEgJfQOjCmuA15IcvSx/kO/M3+AK9+aLDtSVUAluWhWISS//xhnjohL/zxs7QfidbPQvWh+LawN6zkGwW8GFbdkz2bewreomHfHA4WLv3hM/WkcevkLFQ4pUvfaQexfJH2zbVttGx6NNixpDAYJmoifinhXuO9LxeQq8nnzyA10Y45x0eNMC3l1Rxec2oyx4wTxYOsQiNTP8rEZL0af9gUMwfBL0ojRVx2WVHEBAlDeBPKUYVFlDUgad47shma+wKgjsvu9RUGsFDSCBQh/LCIfXrT1uSGlQuUJafnR+q5gTngs70KRG3aAGYDejNU13Wlnaf0tXPMnHrY4kqnhNiFQuNE979WAjQ3UDzpJbbnoT2voPqt7wNdm3OQ18cn1cojc7D+YzaT12szyuqC5pFHGr/Fsp2BJ4Vg+QaouMHF1mydbi2mmIpLFSQmMaRiEhAE0Xe8oraHkSr6jH1vsLf8u2Lf9aIdKMYUrjsU8CYyBeoRRb9Hp5a377Z4kqOzul/6rpJMD2rEfdWXcYsh6uAMc482hNZn4fsbtEYB2I/2V9gIryG68t5ju9S8x7krIZu2zZ8m1N+kNggSEpEnsb5wKqJ4TVlcppl3FhB4++TrWtNyI/ePDgvvM5AzM7rZhAGEA+LjIESMhBttnANtM8JDee5D/wf880mDnISfSlOvPjTXY6L5b/bV06RX5JdEKWZwsS1xDvx4gvQR1My2xwiW1GnlqTmNZbFJjb14cc+EqpNVyDPeazar9vCGss9Ql40GqqEHPpczY0HVBv7Z6UQ9WIvu4tN595vv4yC5viSUbWrjulTP22/Svl3KczLbM0AoPkvdrRj21NiHaLzcEZEH5ezOfniHaAcTg1gx5Y8JJ6Ijq1AlPS4Y3+wX6UYRMbWlllgL9lVUYfBxfqYQh7HZyakgP9s4onxPknxtSpg1RjWlBWZaX X-MS-TrafficTypeDiagnostic: DB3EUR04HT020: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GwmK0eFDf2B8hsF0QqXVBndq1gHxErqxyFt3eyXMCAQVCtmW805lrz4n6j2G18Lg4D1vS7b+7wprETJRUclYfb4juNFDX1Jc/9PXzAtS5b6iQleQD+rtOZj9uuO06t6RRuv/md64lhkgvOYnFsGq8PLFuJDVu9baDZcp2ni3f+uZwRr+mg2e4JbbuqjmJj4gJAmeutQGqs77nWzB1flFqS05HQGshw/tPQPSez4ayyFnHgC8NzgzttnbaK2OIFxSncdxDcW0EibbD5hkaSn4hlOq4hwow89NikqixBuBooTFFd7Ob3qVmx5bIHHadTOQYC+QCd1Uezf5lzqMEznvigXJ+TcSAbIOJ/Bj9dXxs+Hmzleis2GB/R72iUAGVuLLRdzSsMexb70fJ27GzPOyC7JcBYAe7LXgPeOO+bhyKKyVw9n7linUDLv27FIMFBXP X-MS-Exchange-AntiSpam-MessageData: lbqqf+YSiZZjJ6jZP1FTVXCoAJipTwVoyS0mMiA49xNpOb9GctXtgxq0lEVryInfDIVln/72Ys6rd8QFwPhG5Lbt3hvvCXDvqoFQNDBjvamPF+c8Vvm0VYPDH9kQgT4C/jnuKkwcHpH+3pSGKQLFkg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a94a05b0-43a2-4cbd-abbe-08d9104d7136 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:45.0479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT020 Subject: [FFmpeg-devel] [PATCH 06/23] avcodec/zmbvenc: 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: sBZNzLzxHJ1T Initializing zlib in the way we do here is threadsafe, see https://www.zlib.net/zlib_faq.html#faq21 Signed-off-by: Andreas Rheinhardt --- libavcodec/zmbvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index d0c353d0df..b431476241 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -442,5 +442,5 @@ const AVCodec ff_zmbv_encoder = { #endif //ZMBV_ENABLE_24BPP AV_PIX_FMT_BGR0, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:11:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980550iob; Wed, 5 May 2021 22:12:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOu/dwtGA9kXN+1ZX25iehRRLA3V+Iu80qoNZhAhFZMO9J0tObaWT35tABVtCOS1fr05KG X-Received: by 2002:a17:906:3b10:: with SMTP id g16mr2456939ejf.232.1620277969949; Wed, 05 May 2021 22:12: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 p5si1656804edt.116.2021.05.05.22.12.49; Wed, 05 May 2021 22:12: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=ZQPB1ran; 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 25B6B680835; Thu, 6 May 2021 08:11:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073070.outbound.protection.outlook.com [40.92.73.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 681D768094F for ; Thu, 6 May 2021 08:11:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UfCpHN/lRbN9K0/Qgz/WmgvUhwwG1fI3Y4kHxnQ8W9dO53iuoc/+/pw0hCCANaKBQKBf8Q+iACosGCj8Jo32grt2+jeHGyE2H94hGsaCIfmNiULKuMDW1CTFDpGOoMVhc+7TmPx0+ZmZHBJcR60lIqem3OZ9wZodCTGi6kfed/GCNUrwgOFzEYJLwSglBt8hHWijcRylh2HtP2R1V4sZhLXwjzQOp0vQ9Tk0mQDEZCqUU5qqDisT8DxSCCfmEz+SgYZLGZhjRwmpcs9Ij6dOmi1KFR6uHE8RuuL8pYaHLGMtVTeEGnZFCYCW3j0HEYWCvELOpTK6xltgXeR9mU2F1Q== 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=laTD/eTWFEcs/JjAqX84Ecl5hwu1Vb1UY+snbpVCqKo=; b=mMggr/Zv9K+HZQbypujbhPfqpsMNx0JcHS1YUJ2xOqT5LrN/RvYQxYGuidQ21Z2O7pWFdYkAMQQhIDHLNj5H7AZ1imbCipFjR6CKngZYFfCTqBg7w5OGGsGGKV7J2V1XEME4JYmHP8WDvAZ96QXPgfv+70b9KQmp44DZMLHh/2Gw5y8MtfAWbxsxiavva6M8d/n94hE5JLuxB6ShPAdib49gZlWBFWzl98gegmEcjVtg7GPmgp7EHjAB4AExO11Fb9egRwy/8BrbePjG3jE7bOmyI6YunxiLCA9twq7CbdO2eLKwONzHtKV8xOc9SO4piccoTtl2Fbg+oRSMQiTOCg== 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=laTD/eTWFEcs/JjAqX84Ecl5hwu1Vb1UY+snbpVCqKo=; b=ZQPB1ranGJ1GMCBYF2+zRRFreUxstti1E4cQk2ZB6ADlSMuulc142VYaPZCTpp+YUGRMizsB+tDYSRYJTpdobxcB0O+6upmMNByPiPYmPAJipoKpcKA41YIHQZa+XFQCfzWeg6Iy/SLaw11Ta36Jl7jMrqzn2RfFmCjUv9BF7k58Ap1MubZ8wx9g+F6hWdLbadNc0DuNNACZT0LYK4pvvtYGrS5UXiyokWBU9rIR3LKRTMprUWbASzOeYXZBZPsc1OE+caDoSQdS87771K8t9jfU+ZDrIRrhWjfxr9DQ1DJX+hnLIu20E6/ZE7R4EvM7FX7EoDX/Zjy9nusYsnkguQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::48) by DB3EUR04HT045.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::320) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:46 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9BF611F5D8F3AE633AEF47573107D2A4B31A87F88BEF64001401EFCCFF1578EB; UpperCasedChecksum:965EB094E729E98528F250D29ED372BC9AE5A3D722FF06DB5A1AA7B71AB42329; SizeAsReceived:7593; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:05 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [WzuCS2Q7/AphH969GHYUHSIMDU4yajjsP0dKP4GiUJM=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:45 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d7439bc0-3cbf-48d2-2685-08d9104d71f7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTOZvmSdSkFmrII0w+yr7JCJ9sEcPJCcdbPOyk74LSbezizn1teslm0gxnRkCFzhWOvcLzf9FG6PhQPTPjgu2bGIp/T7wM4Ec3CMHJHi0KjT8Kxgplfmhha1PgFkGBoryZt6AKI0Yhib9V2pBe9J5CKPeSZIfRB4vnSiLSSHWVZzD0E5qMbT4iX1rAfZa/YM7/pKq9S2kMSIUuM3LB9LsdNQnmW0GHuXfL2omAbg616EGgQ9RPjHds+rPQQgi7rdhGTrgLgsbnPgihRTnZ9zYp1EuPK3gqh0sWhFzZZdc97KIt5D19+aO0h+mC3MQWR0FOr6TVjXRz1OXtELMCZGT8RINgyIOP6a039jzs+a0UK0h6PfxQSWrMeBiSfgmX7feqFoW1wHTTt3C0a7O9Ki39u2hYgLS4X0mOgBmps6zcJNd+9DZGa+i6UxjXpGMXwzOWUvW/EsbPagaFC12viyy1xrLRMLammlRtV04MxHJsu2+Q482sJ0JBVUvPT/jnl51G5e478gtg8c+Kw/U7z77tnz7i1YNA0kb+PApGWtT+XNj7uNYtTe/YxGxcmUr2hgBZYB+mYHuy7DWMsghFOjROklrBba5vtLDbeCSDu9a5AP/q8s7NIDY2SzY7c0gW2fr7hHIQFgTeWNrbmKlcq5XVF5MTKSaE0wc982z4jbAvFqF8mQLlwnMGAEqMVOT1CNhqaY3DglQgL+0ee7KF0FUMu4jZyIS3ES1IRu0PnBtEuHI= X-MS-TrafficTypeDiagnostic: DB3EUR04HT045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Md8E3r+qNOFpNhcrIKhKrkX/NPXzhJXWnRhZmlHiqYl7cVJbFL+Nnon8qPZIE4/6A9HJOe9ljgal6GMJW/MKkJyksAvIV1GgvPaYipNdXBS+3RNPN6OymJjFFfVHU5T1ONMSRSoemUrkmEpLaAz9ElgqxmcrOWTqkAL8qLaulptHLtEdyivCZyYgmygiAc/IIItc1SVIWuAOwmETasdpeh5Pcodaqy7pIrBfsDVunl8ORxF54G5Gskr/sXASMQYp4e079E6rGx0dgqeP8HXBubemFpWHCXNydUFL9kgtLIFgkFfx7W+yioK2q6zF0NZJ+LnVF2hNzY0L9rpe4bfKlMnBVjZg/NaCJ2Flse7FNt3WeVHeO0alNFFPaXX4fA4UU8ms/6honNOkGAjwc1XyLQ== X-MS-Exchange-AntiSpam-MessageData: Ri04TnCZ3PI6TOJ40afjlft2BClekI9RJ4/HfytXKPS3U7oHx2mjRlOO8tbJSIUscJhnP9038Skha/J6CVtPJ4mrSDWCzCto8vzyQotkbEexZE1AOy0u9KUqm5tEAsAon4YlGsyOvDkKn6fn4nbCuQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7439bc0-3cbf-48d2-2685-08d9104d71f7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:46.3193 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT045 Subject: [FFmpeg-devel] [PATCH 07/23] avcodec/rawdec: 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: gAO3Ts/DfdPf Signed-off-by: Andreas Rheinhardt --- libavcodec/rawdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 96abf6a48c..b22e36e984 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -492,4 +492,5 @@ const AVCodec ff_rawvideo_decoder = { .decode = raw_decode, .priv_class = &rawdec_class, .capabilities = AV_CODEC_CAP_PARAM_CHANGE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Thu May 6 05:11:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980461iob; Wed, 5 May 2021 22:12:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3tlV39fEXlK9unfYvt2sEDc4t/Adqir5JP5Ibrsv9elO5RNyVdMGL7BJ1RQGlbemMkZVt X-Received: by 2002:a17:907:10cb:: with SMTP id rv11mr2384694ejb.379.1620277959488; Wed, 05 May 2021 22:12:39 -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 ha1si1243275ejb.743.2021.05.05.22.12.39; Wed, 05 May 2021 22:12:39 -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=kVogsdJ2; 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 25909680A3D; Thu, 6 May 2021 08:11:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074045.outbound.protection.outlook.com [40.92.74.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94E816808EE for ; Thu, 6 May 2021 08:11:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4GfgZZbkvsmjkKrAevXZafU2TYAmUm1zLBQz0yuF6pwmkD7aPj5hJI4pCCopO9QvVacgHJEE1hBgtur0qDx6PLIcYMvN8KG9oE29bhIVhljYnqLw+VxJWbcAnZYVBSXv5yzyYX4+rRXd5PrVNs1fcdRBDNoF4beA332BzaAwbBD/GNPHU1ieddBfvQuBfJRf1M4EZYesY9rhtMDTlnv0LAjshTaQG1IH7GqyCXMk0qQ9Dn7PFfVlb8HvmQ78ChfBUmlIrGoTa8zg3P00JMDmwTRZH3uouKl8u4tyYR1J/2xSGS1aQYASNb6CY2/juAXj4I75drUxpcNErKbF2vthQ== 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=yS5wARXvGl1HSOKoENGoyz1Tmq5k3IA1wTAyYLgTuzY=; b=AF/S2eJZVOO0UctJFGwrlbCBFkLrrnFadVQrB/eKRnPhKWeRxihLmKlARw4YRb56GZEA0cZgI9lMAY0C1AmDLowwHufDcUklp2estb6ZH+lSWB5uA1CFiZFyjFGCeeP4Hb4j43bp3i+mfrL1iDu4pc2zbEuAKnJMBUGymlIV7rD+eYpYdedvIixGJPy+HECoaOclnrWsPUP8IfHT9GQc1r/PYGowahMqW+5ipjFS3K86oH14DfcLc2SfFa5gFQvdIkTH1Yo1lrow5/cVetpmag7ZsKkQCoZmJY9pS9+C9zQKaCx2ZkfBjmYlNhh+wgZBIgMYEVjRwo2ptl6o4E6tIQ== 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=yS5wARXvGl1HSOKoENGoyz1Tmq5k3IA1wTAyYLgTuzY=; b=kVogsdJ2+h+ItEUnBqAv6LOMGG8nE7uk/IABwgyf1vSZ7oYFaS2iDzI5OyR8LEyRoDiaCLOMXTITQZn17Wea3YajYjpJS2VhlC5fPFg321LeIT7BqHd/XWDXQ8uVw518FhLvS4kIDuyCPe3KaLl7vEw1oATwA2FHoa50XcjIJZ30oFYtQV8dm1sCX9GHSWiP+64lO7HJfmGM1FiScFgcmTfV/i6cwB496GvNJokvc81PqdWSVjwYae8uK5ZbGe2rY1zT8I0Te3nRIFAmA9jGNOio75m01RrZnfUJgKQ21I4YvUUtajh45FC3UeJOlpjkQw8VxWZxHC1KSCqsuQP/jw== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::47) by DB3EUR04HT020.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::311) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:47 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BA39CD287B38DE88BD7B183E09098F66E60FE458FDA30A24777E6B5DA076D834; UpperCasedChecksum:91D3A2A74115F1D117C03767B5D1076BF690F63390ED5640FF34839749ED2F8C; SizeAsReceived:7594; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:06 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [ejPORzzRVRp2cdLCFw5jRkxacNtnYR6d2ckgJxcGqes=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:46 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8e50a5d1-c686-4a2d-4ccd-08d9104d727c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTEg6DjnyLH3U63QWz69b6bbPVSOuXF1/6CeArzlLQyDFN6EpKaLZ2+A3Gl7Xpm9847zshgkBhAD/P3+/xYpeRzxQMMJNVR5f3ZWYaYcX1yyhPIUIhH5Vjn5IRR87fh3ClM9HTpITWZnc/TRAcArZFIAZ3PZ++i9f5e1m88Slvw9PbnNGTnfujL5OOsfBTWDs5J/8yzOD4OasNKwfjtaqLYJW8gOASMCd7w6PnOZk39oFQaDGlK5MriEaJV8qiXrmUXU/UYJOcpWUpY6Chtc2S55wdAeQDtzaPoPjrCeH4MGa6TC35RoDpnOfywegwL2wrhVTY/fgEcg1Z/Tc2rFdU44xBG+Il/3HMIJIu/pEELMJVIr/LjGPwJE9zVcDIXUFdaJe7IsS8qR1OhD4k1nXsvFY/jLOslNfn5ntGqlar7i8+p/xSGhJPj3z8RV3WgXhDN0hmR1YfF9YvxU9Kg9kkc1pXZyKcFohusZCbCqm33Kmz1jns+r5CRepaXxHRjrBHi6MUDFaVLsIoHxDjF05A2dqfEjufMcoSOepLSGwguJoBWCnWIfITkbVNS/wtCT9sfEqXCFKEyD8di+1rScRxvTcfo1fXgkdYUBdy44VrzdkvGB2u1PE/eNHteFlo5cDgmalej200jZFs9otrfPliF236hOgJcR6DNcVNtvwYafHdkMMRllegQoWsO7IDXN3OiQk+HxAOkc9mylIOidGU8GPT3ivTvJA8zS+IRIRzkqM= X-MS-TrafficTypeDiagnostic: DB3EUR04HT020: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Mb1wQT0V5xjBaODVcLNh4uuoZ6ReAgOgRqd/pZfNlH3inpVhpqbQWglzMTr6WH/RftXXsFer/i36PygctOQZbjAMjTMLUB/KlKTiv20U1mTcY4dltWLYEEa7CxvBb57kU5E3gJxjZfvyE75QlqENQ0pmAh7A5FZhp0m8d7OWQysEskNnmDkJIEr59oYF06e7sPqz+mOs04z2eVjdZCZRkZJ9PUuTZdsoLo4qUpXfe61cMHgvtqn6Wyiq6LAfjlgkWwW6Ucp/EqqdqsDMJ3jVq6lIYkYuSpqzOC8Db0NJqJLbS8ZlFDnBidkJURGqM1piRM3nwisD4KR5sIZq5HCPRIZvitInHygTuPBbeEwB7lAe8BGn+lyDK5Na2DkfkifTizBl/V5K/tWbwam0esvzw== X-MS-Exchange-AntiSpam-MessageData: QlEXr3w6cXSgxt2vxXFbznJewLWjcY4+6f+8Ny6Lew08mNvKS+t6m5gTMvJuUKipTqXC2ASGF+13yExxdspnwueM0mA4UU1d0jUMNXKxJVh2SgSnk2i8vt0zL+HyRE6Z5PsP2O0uQ89yAZp6iWbe1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e50a5d1-c686-4a2d-4ccd-08d9104d727c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:47.0969 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT020 Subject: [FFmpeg-devel] [PATCH 08/23] avcodec/vp9: Cleanup generically on init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6x63eze38y2/ Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 32776ebae7..7409178501 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1798,7 +1798,6 @@ static int init_frames(AVCodecContext *avctx) for (i = 0; i < 3; i++) { s->s.frames[i].tf.f = av_frame_alloc(); if (!s->s.frames[i].tf.f) { - vp9_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); return AVERROR(ENOMEM); } @@ -1807,7 +1806,6 @@ static int init_frames(AVCodecContext *avctx) s->s.refs[i].f = av_frame_alloc(); s->next_refs[i].f = av_frame_alloc(); if (!s->s.refs[i].f || !s->next_refs[i].f) { - vp9_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); return AVERROR(ENOMEM); } @@ -1883,7 +1881,8 @@ const AVCodec ff_vp9_decoder = { .close = vp9_decode_free, .decode = vp9_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_SLICE_THREAD_HAS_MF | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_SLICE_THREAD_HAS_MF | FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp9_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), From patchwork Thu May 6 05:11:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980827iob; Wed, 5 May 2021 22:13:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkq7TA0QXPx7EKYWWq06v3XDj3T8hpTuCIfpffSlz8G/cNw1bf5GXWO3owSI68O1jfN1Qb X-Received: by 2002:a17:906:507:: with SMTP id j7mr2385543eja.151.1620277996674; Wed, 05 May 2021 22:13: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 m9si1332164edc.229.2021.05.05.22.13.16; Wed, 05 May 2021 22:13: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=FVOSiWrZ; 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 317686808A7; Thu, 6 May 2021 08:11:59 +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-oln040092075070.outbound.protection.outlook.com [40.92.75.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70737680968 for ; Thu, 6 May 2021 08:11:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cG9qZSIkLIUFMed6/IIda6YphtxjKDy0UCdBaVOM53llbWh+LY58rwl3wNmLfBYTsuJLLo3QzMDjNRhuOmIDrnh9k1DQGJpJRW8qthQe4LToSJA9KuMawDarvomd41rn+rpmGZVR9nv0hb6kCYmD5hi5Qnzg3KMbMTr9OTTQHVVYqrM+L0aiVXoyFhXqbQ3rPge8yx8Ptpl82Tv4Mdqbdbxmt8++y680YKIvDPi6h9CYlZnbc8tIaNaXlWl99FCjpw41K0Sxn3bIW8HS8vuZEPwro80kliyH754G3ElMlMr0o6VpQZmnNugx3YHC5uSB3MjdyMlrSLmJRrahJreL1A== 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=APnTXdUNa9cyL88hu2aeyTBTpAwUUMibWqeHK9YgHJ4=; b=IsqV/utBI1RBIv0HN+IqfcPU6eV0BgG1rDFcuFGE3nAYuUqDNWaS7CdzlqqlviRBz9/6yjrYnDwTnZ80xhIxbtCDqtjZV9bFjTbo/f0/WhGmF9PsQABoMof4/1CfiZLVz68HKw+LXFhlPRNYj+lgzRKzBoQp+AN5/Sc9CZe5/gwf9dZkpB32rqMWBW3T5AIUH1itvuhMnf6AKIRen8x0/yY7cn0SdMPg9v5XaY6g6rgtw81vIw5ciMsvtJRSH4gx9C7QkuAhqKUjFqc8B/lJwmbxbZTsb4TXRXuOeHdeQwa42fcpLmRQFjBL5PRc/THbyXOI97PZPf71+QFb6BuXjA== 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=APnTXdUNa9cyL88hu2aeyTBTpAwUUMibWqeHK9YgHJ4=; b=FVOSiWrZDpjybT/5lJA6xwvogkNowIujQgj4+OmwyWazlJYK4JfOZdu12nRfibZrw9dRTigrPSWyWmQCzY0Jg8Azrfdjwx+A07D1kPoz0vQPntye8UGP+y/YanDB47PFj6q3TmOZmeJC5Ftl9K/9Qn2Q3GZAFgKaPkUhdoVPTin8bQWw1bLRpjY2p7xFTUjzWn/niPI+fVLiAkd1o/SffPnnNWv9g8nkRlxw+RZSOf2U9gHbpmLoYm2cw27K6Xq8aRUuYSAkqlyPgp8EJWKoKmDkDzd+zmsp+/Q7vlUn0K4Lw/4DDYu94bdzZ5Bz6PuQxT9vgAz6+fmakGowd3oq+A== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4a) by DB3EUR04HT165.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::370) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:48 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:48 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:17B1DCF7E04189354CF49B68C9F0FDF0F89AE9DC44A7D149DA9DF5F53FCCBDCF; UpperCasedChecksum:9710E88764628992CDC786BA9EF6C794C20B9E8C2A90B729D76772D976B880FC; SizeAsReceived:7597; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:07 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [s7oiE8Y8tn7PtPYZMN01Uc9931PYv5AH1j9jKr197To=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:48 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ad751ccf-4012-453c-8572-08d9104d735a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ6Z3qDqpu+gYzH1t+dXNbMDak37NEmTH+uq0TlCgfGkdf7nP8KQ2r3AgV4JUHVYJivYWnrmmpmGoJ3vKaacoDj/416BXIu+WKiRJee0ZpJjBbDkX9KC1Ff0mIHQziT5FLy5T6yQA7mQrlrQccNhhUa9P+LHsP9r/p0CqovsfJKxT14eG449P9T79wO3Gkg6FuOfnUWwPqvprRVzWunPL0rxhXMEV1kT4vKOtqFPtBRrOLZxZfhNcSbrmED5FYfydYmurpvdgNZe1biEinkJ4LPFtcoLdk2uIZL3YR91tMb+qMAOe7xeUbFJprGoioIAvCIiMYic8apSqWkDZHdjJLyN8s6eXXrco1FTqDTX6hH4CaXmEt+GfescfvE7dMIdBtP95UJX+n22GXY+JdOOSULn9R0fqYnw3sQWNL2FN5VK+GkwpY3E+5PUiVLKjG4rXDlvqUFe0ajgL3GiQnawG5boQI9dCQRdUhxtjIpi/JLfveJI4BCE7neojfvWuzR6xWOT41T4aoUwQGqwZAVy9YDmsgQ9yTXqjQc3Uye5EKk9fP7vHgWZ9rDCP8aJZODuPwO17+OMGydwEdTO7rOZlvSJQrBsmaPIRrGE6mh28zOgp7KP74x0UHhffLwtlfZg8YR+q5EXp3SmlEmh7z46wWjUgvXAToUlBVnY21CRYUMIwRFf/R94nbQtMnY4GvShlKEb0vOxd0+ow== X-MS-TrafficTypeDiagnostic: DB3EUR04HT165: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: shiLqOAuEcMkiaHEtcQK/FJfIiqXKR2h1eM1nrffJ8jaaqDdxrSd2eB21LFGQgo9WPssWCEWhHOwG4s1K/Ekp5CmUbyYOLV5eM+NTRkBQtNfmq/ZbwvVWytBC3r1prj5y0iWpcIqwm8MfxkvtGX0I2uvSOspYaVHEem87IID5m9Mly3sTDEfj+e5abMY8gPfQHRt2ZP3+AWlMiEzVSx+gyGJkJikFTeLW5mDK243UfzQ0ix89tcVEOXyG2Px+KP0ngz+CFpEMyVdmDVpvwyZfPDPqoIYlzGzHZqviaArLc89rIlnLf8hwaM3pBQ96nictmVoUMWdbJYGVq+iTC+gyj2OWWmV2QxSc9C74NSzLVxzYvaJuzFt+tiBUR1VxhvQLFk6Dr2wqVzGifmC98m3yg== X-MS-Exchange-AntiSpam-MessageData: 2BOmSJ16iRVeu0fURceKppggHZ3z9JWeUbcUOSMK+3lsBg2M+r33YtVPGvuZinR7gZrQ6vAnT8DoMR68w8xIk2c/wCAaHl/3U3N98TXFTOnwUEz1/03WBN6s7OgYO2AOnDdDseybW48hPFFBZivOUA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad751ccf-4012-453c-8572-08d9104d735a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:48.5743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT165 Subject: [FFmpeg-devel] [PATCH 09/23] avcodec/vp9: Remove excessive log messages 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: ReKAjOjfvqw2 Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7409178501..fd0e0dc54f 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1797,18 +1797,14 @@ static int init_frames(AVCodecContext *avctx) for (i = 0; i < 3; i++) { s->s.frames[i].tf.f = av_frame_alloc(); - if (!s->s.frames[i].tf.f) { - av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); + if (!s->s.frames[i].tf.f) return AVERROR(ENOMEM); - } } for (i = 0; i < 8; i++) { s->s.refs[i].f = av_frame_alloc(); s->next_refs[i].f = av_frame_alloc(); - if (!s->s.refs[i].f || !s->next_refs[i].f) { - av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); + if (!s->s.refs[i].f || !s->next_refs[i].f) return AVERROR(ENOMEM); - } } return 0; From patchwork Thu May 6 05:11:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980299iob; Wed, 5 May 2021 22:12:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRuvVXZruQS+876WS1Laix0BSk6K+jWm4YtfJm41Q5RTfZp/ClA6I2FK9q5t4Tfcv8NYO7 X-Received: by 2002:a17:906:b104:: with SMTP id u4mr2385893ejy.211.1620277939685; Wed, 05 May 2021 22:12:19 -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 i5si1284795eje.413.2021.05.05.22.12.19; Wed, 05 May 2021 22:12:19 -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=ffkYXcbT; 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 044376806F4; Thu, 6 May 2021 08:11:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074068.outbound.protection.outlook.com [40.92.74.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2925A6804AE for ; Thu, 6 May 2021 08:11:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DLsCLnA0dUEnNdjWU6f92w12BauZR9Fs3NWGFB6bj6NOSWh3IklHzTC23q/ipjX7j2cLp765wjVcajyiQK0upciQUeDgviJPLVFFnf3XisPEKURVfJTywnlDH/obhcsIGx4+bzI6PNO/+9E6G3VvdbVh8D2N+N+lPQ0y7rdcauieG26G8hPFdo9B9SDkRKpYTqHE9EM+BMXw8boYjzoSYFwIuiCTKlVzaq8SDy54uFIkACbd2h/Rrv1JFbWONS+G4+gD+BuIukyZGHYLCwOxiKLCUR05A2OpWjPFtO7X5i2dA8B5XtoxPqRmISFHILdDhdeJyvfowKnb4d0cAfJT6A== 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=Tr4aZpjAP8JMEVyTmrFsGRpxIO6KCisbmZBNoZP9yKo=; b=HHdHFtjVdPExp2t/VhMd5ZwokB5ri1NPfjAjd8RtDLBvD44fOkmdLWuCSeceEKF5UHWJycG2si3CT6iAIP+E3yMY6ra7tWOAE9JN03/Df/LvnDU5p1t33hK4HMCs7FOMOaIrff6KH6DWfTxZiA/EoxaqegsKqaqvnIh3nHB5EQNhq3gQ2t2DNfCLjElVA1e9fNe4ShfSku2BGmv9x5QYvxc3+tQ+RG4LDXxxljvZaUqnWHetOi6SYso7dCh3Ubvfgz/mONFpJv+wJHDmtB7aOtltYhRKbKogNx1KADcrjGrFjMS8Dg9E2yjhFWi8zmWVR6JYBVtPtALLR7NW0cJDYw== 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=Tr4aZpjAP8JMEVyTmrFsGRpxIO6KCisbmZBNoZP9yKo=; b=ffkYXcbTgErHDcQaBHA0z4k+EOOf1nm4DoodnQMefHnqKIkoOTx3AaztSM1Sfcqq+b0e9S/zfmbfm1qXiFOEzUEcTA3ef3H+GvOAfJChnt0BWgQlesXRwlViWhlkINfmv9/Faq3tfHMXdPgiABFId7DAD28yzOXk1gzuwOfFvzqwQ2bER8Ub6fOI8tWg/YXTCSxi0So5Bx4GWeOFBixo51v2R4cA5L5vVj/rhFN1jhOUoa4dGs7M6jdFkltWIYGFLMqX+qR9FSDyU8kSrbSRvp4Mf73Btb46cArKBRBVRp+qGmPl1TEc0Xy/rXvWzEHae0hfk1Y0urj1PDgJ1Tykhg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4a) by DB3EUR04HT084.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::340) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:49 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:31E4B598265B1E5FF5575DBFD3A6A460216D71F7BB3FB4013C00361BC3F26599; UpperCasedChecksum:D7A6BA2536D375B1B2D6A3F77DA66CA8925BD6C5CF5A77D19109FB6CA2F703FB; SizeAsReceived:7611; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [q3pCP+gpHzaqmmKZhFRZxfDPxEaYI8/EmSwQ9nGDqig=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f18aaba5-ca5e-4200-2d15-08d9104d73f5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0SMeG40uUNOrRKaJzsIuKhS3q/u2EZjpbxrvu4YCdqVQ1xjCVmxPMDE0DpWjYJbm8Ni9rixGRKH6Uxi/T0ndNYPYoMyHfByX0zXRHwN3mA9yhPQV6+8Y5uT6ppvhqd4koXa9zWYGtZxD0raR/7JuuGRQi8UgMKZ43zNBffdp4uubcvKtKmPzMU6ZdHMABW6NC34R/CT++EZVzQ0DncfE6fXK69pIVpmSXERR5vCClC/vXSzQhIvd5aWIzCiy5Sc/kp3YLp5LGf4pnndid2a4uNKwMCvfdgumqtesMwEv2CxtAN16jGG4Oz497pSdBH359DQEkQ6nzH4geBi9CjvGSo+h66P79ougjXmvwnu59Ne5VV5NsGOXOZagdiyd4sk+NyAxq8CqMWftMHgYkijuKFfc59rovCt6E6lcw+qK5ZgzSt31ZX/Fna6CcZcJNYWCrG2jQVGihSBT1+RVmrg2ZwWAb5BPwUk0+QppXBNCWBOO75AqKGpyraIdonAWXFGSbew4vZDQf6VCVYpkT4sV4uq2hSU7+cfwDZnZhGutc8Sagn5wwdQMjgIAY3fznyZR3khTE4E2TToBBoXLwGqQd3Fjdppu9YiB1SIUzdfoIXbae5D9ZjLdXlrOdnb+dk14aSB8fyoTHOli+RKa1cKGMyqkD26gGKvLBiE0wKgRk4xL0ObxjXs2GD+jeNTnmN95GVjSlFh2flj+g= X-MS-TrafficTypeDiagnostic: DB3EUR04HT084: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KbLgDSr+iPuAdkiO6GoQ17pLU2RwDjgSrffCd2nfLNaBspo/csbT1stwxLRhFYG1elBaAryKF9P6HmbhbrI+vzc8X0KCvhwiaBxM/tvNd8cfREuK1AgTMELsRmEmE10bd308iFQgzYvCpLttbF5HUmcsgtTclIKc3AAF7Gwoj3H6ChhjF0/gqlaTa16foKawrv3dZtMad2yWpVF06dbHCdPIqtd0bNRyL39lcffrDWxg3cYBNaHRS1QDv4V/pE0xcJ4h8YUJIkQgCRUojri905Kwkusbv8hCH5o6rhST/jBv3RVYvifNdKF24X0Z4vTtRz2RaVYdLjOdACe3rhQjkjflnoPtR4N9Y3pDLAqUydUjVguPLXJDBJW3Mg01AanO2dsoE/li+oSO62f7k1zHGg== X-MS-Exchange-AntiSpam-MessageData: NgSr+RwcK8o0tfap8br3KpAmVZtC/cigWA8h7dJMAwFwEb3cfl5HVH9o+TO8G/kOG0kLJ3kSR6dE8+6kXvzfQA/FWlLeuLE6RBOfIO3nTpkagt+eWDIGEArKZ2BjqK4PofB02WtRFNuRpF6CtbJYWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f18aaba5-ca5e-4200-2d15-08d9104d73f5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:49.5888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT084 Subject: [FFmpeg-devel] [PATCH 10/23] avcodec/vp9: Inline function with only one caller into it 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: gtmpE/7tO7W1 The split into vp9_decode_init() and init_frames() is a remnant of using init_thread_copy() for frame-threading; the latter has been removed, so there is no reason for init_frames() not be part of vp9_decode_init(). Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fd0e0dc54f..783f446125 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1790,36 +1790,27 @@ static void vp9_decode_flush(AVCodecContext *avctx) ff_thread_release_buffer(avctx, &s->s.refs[i]); } -static int init_frames(AVCodecContext *avctx) +static av_cold int vp9_decode_init(AVCodecContext *avctx) { VP9Context *s = avctx->priv_data; - int i; - for (i = 0; i < 3; i++) { + s->last_bpp = 0; + s->s.h.filter.sharpness = -1; + + for (int i = 0; i < 3; i++) { s->s.frames[i].tf.f = av_frame_alloc(); if (!s->s.frames[i].tf.f) return AVERROR(ENOMEM); } - for (i = 0; i < 8; i++) { - s->s.refs[i].f = av_frame_alloc(); - s->next_refs[i].f = av_frame_alloc(); + for (int i = 0; i < 8; i++) { + s->s.refs[i].f = av_frame_alloc(); + s->next_refs[i].f = av_frame_alloc(); if (!s->s.refs[i].f || !s->next_refs[i].f) return AVERROR(ENOMEM); } - return 0; } -static av_cold int vp9_decode_init(AVCodecContext *avctx) -{ - VP9Context *s = avctx->priv_data; - - s->last_bpp = 0; - s->s.h.filter.sharpness = -1; - - return init_frames(avctx); -} - #if HAVE_THREADS static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { From patchwork Thu May 6 05:11:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27596 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980658iob; Wed, 5 May 2021 22:12:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5uZXFoekrEaa2JPDmaz7L5xaXr4YUuK9rKxBru7sqcK2sOGeiR58O5awkaz49D0zezzxS X-Received: by 2002:a17:906:2bd3:: with SMTP id n19mr2410355ejg.210.1620277979001; Wed, 05 May 2021 22:12:59 -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 ky26si1368625ejc.683.2021.05.05.22.12.58; Wed, 05 May 2021 22:12:58 -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=KiFI0NSU; 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 299AB6808E8; Thu, 6 May 2021 08:11:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073030.outbound.protection.outlook.com [40.92.73.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EF57680986 for ; Thu, 6 May 2021 08:11:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WkrfwibRySTsNWssA8Y0JKHw7s98UpDbiST/0GUqew8Hkz40lsst446ZQ+FhHxzRK4/o2I29pz9oKtzI2qvDDdMilcZCdHca1E80Zcmjy6MpMbqM31R1UQ7Z5IxXpzmMFDQv8IEW8Q30RPmY+R4+izfZBZD7xliHzmA7vAnRQjFFPVBxcjTn38yUXzxqGgndyJPhjbHcfmAEb7t07VGKqiUZJkR2QZZ3rIh7CDB3C7qMcBuIiguiaL8dJwxYI1AtaE4a9PunQfFSU5x3lCmtIcGRTyFk699NQ8KrKFbpVTGSZ1CQbF2l/kLt0PVN25sn5+yWiJYyGSrzndeTevKj6w== 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=rqfClS1CuM1MFeCjihw8aLQXFjXcu28wIJb3YFfdLtc=; b=mSBYhLLvthorPb3uKTrZvGhNMPvWNiWqbwcvBT+i1bM1FpPYWFE8jo/4wQkdaYwgu+s9biXTCTv0uHOTYPDu1Xub8JN6NZu3jJqGrF3S3BGZAwW6bdm48D69q3OV0YRxDDvWAsyIGvWa7aWzpmlKiVcYid2IvH2qAJVGM0ipxHpO7a33ba97Qxppi7kh1XuudJC6RVo6ZHjUDL7M1f3P05Tg348MlqVBm3XkbLtOI2Hki86BPCziET/Ts+Mwz5AD8S9jksDUM27nZlnaI6XN3zL2F7t0eqcRw3m4D/3ap83ssi+6LfHkQ7Q3iKpHDKobk3P3cHCNztQypX4skFU4kg== 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=rqfClS1CuM1MFeCjihw8aLQXFjXcu28wIJb3YFfdLtc=; b=KiFI0NSUG8afANrpwX8j5RXc1ShyEhgZKJzbDXPInjqUKqXVtmBA85fuX+gBIPXoaiksI04obXNRL+BMujO1scXzsEzve0oVDd91e55VV1nBDM6tp4uNViAmcbSBuDqtWEtxe8qGmj36NW55qcHpzSZtcQX2pALTbDD9MRqnOw2HBfAE/K9qi4Dp/5jfogXRWWpAx6H5Wb39TLwiMX8c/wbwhkTvzqUAd4XlQYsHC0xGNie/PYS8/PpevAnKGbvdOKeaO+I+6jMCzo5eTAWsH6noY83sY7dq7wzfYEVX8t4Yl1CS1BH6dTy35cYDYvJvhz2bKxQfR8OelduCVCnfSQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::52) by DB3EUR04HT167.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::372) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:51 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:81BA0ED0ED1C9BFCC832DA830F31E4B56159137DBBFCE2E0D578389A82373431; UpperCasedChecksum:AA36E1F048B1E732F6113E51997871986DF06C1A3323C3B3C34C455DC4AEE78D; SizeAsReceived:7599; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:09 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [nLoiw09eXRoWLMHMwS2TIUFvaVBCfxkl4+FrblzTkA4=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 41316355-bde8-481d-1af5-08d9104d74ec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPT4FH6ECbf60RRoKCSyq2iM7oU1ocPTzo3WeYWwR66KeQENjQDz6J1akVPWLZPw+6LvsCJYbdr3cs9WKEDsrjcBR02lR1SNRxdTktBAdKdJTXcbb36TSjvAFvNWk51+T+oEYZluUwjw3lUqHER1ZAP5n/XqZ1Fmi5Xp45sXwABztXgslZxQTr3SjJcMsX3o84JEkMRIkH7TVrhik/pE7fMgqLDZwBYfRQAWjSTVg5/722pcrljizaORPbXAO+4J/KieXuRAENzn+wrpUhX0cZUC7YYdlheFlZPi51EbgZfX8QDWMzhKm5aFKcl4v8+d3ZD6/Azv79w2+ff54MDjR0793pwcRMOWd6TBrhzPIwP6ALBPrM10o+irJnKY4UYZwseWWmCnDJQ3SpkdzlYChcEu+tBLBq5CbFZbjfpqEP6waAixw4/Gne4SY/yMgmf7D88IVgdK3K/4gf10oaty21XXhKvd4BVgn5Aco8JYEkYLRXO3XlBt8IEnN89BOjCdD7QDuH9H8E5IwmXBmYkfP3NcXOW3ZbI+zpulFQuACp14ENMNegdF0H+kSijrQBc+pQotGNmojxd+MXYtW5jJN6kH4x9F0bmO91IhvGdZ3RB9p2pi43aKjn+RRXj/WIvmGWDIeW5MTZr7/MBRLxX9UjIM0uMAF2pgtc639g486t0uYjO12L7HyE2q4AOMRzVS4mv8QEh9mMEwJX+KmKOQpz+5mDUHXfuoAnNGxqn20LtPng= X-MS-TrafficTypeDiagnostic: DB3EUR04HT167: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fo53U/bM0fyxJkCR3el42lAGYj9TJVwQnbNbA6FTg5h8VJyeJq8rSVgUJ3iGryeYwKs5SB5iCZp0qetJH4fLoPYcuJ5BM8p6aAN5TwWMNA0mS4c3d2deCFmq9Z2xn3uGszhiJV8zuQmF+kV5TbkyUYG8txtDricF97D/4q55CHsJ1MWjLKOqbzhdb7ZwkCIYZJhNHPCsbHgTWjQUDHddcipuP9xfSYAOtPa9D6eLTPJPHIWSJ38HifEKxBjTdxzVCQH+mllSMpbQVUW7eynSOA3P6dxPjAS5UxAbw0SkEWJQmktOwVFOpbA3Y8GGkHhs2fihAN+eG08Q+0ggwohrNDzabuyrKrAon+3ft6N/FtnAGvkw3YOVavaqazDQF6oRBTQrl+E1Ke6b6F0vJDLWug== X-MS-Exchange-AntiSpam-MessageData: 2qXCX/cCQdQ9rQ/edOQ84q5BP4NsZgi6uU2mmWcPSuiuGEkm0bj8mduTX7eRwhIdou4k3BrrJwWLg1lXlEQJQ/o32FZ/rsb8PUS/En4Jq4YkoBCj1n2hn9UNjhsGpLZbMKHsZJ9WuO2V5Qw50w2b1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41316355-bde8-481d-1af5-08d9104d74ec X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:51.1831 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT167 Subject: [FFmpeg-devel] [PATCH 11/23] avcodec/vp9: 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: sfs2GICAQDoX It only allocates some AVFrames. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 783f446125..874005a5ae 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1868,7 +1868,7 @@ const AVCodec ff_vp9_decoder = { .close = vp9_decode_free, .decode = vp9_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SLICE_THREAD_HAS_MF | FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp9_decode_flush, From patchwork Thu May 6 05:11:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980761iob; Wed, 5 May 2021 22:13:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmz4kxfT2KJsOUjsDubBNsg3kf7A1wawsPZibnS5ACeLKcJx5FLsRCPFPnMFrll5PVPjNN X-Received: by 2002:a17:906:328c:: with SMTP id 12mr2437731ejw.361.1620277989790; Wed, 05 May 2021 22:13:09 -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 v26si1403455edx.196.2021.05.05.22.13.07; Wed, 05 May 2021 22:13:09 -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=KSkrYrvS; 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 326866809C9; Thu, 6 May 2021 08:11:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073030.outbound.protection.outlook.com [40.92.73.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 508906809E6 for ; Thu, 6 May 2021 08:11:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y82lnlB2f9uKt9kpi56PGFL7wNyAXGDVsOOPnIu3ASK4005osfcZTXGVJHJgXfOGtJK3a4qMMN9O0fdubNySlpNPJtjRf7k5uFtyIHv5o/3JiU+7ky16owx6uauOekQ8AYZBIx1kR3nToTY0La0TcZ4MwpUKw2kbKsM9ICsS148w/eHloO9euaGj4R7pAcAzuFZQXxlERdRIHeWxqpWvxU8b7HAxsvLn+VHNz85K0OK2ml+8b5pqHF9fWECHKEjoBcVLCoqAPZKKouBJxYXyvjBRw6tZ47SdYyeZ1pcdgiBAnBlKqRkQSzvirng+AmIcf3Va1n+h1hfU28VPbsdSiA== 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=u7LJHWzSqSpvWclP+2R9FVbd4s7X3t1cxPtFAeD6L2Q=; b=BIILfqx6BhNRWZEKfDsDD2OGZmgriitkOXhbLkLmz9RIwM+wzVJuEyAA6+pShKH2IUMqaU07zxVI6MsKgIVB5nNbesGo1K7KUA1sQdiWwKAOu692fuOTECVmAwJDRIocRd8JASkDBsmG9VMMgz7/ydyBVxvID103jUXYSIE6isrAwQ2qVr4suyjSN1xAlmJ6KSpKLNY+XDmOk42XYKjuMZl2xpO6l9HTmZDmDWTxGBhJe/m7f7m/62XqvPaHLnypwkGv/5I83kFGD8uQaX3Bh6FWI4VGevrxwjJ1VJs+7WeLZSY9KzItbzX7eoEIoVV2RVfdBy9541b+fc3qq0pxZQ== 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=u7LJHWzSqSpvWclP+2R9FVbd4s7X3t1cxPtFAeD6L2Q=; b=KSkrYrvSFyeoLRs/srZy/Dhmw9dPBl+kip2fJywT7rGrBfMU+MJiJYuqJJ30jXa4jaeXAi5787cyQh/CS2kc4YGkiq57XpiNgOlQGpEpWTh+gkBzY5UDbUA+Vm5g+LR/zDNKDBZ5uD/iKcJhT2bAQy0ZamD/JP6t7FJY6xcs6VLXHmhY13vGG5vypE69w9vrVZdFj1fs3hVhZ2KhKGl8vCf/zZMJmUoN/EtAWcdEmOau4y4b6CWB5vPbpnvVICCLFM77JdnTyTdQtf9P/3v43OycSwt7yLilOai1Y5vDf9S8r3QdltuyKM4UDsx8JQeFj8AzZmmhoVzSeirI43Psqw== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::52) by DB3EUR04HT167.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::372) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:52 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:52 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C522ED9A80BBD976E591126D411FC7AFE3127F778C3642B269A520648DAB2D7C; UpperCasedChecksum:0E6CFD32E5FF38F518353F4A0D0B594C68EC4F0D49DE81FCB8B6BBDB279E7161; SizeAsReceived:7617; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:10 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [5+OoIhVvrMjwNRfuO1tH0skq5oMcf2eQ9DMoafT3Cew=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0b08a972-6ccf-4adf-c6b2-08d9104d758d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPT4FH6ECbf60RRoKCSyq2iMzerPLBVZDze5gX0HLy00Kd368HFAM2mbIaFsfYqNX5nGabA32ODtdfXhszoo7HT6iaai0GUYB2CmvbYXrHt+qglZnAyaGxSSz+scEhS6FP4gnu5YYUL+OqWswsMls0kCUvZfSKpZTLN6H1DyictqRUuMyhqg4OjiUhYjX0JEcN0H4E14pRmpwK3yvhwAVHTovn45tvGaVdNSWci3RHYz5UlZ6AHB4Bm/hlTLF4z2C+UObUMfFbbPZ2rUU9Ij3JvbeG92aUf5kKHp/2fx/9ToVMJsdgkp9wPFtkzQwz+MkaVKkcU64B45ejcYSBnoYHqnr1/GQHx8FkkwTlpTaaNPHBwKhPxIqMBTZDConEMEbzeMQNng3c5Al88USEoRKMXLC4ucfjMqvE+ltA8ujwr045zChOFazNPRjGGBYIyLsxidqp75M+63t1Z60j01JIo/E1zIX1RA06OSkBT7wTa7yw+nYNBsCFvTUrwMvZWCYpn8a22+GOvxRhG0nutapghuLoswF+FiIeBGgOLKXv87L3qU4VqC+HGxMCc994KBjNWMrXnrcyyhXNGDP05FLQOObjqM+U1bqelvlgoHQr0c5Ye2hos3VqKoubkd6VDiy2XTkFGczebttx38noSX1fqLmuiu2xSRew98Yi5t/A/QNhqgWt3ovhKRoWf3u8cdISDqJTwGEebOB4QZf+OV0kQUzie+PMqjIyjTDTwsvEzrqM= X-MS-TrafficTypeDiagnostic: DB3EUR04HT167: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aq5M8AFSg/LEC3yhbE3NVnnWjaR+eWBs40sfDO7oP4XfFglAMlxh7KfiKN2r1eqSvr4kNfICEOy2RjW6IMOopfnE3TBDEixk095GhBFD1hobM0aSowfMblsrHhbG8z1+DXECBJKfeblt0qvucgd0dixIS4JPYbsbZbbiSgj5ECs+z3VnFcq09UAd0WD9shnE05RJvdKUbJ204N4gJriVjLpZYnKXFIliLCnxEfepYg1LylcvkkitcUN2RM9IehBjwINUsbE8nMYupRvSeWcx0xL7DwgRmmZI57WW96ON42bskX7N5NYBvRsMDkmdA3vEAVGdbWmAb9oPjK9S0NkAvB9WwpZrNW1ILYSp/ae9CiWkoRxzpdYTa3ssyYWFjg3CDORc2FT9K4Y7VbaQqzRJ4A== X-MS-Exchange-AntiSpam-MessageData: dZ99OOU1rQycP2pmSOIgptAO23qKNy0FS4re6wn3m/tw01StD5LEp8B3ipQABskY55GY6ikUQRucEjRyrZKH/QjoLEkau8v/wTwjROEQOG8sDCSamudOQyXtaWLf+TgOPPWuiFKnagBCIZreWbi0bw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b08a972-6ccf-4adf-c6b2-08d9104d758d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:52.2686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT167 Subject: [FFmpeg-devel] [PATCH 12/23] avcodec/vp8: 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: HldpTrEzi/77 Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index b964d2fd2d..a70d94bd82 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2948,6 +2948,7 @@ const AVCodec ff_vp7_decoder = { .close = ff_vp8_decode_free, .decode = vp7_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = vp8_decode_flush, }; #endif /* CONFIG_VP7_DECODER */ @@ -2964,6 +2965,8 @@ const AVCodec ff_vp8_decoder = { .decode = ff_vp8_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp8_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), .hw_configs = (const AVCodecHWConfigInternal *const []) { @@ -2975,6 +2978,5 @@ const AVCodec ff_vp8_decoder = { #endif NULL }, - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif /* CONFIG_VP7_DECODER */ From patchwork Thu May 6 05:11:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980937iob; Wed, 5 May 2021 22:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNi7tQzXVzHYgc9vqCIPJRQEKQydnN1RM9KwdgFRuYL1auxFf7XnXL7mCb2WWOYfnyv7Xe X-Received: by 2002:a05:6402:1056:: with SMTP id e22mr2880722edu.279.1620278005782; Wed, 05 May 2021 22:13: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 y7si1057254ejq.725.2021.05.05.22.13.25; Wed, 05 May 2021 22:13: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=SnBehbqy; 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 10390680CC6; Thu, 6 May 2021 08:12:00 +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-oln040092075039.outbound.protection.outlook.com [40.92.75.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D011680ADB for ; Thu, 6 May 2021 08:11:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mlXm3Ij+Twj5JRYE8tz8mUGgNJGYGpmUFSj9+PVrjVDIrgL1Y3R4yDgPImY8W1znPpU+P0Fa2LugtOqW9YNlRK1Uof2JHaQinTTFmNb3vy8YEnZLFhR8IuXhgwfdj3DYOdOVFeiIaIrt/SeVPxeVJS04/Bk5Wzwqsd34t1tTvXbBkRU/mIQwYcBqdveyyim2Qlm1PqeSMrR8A3KQC96+KSfH8I85d5Tp/AGTfKJ3Fb/pS+vDToLYHv4pmVjRMj87gaLGXN2vnaxgMwEs8eBkBk7NP3W2986a0hEg+6/vfHscmgGXthkOXjXB0K4Vzy37dTOwSInhR+oNKV+tRrCkWQ== 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=w0yHgBpl/unaV2jq8bZLqe7AejF4HxEptqejlDooTPk=; b=H0Q+BS4HBYga1KrbP0kYlx5mwhwIY8toDVmcqypjJl7wRjU9TJDhE+zM2wsI5aP6GwAo+nucbF+lhV21dWil3/oNAuatYIB/8qQBEww3H3NK+uLa4unTePi7SyQpjRhwXhXKdYTaM+t2mnuny1HRr4dG/27RhmxKZv5KaL07rTuIJC6IrYuPG+MUObP7A1/G9rJcPKENWDn+/i2DcihPQ4F7oSZKIt4K2hULLU/CjwuDWSQhCUdu2KqlUc8yQ8ha0uqfVm5IEUEFjfpcjn+IiY5maNaLRwv1BxkvqGuq8DtIR6wuTk3wlLp/Oa+i2MSzDdFVQnfZCRr7w8fa6B6fUw== 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=w0yHgBpl/unaV2jq8bZLqe7AejF4HxEptqejlDooTPk=; b=SnBehbqyraTEZOlX+SCeLzoJ37o03UrGWRAPNqSyesEXBNnZU1Ykm7/Z3Ri5jVJ4eKLLdnHVsSUj867kUXJjPWV5Q26oYfwsuri76yx009RAAnjpr9OineOUb3Zi/WaUJmS68z8xgp0h+DrhGEi5cNh/q7+QRI1TmFQMKL+oO2FbWFr4uyeTXLu7Za2I7PIKpoV/TRkTrOOGJepGaip4F6GQwv+JVZLgO8yMl64tS3Fk5hGkkzrePGcAFkgWPhNajvPFibvBQJxQrZUliKwNvk9GKvFVV9uIYpVoMvtu1jQMorb5J1reac0DqUy5iNb2TtT7xeHUbo2KjAQenwSG0Q== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::48) by DB3EUR04HT044.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::426) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:54 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:54 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9249EF3A7960835F4E58266A0BC210613BFA79334A50BCB0907AC30DA4C43F34; UpperCasedChecksum:7276F380D7AA7E980058D0C85C5BAB28213666558FDB95C2374CE82E26E0125B; SizeAsReceived:7592; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [60N6zH4D/tfd5noPz+o3bZh46v0LhhYOhV/LDP7Msms=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:53 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 93457012-25dc-47c0-ec3d-08d9104d7697 X-MS-Exchange-SLBlob-MailProps: KE5ywuOaN5hPds5nKO/bjhDtHg+Cdr339K1q6IU6iBTEbBHQwHqXSfCv977SjqB+80QWjJSP92HdZljkFJ5Q/qWHwOUfPhk5LkOPV0ane3V/X/1+l+k5XsGoSNp6cfr7N1SvALXHpfmyXSp9X87iGO+4xjT+1l32cyV3kb7HYAS/vd1sLAueuUDf2cEu+xgDE8rR5KJhmqRWLV9Qjy4N009EQB7/erqtWrQmpJM6Lhv+ER2oQ+mqCXZS17nOkm4VdstaEg5euybvcNGAxz2oZn0Bw39N5ozEZiTyUIUabPWqUxQH+SZnhxs1m36iNrCCFElrUaMAmBmQVWwVvwqOt9OdkiWLrdWe67o0VBpj6X/SE02HgLrHXmoEit3R5UY9mNFhCjDTBapdrv8+vRB5L/p7/zM/TOFoupUmNmlsDquRJGUDzQdQn9W000lPHrnxhDMWd7851mv7sAD0Z7aoXXhm9mTFD8I4nac5rtylMWOzGpmtb4TeaqCl5cYApMgTkvzs1moaHytfM8UoK98QDx8724V/2QvQLtKg8H2you9XPIvKV7QsWpcOFKx8e5sVT80yJ2HeW+QdvOyoPiIlGLcth/538wPZmFFJZ9Vv7vhGC9SzSS7qy1iM/fchLqX05vKDyamiuGbezOUnCn3f7/aYG4NWL0/rHKKIr9+xyEm499/AEFZXhA9WX96r15aaTLoGgqCxivCYcwgBF04Mhssn9WuF2BWeQaTywCEM/vcxxN/UwJAa9YZbkFWsKdO2l/DiBK067lgKbLeKHOFL2G+st28phbP6mzhkef8M7i4gKaRK6TiStmCyrOokem56zRb4+TAv49mMsjcu9MorP2eyOp3SJbAvnsY2vK6C/nPAyI6J+Su+UyYRaO7WcWiWCvuWUi9fjI6Q03YfcB5ajjVLU9jI/sfn5NrucMmBPMjYQT1c0UvsmTjdH47FcEeIFxHim5w1CNV28wnz/E71CzWQdgBGNMSz X-MS-TrafficTypeDiagnostic: DB3EUR04HT044: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /yZg96OjzqftLWSdVdHTcL8ypHuRxg77v16PCzOE28iCX8reDnH3ue9Zlz0UaDb2dGxxblVGrxXKMiiycnF9LrjhECP+0qqi+qNO/JqtOe5y7eWy4yTvcI+keKT96NuW4KtczA+0a/A2SqQoGD5DGGVpaJIBT2Cb4n6lL3MBxSM5zSNpiYJBklkiDO8QsuyfZ8SvhCei56qw5MJRAhVRkqd9cunjGDmNtUENMFX6rv74QpltnkHhTqe2kNgmtmC8Sv2+CDcsDTV/ifxD2HecIETwyD9RV+gTht6ONS9VhDHtif/e5iU/l68wAdJfDdtvStCSwI3IW80i1++x2GECca2kSz3dYv2eTdX06mULPYGB+esrLCgI4rKAKy89Sxd+ORGXrJxikAKN+bH0NYsdEpGMKJ0R3/EMYircS5RimfBo/EtH40nYH8qfEcIM/q7L9/qUmWVc0yo0w4kzdMMDX1j01jYNHXKNdU0YWwhvcvo= X-MS-Exchange-AntiSpam-MessageData: KffGBhU8FpMW8xVCh8RfYiWDY2xcBI/qStQp0pNB/FMu3nZir0Ui80L4Ahq1yzJ2xkqQcNhMPUiVCPREpZg7pe28UCZYa9+x8/7NspiJzuw7sp2V7kKtScM3joZl+GT4AGHPoAN43WWVuUhYYOhhDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93457012-25dc-47c0-ec3d-08d9104d7697 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:54.0148 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT044 Subject: [FFmpeg-devel] [PATCH 13/23] avcodec/mscc: 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: KHEn3maAcMIm Initializing zlib in the way we do here is threadsafe, see https://www.zlib.net/zlib_faq.html#faq21 Signed-off-by: Andreas Rheinhardt --- libavcodec/mscc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mscc.c b/libavcodec/mscc.c index 027eb16085..d9a6de094a 100644 --- a/libavcodec/mscc.c +++ b/libavcodec/mscc.c @@ -262,7 +262,7 @@ const AVCodec ff_mscc_decoder = { .close = decode_close, .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, }; const AVCodec ff_srgc_decoder = { @@ -275,5 +275,5 @@ const AVCodec ff_srgc_decoder = { .close = decode_close, .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 Thu May 6 05:11:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp981031iob; Wed, 5 May 2021 22:13:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0JL54yrgY45xClQomvgIJg7dvkMOa6pd/7cXmsj1WV2GXa4ujsAxV5GcYC7oLxZ/5i5U3 X-Received: by 2002:a17:906:c218:: with SMTP id d24mr2318510ejz.363.1620278015929; Wed, 05 May 2021 22:13:35 -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 ka24si1325027ejc.64.2021.05.05.22.13.35; Wed, 05 May 2021 22:13:35 -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=CU5VF3hj; 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 F241B680C9A; Thu, 6 May 2021 08:12:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073058.outbound.protection.outlook.com [40.92.73.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3A0A680AEC for ; Thu, 6 May 2021 08:11:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ea65bUWF1YbaLL5+iY7kz3n6AFAb4zsg/1QXDpeXnb/QxLG6Zp/AP35Cd8eZxoL2WoV13LX3g1NlYdR21QvK3XtnxEzs2lvmetGjKLOtQZ+HocrN19w2+7m+/48/Sy7cKPD8Tqr4/Yjvowhj1+yGfGXTJnsoYES15B5c/wtMAfji6ZtaVg1V63aXJIKKz3PlIQFl6crope9vw+SQ+HBcsnKafGwEPBN4O42aBTJhRLWJwRR7vsF8u90E/0KLSkaWy73WOb6RazN+qSNzBKp6l/bVzl/6cb5zrlRnX9t5vd0AxPk1iwIwMPtEPxQIYcfcGGmTORhkKHL/khbcIjxClw== 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=d7v/yzKVQ6PUA1KX0mr/paO5OKSlkgTx+UzwEAKR+Ik=; b=msyW/NnlPZjMZcXJZTCAvxAjb7SEoOk+5WFEdBsHmb2Uzb66BbaQ1I/VC4J2LF3dRj7uUIiPiNO+u5uqBCrExJ5P4gVeWIgHSgbW8I+oC7F08ND/niW0RRettvGT/+y0a3Uvpezse0U5tzsZzBtgj9Ns8Wx9wI/P/anEaQomsGF6I4/RiWwWYjlkkVsql9D8y92TPa9FsElzwKVcUKN8D42fIiWQ1fTJIqmRchXmZhOk4FqHpZCc6C52ARMR5fdUTFXVHVD17bzWbzmwikjzHi+zCbtY+7w65zyoRZIy29rZVRAk9qcAaRlHdBYqvsjsXf+KMj6hMu0OCax/qz/jaw== 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=d7v/yzKVQ6PUA1KX0mr/paO5OKSlkgTx+UzwEAKR+Ik=; b=CU5VF3hj1jLIJT/v3/1i7aceKLAW4qHYp0UHkvDFGlXZeEmDft4/nMAnOxdYJ2C8akZPpaXkacjPRg0dMCLAfKv8m+3LNj6ohZNeckLXOAob7KFo3jhhKqsiYUb6Hl2qJi4XXAUDwBo5Rj/Rg4dP78a4ErsqCy6IXuaa/tX89ysl8E3vpvhQvnbFuctMxSzf493M56vrInELaDzq5Zgg+2HLO+ieFCcoiJCxsDq68b/4Pk9+c7LNVqDXw+SNPMtvGpV3kZn2Zfip2pcYAzugv9KCJwVXeN+zDx61mcY+cZmSYCwZWnut7mtCPOpr8F2XjxMZ4qlnHmZkB5Db/oU39A== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::52) by DB3EUR04HT167.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::372) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:55 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:55 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:973AAD6A22040459415C402A21C3B31FFE50CEEE2120BCCD144071EEC3D5F102; UpperCasedChecksum:4C7CD14790AE830DE60AE473FF6F872EE3AE106DBFB2964F2CADCD3E68047894; SizeAsReceived:7593; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:12 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [hUVYT7SpxP3bhGNFXW20dw3aBU6oHiQ/OcEwZEwkFAw=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:54 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4cd8fba3-a699-4012-5de4-08d9104d7765 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0SOooF04Dlm/5KlDve22eKYQ7tLoF+9Y1furnS+Tdq3i9FYIdnK3Hy6fLHvQyBpJzVXafDhctCtxQX9z90znwWLvkGIfFLpRmbFe79ba7xjUuq/AKj3nyeC3UbZc5j1EhOOK/QxYhT1Ahvny4y5CO+0eGnRxUCD2I4+qfBBhoPYiqS8oKci1McuPOZ14oHYTHKOhSCkiDqD5bjAQ28Jj+gT9rM0K3Y82iZ6VsbR4ZmoRpOngAjm7pC8thIsQJhl0oRaGfbPcobfWXyOS+sZVauBWDD5ecC625UlPLkrgMU0xEBfkM+v4SjYGz1wyhXjbDa1PoXnm9/ExX4zj35k3djxrrMUxF0VXrOLL6LjjCm4PntcH1bS8k9yx4rnUTuwSww0KMYJd/Ic4K2U+2tqGC7gVUV64J7Gvu6E00X7SXNLijWkOFOuKf65Ep6S49Cw+pPwqHrCS5DjeMPCFaa1XQLCqTkQr6nbf3y0PKKtrbCGQ1LmwOVd9vCwRb3k36V5mExogv/IRUn+hhFoT/7l3mHrhSvrk+IJGvWhcP3IoQVAJswPBhmX5nYdVUC0xgcua9QL8xIQn6QzhOYu/PLwBnngps19VgwLP5H2982kHvGnMB+NuIdfOVdwEqh6CBgLwhEww2hoOPNThnoZBlaDhdTU1WmCa5MjsLsx0TpjIl88kokpQU15/OIChNT8NdOy7zQ4sSSt1lfdqQ= X-MS-TrafficTypeDiagnostic: DB3EUR04HT167: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Fs1U5Y6Qkcwiw/t7mMUeh5E5nlYkK/wcKHs8Ilf29sdiIZ4PGNsEXmo7XvAFQLHjHes8W9THjErbJbkf8+ZeaiU+8DO//N/FLocBJ8PO7sxZggNtda5IDFwNQOshwS4r4UZMcnghRdkZtnV8Vz/lUOIq4dab19rsjyd618wj0DiAMlQw4YA0dXpaEu//rkieD2VAJX7cgfx38NroXdtNHTC8F65DTe27Rt4bZoLeb2+flOQMJEDTkT+SkRnO0GhtBuefHZXkxiPuBSYEZgrFgVvWWq++d4Lj8tvycKWQhT5M8WasA4xDNvoAsBcPe2e7PsQR4j9silb+ZQHV461VEWT2SD6FWnRtMgHvVgGLYZ4W/rF1lgar1vP0i1CArzo X-MS-Exchange-AntiSpam-MessageData: Ltev8jxDWfo6nfGyBaucHGfnVnqj0JpUkhcQYdu3GtZaPi9Nirkbtd7W0jQPxXA+en1QQ63/bOOgY6eSZ8AFh6mXh5gV1BB7TQXc2/NBXJ90+J/1cA9VNlfGOcDXxAzY90HBNmax7g97otp7VXgq5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cd8fba3-a699-4012-5de4-08d9104d7765 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:55.3323 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT167 Subject: [FFmpeg-devel] [PATCH 14/23] avcodec/tscc: Don't free uninitialized z_stream 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: zhEMO3iijO1z It is not documented to be safe to call inflateEnd() on a z_stream that has not been successfully initialized via inflateInit(); so record whether it has been successfully initialized. Signed-off-by: Andreas Rheinhardt --- libavcodec/tscc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 043d78d018..e1a075faa7 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -57,6 +57,7 @@ typedef struct TsccContext { unsigned char* decomp_buf; GetByteContext gb; int height; + int zlib_init_ok; z_stream zstream; uint32_t pal[256]; @@ -128,8 +129,6 @@ static av_cold int decode_init(AVCodecContext *avctx) c->height = avctx->height; - // Needed if zlib unused or init aborted before inflateInit - memset(&c->zstream, 0, sizeof(z_stream)); switch(avctx->bits_per_coded_sample){ case 8: avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break; @@ -160,6 +159,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return AVERROR_UNKNOWN; } + c->zlib_init_ok = 1; c->frame = av_frame_alloc(); if (!c->frame) @@ -175,7 +175,8 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&c->decomp_buf); av_frame_free(&c->frame); - inflateEnd(&c->zstream); + if (c->zlib_init_ok) + inflateEnd(&c->zstream); return 0; } From patchwork Thu May 6 05:11:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp981133iob; Wed, 5 May 2021 22:13:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwE3ktAc2+aeXA35+/+nS4beusdtN2kQKbs8cZ9955lJDkqGHVpsavpQ4TECe2G5hRa6WiR X-Received: by 2002:aa7:de8b:: with SMTP id j11mr2883098edv.363.1620278026881; Wed, 05 May 2021 22:13: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 i18si1367329edr.178.2021.05.05.22.13.46; Wed, 05 May 2021 22:13: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=FMPXS+Sw; 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 ED438680CEC; Thu, 6 May 2021 08:12:01 +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-oln040092075027.outbound.protection.outlook.com [40.92.75.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAA46680BAD for ; Thu, 6 May 2021 08:11:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TiOVowOMuV0o2swAQp8V8yrW5iy75xnr7T1MVeGgjD/+Uc2iiNbiB/fimhRQSnxeDGBn4k+tWFX0VPIZKHC69JynHpaXCLPXZtdVKmUtcmICKQvNj4LT5gI+VD4XSEWp6vCXfFgqKtAtTdIXbe+9arM4xLSvtHTKvTe4+lDIvLCy/mdscxQR1EPyml0FpaBpzQJ35/F6u5j1zmt2J/bHWX/aWTlz5cWC1l0VS5chMe2VkbmBiVpgroI9Xjc+3I/9GGLQLVsxFnaooRx43uIRHkU6LXePqaS/Fy5vhPtOs+fFstz/w283cBMFUDY1nqRcH3+zfEVRjRz+KhcJXtJpBg== 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=HhXLkTHCWkuzAxWbum4ptuMiVQpG7SZdA5XHqtphyI0=; b=C9Ixq1X/7JCyRx440r5YTve/wbD0kNnDIVQYUfKxOfdiYthGJ+a3jiF6wTLxLChZHNY+YdcKRnrxRtB7JHCUoixVggKl20cVXRIL8V+TykWKS1Ymr4cldK4UM77YA8Vqut1fQsQkz33Csch7I2vXLMhIZffR4SRP4IZuiI5AUi1WagxmENfM/Ds/Vk90YOLZRcpq7AfY2i4PAI+mzuxr46ianvFEfotmwmTb/3p58WCoPmBI186DVd9J0+L3c9BrvKDS5BDSMzWFTRG1Z4NsuUqeKpDtN3nVjP8lWMZKTQpkzqPgEDncxGMZIf3r8T1e8uPx1POHjcZYcJGKXRXaww== 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=HhXLkTHCWkuzAxWbum4ptuMiVQpG7SZdA5XHqtphyI0=; b=FMPXS+SwXKG1zhzmZMNNxqyT/ZTxrMEbTYUiwRzNsHmd/azjkz7zCcjPJfL6YhCzHhi5QxjbiyhZ09mwMSl44jFd/oNbGtnO+13X9/uwRGGVT+uS1FlvoPKPn76dGRbePn5zOdGDmm8L0QfBAF0FlXRrPYPjGyaVClUPBgLVMSddCodxsjmYvW+xkdqCM2JbpsRt1O4EsPUBiuhP4RA5v8WKpnz+NAI1F7VBcJkZy5Qm3cAWQtCuiuKwUdaA61hcN8c9TA3ELYBtj4xm4hzTCPdK5Gd5B6LEyNHFav37NEIiYnlS/SQOPue3MZVU/XwK/XFHu2dmiBa7uosWMhb/lg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::43) by DB3EUR04HT192.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::381) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:56 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9CF8E016614498889FBA44B8ABA14F984D37B3F245B6041EA94A89A274946508; UpperCasedChecksum:9FB866B56D541C6F329232A46CDB812068BBD888200ED97755D3A7C84FB5E45B; SizeAsReceived:7591; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:13 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [E8KsNvs1zVbMxUr93VNw/TgxwxGjPb9SHh2qh0c/VpA=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:56 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 36786cbb-c854-468f-455f-08d9104d7821 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMUVAIEgJfQOjCmuA15IcvSx70bU2gZwEmxw0Kg4lplwj1njNmyORErlrtPqnwfYuEJN5ulZS9nPR14MDsvpMS3tT17pnPaSDKm3rbSHo9VP0WIg2d+Y8/BvxehbbczsaIgtLYBPjfcTfGJHnaJfhLJBBhUljGtiFbxt5W0o8fGoZny40aVMtTJ1C7l9ufYcIHGPPf8uNOR7AsYBvm7Y/klpK/f7tNFD5HW5NgSkmMzgN72ESMlIMzeaGQpRgcgPS7mzXWaWOG/h/UkIidjn3NyUA/mvckstuEHKWF3g8BeAmrA4fvYbcSJuv2t3QKx9Ce+zMz1tz4FSdQgja7NR5kA9o0qn5/x+fmKsrgco64inK9IatFgTUC6Zl5FwFygV2QfCwBUPbaGT9Ey4LbIZ85Kdv7At3I4JD7JsoGH8E1rY4Ga4kd5mVICcABPOtgeBmIoB6hdcFCT/yvFb2xqAjrd8C+l94nqdD2YRoImbbJeKiIVb6B/exvdNcZGE80x123uZa7WiC3JI1PAhuMOdfywLpsUsoWKyFzPdvMV6xlLAWZ1dM/dgvhdyokwsXEtmAXJiUVmvEcdic2F1nyPOz5gkPInSBeRL8R5fQhgOQKsUadyRZKgeJpxO6WYEHHiceZhCFC3TR/8TmpAawEJeGQzMdlgJBUUDPgeqpFTBvB1TrX7THLRALAeD+tV7dV3qsA0vM+rZSJ1bSBCp/+Xh5YekHog47RxxTyk53RQxJlCTt7lAdwoDKdlJUQAAozovOQA0RzKEnwjVSaVPJ664p8duXY/l1vn3S9BM3VBvrhRfpi+PfQss78jEkkr8aI2Sns3PmN+/6AA0XJ9AUbaTTY2Hgtd8qEXkhUogIKWuzVSlsPRawKmJwfj1iMtyyH/1000O0CQusJsgTVjMFJ3AvX7YqPPc3xmRyipy6gLFXYWQaYGwvWqqgU8w X-MS-TrafficTypeDiagnostic: DB3EUR04HT192: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xEBKK00r75Hv8OGaDEY+S8WVeMkca8r15by/sqmq9IM/FFMznsFhxbk1rKHY26QLaS3curat2OU0d+PxEEtb3m2XkuLwfDvVt4AL2dcy8FmLhzLLh1TMgBqTl4VmHfH9dsSvzYD8ADS4aFWSKBMD3bdsQmU0CRJeGcEtz559/Il+3JSv4nuGDtvhdAUleoeL/iVSvw1uBikcRSxdygwjZTuYc0EirQ2pPba206AWJSUZxWxq7FANO3F59Irn0nchjmj90AzGoNFHor4Qogk+WtV76QRBgXhiYF7EMKpDM2rWNyHq02ByPYdGvduh1YtmOl7g+m0S3sxypWnuTdZ98VctSErXG0RkxGU7iixS0AcF2MYPorsyMuIFPaSrFerevUPzm6+dwtaf1Wd9qap8i7hzVbU/iFm0qG50/CQ0xpU4ynaTxxAO71kt6jGqHMUpO1Im4cJtYKf8k6VEsKPJIxfzOi2rBs3HaLg5RteYW4E= X-MS-Exchange-AntiSpam-MessageData: LIjJndhwT3GfruBfzTHH92w/nnBhZb9erfYqGxkHdCmYzQqx1v8y/kShXFzsb2FZWAk1LlEFD7rTGp0pbV7wxdiuv5qywwNYW9wTj1k8xltImIRvpxy9J5pJWhFSNQajtbOePW8wjf7YGb5/5DWkZg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36786cbb-c854-468f-455f-08d9104d7821 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:56.5677 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT192 Subject: [FFmpeg-devel] [PATCH 15/23] avcodec/tscc: 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: RpybCVIMtdyu Initializing zlib in the way we do here is threadsafe, see https://www.zlib.net/zlib_faq.html#faq21 Signed-off-by: Andreas Rheinhardt --- libavcodec/tscc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index e1a075faa7..841f0c0d14 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -191,5 +191,5 @@ const AVCodec ff_tscc_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 Thu May 6 05:11:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp981230iob; Wed, 5 May 2021 22:13:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvk1QwqQMMAxDptnv0qeQWUKoZ6vPrtbkVSa/WN2rCgp8H4hbnOK39N+xTpP250M+Xo9fV X-Received: by 2002:a17:906:32d1:: with SMTP id k17mr2446615ejk.94.1620278035213; Wed, 05 May 2021 22:13:55 -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 m11si665731edc.201.2021.05.05.22.13.54; Wed, 05 May 2021 22:13:55 -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=TS9BThNH; 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 03300680CF3; Thu, 6 May 2021 08:12:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074096.outbound.protection.outlook.com [40.92.74.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5A016808A7 for ; Thu, 6 May 2021 08:11:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lAHgEcrssgmy+LpvWSYjwUA2gp9WD9Kf6z8bMBpqE0V65k5rlw/xthFFGkZram553pYvt3QEqP4yOdUC/poXG48IOusmZa3MtVMVFOyzl8G3yWSxd81e8eTZZtGQO4IHwcAnGaGa80MCde6ZmQ8H/uapQPHht3v4AlI4VRRkvCjFPKrKf7LvAnVMuG3SASW6drUz4rwQ4eSg4QZz4VXTZCFJxS4nAXz5120PqWWi34XqWS2bg6NgYxDSlcLQUjgPhB8RG36TLEBHaFmWd6lrq1Zemjt4UUbyUGOLWEJ+ddAhW9/Q481ZBxXNRVvEuqg/qXK6pW0yBUP4C6yVZL9VXQ== 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=t0xMDtPVHWF0266SlIMY62Nu6i+XOuLfxoIAgqw7Gfc=; b=StPx1zVemp1VinBtv2J/Yc4r62vFDbuGaAP/qV0cRqS5fqw73p/3fiuLgddRSYVi40EzxGPhEbTVYJEQqar8LE5OLFRfo/0ZXTcZmf0jjQxrY4ztTADOWYiqc3+HuL2rKcGovcNxhydVCZHzXD+UsipacS4XQRiypG0K9p8oe9O2034Wr2hD9C+FVNMW0GBBRbP21HcrX3YmMEkqippD8iplJQzYmcFJrXon9QFJ/N9eqqzCXhMIIWsuwOfSgTca71A91rLaIUdRgf/xSEzMwCpuh8Zyrhtvt3j3ld2InKF/jtDuU+XCGhEPAjA/dWkltjgvgq+/6YWTDKEG+J5bSQ== 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=t0xMDtPVHWF0266SlIMY62Nu6i+XOuLfxoIAgqw7Gfc=; b=TS9BThNHdH9PMw9ZYJbqp9z99LT5XbvIBnGHbXn1Oy0KuWHFYkyMOBP3xZlh/SvNYuwOsPSheVuToIq9flpHmbZIkUr1vwpJ4A7HdThQabvdTZIeUGG5VhxxM3vG8iPq/EDQ6UIgKwAEBUqEhj99LvtbMkvDGuBnYwa5EkdOu1oPt9Q+9qaeUCuKkdK0y3O12UKDYriS5QMfvsOXu6q6e48idpLutUGisPGi4mBljdBwZCmsM0zCJ8ITJa8wjDEJ8zMsRcNG+kejGdj5WfghhTHGG6Iv388MdyuQuAL8679HtXl/lbnrSVcA9YfbjDrjvR2RuZtOb02M+oBG67lIUg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::42) by DB3EUR04HT250.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::405) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:57 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FC09406170E0AFC52636DFA1A84F4314336DFE41DFF3E6990D02EE4B6A6B7A17; UpperCasedChecksum:6FC0D56DEEFC0370C27F26A18B9F74D506B48DBB49D8A6922939D7EC0C8EA0EF; SizeAsReceived:7597; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:14 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [iu/1799zpg2uEJKzwjkTS9lyD++Qey3l/LqW2xTN5gE=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:57 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9e493842-a9b7-4c00-e487-08d9104d78b6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0S8Q705S0v7LHdAQCMWssZLzc+FjFUk1e1cH+dopwgdrVZvWTyGAlZ/I8xEwPumnUgq/nG3roTt94vqPJQf4eSgVhuOI1lQ6fQdnezhy86K5zBi2uv6sTHC2zRap+dPIZmIqyHfSg4h7zlHyapFsUVhEhQnoBh+F68TbtE3hfFj5S8FwI/h4fnxDDlH1UDDTj7QDa/JncqVEAfSceO66MD1QIfo6iElHabqv9bJGYfcw28DNkoud9DhpM3fgsAD9GTrw2dEIkgRLEDHxNAFgEop0H3zPd7Yc2N/jIsOp3JQ9opLzlV/wMokgJ+//cz0ORx9iJdGNOM1/n/3hwL9ZVuR9VCsXOEIxWMtfdEOPGKIgh5hYxKm8uhZR/ABVKy/BjYomtrKuu0gZ2y9bMU+St657OoYaCF8DeBh+bD0nBSuPrNUx/s4v+AuKaqPvuxfezkRKpcf+j0uRYDsoXY5fC78tWFtSP0sVUkg/P8U3BZHgxEtjsE/KxyqUt8pmMC6Rxh0TfGmx1K/94t/XduuSeT80KebMR5wNkm+6c35++IpuI8omlrScmjQUyuAiqjdvP1Jy1P7rGM7mjSAAuBM6Aufbi9+4XFqN/XNTrJ3vvv3tL35guPE2TokaM1zWiIh8zZJCuyMSgYUQ2rr1650k2Beek5jB5JLa30jH3MuYalf7mCGuay8RQSCTZ+yuCtcvaPnI5JnZj2mS8= X-MS-TrafficTypeDiagnostic: DB3EUR04HT250: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zZT+jmEQ1IV1UX9Ke3VH/8oynx1GunUlmBWrxaWM2ZmaWK3bRLCPuPjlrtbKvWCnbdEBfUsCU1rTAXTimqzlHf+d3w4/VO6KIL3VXlCncyTM2cRZWhXd5AOL5nsMz4oXt/sRr+uNoWLhmG/BTTWlp1njY5Knimmn5+qdgMmP12AKJyEqQVYk9/DgyNvVyFPhFcvTmHizPQ6AamUTb9yLO2uBJyrcLKN9bNLTqggKEK6vzm//cOfCeu4XVxX1duq6l0TEZPiB/NF552idSa0W53DW+7CnKmZKtMbKKg1mslKCvFbI4m8Q7T8BclEtQ9DpEd0AYNCqelnvjAibjCqYFzQLhoVsQEwzqG87tcerXEi3SYhwSodUQH7fXsYkHC4SswpRb38yzAfyaoNccnojTg== X-MS-Exchange-AntiSpam-MessageData: y/qhsP5h4nuoa7owGsSpguFNfvFP45TxCQPFfhQggoS0ae8goObV8+6UrndrO5J5hNiSVolWHNgzQr4klUyai2YeyWdnIGhbpHa7h+GCdPPHKtI5/3RADXpi0kSU8ri6Yyf/5U+6Qgmdbdv1mF90Ag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e493842-a9b7-4c00-e487-08d9104d78b6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:57.5403 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT250 Subject: [FFmpeg-devel] [PATCH 16/23] avcodec/wmaprodec: Check ff_mdct_init() for failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8IUddt+XoJJI Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaprodec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 9607e50968..4b2dceb5bc 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -318,7 +318,7 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu { uint8_t *edata_ptr = avctx->extradata; unsigned int channel_mask; - int i, bits; + int i, bits, ret; int log2_max_num_subframes; int num_possible_block_sizes; @@ -543,10 +543,13 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu return AVERROR(ENOMEM); /** init MDCT, FIXME: only init needed sizes */ - for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) - ff_mdct_init(&s->mdct_ctx[i], WMAPRO_BLOCK_MIN_BITS+1+i, 1, - 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1)) - / (1ll << (s->bits_per_sample - 1))); + for (int i = 0; i < WMAPRO_BLOCK_SIZES; i++) { + ret = ff_mdct_init(&s->mdct_ctx[i], WMAPRO_BLOCK_MIN_BITS + 1 + i, 1, + 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1)) + / (1ll << (s->bits_per_sample - 1))); + if (ret < 0) + return ret; + } /** init MDCT windows: simple sine window */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) { From patchwork Thu May 6 05:11:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27626 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902076yba; Wed, 5 May 2021 22:14:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKuBgRB3mAIT/z5xA7ocXIXAIPEKNlyBRdKkx6ViiF/APMLdw9f1uyy1YZIJuYAZOJ0rpe X-Received: by 2002:a17:906:27c3:: with SMTP id k3mr2362432ejc.519.1620278044402; Wed, 05 May 2021 22:14: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 y15si1602624edv.431.2021.05.05.22.14.04; Wed, 05 May 2021 22:14: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=IDHC4zrM; 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 32282680CF6; Thu, 6 May 2021 08:12:04 +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-oln040092075108.outbound.protection.outlook.com [40.92.75.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B16D2680C5A for ; Thu, 6 May 2021 08:11:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D3+22PYRUIRvpFzfUQWvBvozGSn1vuoRGtdbK3sqrO+fxpZc7NEzirzx73GX7cZhS4VSMjGZver+6FCn5C4Al/zUmlFQyYxIK7e8Te+/ewNbQ64YhZ1coJ9gUeHYNpBn89XegUcf2AUgEohv37azWRTfl3tEQoNvlJTSYWyyzyxuYXeBWIeuIaBMwBIdEavMezrwGE63CNysiLJ46f4qz2S2gntFaYJWD4xa2wTtjc7yoH/ggEyMvigy+mxZJVaqozBxPvAhBwmzdkLBxlMfDjkJ6Hka2HHFNYXth/us7Chj6hbv4Ad41povBhdss2Dzo2+qocgHLZ63/I+maWLfsA== 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=aZO8PawU/dDi4Hx2CxbhbwQWkPfwvax029IZQaU44nA=; b=fwasnHGrli7CFq63qaBRy1SyTMISbThRUAhiCvwk3VGobe2ntqgufaNbiREcd5xcGngmNV7QOIdZmBTa2UXBsCEj0zQnQpYkoEcE+GfE31x5Vv0fRlLA0UUHEED3BAWG7dUvNx1K4IkuDWZlfybxM4DgjOBs1FbCz8DC+fujNeez6uxKWv6EezTGey6nW5PNqVx7KZvhDNcbj+SMEMDptrm+QQBAYHTHQeLW5SdA7a0o2NlrfD9qrZW+DE4DFrkkPgXEKnCqNuGUBTfQRdu03R3f3arAYlfqLkY4fY2fYM63RpBDUuJNNZN6HMKl5Cz+GqCnsZEL0LiWIAH6HxCloA== 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=aZO8PawU/dDi4Hx2CxbhbwQWkPfwvax029IZQaU44nA=; b=IDHC4zrMa+LStI++izUaTmA9mLAR5ftZbsvBxUh9rQ8m4JEEy1gXUX4jsosZcS6Tw4LF/5mc9MBfndYA/dwDoygsm3A496Emu1NTepO6I/DaMvG08GqOg+A3ztuR4ZZ6L4E5qU1q4cZBUqlgTsf9Nu/sm+rXXxvTMhyiFe0fAqJlhSA4BgiDvXnR3MaTMEG3To41nLRa8QEuFZbeHZCfzNY+p9CvUG4H8NHso+wA7n07f1rLhEOLb5tsliiBgqYn8t1PfcjI4JOMwIu+BZ4nxKZHa4QS8VCC0g/8c73cZA3cZVamAiKGuEJOOmquuTqqOQtQz5S5KOX0dJIGDvWrMQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::43) by DB3EUR04HT192.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::381) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:58 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F41C9A2AEECEB12451A62E555B9D281FFE379BD8DA30D7B05EBDF8A83FAADE45; UpperCasedChecksum:BC8D20C215C4E0D5A8DFCAFB9CD79F30FD74AEB52A7BD352FA1DC53AE1AE5E54; SizeAsReceived:7603; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:15 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [tZkG0ookUTdPUxi7KC4+qIyk0jfLQe0A9LENTXot9eM=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1b3d11f1-29cf-44b5-b79d-08d9104d794f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTIt1mUYdi7H/v565yEWvnh8vw5/WmSxgjj93KUsN+CBtym/O5uJg0a4KbfIYLVFZD4YbfGFQ58ENqSHGWkUWJBFlrh5kTuD9RR5FeFyFFenGzAWYXE+lBXgN2Lq4cq8ZB3zVnWl8oAJb03lB9F1bicNK62yW40jR5izAJwyuFd059sD/JuAe30AKIQXg1JE3MBnlBa34nkJKczaTV82q82WDiatrt5UXzFEhPdPFkapUADdNs3J+50POyuBhoN5ETbbESxON2UB7kr7CwUVbLPMgRLKQFugzVtCfgO3ybf6zkB7/fsgQ1S15/E7iR4px7zbXrJBhGB0pZcYGonnMcOCcI3SCL8PllVtMaldSqKcYo6AAKNy+kjKMGz7UGpHmX/Jjlz8ldgPjNUgBHmv0N9AZz1rW+fBt0LCR3zwVxDsYFdmQ2WGzjKi+ImkI2Fx8f52zZpNKDMn0ALFUkGjJIq1hhMTyO+yHalv2pSupkhoXnxCaO1EAknvHBdVedg7kDkqcenWZrb4mEKU0diL+aWVxwqIYkUyYgs7D7j/V0XqameWDwNoQjewNtB+Jiv2Z65GJ8jYn7GFBiPIhPXBbhFqW1rr94xJNhFl5hRF81UkobrQl+gDy65g1BzwhAqiNxBHiL1zw1SbEW7J+GuEtrwn4oVEW2eGunamw9jgyPkW6zcy4h7Enn1PgNX9QJVaRyFhVxkq114ldyLhzy/Ny/S9IveuJEd4sDh882dkN7DCU= X-MS-TrafficTypeDiagnostic: DB3EUR04HT192: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q0/axhbIaOVlQ47aAYN7A9QBBJ/oUfycRwpn4kutHigm9xpNQgO2Ud+VQEiLqc0VgsDk84W0avSimsE4Nu7mzfyUPoQrsaL9dN9FwjdqLd6PxfZxKm+IEVZ4OBjMwCcwYxWWrp++vJH/kDqRg5ncQf8R8CVGN63aA14yijdi03pGiRLWA9czHbFtE2Ene8mO6W/Zb03dLVYuYhKrgKhv/h82gALRy7qZyHKLjq9s/1Zrsbdz+IbEeCsk3Gg/n8fo5WYDjdLRRUB+PVRfXPjQ72FP+aPUjDmzASLJrTDx+G0fq31+F0B0WUtKcHc4ELH8muP8R3Twg7iKJ3jHSNsGDsnGNDn4TQkCtlt31/3RubMdgc4oquRHBkYJyKDgxVLPJk49OxLx765T1OqcYk3i6Q== X-MS-Exchange-AntiSpam-MessageData: H8MEmy9lli4JMERCyqBuU4C7I+fl4LDGsqHnHAXslYIqQ0MxYM4vzRUiDs1Q6rZxRudm029e9czm6ZpiYLALCnfFhzHjHdf/ZHyp5tHdwWQ5HRZjd9qVqZPGWMbl2BIKB22xunCxHTu7MJFHKQPnAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b3d11f1-29cf-44b5-b79d-08d9104d794f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:58.5098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT192 Subject: [FFmpeg-devel] [PATCH 17/23] avcodec/wmaprodec: Make decoders 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: gK0YXTSY/wUW Content-Length: 7115 In this case this actually fixes a potential data race: The static VLC tables were reinitialized every time an AVCodecContext has been initialized; while the mutex in avcodec_open2() ensured that the VLCs could not be initialized concurrently by multiple threads, nothing guaranteed that these VLCs are not read concurrently (when decoding a packet with an already initialized AVCodecContext) while another thread initializes them. This is undefined behaviour despite the values being written coinciding with the earlier values. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaprodec.c | 75 ++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 4b2dceb5bc..e0d00d2d37 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -93,6 +93,7 @@ #include "libavutil/intfloat.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "internal.h" @@ -309,6 +310,38 @@ static av_cold int get_rate(AVCodecContext *avctx) return avctx->sample_rate; } +static av_cold void decode_init_static(void) +{ + INIT_VLC_STATIC(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, + scale_huffbits, 1, 1, + scale_huffcodes, 2, 2, 616); + INIT_VLC_STATIC(&sf_rl_vlc, VLCBITS, HUFF_SCALE_RL_SIZE, + scale_rl_huffbits, 1, 1, + scale_rl_huffcodes, 4, 4, 1406); + INIT_VLC_STATIC(&coef_vlc[0], VLCBITS, HUFF_COEF0_SIZE, + coef0_huffbits, 1, 1, + coef0_huffcodes, 4, 4, 2108); + INIT_VLC_STATIC(&coef_vlc[1], VLCBITS, HUFF_COEF1_SIZE, + coef1_huffbits, 1, 1, + coef1_huffcodes, 4, 4, 3912); + INIT_VLC_STATIC(&vec4_vlc, VLCBITS, HUFF_VEC4_SIZE, + vec4_huffbits, 1, 1, + vec4_huffcodes, 2, 2, 604); + INIT_VLC_STATIC(&vec2_vlc, VLCBITS, HUFF_VEC2_SIZE, + vec2_huffbits, 1, 1, + vec2_huffcodes, 2, 2, 562); + INIT_VLC_STATIC(&vec1_vlc, VLCBITS, HUFF_VEC1_SIZE, + vec1_huffbits, 1, 1, + vec1_huffcodes, 2, 2, 562); + + /** calculate sine values for the decorrelation matrix */ + for (int i = 0; i < 33; i++) + sin64[i] = sin(i * M_PI / 64.0); + + for (int i = WMAPRO_BLOCK_MIN_BITS; i <= WMAPRO_BLOCK_MAX_BITS; i++) + ff_init_ff_sine_windows(i); +} + /** *@brief Initialize the decoder. *@param avctx codec context @@ -316,6 +349,7 @@ static av_cold int get_rate(AVCodecContext *avctx) */ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int num_stream) { + static AVOnce init_static_once = AV_ONCE_INIT; uint8_t *edata_ptr = avctx->extradata; unsigned int channel_mask; int i, bits, ret; @@ -460,34 +494,6 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu } } - INIT_VLC_STATIC(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, - scale_huffbits, 1, 1, - scale_huffcodes, 2, 2, 616); - - INIT_VLC_STATIC(&sf_rl_vlc, VLCBITS, HUFF_SCALE_RL_SIZE, - scale_rl_huffbits, 1, 1, - scale_rl_huffcodes, 4, 4, 1406); - - INIT_VLC_STATIC(&coef_vlc[0], VLCBITS, HUFF_COEF0_SIZE, - coef0_huffbits, 1, 1, - coef0_huffcodes, 4, 4, 2108); - - INIT_VLC_STATIC(&coef_vlc[1], VLCBITS, HUFF_COEF1_SIZE, - coef1_huffbits, 1, 1, - coef1_huffcodes, 4, 4, 3912); - - INIT_VLC_STATIC(&vec4_vlc, VLCBITS, HUFF_VEC4_SIZE, - vec4_huffbits, 1, 1, - vec4_huffcodes, 2, 2, 604); - - INIT_VLC_STATIC(&vec2_vlc, VLCBITS, HUFF_VEC2_SIZE, - vec2_huffbits, 1, 1, - vec2_huffcodes, 2, 2, 562); - - INIT_VLC_STATIC(&vec1_vlc, VLCBITS, HUFF_VEC1_SIZE, - vec1_huffbits, 1, 1, - vec1_huffcodes, 2, 2, 562); - /** calculate number of scale factor bands and their offsets for every possible block size */ for (i = 0; i < num_possible_block_sizes; i++) { @@ -554,7 +560,6 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu /** init MDCT windows: simple sine window */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) { const int win_idx = WMAPRO_BLOCK_MAX_BITS - i; - ff_init_ff_sine_windows(win_idx); s->windows[WMAPRO_BLOCK_SIZES - i - 1] = ff_sine_windows[win_idx]; } @@ -566,15 +571,13 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu s->subwoofer_cutoffs[i] = av_clip(cutoff, 4, block_size); } - /** calculate sine values for the decorrelation matrix */ - for (i = 0; i < 33; i++) - sin64[i] = sin(i*M_PI / 64.0); - if (avctx->debug & FF_DEBUG_BITSTREAM) dump_context(s); avctx->channel_layout = channel_mask; + ff_thread_once(&init_static_once, decode_init_static); + return 0; } @@ -2018,10 +2021,10 @@ const AVCodec ff_wmapro_decoder = { .close = wmapro_decode_end, .decode = wmapro_decode_packet, .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .flush = wmapro_flush, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; const AVCodec ff_xma1_decoder = { @@ -2034,9 +2037,9 @@ const AVCodec ff_xma1_decoder = { .close = xma_decode_end, .decode = xma_decode_packet, .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; const AVCodec ff_xma2_decoder = { @@ -2050,7 +2053,7 @@ const AVCodec ff_xma2_decoder = { .decode = xma_decode_packet, .flush = xma_flush, .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:11:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27619 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902146yba; Wed, 5 May 2021 22:14:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybP/KXFRHBq3JMDXSzedIOZ4b1FhFGdpgPkjx2CM8sQ0BO0WvkRYm2j++6RsITktaRVK1G X-Received: by 2002:a17:906:38c5:: with SMTP id r5mr2299429ejd.230.1620278050774; Wed, 05 May 2021 22:14: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 u21si1302526edo.341.2021.05.05.22.14.10; Wed, 05 May 2021 22:14: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=MwKBSWsA; 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 A8A58687F21; Thu, 6 May 2021 08:12:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074034.outbound.protection.outlook.com [40.92.74.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16C1F681871 for ; Thu, 6 May 2021 08:12:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=af7g+O1p9d6oiHU/t/rCjnsgn44jQqn+gL7NTyDHnJQcNF34yZYuMaObZUtPXwHpWPrLWnQnOC2K9CL3YAhU4ZABKPBCuj/V7aLRYqGh9zzVZO737XAyDbWNuG4j+7eE/O+BgB+JqPZNM2fw75dB1kdM/RGKmm78xKBvTl8/lffW/FUgyWa2zqkmPEUB/DmcptXQ9eMXZCHfgCgjhJ6/sDZGwFjQ+tbeaTv2u03ppmsaYW0ZNzkPAyDTefKmhCWcHJChAbcr/cNHE7g9sQCYmX5nxfijI6XcnEppuWuV9Naw5TqFlPcNwf9evkTPdJrwt+wcTEvHXmZx3tM5MabJIA== 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=+DE+qpuCSzbWlCdUnSykbrvGGF/XiPEDhow2jxXllIY=; b=NUaHDVe8K+1GrNLZYM0RhRD9tZC8ncmW0k9YzgEO1P9GBymmktLCtWj7GFMCCb4vZ1gDyFzNnUfGjQViXSlX8xHw2HjvvFk0hkR0TukueRYaQdnTuJKa5IKdY4cHUfPyCCA3DdH5Jw33df9pgCqPnJR2GH1vkPLZCWNDOgRpbYZjVszATujpPE628iuGLR6Hvw+CqDGBQVIF0c1THTG6XjmL4uoSEbW7G8mnticQL74hJyouj8WCVaIeqKZ0UkGSQGRpBk6FOMPVuWb4qzWOMsmDZ2gayWdLAEzNr3kSAPrXlqs5S155Ax8z+cFPkEJ1mTj5aafCLN7kGc/bhVkyug== 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=+DE+qpuCSzbWlCdUnSykbrvGGF/XiPEDhow2jxXllIY=; b=MwKBSWsAmBKgMHwt83me7eiAnODPzdeXOOvuSrs+3oy5BSx1nMFqm9k8xY/uH9m6/atOq+AZNF+CtFATDwj6NEiRNbcUGFSvk8Iv+eZ6j2oTwCtOyvnpkXj0gS+npGoa4cwpjQnq2A7qSw+fArJBPZxEJnixZdrgIV8tC1YX8u/p0qVZAm/d3v+ew2atQxDGCH0qJxa5Tif75A4ekCv2gckH/28Aw47tMg1oaEn2oYT3ytGG3MAZTja0bex+hiONN6A+mqmANYT3IrDIje9GPSFNZGG2AalYkEXkdosef3UCYssbSthhKaYSeq4xN3pzhDnFiYgXbTEvKRNbg8fbIQ== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::44) by DB3EUR04HT165.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::370) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:01 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:01 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1A18D90F3120F8FA06103F86DC20B3B8D57B9B2CCC7E526745D40FA95D542ADA; UpperCasedChecksum:803B201D97908CA2D44143A8C000D24C85603DF79F960D3CD89ED25A77D36237; SizeAsReceived:7603; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:16 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [IvXoSYXTgWnnmsjeYvlTQ0/YuBoDb13JtGLqC58yg8E=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:00 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9900681e-cadd-4695-0329-08d9104d7ae8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0S/ll7i9GaYTFASg7m7W7iC7DUr9c0ZvAgSui6H4p9ZLluIfdKU4Rry+RW8somGh63SXJ9PPWWrQkJ7oroQJXjSdj+p7r3w6YyDlVzvJJ8kBnRO5vJHossgpGkx3tTpJ8S6Vn6J2vP5lIcTpdl/RVl087opLh4eYnfdIVppPtgqENLoH2l3VokrJqoyszUV7SP/9ICG9BYgaTd3Y2msoM5Z4Y5OSkCrBMGFfBMRCF0UIlJ4z9sDpNL/xjfDgsrzjqjZ7XwWZjpG8kCZioCt09PijtRTbQgH/bzpYHQjWYNRqLlgMD9sUajzWahKKMlsTRBFsojo8GbRTku1VecOPmfQ1qcJ6xzSHmXYNg1J8N8cwwDwQnWa+j3YvbFTstXfeyEVf+SxYqJOqWMV6+b3WkKsGTHTzwrHlgc5biSIrMtzuOg084ixHERz/R++ygxh6pGBHNrex6vQ+IT3/N+HzMRh9+wlWRrIGON+2QoVKRKHl8lzvaNVbWZnAFUv/SMlwHwq7P5K1vGo86R8K5LHKn4PBpe8QdzxGUXcQy7j4iZkdvuoPgQo0s6nuRXjnA3RdTDHhvZhumGkwg4RFQSen9cAz/WsQr6lI3Bm+k0q94z1oV+J2OTeYlNFmgmQpkwH9R/D3bT8Q2rm9AyEKCe8Zfd3wrIZaRBFuBiuzuqbyYs9+yh9A4NvGJOer4UEcXVTbkJnQSjBr7L4YA= X-MS-TrafficTypeDiagnostic: DB3EUR04HT165: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f6JIhr+VzySnfhSPkNhcwsAMqTc4O90CO5Mg0UKEren4hOT8ItvC5sN4/vLj6seQTahUdoPFWBROHvXObNjLVKRkmJpintexA93DFDPY8dAuAneZcwyb79EIgrlLs+rOwTknY/J7jMgG1qh2Wh33yc3w6A3+jwtu6o0Xo9xGzT0AabPSVOvGphKp0W8p4Q96weOs0ibVmL0eFQtPyyuMGjsPfPAsn0sE+P9uRhOczTVHZ9Fyzxjq4ptsAQp2ETzUCId+g2lXMujjP0K6BCcRSsMZzlmIvwGvwKgrQ9yZYcB6ItCfBTGdLE2BUUx+oDYM0dc9WXhaPigRPPhL1TRr+tM8YK/QKWFFWydUpoVV5KJkJtRXPTABFWPiG4kn7H854XBRtd0o/4nWq5/RPDwQdA== X-MS-Exchange-AntiSpam-MessageData: Wfz4FFsZCY1x8XfKIMrHnGhlyy/LqoyBlC+FvvUblH8yXsjGZIJ6sPGZyRtACQ4LMLkQBgk8oMmR8JJxXHfjXf6Bvk/4mqmiOVNbDcqOUQ4q7BI+iGIn7rYfOAhe75uj2XDTJtzq2v9kEUKxGJYzag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9900681e-cadd-4695-0329-08d9104d7ae8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:01.2516 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT165 Subject: [FFmpeg-devel] [PATCH 18/23] avcodec/exrenc: 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: F4bkevz33TyF Content-Length: 857 Signed-off-by: Andreas Rheinhardt --- libavcodec/exrenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c index b2cb9c4205..207a335f44 100644 --- a/libavcodec/exrenc.c +++ b/libavcodec/exrenc.c @@ -549,4 +549,5 @@ const AVCodec ff_exr_encoder = { AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Thu May 6 05:11:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27624 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902231yba; Wed, 5 May 2021 22:14:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+WBnL4uPJwjQhXZJYf+zBVCQHQg11Nxo5DXXQIwP0SxmA7d+6P7qhO/FeArud+6pFDoE5 X-Received: by 2002:a17:906:c1c4:: with SMTP id bw4mr2406337ejb.534.1620278059835; Wed, 05 May 2021 22:14:19 -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 hq40si1468970ejc.161.2021.05.05.22.14.19; Wed, 05 May 2021 22:14:19 -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=Xs7z01EB; 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 92259687F3D; Thu, 6 May 2021 08:12:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A562687F12 for ; Thu, 6 May 2021 08:12:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NMAxIwUzdmRgZG8B/qVM4TJ06zM1bRx0JY5yKfFkpp4Sp77XyVGRcxnQidRw5f1nGZ4JXac5ocapChlo4uFT2iStZDgEOQrXI9Y9zL39FCp48RsG2qIPygHJoLCd6x1MkHF4iKrV0Dq1d/JbuUGVhE7mDMKtTVWl9IGaXOjLagy9NQLC5PGMfkdumKfT1gBXntKqYFZ+zWYoOkvtOBvlc2/TwDCS0OuUqbSkM9ZsFvbGVN/9/zFvBbU0fscAzfwDqfUR8Kd1yauLRjreeUcVSylsqQ6rAsGxjefE+QoDlu3gm5PVKxfmFy7+YvQrP89QMXfw8WgcSiywbLdL27w3TA== 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=3REosNGegr4sBvkCDwpQqyvesSv5RY+twoYNLL8yUko=; b=gtqMLkzD+WFOz/3LXf65yDOqCkr3HNpXFij/jjfHR7CclSznQrcFQY3mHmtVhemJ4pnj2uuCvHzn3Ji2V2dGNv7Ng63PQyqvvFBTta6KORpeFX3ZT1+ocTzhVdAxUZ3AlNFmMbD37p++VHxJ9E+k7lVWLuBzcfQWcoPnif4ZlL41zOIDpJK2vylY9/I/r2oUbMejLIjNZKz+vLrcPyoL8LuKkpttIwrilahfNyo6qS5oG/00eio6zjAiP024q+a07QDmFhmND7CHAOHgF7dtPIFQZT+L0tsI+BZcC3/hnNL+E2XmhV6h3l+MkFuvz3Ef83bIarnd6Z6IP0MRdP1KOA== 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=3REosNGegr4sBvkCDwpQqyvesSv5RY+twoYNLL8yUko=; b=Xs7z01EBB0Z7yB3p4auUql4BUm6cxjkGfwwjgxGxOLxaNVTu3KjwSF1RmsvxixPeA3i1oLLzQVyrhr+1pA/IV6xqEF/NJwMm0ylhEskK06gf8A+W1Epp06mWzTRYLmT1Z6Wk07UeB3B3Skv99lsfO1Sgq1qypKgPoBCS+rXTFmLlQE2MycYDjHio0VlG9TtcEtcnwJsaMuXlJMkr63zKmG5O6DNW/1aQF0ppGEwaHPp7086pqYf/NbMW8/TlR6mgi/Jvw0FFiypr/zqg5greScOQdatM+aB7cEy1tZODchbwoaS4uvoVMrMq+K7un/9mAPgRAEgA50D25+oA1siN5A== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4b) by DB3EUR04HT144.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:02 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:02 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3FB86E33152C8717B1E710C8911FDCB26F59D91F9AC88850524C34E1A5F7A9A4; UpperCasedChecksum:6552F72B34C59B87FCD20AA7476EE27C23D4AA17A893BFC160249BEA07B874DD; SizeAsReceived:7595; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:17 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [l5rz5E6qMH7KQMqQwKfAnu4ccFnRqs0u+DyB9f/Npx4=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:01 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0185e477-1d6d-4e4b-9d3c-08d9104d7b91 X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMUVAIEgJfQOjCmuA15IcvSx/kO/M3+AK99w++zzhc2Tjq7Epox1xpZn1lMs+OxRZoHC1FK4fa3AYmYQLXxDQZ++i+Fyhpzq4Vpg0XBWq20TukRTOLqhQuwAZHkVXy2m05iDptA4owh7sPaiC05yuDLnzgR/a3aMEefX4zk81/scpJ2ofauBX4P1wNUdqbjj3iTN0OZ+2pckIZ/bYGRoE3sgAiYaD3h6OdSKMYrJq2ybQz4rMpV5CUFrigXCeZz4pN+MzCr/4nLBmVT/eesEKFaC7/0gfc8SUGgOIWSYNhMF2WX1IK5DR63EMf+YvOyjAyMFlcoWZHcVaq70b8iVdP/5Mz5nSp8OLSQfBOYccy4jbw+2VTrzQUBVPbGW1KKmvt/pWbGOkOGycYXwHDLYFVUFqpPe3VHNr279dKgwVsutazBada0/Wues89+QmysP7v7cGk2XBN5xeitqHszcd7l6Bv2hm4MyvWdnsCcmqcKmJ5McSM5rXZ6qDqr3yMQIEttxPTAE1QVbZ6dre+Mu3NoGAWboXUSMphcNFiJdeqDdFqvFqzYea5wi98mwH8hwtnDiQf36EwD9ZV0mRIzsa4HVmNkSIiJNNj2IMRIAIP5y9Bd+NZbZj1ZIep4w/ZnA7kLztt5AO1qQ1NIBlvjdFSIvAF11gH5u+O70UckiIZESV4Ijx/9jVcv4n8KsmkACGPpHW0FQsv/zfuV0KFs05v1KBOuNoLyyKVunUIAirA+lJuTE0T0T6PyULxT+b01Ib+3J5uTO59OKzHSMy3oAq63GzO+b7kBlI3XeQ8pUblNb9gO9ATGHteg+xyqs8U7LRChH/VoydpNTs7uB8bc+wjA5vOW6OlPAbpIwBe65nJqV3NAsGTojs7w4vymTWc+8BGasVhZWtpwFoQDAMveajXx8mfP+gxDoeulObldYTFceWC2zOnAeZK5r X-MS-TrafficTypeDiagnostic: DB3EUR04HT144: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TAdLRqBOAfteo9km9xG3KlpBvPbkWZzvsrOL8ZDh77FJHB+V2KU4eIxpiA1rQfNKVN6MApPJ6W1g3OQSObk6BbNWaWbrJRDZSFrSlNeTeXrn6HH0ZEEHx7Nzn+ehR54zNntpaN5GEB6+vqU9TqtNSH5qxTEmwjn5OxD9+/HqriyF8tEhbjTfVUoBcgMlPXT5b56yYkvJWpMGnbqjtKyjJ5qi+UjDFVOd4fKD7aa7ICd93kY/wgI8DhrPzMz8/c0pC9uQyGZeYAcKNku8l8m6skU71aKWEw+fj1F2SjLeFxr7gfO3m/g+4nspEjLcCpFojfH6laIRJfO9uuH02KseWiZst3hkyAlNyRVEf+TRvMK40irwfxIQqbcNCmvTETqvqRSmkxQXVpeAOAOM3M38o1dYO2OlpqGxkszC6lwoVHjF9OFb4QRaeAOQKAS2Vj1ZkDPQ/dLgpIHcRMy7AoongC9nGO04mAow+6grg3xcu08= X-MS-Exchange-AntiSpam-MessageData: amyPoYdOjC25LgmtabcB33cBudq29rbg/Pclos7ydQSEHyPEucxCi4vU3L629AvMs9jaGvIxvY3P4IJnTGYcEwLBj6KDCCk8PnLljf5PpTVeK09niBgKJJWiF7r99VyKIr4jFLrqZKfpBXMuNBUcbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0185e477-1d6d-4e4b-9d3c-08d9104d7b91 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:02.3601 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT144 Subject: [FFmpeg-devel] [PATCH 19/23] avcodec/pngenc: 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: Az79RQg1rOGm Content-Length: 1067 Initializing zlib in the way we do here is threadsafe, see https://www.zlib.net/zlib_faq.html#faq21 Signed-off-by: Andreas Rheinhardt --- libavcodec/pngenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 831223be63..a398155100 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1140,6 +1140,7 @@ const AVCodec ff_png_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, .priv_class = &pngenc_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; const AVCodec ff_apng_encoder = { @@ -1161,4 +1162,5 @@ const AVCodec ff_apng_encoder = { AV_PIX_FMT_NONE }, .priv_class = &apngenc_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Thu May 6 05:11:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27621 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902356yba; Wed, 5 May 2021 22:14:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL5D3+n1kfrRGd9JS/W90TLydEOabR+vWLv8XVl90eOq8FRBMI4VJoGpv8Ec1HbtDOUFPZ X-Received: by 2002:a05:6402:b91:: with SMTP id cf17mr2953426edb.19.1620278072171; Wed, 05 May 2021 22:14: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 a7si1267157ejx.527.2021.05.05.22.14.31; Wed, 05 May 2021 22:14: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=PtGi5HkB; 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 22689687FA3; Thu, 6 May 2021 08:12:07 +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-oln040092075078.outbound.protection.outlook.com [40.92.75.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBAEC68074D for ; Thu, 6 May 2021 08:12:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EhiQ59zL169GQxuj1pE8pLlAD8CHwZ5/8tcTHdygcjrkp8gxHJc0NxGVx9p2MNO6mscgRsYowxnNj4S8pArZjWipefS7aKdUDofrxBYrPh7BYiovUSrYAKajkPOqRWaLbTZXSvx1WNVhf76pN0pGOgMNN9LTi/0Zvf2Zu8JGbnb+4KY2a3LCZvV+uA39Vq4QxxJ7yF81SVnyNjZa6qQgzPLqLEFne4+f3hVjrcbY4EQv/WUZFmm32J5YBInhfqBhJ7qySYDuGdg2OTi+yreysv/JIb9h/oJbBBWmKDYQuN9mojwCsy6XSP5pWoY5Lcy0hw8O+bYHv2n6SpbFkIvb9Q== 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=Q6jSvyZVR6Rsiw5+tkD0et+SycQIKcCsvPF0lp8ydLc=; b=VYzlqJqyPETDLKi/BeeWPeNOAw2BWuM4ZfCOvdQF8W3Dh3N1Nk5pvZ9Xwvhm6SJa7fHMETmN3UvHPH5SmcS3kxbSv0Oyxr3QrPqldqtNenAyfyC0Zf0GtTS1kkWIn4z5m/a9OjCoTDWFUyfT2kU+4kDsKcAxaqMnMVqSKHAe8obtiyv8ULvSyZ05BNqtGA40FN+Y3e0dEgTw4nPWK+tiN6/UWm62hwOE52oXyePjrvfbhykQ0Kj5irY+8lqB73+SYGCIY/ZROJg+/ZnhKvQusCNY50OeZPn9yluDFdYPqicx4CHCUhwetJbgNl41AAkTywxeTzmkrZobuJc/gOskWA== 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=Q6jSvyZVR6Rsiw5+tkD0et+SycQIKcCsvPF0lp8ydLc=; b=PtGi5HkBPS78u7Ai0YFrGeiM0sPG9g+Se2ZTwxXq3SlUvbsLtLKxL76tedpu/8n15kNdndtIj6+sUxpvRYup9BOtRuNsPMXomzfJmOMtP1ceRSxASuqOiHu3D2SkuNfvIZJPc3ayipRt4mVBf1ISiFkT1Y/uO5JLv6BjwEfrF0kY/nwJDixqmVJNDE82HlA3m/WPU120UYhMjRloFsj/D8S9ig0c9MfqUnQCChR9vsHGYY5Yt8hMlU142yijgblseogl2UElhcnbGKqrPcQfLwGaiUnefoaJ8bTiCugWfCj59ckSIwVRWXBNCiX012nZ8stGy3CruKKWq40ojyIyyw== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::42) by DB3EUR04HT250.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::405) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:03 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:03 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:483381694E23E396EA15C607B4E8C5A28FBC979AFC347BEA49D344DEE1C34D1A; UpperCasedChecksum:652DC6944328864BD0086F103DEE420510E57E5D4F34D85FEE10A1EF49F7B87B; SizeAsReceived:7605; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:18 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [7jvPMoitsVX/M9OsLqQwUqCLoMOYMDiNWX2uRrQUm+o=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 135a817e-ecbb-47cf-562e-08d9104d7c2d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTOZvmSdSkFmoWqgz72Ju7zysUACXzlgSdaUvPkZbl4nSgBQaCuQknXMgzMFoTAbdiALL6JGNptqZQFeWefNH7Vr1+AGpZzjg+oeT7hN8Qjis1iSK6TEHvQaO4J42nlL6Bm4bRCg/HcdwsnDm4DybLb7Wgf+rJJb/8hKiMNNTmgEQDANJ6ItC2hUMNfVurHVwIjwuK7/9qsMTlETqy3IOUcntQbKr3M7japV7fTtYVq5n4JiivO5EvMooc+hf77E3CiO/tse2/HttaJwGWfmy7GDamOwRylfb9A66orBdBKPnDxyEMMYutWlSRAWQSvHvalCVM4BtC256KHQ0hvwPBUJCYyv/V306RSHKa0qxd6K4mKS7zZvemrWXs+pfVCju8qeY7d0zbgc1L0RCEpevaISe5pCHhDLgoPZE55rCiVNkXyXpY5Gzm0iz9BFV4i5i97YASeuRxpbYyigLbjB0kqL/3u/iqYNWO/4zPQIFmRuWNkomcc5wV32O1w5KkOPiT8vr7ZUBIqKJdYTlsazZuXKQakHMjYK+o/cmzpL3C4vbEG5D3GxmXEJ8zb3Yym8jCub7aFxysPYfy/uliEnfBszDCHQsil0M63sGKSsOoJi3OrnWsfaqzr2eBtT/tFmzH4LrgRUR0um+F3sTb7dOpLbeB2PtDLh8EcZeBePzxyqNaEI3lpKJ+fH3XGo2x41kwMPBBCoa2hFjg2Z7rYj0/LA7TrRB+9mSO6INltlA9At0= X-MS-TrafficTypeDiagnostic: DB3EUR04HT250: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d6koOklHrNgy9gvMb5VzfZYtrt3CI8Bhq0UPRaHjHE7fuQicQ0mZg0tSeFK5g7aqaZaG1KIdjju5Xp/ERsVmG1MO0Jg2pAu67r8jIl7VAVbAogrU8FKldhKSIMbeN0OK3KfetdFyYOswFmmtsHbrrWsGoS66jSR9CTvPr8u88oo2BnSbiukwRU+da99/1csZ0w8UsyQanDaoFSpS4rGblJ3DVLCdylEsodjFH+2uLUi4a0oIivW7V/fLG+6x8482Fd9jxCZkdusgnxvmlta5NH3eVj8+1tXZMp1JmYcba56o6B8g7hLNqiqF0oHqlJXEJ+Z3w/RWs2TMWy4H3ke2Uqhya1Lay+FEZUfe71C6BnTICoPO3EjG3s5eW7H4Q7CbyEcnjVpI1639NX0+juKSxw== X-MS-Exchange-AntiSpam-MessageData: /zRg6ZlwDrsQYRGzDb9t+zPTnSpyedRiZfgVnOS/fknIEjxWveLZlMi1pFn7yQ7/GsK7QzGLSt5Q3c8WfR4A5Gb501ufnEcUQ+/7jQpXfwSYtc5LyPJSj006bLf1RQJrnbiBOnVVZaJ6f8hGoylJeQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 135a817e-ecbb-47cf-562e-08d9104d7c2d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:03.3717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.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: DB3EUR04HT250 Subject: [FFmpeg-devel] [PATCH 20/23] avcodec/dnxhddec: 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: SZF5bRGxZOO6 Content-Length: 845 Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhddec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index b9e07a8562..c3eca7becf 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -729,4 +729,5 @@ const AVCodec ff_dnxhd_decoder = { .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .profiles = NULL_IF_CONFIG_SMALL(ff_dnxhd_profiles), + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; From patchwork Thu May 6 05:11:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27620 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902435yba; Wed, 5 May 2021 22:14:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuTTyVTxxvRlpzVJlSxJHqPHYVPcpCodKRuqj96Tf6WXD/EGOj9lvBznP6NVfpc9zUxnQ6 X-Received: by 2002:a17:906:c099:: with SMTP id f25mr2313908ejz.499.1620278079142; Wed, 05 May 2021 22:14:39 -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 p5si1065467edx.563.2021.05.05.22.14.38; Wed, 05 May 2021 22:14:39 -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=qrTEKhqt; 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 AA074687F43; Thu, 6 May 2021 08:12:07 +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-oln040092075026.outbound.protection.outlook.com [40.92.75.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DD2B680AF3 for ; Thu, 6 May 2021 08:12:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eI69z88iBUkdsiOKsonwmagx+zQTWgsQFqXUBCv0nrOcA9+h+o8C7nLa1SSHb0/3FSV+c578WrOfpxuUSTBfpAP4YgyOa4XacKC2AV/UnraFwVOBEcPx7pXv8LrSyfdcisxo7bcydSAU+t6RMke3gUaEAMEDoTuMKZtvngLetUNZmiPSEMx81FCjkkf+wM94wY99eluxI2oTf8FD1xAJ/BIafn9zitSsFTKEMiiF8Cke3ltJxK00IIeKJBHxyXfWqUOMHQiOC41Mmg0JkptIrMam2A40mmW3AzNP8H+y57HvT8aZKkQ2/qPXVyg+AGQMl41fs4Mi3IP9ygH9OzGB0w== 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=RnlmTIUcgFfONMdE9u32RE0d/gmUX+SS1pVDk/K6qFs=; b=X7BQ73TsI3DcuPWNdHTaZnPs0lfbrFLtfYLCKbQmY8nydNHxydasC35+mv5OXlK3RRaz1l/SyZ1zAF20pqOB91D4x+fPT/j9/eMm/qjCN2zfsMLCoH+dBUM8mqy2obeKjkm1gyE9sUS0HQfxEK+hBdqfRPgS3qFVAghNmDNDUuZHzGDbxGFVCmqBf7budjgUwNTp7cJeq//9tDu8mjYjLqfqnwnScu2dBtae7tsaqLM/UpR7kxn1BMsYR9SKi0IqhW2ShAelXFarlNHhfPvMuhgonBokjfA6w5KNMfypn/oEE7g7b8LWUGQ+AAoaL5oz8fOtE3XbWV8pQ/vH2MrP2A== 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=RnlmTIUcgFfONMdE9u32RE0d/gmUX+SS1pVDk/K6qFs=; b=qrTEKhqtPmZFzChHHQvUf/goY95oWvTQkX7H7RqmnkVPVX4P9qHeeqcSgouDgzXiy4UtiB5h9mrsyZzJgkEiHAihq+ytYZrwr1bn/Am0mbhGUGHIXlF0kKJiAk84E7x0OnNDKN8jRn/CHGEFGffQIcawK/69rFVytrDqGiXHUwAoyGia2YmTmCwiCJhLgQF8GfN7kRY0SEXyLtvGXuu+z7JjVhl6DUA6ghqB3NAT2x1oCLNzwZPzoPzKVt7e8Gcu7DgdtZB9aq5eTMjisxE8paAk0Hw5ufXAHPF9BAkqFwCrNUq6zJmm8T8d4+bYUcgGdwCEpBe9AwrUPYDwPiSicw== Received: from DB3EUR04FT015.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::40) by DB3EUR04HT198.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:05 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::40) by DB3EUR04FT015.mail.protection.outlook.com (2a01:111:e400:7e0c::453) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1970401E366D578A15EA79A7EB571DBC6AA1BAA09F3B0D359620639E7413099D; UpperCasedChecksum:07A46BA7C6DCF8E1024AA99FCD743088154EB190822E375A2C3165542B2A81D2; SizeAsReceived:7620; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:19 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [eYTpD84ZJxjJmxVZe/CFuVuGnNP0laW8s+ce/W1XOvM=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:04 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 69d5cdcb-243a-4268-2c59-08d9104d7ce8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0SyrLVZYZfPb3hgcdGwpXeQrvcE5G4JhGhJBmePOBi61TEhdz/NXJdo3XRWuXWB2SrAG8VsJwNiPi7Oz8vmjHFeQyyAm+rx0idmZVaSHgfqplfP9NVjrW7R65BjPB0lT9KkEp+CfXHTnJd+XtQsUPPRScYprA+i1gnZWp0ENZi7sWyp6moe8vPy75jz7+h03EWc8inWfHJVo9MY6cBLoLRDznzye3r6+qyrknWWbWWeK3kgT4zvmOvFUSqUyBE2e5j4Jn19VggUk6l3bkD+7FisPsokblLWVio77UGcGxJiIszwX694IFQ4hXVlevryTqO7SyfkrKTZKh28WCVSUda4dl3IySCKctQ8cPgObSbiKfveVL778R6eJctYlg+O7P/Z/7GUvL6G4Uyxsd2I5lHTL5rS7dJcyBfJms3qER8CLiLhlTeiSQ2uuNMh247IQI8d3N7MIEjvYZs6iHR+fxP3Kx1W6zzNQXo/AYCfPH693CtcMQ0sCpHpr0SG1lzRqfJqSd4adUY3Nc3/pakjTFIeqNCDFY9WaChobfmSRvpYsU7zRPLASoxX0jYTCnD+AFkTDk7/h02p1kuYR3cqridqQ6v2qk5QEt9FwLKION8nnKMhOMPrDxVAN5TCIkFTgEqVGEV/amJdZUTYNUc9dzDs+9mwSyowXh+EyJZHJdLf1SdwLJ6rDBTYWtEAwN6x3JwzLyZ7HB3Z2I= X-MS-TrafficTypeDiagnostic: DB3EUR04HT198: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O3/NKmoN+B7Wx1Qn3LIlPC2eqUpl8aCN/uFe4hpOIAJ1BLnrpZudz4YyATYxCb59OaYSzV7W5jhRpSV8ijNInNN/PwmZvHe5ZZBNcHtTvj4kKLCE/GHdACKFbGQagonpen4f0O98yK6w+uQn5accs+SolV8ynfA64ngQnnkRfEfeGCGtfe1p9MBiIavSWB/wyIUIu53GDCqVUFoSXhv6cI4fasqP4xPnaFeidhAWe/ocazL3J1fih4L/1MA1yDAQ7smpNwsZ8+n2aiBurMA2BA4J6WS0dvTX5svR6CTybVoVxfayYf0Vlmlp83imPlhf7pJOhVxsM2eNI15owpDVEKisTD5ZaZglvffnTBZ9+yFHqVpxpo00/jqiyoBPfVAAY+JlXRtgjrysZZ5AmMjgfQ== X-MS-Exchange-AntiSpam-MessageData: i3ZZrXR8r+uXYWF7UCF6ASbm+2k4Y4P/XcPHdU9qJlqEvksb0UYFQ/G5iuuk5/mHbGBJECeyEISKJrwKkOrstF/a+18KTB08wwMnUVuS0S6eA3XzUhKbqiuPsDwKJiQwdVXJh9t68J61GXWfof1M7Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d5cdcb-243a-4268-2c59-08d9104d7ce8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:04.6111 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT015.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: DB3EUR04HT198 Subject: [FFmpeg-devel] [PATCH 21/23] avcodec/dnxhdenc: Fix segfault when using too many slice threads 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: 9ll0PqFrn5oD Content-Length: 1350 The DNXHD encoder's context contains an array of 32 pointers to DNXHDEncContexts used in case of slice threading; when trying to use more than 32 threads with slice threading, the encoder's init function errors out, but the close function takes avctx->thread_count at face value and tries to free inexistent elements of the array, leading to potential crashes. Fix this by modifying the check used to decide whether the slice contexts should be freed. Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhdenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 7f18aff66e..1df5346e62 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1337,7 +1337,7 @@ static av_cold int dnxhd_encode_end(AVCodecContext *avctx) av_freep(&ctx->qmatrix_c16); av_freep(&ctx->qmatrix_l16); - if (avctx->active_thread_type == FF_THREAD_SLICE) { + if (ctx->thread[1]) { for (i = 1; i < avctx->thread_count; i++) av_freep(&ctx->thread[i]); } From patchwork Thu May 6 05:11:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27617 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp902546yba; Wed, 5 May 2021 22:14:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVBEFd9Z+MRcuWKQ7a3ulr+4bYWkzJu4UZ9hK5sT1B+aHdfuhov9uNN4BUEQ6FZZxkDI6X X-Received: by 2002:a17:906:74c6:: with SMTP id z6mr2436295ejl.13.1620278088715; Wed, 05 May 2021 22:14:48 -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 l13si1333564edv.124.2021.05.05.22.14.48; Wed, 05 May 2021 22:14:48 -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=o9wiwJ6h; 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 0FAE668803C; Thu, 6 May 2021 08:12:09 +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-oln040092075016.outbound.protection.outlook.com [40.92.75.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 511CD687F13 for ; Thu, 6 May 2021 08:12:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VZyHgfjraBjmbdTaIarlYcmOYZYSeuFph+b5amWojdKcMabxY12CJBJKALruCMIfRRmInciWA9wyxpmemw9eniMeq0SXEzTI7GLWDKXTHwH92a5F25xEtcVi9PuCZvtj3nKBjXFOCoWJTuDL4B82ZkX/evDcI2qR/86wuAkrI0HInjU0e6P5JSksC0qxR1xcgSZu4kmDz9oqK253g3OayJsobMCGqCvW0tylkB+mSfX535fqXQfspGocA/sDuDtF8uY7SguN+COlpm8xHQO4pKRAsn1iwLqzjB/sOsnZkbCrOlwma8iyQ4gMVKxrZAVwvY6vKEimBoiB+NzQtPWIcw== 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=Bx6Au9DXY3cNdn3fCO6xm60jPUABy9SE2pCUe7FGez8=; b=PyZJRg8F5tB6dvpbFEMsxPaK2V2n19fB0BH6CFWVNRsj6GxMudcsAfKa9O8KNsOkjcAhaZevhaqchMf7jgXzayfQVMQ6FNFklkq2ih/fnIacKsDfh04aOBe39FXvPBZqXh0fmSPJp4BDYseGPfV57SzQPPrwceSRPIYqL5id46t7k2yT/tRjdZKFLbS3TOVx/FUvBCAiYeNQRsQAgPLEW5zdp1KzL8n5Q3RlxleFpLJvPvueQyX4Zvvq2ueZlyQQastErunF3Gaf2XQbtjhUiB5ytd131MLZH6XKa6kMCuBvF9QYkr7kAogf3pjuRJ3YPxk8NAki9QvxemJSKNO+KQ== 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=Bx6Au9DXY3cNdn3fCO6xm60jPUABy9SE2pCUe7FGez8=; b=o9wiwJ6h6iaS6THv88BOXNf0q0hDC+c7p70CW1yIuL8JoUHehKIjUrfm8buQ/kIpnjsNrchPiXhaz9P9i1XBkLdq/HZSXbDi9CPFz0FIRNacBbMwQ8PiXIntzHu48HmODEWyeE1RkB9QdMX8IZJ9D/zf4wOEZvUj3GBwCTjo1m26Pqbn43lC93cyd5NVXhl8OCYGbuITvRsP7WPiV9cahFF+QhQr+jYw1v0Hzt/vJGz//m3h6H708m+y4+uaQf17UTafF59TTxtJdfshg33k4FVg9yCDzA3IQkSsjSVKsNOuN3SeY5CEC/qWLPI4uFdGaqO9p4bq/kf55DzeHK+J+w== Received: from DB3EUR04FT015.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::42) by DB3EUR04HT077.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::424) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:05 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::40) by DB3EUR04FT015.mail.protection.outlook.com (2a01:111:e400:7e0c::453) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:A4FB8BC2CBBA30444763DFB419C54788BE4D20337935A489F89A8D5E409737AF; UpperCasedChecksum:5A493F29505AC25E28462D23835EAEC6DA2FAA48A5059A45013D7DB9C0861DFD; SizeAsReceived:7611; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:20 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [UsbNeY+ybCX+QLUgfgsCHuErO1PIpomeO6ObNlcvoSY=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 94b35ae1-1770-4516-e02c-08d9104d7d97 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTfwKLxOCYp7ThILWlq+fGx07p0IvZbUemN3/hVlKb1d9MTciFynl3Bs4bG2myak4ZgxLodxveglRkO9w63tCs+3Z7XaXjl64Sv6Ih/PyuH/GlKOxBWZPIDbMLVkuSJ50oJ8ewDQOaUs2J/j7h0GlyOnqYPt/bP8ch2rZfvHMzNwYKdRdB2/a3UfYt+O+pHQVD8trDvpvR785ISaUx83m+ByjPkYs2OAaGPME8QrM8Av1B0vcTyJe9+YFS3qk2eoR4/qpx3C86P+qAM7q5MT8DZtUg8eny23SWJuCdf/Rr2F8UEvecgH+HhRrNg2A/t/9YthXi6HsrOQbyTfcdSZKh1L+PiglCbbASwJbYQDMi6vMg6Z4hCB/xb6hc0XBspVixwpMaeNj8GgxDArSeNqHRz/uit6izYghi/9BnZExPz4XuJLq4MagJnDky0C0mBzbUBGUsk0rg+J+Xr2vxtbbTxvscF0sHe1YctrFNzK9FA2v0qtCaFcVZP0GrDXpaQ3lkDyEcfS6+ixMnSXvRxDkn6nsbbJzKc4oJaGye1PYTMkOM3j8P/FFudDkfcN6etxUb2pYb/6ZiU+ajpPjRRuAhFZYNNAFzgtXscuDtImj40Al9iTcj+gqaXaEHhngzkcj2D0N0/WXIu3C6CVIFeuM/nDpD5btIF74dYBdGtQXKDbpnekat0mXp3nP66Sv0maXKUlSUERgl85bwDfh54X3CaahndGVK4rG/39u7W2m7slA= X-MS-TrafficTypeDiagnostic: DB3EUR04HT077: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pgR0fWZkkhQ757LFegCiwd3MuwhvLw5XCkT9M1j01tXqhTP82WVEyN6/hpQ3gs3JQwXFevf2VFYaEYUedTBYZHo55On48Fs8VAE3X4sKNZMyWL7Zjn7kgXZOSW6NYMza5lDot7H+vHVM0cKgdv8aTb6ZtVqmm0FMEPU0Gak8/6/tm74SIH6qJoQpKObvNZWGzP+tHNTSnIKjQzRNNqxvvp8OILYiFkgjTE33QDsJq+/9mm8F+LKplDmbRGFmnF/XAfE7E5Db1D37j9jIN8rEffPoGauAWogN48hlKWMN5jep6NnhmkJpi+Rt1CxVRCGoBzhKvlqdXsyAiUaruE+D3Dn8LgMV+fZR1K2ing9gccnGIon+RblH2f8OqRDbesA6RpVAHOIw+NnY3S3CcQH8ng== X-MS-Exchange-AntiSpam-MessageData: ItDEMXcnfEViwUzJ0is+62YP/z4gRwoDXWfXieSNq4i91rlTgckAPQJd7NjI6bJdvDWsxZCsJzrt2j0jOyPFsR8HukvaMabijSpMRWn2EQIfPh3do88fI5m5G1B6IQ9IZGj8zSjNWF4caklt8lzEnQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94b35ae1-1770-4516-e02c-08d9104d7d97 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:05.7726 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT015.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: DB3EUR04HT077 Subject: [FFmpeg-devel] [PATCH 22/23] avcodec/dnxhdenc: Use av_memdup() instead of av_malloc()+memcpy() 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: 2ImDsWTQc4ri Content-Length: 1082 Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhdenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 1df5346e62..1a59815472 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -516,10 +516,9 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->thread[0] = ctx; if (avctx->active_thread_type == FF_THREAD_SLICE) { for (i = 1; i < avctx->thread_count; i++) { - ctx->thread[i] = av_malloc(sizeof(DNXHDEncContext)); + ctx->thread[i] = av_memdup(ctx, sizeof(DNXHDEncContext)); if (!ctx->thread[i]) return AVERROR(ENOMEM); - memcpy(ctx->thread[i], ctx, sizeof(DNXHDEncContext)); } } From patchwork Thu May 6 05:11:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27607 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp987952iob; Wed, 5 May 2021 22:28:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKHFkgwFzlrXKv7Kfxn4ZuXURYw3V7qpwhrgzJnzZbhhXI2Sa+k2RoeMFH+U8mexdqZlFJ X-Received: by 2002:a17:906:b850:: with SMTP id ga16mr2405391ejb.161.1620278893450; Wed, 05 May 2021 22:28: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 eb8si1412684edb.49.2021.05.05.22.28.12; Wed, 05 May 2021 22:28: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=c+ZVkISf; 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 A179168089B; Thu, 6 May 2021 08:28:09 +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-oln040092075028.outbound.protection.outlook.com [40.92.75.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDC37680529 for ; Thu, 6 May 2021 08:28:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F6GOvk5nIL18DqO/YCqlR7PZ5mluURwzK7NivcHjQ3MSGUkjFPCmHR2VEAJjpac0gSnrWL5TE9RBHVQgBqoOQ4uSLgZh35DA9Smn3nRYvJTNm/ZXEI0unzoS5MiCeowMqkTIwcT0sR66g2G8eMPLZv+drD6j/tpBdrym4PmyTUr4+2enVpJeeen9m9V2X/VscHy61PIp7yZEuw7GJn+w+pTzuRShlMteBdpyYONVzPR5sVjTaJAbr5c8HNDr2pBxBGMY6qZuOMW+pJrh/PU3jp/0SOD7ORCOy5DiyPX8pH2X2Nlry+if1w1pyq7m3Bc6AaeseODtkv0ZG/5gti9g2g== 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=HqQ7tolHVJJF7JOiyB0sFVCdkq7NYkcTOTycHDCv2nY=; b=YPuzzn43FlrJyRJ596dryTFx4lBZgIutQz+mWeQKNL6U0WsrtnOeKMtkjMDjsQSgTW03H7rM0OsEHdQKnrgwoJRS0rJyfUS8WsFGTSLeaa4Tt/SuAvkHrNC6j0GUCB/qi/3bOnWrc5TnOJoxa+jHABKEShrPFlR3ZOVFD4QuE8rYngcMVwfcqfgTqSLcWN7PhEfGp2PFr3YdEoGsSTmnt/6liJGaCCGilhZ7hkRY418LTs6AkH5kSdhxslZ/KTXaXgGoqjt9WUUqoGh+taIRz8lU689tA/a3xwKYaQxpUV4idyJnOSk+NDFAXZXG+IBqwpIdLYkkq2vE430DN1v/yQ== 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=HqQ7tolHVJJF7JOiyB0sFVCdkq7NYkcTOTycHDCv2nY=; b=c+ZVkISfY/Ehr/zmJZ07nngGj2gbkOAcL76cNOfkb/a0anCBDwid+3/cXD9TlDuVk2ciPX7bGaIuHRcunP1WwFsE5RezDuBBsii8/6CeOq5FJ/292fB048tlAqZqco83IW/m4Jpj68TSPcIsXmWAy7TCdurzbWVFXq9x6DD6jbNtMOy/+uoK+3gkFfYQ0S9sBJjNqHG3EhP9RExo4ndvZhCVSyMsxS0ir9s1kAlPCTa6tgm/WeuElqlu+5pefH93XA145IuWqGX7zO4poh74ZhKsAj7OCkLwbrACaT41sDZRa0Y59NlUTav+iFOeXcG0feLtlD7/eKT4q7IFvp4Htw== Received: from DB3EUR04FT015.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04HT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::321) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:12:07 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::40) by DB3EUR04FT015.mail.protection.outlook.com (2a01:111:e400:7e0c::453) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:12:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B4037C9C6480F81AE3596E6AD810BF9D0ABD738C311EE0432C24A3A2E1C07C32; UpperCasedChecksum:54CB78F05E2F3EB4698236202C11B50A5ED884247B0E204F9231FCD660D85EA4; SizeAsReceived:7605; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:12:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [97Rhz4IqgtIXjFldvY6qQVAiZ97mSh/WHfQ25LVeg5c=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:12:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b5e06d7e-5494-4ff4-2403-08d9104d7e33 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0S/ll7i9GaYTFASg7m7W7iC/RBHta62MrC9EA84PqfooFteqPrscK+FHAiMioGQpsMEhVq9GGnkgNHWxIfjvk2oVaMfqjgHwbwZ068p0i3lhF0skfzdXLN1Hzf+q/nSZwxfGFDHadOcdQ9wNO3gd6xjmqLSEuKA1HhxOkTdkq0ihMOh2jFreeQTA4Dv/nqXd0ren8u/mTlymayoENM1s0+64YGXuDcLO7qOnd5yCKHVRE2xNs+FDlmKPGpX3TTsN9KRPYOfPLEmHHfjdIpykOUZpKmkL+B4MrU9cu07SuDkI5k7JRPoPCj9EgehrdGzJdHWuLE9WZv1e9v0tYdVnJEHjeJ6eeR/Wp+XKVkDFGwKsxmfXDVj60pw4hvCZS5mhjSkOLuHpcO75N5emhytAPNDnjAnl81BxkXzTxmmnSo1q2YEYSsDBZ80J0reADfoetD+wgLi0tpB7M1bbdz+6j7pCdk5WY9HHTV1q5CKkgt3YhLa9IA+YzoQafW1DYWwTUgyxhxAeV5XnYm5b35D6r2itlug7sahm8Jb+EHZc5ITYwI6lMcDuXkHFPnlVfN/BTXOo4Gl6DGxLgNtZMAVg3FDTQOAUyv/EEguQqAxdeykyP+a8UIdozAkul8s26qU6YKfcUf3zSav/C17GiGl54HAtk9ls7QsBIAhY0LmOq6ukqnwFNnGcodRAZ4JMJp/wcYFAPtzIM6yms= X-MS-TrafficTypeDiagnostic: DB3EUR04HT047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aUJbbACyW528QYTheIGvO9JCguTYPVISP4o59sOuW/i8UgE16MmDm3KeEbVwpzOZ/pA3p6JCKaGZbArtJInL5VjIMqSCSfbWynTtNkCMtFMvdg723xvLn72Q5D7Okjgv+SyDJEsZeBhlb6FWoI8FiOeSVvIMq3ylmbUGgu6CfUMzxtP0HwXmMEm8cgd+65btoQXHF2vsKr/f8C2pfIj7J19dF7Dgxjgg9f5nHcvanTwgerY2F3QgKo37G1ob76sYgk/3DkS5s02lBwxYEkyd48xK2g5YUMGq3HqKpbOECJ4ILQAcitmcbbrKRhylxwXifkmQWNgSdof7BIpp0StWcoh5fEuNf2H4dcsg4jvvfaEDzWsrZD9DqlZ0pd8niabNJrJpP3re/xJhFbqiHVIusQ== X-MS-Exchange-AntiSpam-MessageData: 69BtPt+tfLr1XYx6I7h6SJ8q2otizR+eGY+rXdFzGB41cycJQr+ayk2RlieoBUhFLyTnKjgH/fO+T5cITxqyJBSAyRMZ8hORC4Ksx6eT5f6oFfSG6RfANf4krVkW2NeAcmfcV1fT/f50n7NZaeM7hQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5e06d7e-5494-4ff4-2403-08d9104d7e33 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:12:06.7711 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT015.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: DB3EUR04HT047 Subject: [FFmpeg-devel] [PATCH 23/23] avcodec/dnxhdenc: 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: FBndDiVkHSKE Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhdenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 1a59815472..ee45c64ff4 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1360,7 +1360,6 @@ const AVCodec ff_dnxhd_encoder = { .init = dnxhd_encode_init, .encode2 = dnxhd_encode_picture, .close = dnxhd_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, @@ -1371,4 +1370,5 @@ const AVCodec ff_dnxhd_encoder = { .priv_class = &dnxhd_class, .defaults = dnxhd_defaults, .profiles = NULL_IF_CONFIG_SMALL(ff_dnxhd_profiles), + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:29:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27608 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp988902iob; Wed, 5 May 2021 22:30:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6Qh0YpEbyrd/kEH29Fjmis4kwtMkR9b3lxszwPZ+YB8Zgz9/Zb6tIurvXmSrsHJwtCxsv X-Received: by 2002:a05:6402:164e:: with SMTP id s14mr74149edx.232.1620279013726; Wed, 05 May 2021 22:30: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 cn23si1395321edb.168.2021.05.05.22.30.13; Wed, 05 May 2021 22:30: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=iKjDP3RI; 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 F0D7C6806F3; Thu, 6 May 2021 08:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2013.outbound.protection.outlook.com [40.92.51.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1ED26803A7 for ; Thu, 6 May 2021 08:30:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N4zQFlSNHa48DpZV0ZqrP59nOjvkUnOiuVqFTM2d+iakE3bQ7izYj3zIeUkMqoR1nE2oQBACME1O7y0thkVgPIL3MvmAjvoHarYc5zR0vePQdaUE05jcg2WV6c/6sQyuph9EkuDLJ0+/gcUdyYC6mp3or72RrGXw93YulXbqJMWdskBilIe+V66CpBnzK/GARw1B9FySP6NVZxto0Pg4LYyICoYPavcavbWL4wvDUUhNHhO8iDuYg9TOSzn7TD4UdvQgtrBVgLDGaViuQfHjricLOG/2x4zdzZG9t7VlZIA6b/1rMowgYibjSar4VvKy9TNbJT216ihoD348Gf1AQA== 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=Gv7X+X4RZLPWKa1qBAdp81si5PSowjSQoKq+jmVQJWo=; b=MfU97aZChXFzgPTllh9zh9bBZSkZme41aD9jZkOgGLKE0ifII8FYJriWFkcNmq1Gma2asH4je0YuFGN+gLxffeDIMVlaDqQZLyp7CeGW3bSRhM65CkIVcUEgkWORmMbsiD5Vzx3KRwIJKcGApKyCoQ/nQDeLSOZw6ai66ohlpcQdRBz0/lHctKaTaFnrId8549NAxbSf/JtVnl4jpOQomrc/DfdteutpHTQXU2iZ7P7m67XG4Z2B5nouWR89gUcZuglEVIrhcC01JXTPqoYfR1tTRzcvicN8lFljW48PdiwIDRVrVsC9krNxHv720CQMzPl0QZjBq9Y7QCX3/gon/A== 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=Gv7X+X4RZLPWKa1qBAdp81si5PSowjSQoKq+jmVQJWo=; b=iKjDP3RI4SdC4li01HBq0sq1KYHzrcPi0l1Zh+B49oWQ18s8+frKgBhO7Eg0e2T8TnLxrVxJ4Q0lBJTCKpTNc1SeCza5t/3O9jS9fO9WcLqqjmg+i/WDdAweJusJZLkMVewIHkcXgsNzBgildHL0ycBTROuLPahnqijlxsq/sIi5gkhRLSkcum8guMl9b/v3ZbxZxLx40/NfuasppvJNP7kkCqDSzqfrITsp5Nv9p7JMKrNWuq3MGuCb3JBBrSmJs+gNyl1ZiguH9U6S+Kq3kVCmOA9vQMDm+dgj9KKXGaG07j7Th7aKAvRf4/4oHC6fLWaaa4lnGussm6gK9vCrkA== Received: from DB8EUR06FT062.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::53) by DB8EUR06HT076.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::458) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:30:02 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:fc35::42) by DB8EUR06FT062.mail.protection.outlook.com (2a01:111:e400:fc35::393) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:02 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7C503FC0424027E10A0FD9D432C7161628994A40DC2A5B2AF722942A554BCCA9; UpperCasedChecksum:7FED70343DCAE51D6A585EC26740D364363C274806D6573FDBA9EF421A8465AC; SizeAsReceived:7598; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:30:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:29:54 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [0n/E8kYQn3SzV5930aFuf2q/9w3duvxu] X-ClientProxiedBy: ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506052955.834103-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e12eeb49-8ef6-4509-a350-08d9104fff6b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTGtgDDrme2a3u8vbsZGsMRzOsS1d1Th+2sDoJUe7s9YqFYlgnbu67wyz3S7l32WIFKoYG061n1tC8PLi1hQrK5vI5n5dP/NoCAcZxVjkNj38tpUP2PgomWIpFTmR5xMIwxFsJ8gPq0aqQth2SR/cR7PdauvvCoNzMZDA1l0Fm8tAUrD9Vl21l0/83xWYC6ferdl8eMSytsBE/7LoU0BpthQ9rdVH71qjF67A332D/dQoGtsaLmFjIoEouBiBBTe6ZyN2fP/L+99YFsTdY6VkofhQqsnlo35/7au5NNq/BU/PUHQR7KnFfb6ZRXv7rNLhIReRMCcO6T+fBM/6/OHQg2TyRylyKZ1qKjTF0t5ysSeczG47xEkBI4gfjzxM1CT1Crt3xLoIhRoyPg88cI83hihJg8bGJIoO2DeuFEJIfgzI0+axxBYCpb1MuMEcszt4tD3HvCvg4/CtVLu5vofJq45HXf4eZY+ui9N9Hhf8rhTDrcBfCu40k4fTzsF5OReCQagoP3ljhVCvmR/qlYUV6CPmkdVcekB0DIX4qyR7Vl2pKonvguwNn84Lu0Jow2/NPi9XpkPBcxzY0KMHPgZ8+oxT1omvWfv0kl48+klpUDtx1QYdWyYDfnggmBod3jJ/HDCRr2fboMlp8SZcCh79TcDl7ZQPSvCDMDmnKlVaCmoRXFNrzZhIHGhXcKujLbS3Yd9rswjBzGPyIwE3ZBKYR1BkqhWsPvziO95x8a/BEHOs= X-MS-TrafficTypeDiagnostic: DB8EUR06HT076: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3vdOMMyEPXjiEx2CCn9iX6G4nHGwRv57LzD8bgs3EtRey9uazx0f82XiAKlnwtSiCBcQOZmG/uk1VYiz62nLXKuGautykPLbrtz5ErmW/PeEovEv8IR8mpRioy0Z2bgYh+6KUHwZGLD9/MGE+KlGZEYTlY6MGBLZfSDvIAvC8EUxUzi9Wd9rPDLRUoSySaLlIthXf3/N/6si7g+FNvvId4DAxRNpOAJ2DClEAi+jEbbzySulCdRuJDGPbM55y7AO4dTo50luU/+6/fRNyEHDDjo0D68OmePcb+C7BBdpBnZYYeZNdO7t9pAPEWMDXsR5Xj0y4NoD6HYMaQxSyC6piiNW1hDREk25bllmCDsxC/k/2tOh1tAMFlbpEwXgSu3AKwae9EFBhLFib7aoJPID6Q== X-MS-Exchange-AntiSpam-MessageData: BOCyzjF/mg/0n5+4rwHNv4M0riPTo5cg5L6UunOY3yreiYBCF1Md/y0KOpyARB0pbzr+fAMPuWkGIm6O7/g7nt+WJRtP5dVNhz6W9hOn764Iysi3EVRfda7QGkkJLGMHNSgrR3dLP3eeaBOABbDGTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e12eeb49-8ef6-4509-a350-08d9104fff6b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:30:02.6049 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT062.eop-eur06.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: DB8EUR06HT076 Subject: [FFmpeg-devel] [PATCH 24/25] avcodec/vmdvideo: Cleanup generically upon init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Foz/phqQA7TD Signed-off-by: Andreas Rheinhardt --- libavcodec/vmdvideo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index 15846919d8..ad88a43ae3 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -423,10 +423,8 @@ static av_cold int vmdvideo_decode_init(AVCodecContext *avctx) } s->prev_frame = av_frame_alloc(); - if (!s->prev_frame) { - vmdvideo_decode_end(avctx); + if (!s->prev_frame) return AVERROR(ENOMEM); - } return 0; } @@ -477,4 +475,5 @@ const AVCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, .decode = vmdvideo_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Thu May 6 05:29:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27609 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp988976iob; Wed, 5 May 2021 22:30:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrh6wWXH52UnrIC3GE05497z+IVTsSo1o2x8vgPmnihYtimrW7vkBsHYERYsRAU2Bi2D// X-Received: by 2002:a05:6402:138f:: with SMTP id b15mr2943539edv.121.1620279023372; Wed, 05 May 2021 22:30:23 -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 p88si1259890edd.69.2021.05.05.22.30.22; Wed, 05 May 2021 22:30:23 -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=TwyTEg6Q; 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 1AD966808AA; Thu, 6 May 2021 08:30:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2070.outbound.protection.outlook.com [40.92.51.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFC5E6803A7 for ; Thu, 6 May 2021 08:30:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z67z4KspBDtSQL2SSR5xKvByyx4yd7lQqj4YDU9wN4JQ0NfHo1W2LJntnBLpnk5ZIpCQwcKdm0YftffvYfOCsNv3DT8D+dPGjEz0PTTi77vqG0oCSkPSPhPnPG+qMTMenxmiwxMKqQI7vM5n53k2y3LCKRXpfcMyn/0Tqb/8xKbNNBrdZm/QNK/eIC2vyV7Oa8CP6KcyI07VTj+7XOU95g2nJqQyObx2wglgIx/KviYiJrLZIYdKkSi8TcoKVCqDKh0sm5c5++Mi6FiRPadgQzMF1vBmutTQwsQNOMKsuhq6q4xAiLeHv8U5LGos3fNzgpaJRGdsKgrr38I6BG8Dgw== 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=7aVaYypW174z2Lc1SL+mEfiGIFRzvtRB2PGqOTTu+qM=; b=hzcu8O28B1wyj4C4MgJFQZXgkmMp6JsHvhXS20nSlUdiwfpV7lmgzfmPvAGU5SPOzOE3Q4JLW63etxO0/pxn0sS3PheCZcpfob/yWTMNnGRnDgrdFyDjYTpzg6/jZESDPbR9JhrbQmrlJ/gQUYFuDP+OHsxBK2sBy+dxJLRrRZKyOa2CIoKdwrJmC2gsoQUEaxdF63AAP2PLFuDaeMv7dUNWh14yHzA2mi2neR1ARz0A3RYmNv2OWBdAWJ8TGSBPTyc1F+SifkIHTaRyeLDqEkIbKkN11t22mxVjGViCD6DsB0C6APfrhGvMKhur+yQpn5Y+YkL68B5lBMVYI76/0A== 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=7aVaYypW174z2Lc1SL+mEfiGIFRzvtRB2PGqOTTu+qM=; b=TwyTEg6QKAJ3LucsmR2puF7EwuU9gJkAauoUrY4v/AGDC0VjVKkUGVhl9JdrhvaSkmRU4m89FDFNWgB6m8XC9y7zG3y+zhOebVlirvt93+DkMiIvaZdGVQt2y3EYcSCIKbHsJMuEC4yZbFswBsEpozrCINoqsN/gM2GmRKtgdSNv0pCN5N9WQqhGp4YMP0X7ILDUXpqwxzLVf0BYdHw4YBKpu2MPlD6If3EL/GV8pHW1hX+wN71hwVBFgzaBtKPrcudVtYCCXwZi+hBxbetKlLnk0KaR98O8rCn4HQfubrRGBHUJ17I4rAH8I0t1gFLAO5nLABFl5/k/UX9a30a45A== Received: from DB8EUR06FT062.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::4c) by DB8EUR06HT011.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::296) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:30:12 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:fc35::42) by DB8EUR06FT062.mail.protection.outlook.com (2a01:111:e400:fc35::393) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:724AFDF5B82F725B4F3DA2F6B7BAA2E892978D7F739B81B88C9CB7E1F1E32B2C; UpperCasedChecksum:A6ED26F84CCABA73664E2D18142E15EEF87E9562CED16EF1C337B1F18D86B5A8; SizeAsReceived:7592; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:30:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:29:55 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [kjN/Ijps/SXhGFljc6RV7dBPF0eFbbV5] X-ClientProxiedBy: ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506052955.834103-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ede1693d-4269-4643-507b-08d91050054d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ6Z3qDqpu+gYzH1t+dXNbMnZWEoRkvKRng9l6gVOMSKF8TF4bV4sqI7EgmeGRT5GFLmmrAMzIhTO3MaLy3OMAp7WvpbUThzJnzAbTceCbTQC6AxjvuuN1HsQRAhEgfzBzrkH9sNI0WABtaL6sHVx4WfKCs8wLvhpBRn0EEl+RD9RbU5QrIX8BS+uhihWrkwicAZ+1I9K/zCrUwSH1arxUwvcivwgFVgsyM0RCsdPvLGLMQiiTltJck5rH0f2RdN52so04WUnM2SMeIojNVwofBFvRtyA4PAJeZin5UovPaBdfioEaFckDMz312kzrPaWfVrlyRlG/1Ll3vdPRFwkZUlyaza+xhlvTnaJSqsR8ekLzm2/4JiXcV2zXktGFpORlljXN+XD9yDGMkeimiIaEweDM29GUiQmSSsI52cGjomERbQ1stfAnSiDCq5g6KLWdiVrKOOzaLH32NGARI/7Gi+v1qF64N85i08eun5i+OXZV3uB1IFgWNR9kIrvyCIUu+JiZkV1/mmnfT4S50vHHZlRXwMt3IQeyg5G+NuCn227hZ8la/u1WYsFQ3HERTEwrGwHF0J13UPFVomlWYfdpIfRzuK4tKg5ekLKmYsrt4lXpUb8Q4sOxjAZTW0zHxasSP1DdHm2M+y87D41T29HOozGY9n7MIlxcWuckvvN6W0Q2g9Ih5uSRcUBbrVriQNGmSKg9G7CYERA== X-MS-TrafficTypeDiagnostic: DB8EUR06HT011: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 44JG+77D82nv1torWLhDpVCp1gyB7nQWCNdcO2QYzL8Y12fypRy873jg8cp9VwbLQUtPb+CgOWax7G7uWJvSZDdW3w6iww8h6LRs594RAr/RyOEhEWRzvUjtRKkVyayG3WZcjOi9g7+iCkrL6dQGmdmSk9At3/7ARXLCCQ7jhl9oJE4s1wUuspv8kaAGjZpvBUAX5nP8ykkudM1+txBtphi1Mb5FDDGyTTVdk6Lbr+cA6FkdYxhDoboF3FYseWOrpAMP74GqMdamuJ/U6LyKZ6by6Uo0Qx6yJVrRCeKI1aI4PczouEpX1bfslpI3ETR2Vq3khhHdLqqg+HkqEQcidGoWWL3cv8vX6na4xNVMOQ61D3KhoLS3j2PITulWUnt0JK1uFG7LkTf6CKXRck7tJA== X-MS-Exchange-AntiSpam-MessageData: WzWhxXgf0sOYyZMt9Ahdejy9ghIquB1OQU4DQoNbM2GQ4QRbUChME3mSTX9VRmGcVm+hrV1xFWJUACgKgW+iQFChVE7HjuXq47Z0CfpTHDFjKT3NeUnrzXzAdWFuRFfhISf7vt1QcvKnlKzizx9Y7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ede1693d-4269-4643-507b-08d91050054d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:30:12.4035 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT062.eop-eur06.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: DB8EUR06HT011 Subject: [FFmpeg-devel] [PATCH 25/25] avcodec/vmdvideo: 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: PZgkBhZ4B9zM Signed-off-by: Andreas Rheinhardt --- libavcodec/vmdvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index ad88a43ae3..e0349cba6a 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -475,5 +475,5 @@ const AVCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, .decode = vmdvideo_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, };