From patchwork Sun Oct 23 19:36:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1859933pzb; Sun, 23 Oct 2022 12:37:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4nBGaMKDGniFM9JLO+fPRZxODyK2vz7pLKmwxmLb/WXeqIsraNV6Y5qxG8wf1UmOZste+S X-Received: by 2002:a17:907:7f24:b0:78d:ee20:5c62 with SMTP id qf36-20020a1709077f2400b0078dee205c62mr24362024ejc.177.1666553820189; Sun, 23 Oct 2022 12:37:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wu13-20020a170906eecd00b0078db6f56d51si28059102ejb.808.2022.10.23.12.36.59; Sun, 23 Oct 2022 12:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=LiCuVELe; 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 89ABB68BD06; Sun, 23 Oct 2022 22:36:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2032.outbound.protection.outlook.com [40.92.50.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EF6068BCCE for ; Sun, 23 Oct 2022 22:36:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UUWK6xDwf1ukriyXF6ru6F9Fnd2XlfNjzXKwY3RK6nWshD64OaIeBw4Mh4/q9J5e+Rtbi5ZOoMEf2Xznq1WiPFYIEZMwOE+vlKfpXa8szrkMUfRSq3FDgW06yw9m3mlpBfsKf3Sba4rjdLEHPxdowGV9dihrXwuZ/Gwqtx5iNqnjGWpYIcbRCnI3xqVS3b94bwuPqzjIFm8tdw3L4TCs5abl79L7p28o7wVlCuUwiPrBiJzIbkRB6qG+rSYxu86IFXUEXIb+aM9bXJK0ZLnQxw6ga5M5EejIKZmClaNy9CB+OesylGTabvYw0iYHqUKRTeQfeZiYdWOvDkaDag8fng== 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=d29QLWeInvkzKYNyedrPN/Z9FwltDfY66SKZ8o242uU=; b=Nu2E9jXym759TVUcWhgJF/q9gWOdv8q6GxtbCrbCa7FqChjskr2Gt78m0090cc/DDc47F7opdOKoo4t825yGXA9H3fOabaEwbbLlLQ57cLVrfRqu33uGZYl3GGnSQB0lzEpPPl5EH+b8BbKa4S1GLWQMfSGPeiL0TjiXxOirP88jd/FduE3BdMicFUxTURTQOYB44YvhPGofE3OFHdP81DM0A6CtPmNbaaX4a9o/QYSvDTyZo4j0jmukXFGedNuhknb5dUr1Q0lKjqi6veI361BNhlKDRK7f7g9ate/NbLzF0Sm5uTsZwVRkpqgGTsoLXzIALfcOmFet+V77dCxHng== 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=d29QLWeInvkzKYNyedrPN/Z9FwltDfY66SKZ8o242uU=; b=LiCuVELeVXb0NWwDNWPitfdzsAV391HAC2rkuFqf/jMI+D6N6WTouo/z0+T3bW8WGxBLDLImxQbxgrzy7WzqbiJp73IO1I3kK7tSXxSyqFYErtqPPEYzUcAffFXGFtrJOgOkHhuCZvNdZa6AgsGLChaBxp4c/0Zhferzjsvhv8f/MiG4lzYbhYOxBiTYFP2oAsAlPeWm/pk4/z7C4CyzlWHsH5tm4gf10RKIgiWardUtApvr3dczzcETCuM0MUvIveDeg3rTfFNKRmHPAzxOqwu+Ld+TX1UDguj1lGxfneQQqpoZMxxECq1Gmdr781AqAsn94fBDKWMWQ5LZfb4ZgA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0825.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:aa::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Sun, 23 Oct 2022 19:36:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 23 Oct 2022 19:36:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 21:36:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [eCz9gYPhRvfnkLMRr6tnykwk/VR1khvT4/9+45oRopk=] X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221023193610.674990-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0825:EE_ X-MS-Office365-Filtering-Correlation-Id: fbc92ea0-61fd-4410-f97b-08dab52ddacd X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwtuNlcRaDgURFx8jVPoKbRS+V2oOLKLsvvCjjN2qImb9I/IDhdtR+7LLnjsn+LIJN6GeNNsf1mmijN6hmGVGNicsVc2cCQYzVGssh1xhEbdLrPtu5w81yOPSFV3ncax/vdwuauXZ0oQUnEaTue25yzaxlKBI/YZGr+oQzJQOwlgqTEOkNB3EozSTuA6EXTHfS7ieOq/phrrp+Q1Q2Xto8WyoneIb0RVTN8vcxbGMJRBiEBaRVexYXYCTpuO3fbrU+1gFm0mTrbSIAip38fb4f8V+NOOs5AOzkCgN12RpOa09myJpKtdkdHJjwar1+6+rQwzm3pF85RbS3aZrvMN4nxBpjW9L9j4OF6JI/QN1SOdqToB0m6uaYmZeV9XjOoxmo5MocqCvEfFohDOapLTFyAEPJh/QQ5Ists2QpMDYTD+omRVFtiemFrcb+dPdYeHWunKxNG5OUa69fsUlpneuCnlhepRnvlVVaS/tRqwUCDpmZMPz29ViGTVpJAuAdLx75ilbLPUVtn+Y5BY4hZiMqCWtF4gePr/labVld+4MMDcIzLhkmXi071cHVGwpW6IK5RU7qRAJG6mZ1BnrdjI3SwbOeHejAtu6WVa2+9cOJZiTySvt6RixqUc7ikdoyU2YAfT51hnTAyWuJkuQD10y2PIaZYGlMp1F9tsY69wepPhKUAZStM11N12lRwJ69ZSq6RnjJ94qafYuFK0ZVTKV4f+s/3gi9qd14= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YQqfJPWSxDxs6LUwS7x5ZX6x+b5SaI0rqSa98r8KjCn0EyZGpUZPI5szcxiz5ceSkmuN9ca+eay43qXTXKBrAuEhhZjAQaO6AltvZHMEZghdFxfO4K5dkUStkz/Alo2FhMCsvI77MNGOBo0CVZwql9JBD1fXJLtqZjataALz0RQHr+3WlDJVNt4F+NLGf0Dd8+tXGZWBMfvtAH3ta+6FUEFhr4o3nWAiO1OAXNxHKjXlkxPhAvRZt6ffLnJjIzwkdnBCgBzBuZlQWk9kdCCekK7BF9mAzYvFv0VJOpVR2SArSUHTOP95Qu33CYW6VSghxJqy1OJQ7Qa0khd582rghDX8wJLoCPkUuuzNYb4ndy3RO42xYihjmZKNMtQ/GwkOC8cEltjFWCQACkMAPlTd6mAyEt4uF5f/ayr/ra5VoCLlnlKys3eD60/DbbLeAsi1ea7vXDF4fE/0N3Eq0KXrIyNSaep1EDqILFAufs0mVlTVQPL0YOrAznp2XNsXsqPEY7D6VvXthpVIoh9hftjiLr2BEY7IuL1gDCAV7syNh4BnpjBzLxPcVWcZM7Y4TGxM7yyGxaZ2gA5hkFlBw5va8LxWrDFeTIv9XzC0JtYv7B6bD2jML5ldO8UHMSaRHPo4Hy3wcJIr4UqZvtE/TUvCpZJ3fue1c2Xw/MPpfsS/dM9iKVqaa7oqbmjEwTcfQ9CO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aGTXIx/GEDELZqyotgkraSNw/2VMqQyVGme8QK4sG6jhM3CwfBoMApesbHV2pCwv/qaN7aUS5qyhRqzj7jGP1IjkjhYcQeeB17DH2nGqr2TjY5oPV2h3SrS6Vm39/6GqNkn4yI8GFQAYdLU7Z9VotDlLOMSR4KUGIBjzcQ6yADa3JfZJv2mcWHED7CsPpnkfO/ZKHC1G/x+3PogoOustXe33Q+MwscX1dJTKpbu4dd4Hufmbhiyq37mPSKLrU7mnvKmRr5tRob5AG4Lzv9i2UaWRwCAIWrK0yomjubFcoBHgxlTDOzbRASujjZ2evar3rpTfdWp1a1x8zlu2ElwkEcn7XvJ9gRxZqLqcHXeu/W5tA675MTX/4UxHUDGqNWklKlyH5IMTJVIKOWwj9VK4nWuyfIhfkLCHwL8uVYwiT7UsPwkXF+AsPGr9xuaCFGSWdKkmEhsF4F7jUbOW22xJowd/BALEZKJAGqtKEqd2zqoVOK4ZnKWMG28Wm408FJqHm7HGMamcuQcBRmXKL6zmQaphHxbTjLlcNgJ6Dmw69uAOIEKj70+YotHbtBOEp5bbEzRNUqbNH3VWlsJK1y48l8c9PO2TA630bOG8SAdIFj6B93c4fy6nKAYIuKlQZoZD4pHZ2YB3Xg4xb9B4Mx/T1SDZLoy6Nr4r8vYE4dMO5YCz3S719Bh2pOS45h3IOfQP0qQp0edTOeTO/E/mMj4v7/Gt4I0p7LcVDuUvsl6hqFjsc1kdyZWEBs18OFoSTuSopvLboKI6u9UlGjs6tivZ9V7Bu7btyteneMWbBqDiOiQt/gr+sW6SsjBsw4uc7JPnVWcUNiEXwUusfmT54B1zQLNfjFw5YqSILaqgeOQa5xi3fGPwVBJhjuHHeongtsUED8u5FpPLpcBX71PlZuQ/CTquomihll5lynlb6s3F8283kgiyrUtvWl8L5r6HhRYMIlv4EAClXbxsO06v6BLhFLY+u7UsOs/tn0GIPb46zcPr44RKXIHcPMPWhpGtT7VDSH7fLPXCfUqPKj3NNBLFqXGZIUwmmy6a9/tCWJeFYWvwJbNoA8hObeYPUik463MYU1llqmlaEssehBUuXNGSTEN+BwNJifitLsK5BbF+lrL37HQc9m0ILTCrJawJsoMGhZJm7fE2dRurcSka45xbZQYMF6NNrFWKh3rcmBdnIj550j1XXMBu3Qo/iaLN2BhlsOqYQa/0RKaw+kBWLyXBVm17XbNRN4Xt+VP8ZxkwuPb1akeRU/WE68qNVD0Aaj6sdF5aIeI3kxmHDtl6xAwm2ciwAS/KO0V/sYibG/wfz8GwdcIibCjPXBSUwXJ5ia2f X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbc92ea0-61fd-4410-f97b-08dab52ddacd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2022 19:36:17.7152 (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: GV2P250MB0825 Subject: [FFmpeg-devel] [PATCH 08/17] avcodec/mpeg12enc: Don't initialize ff_rl_mpeg2 unnecessarily 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: d0Nln+GedYzX ff_rl_mpeg1 and ff_rl_mpeg2 differ only in RLTable.table_vlc, which ff_rl_init() does not use to initialize RLTable.max_level, RLTable.max_run and RLTable.index_run. This implies that these tables agree for ff_rl_mpeg1 and ff_rl_mpeg2; hence one can just use one of them and avoid calling ff_rl_init() ff_rl_mpeg2 alltogether. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e0775d6b96..4d10b42bf2 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1076,14 +1076,13 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], static av_cold void mpeg12_encode_init_static(void) { - static uint8_t mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; + static uint8_t mpeg12_static_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; - ff_rl_init(&ff_rl_mpeg1, mpeg12_static_rl_table_store[0]); - ff_rl_init(&ff_rl_mpeg2, mpeg12_static_rl_table_store[1]); + ff_rl_init(&ff_rl_mpeg1, mpeg12_static_rl_table_store); ff_mpeg1_init_uni_ac_vlc(ff_rl_mpeg1.max_level[0], ff_rl_mpeg1.index_run[0], ff_mpeg1_vlc_table, uni_mpeg1_ac_vlc_len); - ff_mpeg1_init_uni_ac_vlc(ff_rl_mpeg2.max_level[0], ff_rl_mpeg2.index_run[0], + ff_mpeg1_init_uni_ac_vlc(ff_rl_mpeg1.max_level[0], ff_rl_mpeg1.index_run[0], ff_mpeg2_vlc_table, uni_mpeg2_ac_vlc_len); /* build unified dc encoding tables */