From patchwork Sun Sep 4 21:58:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37658 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2274714pzh; Sun, 4 Sep 2022 14:59:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR5cC/nvsbYOWWOCrhQU0mYjnGCG0rOh+78SYBq+GXM4UJxh5Ewm30HB/zmQGWAG5/R1ZUmx X-Received: by 2002:a17:907:2c78:b0:741:4b9b:8d40 with SMTP id ib24-20020a1709072c7800b007414b9b8d40mr26734697ejc.553.1662328783496; Sun, 04 Sep 2022 14:59:43 -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 hz6-20020a1709072ce600b0073d82226569si6312862ejc.414.2022.09.04.14.59.43; Sun, 04 Sep 2022 14:59:43 -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=uMlbSKrA; 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 5888A68B898; Mon, 5 Sep 2022 00:59:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2BA568B9C0 for ; Mon, 5 Sep 2022 00:59:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7HYr+MxT8Vxv4cbMhzB/Z1FCl5s5PaVI9pVptVDoHFow2MzZbiHsud2nz2wjfxfyoKpdmY32pkhEPXTCCCqiF3RrXsng+t4WRD2IncTvWrVOdQjuIZf9+fj0ar/eLICATGWxQIVsAEITu+987XvMF0cRvT9naZ/4iq5e6ecJIVuvfkh3UsmBjT6Gi5nsTWfwUtpUEWtyFUejvsW+0a8OYHbfCwAIHIYFrWRp/iKVlk2UA2tgTZ3xVMrUcNjxZfCn4jB6z23SH4NkdCDK5vb3Gex15/huKj2AlV6RIwXMOkvquEq0/SnagAG3D9jTd3Grk+tid92vQIIa6Yx+fFsTw== 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=KgjpqGmDh4RAgnPXu+l80axMJde9fVBZBaX9dy+j4cg=; b=YFTfbY7LusaBZJy1MEaF/T8mTVewhCKg3b1V3blXfQFLlqL27SUwIAhr7UoqACvqiWgnxCzYYWIpndiC5XqMNeHR0bE4IT3O8wKEkm4EGzbZl3uR+XAM+y3rJX63bMlsTf6OwguBognNNb8ABoF/v5Ib4/OC2gYIOpxttQB75ww5vcD42wWNhY2F9wpLwLKnXH9wbmcmol0/OBbke20YF4QR27s5L/Z6p2jxmXzN041U6g6T9ApcNzC3SMg/t22kbjPByfHa6hWgYG5myZ4vlyIDYsPAm4+afk0/CrMelrs3B9aO/bSvgLTmHb2c4MX5VL4vU1LsXVWDEvOPzCK69g== 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=KgjpqGmDh4RAgnPXu+l80axMJde9fVBZBaX9dy+j4cg=; b=uMlbSKrAzdM4w250lr8XtLaCvYK4sYw1h23FCdwAInSlFWNk+agCfd7dY5mu41dfzjgt3lxFDXh0N6EA05PG2kUKhGF/CJsSk7xcr9+C2OiHcutmRdr0HDfuQlbdRvDVZd578bYfcyHuEhOo8zokRjsPmzdX7VQumsHtqHGxhBq3vjUb9M1QJg5jpUpXgP16h420OtjT5z+LBsRhiSzwl2MIIseVp/Ky3BRDtfnZqNKY47I0koMhi2B6UaOuWHy0h266krGFeBfxVS/2x2LaR/twzC+sYq/YlhG3/0hYK/ChQlBRGQhc+LR52Wuq6faYz0vz/DG1wkdNrbC4JJKmWg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0235.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.17; Sun, 4 Sep 2022 21:59:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 21:59:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 23:58:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [2RlYNZf+qXPFibOGfbIXyErRFzAKoiMQ6MuRl/svtjU=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904215851.4164981-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f9f7aa7-7e80-4350-bbd9-08da8ec0c177 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWpuw8QwNKb6G2Lo6Ie5Vp7oI7abGTDlUnryhYRN4e6DjstUalYMuP+4UMvN+TOREBSrMSLdqUQdXRjXopJ8o+SiskybmrzKrZgHThLNfj6GvKnis7QLuCxK+esf+KYRH+CE90BFshoJc+Ji72I0UX6QcZJPpWyrP9sh5zPhju0eH+zJXXefGCGfG7LEaORMukkRmq6bWLaZZknaDda+ZmuThFyr/C0XS9bKxbkPtjK6rK5FI61wcjPbPSa15nu6oNKjNxr11DoA0PCeaOW1BimemFbYV5R1NN0RoU8DEC9NxBgf+oszgNOeIxaceFvNvbaVCzu14K7Kwds52wf4/w6u8X+2aMnxz6tV5EcUnm45DkL6Ii10I9UVwxSFUvnDdAAop5BPFBNJWRJN3DMhuFi1/vCz5yLuwS6N4PHeeyVdYzXc4r3k1vZa0kNmX1heWU9wWN7ECTHHmJB05rfbn0YNwl3wD78kjPUMWRF7AH37sPcYMQfjUj/dY4LUK7c/0LgrYoVZVTkMp4XmlAs6J1FM/lopnSafc/qEncUem2GnMNQg7PzLDrXuG/tv6UvXDMaznH256/NZ3LB2XyzxPRvCEK+R7l0h8jch2p5v7oARjOCZtjjG5du8PnxAOA5ExKN07k0pXhzP8+2XCuULKUg5WA3+CplTXVERcrt/Y7kz8tm/89HF/2Sf+efSzHFIeFmbdKmQlcg0Vl/H8MTpv1t1gi2/aSC3Y= X-MS-TrafficTypeDiagnostic: AS8P250MB0235:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oBLt8XY4XcBhikPJgXiVoacKk1X+8cbvotnGGJ0GhuNOu22TmyuC7VJgvDH0rZTuRE6n4keOJXtCv64uZhb5am4vx2/6ch9rXfmDNI8OFns4YvYDan7U2yzYfjlpZnrBNuLXBn2kCempqOUcPvm+Lb2NuCoVGaUyxFMm3JC9KjhLFWB4a4vOILxPWBtKh4eIXCWjiJ/J1pW/d69TuqjD9foPV46Wb+YCL2x9vAWEwdrEfW3r6AvAFSYQnMPDISsyPRzJh/KQvGZu6EgQduEn/Lp9Za6hv4s6amnv4GY7tyDfsXvS8pdn/2cm16GyGWGnXP+ZcUBp5ebyk0zSPG25YHrvdb1rH7cr8cV7t0P5ieTEDXwV+ABZEKE18bdQujSZQa7dO0szPyackeEgCuOLTUw7HD3FTWUEi3PkEUVByzg8S5gtXgkf4M0TRI3B364b4nrU+OL0aJzXhrGPtMgn0RNmXblcS/ed5LRN20HKx2tjpBf7kMw6CeyZyDSfUNIHTxQoADXUXLIh9CxUUr12Zow46ndIv6isjBRzZeR3gQFQHpYprziRTUuX8tJkVl3FIqr+xqYyso3xMsPJ7jM4iZzwHFeYkVv/RMX9+iasV6R+5oAU5U+YfFFOPanP/4dPHBGvnBZGtUO6u25F6NKUFg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g26b7DfM+lSeaDIvFlmRk/q+gO6K+00GLAbduZpnrMzWV5+6qGzEu6vbLeZaEZCMZZ8/OCqIMf4NSTfD/ygsvhRHlr7hYBKysTbMzMY3lz/H0rw79QwEJs5dGMCyN7lAawo0klR2qtsNHWippRBtVlqJi3EDLFj0EhinAAZZKS/3BwqGhVOc/1RiavRpxTDXjIJBtRH3Lh2GB3c7C4vhPpnCevT0jf3r6JQt3tl5dmJrDiHaRzc9A4wkB2sC7CVAYcwMfjL4BF5x5vlqkst4eAmYFW7wNS6lp3yyT8EnF12QehTHuQteZHxjHIZAgr60mo2VkhGl/V+8UgazaPPDSQiH5pFJjJqPhJ+HQyxHEokDechVRcViZoqS2K8EyOoaI9vfwheswCr4VowlAtvm8eZ1OtTIbg8vHhOMYhC7xVIWgnI/xyeo7d78zzqid73gbfuYy7k9TpaWUHFtKSpQ0ppAbmSaJNMhucmDefO5XPrJJn85O/Tezi7DCFtsIp5STHUuK9f78CzIbB1LFv+P4Cb/kaJqqnqnCjDh2wnEapIYD4VmQzNGl5xECju+eZ9v3kyoZa/QN58UpwZZgkx49JJrZ67EPm8xySnkF2A+A1wZQkGbqV9djUDLfHMPrcs0oyzLlTC3pOl7UA6bwiGizUqbnjDruD7p9gEJfgddtyxeHVN23Yf01x03ByOmT2nam3mrExiv/Qumcx2a8rkRx5D9oyNqNfxGz8QlZ0c/BvpQXmOe9IAxKfURQvj0j70dhLjlHbvkxmXDkSKcGtZfAKVQXgUL1nXMOhhwh0SdHPeDkN+h/fuwhVByuXJoYslrwl13385ROAe/ZeEjymfCAZU9UbjKAaqDio75/Cdhl27O4qu+t9KTPSkgxRBoZjdUSweaR7bJ0buvFAmWZtjUwwhOu3RN5uA/+EL9nqh9OLJCycPnxIXiac3IoEhb53sdO9iH7rPVCeJuashSIOiiwsNCFq/QpNehv/UMO7n+d8n/Chta3Su6kbeEHEYDuUXsoeA65psSqD5JyKFwxOfbYadpwU6Ljf7FHE44Am0PHalVWy3b/I5Bv16+i8d3F/GPcCt2p+jIjISD5zxcbPYkYSSkSYobsOCyEaVx653yPPvFn6D2H8i5q5ahZGVjqGliF3EPWHfMd/8eKcoi2avsgw2wCtkCkyI7ATFgqyPeUygQTddhn14+LMQS7cbAJUvcMUK6MZvHN+dXo2fhKxuTmQZlGXSfu74S0shOWHM5o8tmy/Lg5e6ZDJurA/q1RMid+jxCa0zr6J18xCQoykCfItYwVAeiRDY1CCHczJl2yIZRc6JnfrAQwwgIoCFEBX9u X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f9f7aa7-7e80-4350-bbd9-08da8ec0c177 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 21:59:35.8779 (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: AS8P250MB0235 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/dvdec: Avoid stack buffers 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: GXu2x9kG0vZp Instead reuse the destination RL VLC as scratch space. This is possible, because the (implicit) codes here are already ordered from left-to-right in the tree and because the codelengths are increasing, which implies that mapping from VLC entries to the corresponding entries used to initialize the VLC is monotonically increasing. This means that one can reuse the right end of the destination RL VLC to store the tables used to initialize the VLC with. Signed-off-by: Andreas Rheinhardt --- libavcodec/dvdata.h | 2 ++ libavcodec/dvdec.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index ae104096ad..31191a8475 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -27,6 +27,8 @@ extern const uint8_t ff_dv_quant_shifts[22][4]; extern const uint8_t ff_dv_quant_offset[4]; #define NB_DV_VLC 409 +/* The number of entries with value zero in ff_dv_vlc_level. */ +#define NB_DV_ZERO_LEVEL_ENTRIES 72 extern const uint8_t ff_dv_vlc_len[NB_DV_VLC]; extern const uint8_t ff_dv_vlc_run[NB_DV_VLC]; diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 3857ed1266..32085a3ba6 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -137,31 +137,30 @@ static av_cold void dv_init_static(void) { VLCElem vlc_buf[FF_ARRAY_ELEMS(dv_rl_vlc)] = { 0 }; VLC dv_vlc = { .table = vlc_buf, .table_allocated = FF_ARRAY_ELEMS(vlc_buf) }; - uint8_t new_dv_vlc_len[NB_DV_VLC * 2]; - uint8_t new_dv_vlc_run[NB_DV_VLC * 2]; - int16_t new_dv_vlc_level[NB_DV_VLC * 2]; + const unsigned offset = FF_ARRAY_ELEMS(dv_rl_vlc) - (2 * NB_DV_VLC - NB_DV_ZERO_LEVEL_ENTRIES); + RL_VLC_ELEM *tmp = dv_rl_vlc + offset; int i, j; /* it's faster to include sign bit in a generic VLC parsing scheme */ for (i = 0, j = 0; i < NB_DV_VLC; i++, j++) { - new_dv_vlc_len[j] = ff_dv_vlc_len[i]; - new_dv_vlc_run[j] = ff_dv_vlc_run[i]; - new_dv_vlc_level[j] = ff_dv_vlc_level[i]; + tmp[j].len = ff_dv_vlc_len[i]; + tmp[j].run = ff_dv_vlc_run[i]; + tmp[j].level = ff_dv_vlc_level[i]; if (ff_dv_vlc_level[i]) { - new_dv_vlc_len[j]++; + tmp[j].len++; j++; - new_dv_vlc_len[j] = ff_dv_vlc_len[i] + 1; - new_dv_vlc_run[j] = ff_dv_vlc_run[i]; - new_dv_vlc_level[j] = -ff_dv_vlc_level[i]; + tmp[j].len = ff_dv_vlc_len[i] + 1; + tmp[j].run = ff_dv_vlc_run[i]; + tmp[j].level = -ff_dv_vlc_level[i]; } } /* NOTE: as a trick, we use the fact the no codes are unused * to accelerate the parsing of partial codes */ ff_init_vlc_from_lengths(&dv_vlc, TEX_VLC_BITS, j, - new_dv_vlc_len, 1, + &tmp[0].len, sizeof(tmp[0]), NULL, 0, 0, 0, INIT_VLC_USE_NEW_STATIC, NULL); av_assert1(dv_vlc.table_size == 1664); @@ -174,8 +173,9 @@ static av_cold void dv_init_static(void) run = 0; level = code; } else { - run = new_dv_vlc_run[code] + 1; - level = new_dv_vlc_level[code]; + av_assert1(i <= code + offset); + run = tmp[code].run + 1; + level = tmp[code].level; } dv_rl_vlc[i].len = len; dv_rl_vlc[i].level = level;