From patchwork Sun Oct 2 00:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp527534pzh; Sat, 1 Oct 2022 17:07:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7QEniI00+btG/dGFku6zXkNbLFgzICXUao+KZpvbN7OFuPqOutfs/cwHZmkFzo1bxKuoJj X-Received: by 2002:a17:907:2cc8:b0:77d:6f62:7661 with SMTP id hg8-20020a1709072cc800b0077d6f627661mr11124790ejc.233.1664669276688; Sat, 01 Oct 2022 17:07:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b17-20020a056402279100b00456f51ed614si5555264ede.361.2022.10.01.17.07.56; Sat, 01 Oct 2022 17:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=KMCjltZJ; 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 DE3B868BB2C; Sun, 2 Oct 2022 03:07:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2102.outbound.protection.outlook.com [40.92.89.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC2A568B9C2 for ; Sun, 2 Oct 2022 03:07:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ioTULmt+KiAe64xIrelqCRjN9tnz3E+K3alz66RNdiagghE40k+1bxAox21KEQ3cRe73d44RdSVmF3PLzFHpkMlcSJmpmyjksg1xizwlECUTP2VUMSycyP3o/xr2dPqr5A+efQF8gU7fDg1LChKs3sxE9kpyrz288tBQ4gWxFs/vvW3yDTipTiTSNDhoN/zk8lsCBXhZlCxOpJZVAvoBx6obJvaVlNa1OS9qtjPxRNCWXxWoXyc899+qxP5728HR2b3ENRF1JAlrD0yzYlUEEmUcoGYdLoN4s8S7LPe1kQHWbKFkS9256JzpGxLFu9W2t6rN4xnoyjGmVRdkrXNWSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ReYEpHnwM0/QM9Yyf4VY8EcREuVWyWkFWwtccEYRzDk=; b=ZfBchlNVX/LsLZD34v4i/u3TT9C21WbuTBgr4QCULuxAeinN+EXcAfTQd1+9s1qkknjFe2HiJgL7GPHo11CBRZYdeQUBxLH6oRiC2zHaPC0FkaIzxcKg/FNt/hCSecRW28mHIFw/desGjRYXDSV0jNTpJg3PTcpc5d/9F9Qhi2pua4ir+bB079svp9RSVpvzSDTMXFCR6mYIdZEqTrw16OiDR22tvinlCZR8CaoLqhDlIIObhsgTArhOANtyVVx0G9Rngt/Rl0UVyAw9prczcy6lQshQfvOBxPgHnv8cBk4ilid4t7pV3K5JEdw/vsQ1OIQ6czwPjRUyEa5Bl3b1ig== 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=ReYEpHnwM0/QM9Yyf4VY8EcREuVWyWkFWwtccEYRzDk=; b=KMCjltZJc/05Fn19hTYsvX/hRPMWxSvy2a+LpVMHI+TU+djxxiXtLStft8Cs3wesGuMkgevl4YdD2IzeHelRfFQJa01E7WO6kYwPJdU0kFmMwx59oHjohl+8YdbHAHkL2i32lpCkGL2sx6yI2h3okADh6zwy6i+zDoOoI96qDZxe5cT1/tXpa0FDaiCFlriJ/gtFJzkLNjlHV9b0sLVX2i/wDBWZuAyKpzXWDsLKQQmtNpjUYFSFbEC48J0ObLTOFYSzE+wqVen4JFU2Jz+c5CwEQ7KkH+tNWTSVfpDNAJVO2PEj69XCoMTIePL7Q3JQM0dcPWE5Q6mwe18C2yxnvw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0997.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:d7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Sun, 2 Oct 2022 00:07:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 00:07:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 02:06:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+YPXZOst53/Zo2Z274y/NH+tvJ1iLW3xLLzxc/hAESM=] X-ClientProxiedBy: ZR2P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221002000617.469194-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0997:EE_ X-MS-Office365-Filtering-Correlation-Id: 449ce38d-bea6-4d61-f01e-08daa40a219f X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKx7KypBKN6CnruNpK5hV6MtspfGoFFjgFiXHHdGFHZqKqglZriVcgZpURQFgK/69GyObqu5buFwNoQWZEyFx4EWGHmR849EDHXlQAUXFMC54NtoFGyuPoeuuVzJVibKRJ9qWHc6zNNCspA6Ks33WyBH4fO5rQNoGWfpDYkZtWcdj6RZ2AgD2nnBFJN91NlntinseLJ/C6OUPPp8h5/Ftd7anhOSWVgWuprbIIrDuiSEv93Ci/4atefSKCrqt5Ts8j/cZ/CxHK5oYG6XwOdZWilrp5aoNcJLFSqKoqpneNEy7akU+iZSc6CugLgUzJss4G64Mn/seqlFebZ84xNmWjwDsVLbtRPEp+y2KU0p1EzxmekXi6cfW4S+Hq5JoVTTzM5lGAs7UfoW81UFGi71LCnbcxhqJc9zhCyRXF61aFCB/4OFnc9/qSyhbg3lcqGzG2VbO3jjoiTu902uRPFfH8zs9eyO9sdkdM3WfgfRUic2MvnyEihM+Hm33W7UNMBwUu19ohz+4bhp6egg8jq85V8BKnRbWj7y/Lc4MIYo2lEKZdX1snX5uCIvH/BlWl/1mEySpzKl6lt8Aqs8qk9JlWYur1kcqSL4L9w3jsa4W0hIg32hWUSlYZANOsd5AykSeUXG5RbPXrFhoPTKDDJc2J+Ea9YXzq0UjO+fSqMctFyAbFqu5EcU371tSyzXZTt+3Sg+FLHsE0sGYtkaM85lNUcXfXQ+tOrVF2I= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qi7gD7hHKZcseYJB7DP1B2uTtTk2X74krAQrj/TA7Zl/EXu58hn4p/wrSm0m0274mrr5IuGmrBWhMQo2zSmrrWQF8fQAhFHvFqyYQ/izdaJFUCRRSrbzRSQ5CFnLMqkKAnRIVJtyrD1LqHIl04elHm6M7VH5Oze07fYw+sotJTeEVXeASaqc9P0Mj8l2Ef7+KWYpYqrUZvzl0iuMJ/Fn8dNombsHdPSqKbFQ5La5TShCfyEod72PjY/xv/zWnYhJmggCS2Ss1sx5fdOFHqqy7s8Hv0FXQ6CrEESSEIlC5LFwL+ydjVy9Xb4GjxVBHB1OVBr1+o0earYtVaW6SD8/2MN5IE02IIuDL9zpAknp4G/0cdPNcPwowcWo+rrsv8G9n+x0PcguLyWeDrQ9DSaebwIoMGoCxZRnu27sv7yU9Hh0ixBEHrS3lyQ91Ajpc5GYfApkZIbqQz8p9lM4dHvZ+bQJvsg7MNeHWUTVyzFFjeKuqOXHU/oFJD3Eli4ExQAj0kJzqQ5tUtGUFecTksTiqHq+rMUULyOSi1hx2aFACTbja9jo4z+nvmy2QnzauAl/X1NnIwJj/p8eBAm2nmRc0nzqY3dLhTHnGDu4T/Wm6eqGTjstA9duyrdvsVXD6Rj9XdukQzC5W3WUlJFZlh6B6GqP6AlPPinoWzz+vLHkNr1jAWG7t9HPbxv/hNOQbTrn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k+LSMoRxZmr4LAcRz9aeDOU8WwV8jitV7uruWcnX0Ocn+wDLsz4gk0NHVb7Oal+iWvHRXVyF6PV1h9TJRA6BrLcq9Y3J9Iizz6xpPRo9fDP8AZzt3aemJ94FcjWmtSkB3GOiL8Ep2gGzU/zYWyhEhCMe/V4XCGJI9NXJYPcha5NEc4pafny3A4iHf/CMzY8qNIFORRvAGiAeRz+pC5kd13kJAnb4+YO/+Re7u1pSseai4Mb7qfUX25llWkHiZ1/0xU4r7B9dflKzoksVIPv9iv5gimFOONEPrGLL8jvdkjNYJSgQ5DEet21LT8IQazTytw08Ma6cW+WoIYpHiizoPoJpH5y2WVPOVBhrEDU41SVfYKfLVansrGEa+F/ZXVJEwUhubGmvhYQefcvXyig48cOQZygGBmY/0wJHImTjAWfJRWX219YR5Wej0Xh8ReL6F3mWqmCV/++StC8KA5pExyIIQVpc6hUi+GKymzIG2hDcB9Y5oKFRsgeIfLxOTAEvIzKff4xjhlLYMmIqzaYBO5RvJydt5bVGR+lKWPfWU+FLkXEbHw7u2rZkNjBAwWnY5aTJmzoGJqsO7WDz1Rys4+cwENQqumR8Q+2v9khctallJhJ76ESPVVy+WEGX7f58XLNyFciqIo96315yV3J13hrB4+KH/bqd4wKxLThFoQY9C/waPd7n//BOPRxbldJ+WuGiU42CY8wVUmHFnoCIVAUUt4a1hgJiWizNYH10Bht2hZsDYNMdGLUiCtKAZvz9PWJrqLhfv9S0Tq9m5prWo879QxmkdE6MaAVl5bS2TC1+3IIg+XsKyvxToLsKc8g5nyBqN/FZUtsd0+BEgHRqIu9HfkKR28z4FZsFdWEO7XyQhLvxHwJBuuP395Yl/W8FuhFNJV4S7iMzENbqwznHr6LegDSw+iFeXVNzizzVCfKRZQbvXHntqbtX6PP3JEHXkObcRVcikC/Vfjz+lkQwSwGpD7RpijtNUIrSnIXrtXF1YWM+XZg35+g/lWJnibAoxx88fcrtC08Gai9GBlUky808J4Omfa9aA1U+ZuorTvpkHq9q4jeIZRFk0JwU9k/g+AcKofGj77XG8AdlpTJf9u4v+AEvAfjhoso3dI+JoLqWgepKydtenOoF2zXyIdMyhAUHQY8SkC+ccWlRCpjfJHzxm5ylWHrkAPT75gNvk58OAfY9C1wyJmPmEijz7M0xt+6ERAEJO6GD6THA2hUn5jZNRj6XvNyN9jiglr4zL1wjIg//AqT/sX8+pdMDNaYJgUn2/k91UXvZJfOKY9G+a8CDIi/ctxRzqv95wVN5PJw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 449ce38d-bea6-4d61-f01e-08daa40a219f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 00:07:44.8666 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2P250MB0997 Subject: [FFmpeg-devel] [PATCH 09/14] avcodec/huffyuvenc: Improve code locality 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: +unrMZBp6sZS Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 020159a20e..f903b1924a 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -207,7 +207,7 @@ static av_cold int encode_init(AVCodecContext *avctx) HYuvContext *s = avctx->priv_data; int i, j; int ret; - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + const AVPixFmtDescriptor *desc; s->avctx = avctx; ff_huffyuv_common_init(avctx); @@ -215,6 +215,8 @@ static av_cold int encode_init(AVCodecContext *avctx) ff_llvidencdsp_init(&s->llvidencdsp); avctx->extradata = av_mallocz(3*MAX_N + 4); + if (!avctx->extradata) + return AVERROR(ENOMEM); if (s->flags&AV_CODEC_FLAG_PASS1) { #define STATS_OUT_SIZE 21*MAX_N*3 + 4 avctx->stats_out = av_mallocz(STATS_OUT_SIZE); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132 @@ -223,9 +225,7 @@ static av_cold int encode_init(AVCodecContext *avctx) } s->version = 2; - if (!avctx->extradata) - return AVERROR(ENOMEM); - + desc = av_pix_fmt_desc_get(avctx->pix_fmt); s->bps = desc->comp[0].depth; s->yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2; s->chroma = desc->nb_components > 2;