From patchwork Sun Oct 23 19:36:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38930 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1860248pzb; Sun, 23 Oct 2022 12:37:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5tsZ9IdZg9qfEySs6tp15vmmWcUsqjcD6Lpl9IinNCSW5rQom/s5JMP9WImt8OFZk3z6JG X-Received: by 2002:a17:907:a05:b0:77b:b538:6476 with SMTP id bb5-20020a1709070a0500b0077bb5386476mr25006345ejc.324.1666553878429; Sun, 23 Oct 2022 12:37:58 -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 ne38-20020a1709077ba600b00788a70eed08si5860606ejc.610.2022.10.23.12.37.57; Sun, 23 Oct 2022 12:37: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=OaYFpCcb; 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 927F468BD6A; Sun, 23 Oct 2022 22:36:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2086.outbound.protection.outlook.com [40.92.49.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9276568BD15 for ; Sun, 23 Oct 2022 22:36:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e1+3WveMFCZSEhYMX5kMTo00/0VTsPSJ602YldRV9+IBpTyV6IhZFU6ScDbyA9k2jrXXpiNYmD2kdsL/7FvDQpoGcXIOHX4ok4oKj6h0jQFqmMUETV6vWW7c3VK9+U+sYdp5wni+w6dNq4r1wDcbC0xbiLUkBrtFF80JHFTUjKmeion3qH/ZZ3OmoIz/eSOhrRXAkRnlEdB/RhI/toHzRvUXRj9n6eeKfjJ9KbYJE/eafHxkZ+uFeFvX5tqtweUNEBG2nrIn3j12WfJMfXqtwo+uUYY0/oNwyC9YFBQzIhgbjdns7qkwtPvmzbR1gyaCrDC1vOA/oUQ2pry1aiMg/g== 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=e+jVbuqiTeEAfdemNep+aOnr31ok5Q3nsThJfbCh3KU=; b=FSuq/R0NQYvfX5PLYJb7AuHAwe92oHJqzw8TSGLmFnOn9ICF8E9Ldu/gpfSrraPFXHRYb5sF3LFpH4yj1yzvCz9CvVIMWUXTiObI0iZe1MqNd3GLE9U5GFj2EjZoP2Mhv4aUnoiHmwTY/vsf5Phwk4Q8zEpyC0skoOPO+cvIj6atD8VDqT4IcRbFMHcNHlkRZQ48xVWZMNP53BnPW2tmZrfJMELu6jBcha4aSSFiZO8m4i3JCYuDg6i8OfZn4nadNiZxtouN5q5GucA4hV3+HBiuVKhaO3JEHGX72YPy9Of8Ij3kqsI13EmvaKXOBEtxh0vgxkI3o9tGOLyAtKaPDw== 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=e+jVbuqiTeEAfdemNep+aOnr31ok5Q3nsThJfbCh3KU=; b=OaYFpCcbbvhPgpUYV0yOrwhBKnzeXBGL9BA2wiN6V7O9QsahYEPd5KPnLSSZ+HcgGoef7ZfPblTraIEG6dDY5+aRpR1TIRkHUxaLXE3oWpujL0w6krLiMQcxGyCgPdC+tBfUWrvkIg58BCR+kw/gItIMnRnFJycmlQaOrU9s/j6IttlLUv3gxcQzc17l+TwbHQOkJ0ovCni74/yOrGp5BCjmjyXZFWJmo0vFdrv2VEzlp/hAMUjHTwWChY+14deCyglX7jtH0arCCEklVTSje81YaeRMu9azDDt+JuxML7wkgBRoV/RtQoBL77GRFRiWGneOUFG8QDsfJaunBKRzuw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Sun, 23 Oct 2022 19:36:24 +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:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 21:36:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ESfMy4vJjuDNO7SYlJIs226c+K5DHz44CjDhmEwtbj4=] 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-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: b3da7bf8-2943-4f3b-740c-08dab52ddebc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqH3kRfXJefTqIxzT/YbMNW0WFnR41Q+wgXTlwzjC7qvyoLPFJfBpRDCwDgFy/Gyqb+1+UFe/lDM+GZoDmbis1aWnRueyweyHSt4L744jTvdXvZEq6jYchhFQF3cqq8geckCvCMB4DFCdTrwFq1Se9c5ci1Zr676I4wCKvpajTaz3CpaW4qcamGy/a3KiqPyzoA8WqE+iN+cRe5dAdJa0HSbAg6alxtDxv4yod9Hh5nOw2TAOFVzjWfXcBRD9otx4s8bjAppWcKxWkRQpYEupzKo9snJyw9rGL0Y1lX/ysGaoWnyuUxjPT8V4pqrm639siaJcQfwDswvzht34d2RFeQ2EukKy4zTNdictUOBKgy4EjJhlmQCMxI+NUAiK/fBUajNG3KGTfxlsZSvdTlH3YjoYOGis6V4PlYVJHGKJfXkA8ZX7J333+fUp/YDwjkMdB4CB0RbEzEmRLKMmW13jyyukX/+Tz9uuCM85cfZJrWySwjjz4yJGkQUL+XgeLAED7QOP8wKXcZNNGudgvuqdjWoCFoiXm9+3sVuCVb3bYm27HC4ATCQLeMtzT20/v8N4kOrXum2w3tJG6DCtnst7EgBV/lGVW8OGG96sJHYxJ+rFigI7wKSt3Wp1csMfI7oFSbkqKA47YQ7hcDwBHnQLkCGwRQ+SHss7n6lelovV+gW5sUIFpluT5n0LRWWRXcXGjD9c8IpMPBj0yH+job7ioDbxhuXOE70PAFqYZUkOoDa7cQE18IpKNvu4coCGOq7cA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t+oFireysWwnCt+ZkICEHRnS5wcgWwbvBB7hrtgqLlqixaI9B8lvyiIk1FueGm3KF8+1s9/sOFy9s3ouiJKhMfQTDEgiOZs/wwFejTboDlV2bSYVJXlCzMx4AieVFz/JpqJRYg2jOI05TbHjwSwOR0FSKFfl1qdPem3/XT4irF/uaJkRIpCBiIAWU6M7OxaCV1C5C2dpYiRPP2AiNAleze7BwDD1j/XHJzydMDDx7u6QDWkkpEz70o4UT10yY+wznho0ihlQAEV4A78oo1RBp5K8qX0/hhtcArABUwRiVBRL0cBBrh5hKrzQ+5asliucjE0brqTyziKObgzEzT5Wt31hlPB5y6lR5mVA0etgGkdDUvdCGgqc2krCDwqxhBvxgW6tI4aqdIKe2ZQO02ijMirrAZhi3kyFcNvN5W2IYh/IXqqM5Rl+qlEB99Duiu4g+Ogk1RUJn0UOm/052A20TvpoFpptbqQ/Fs279HMqEuP9BsR9cxAQGYJUTHvQ8RTVqqeCZpVMT7YQoKiiJ1/f+BAPrnEFQ4QDG8d3zLuDQlX7QPdy9XG6d2dhILdmCGc7ilWXp5UtgQDx6VWKss+/J++zwqOGep2AT0bKQr5VYY2HLVWPL5Ct0Nhcl+J4cg/BY77hCUyac7AIjBuptDPmHiG5ueK5jGbQnWsfWCPa+hVokUXX3WlBa63IHNj70H2V X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9QdnthfSH61EWAMuiu1a/y9aQYJ+ZWHXLp17CikUdBLfhVUMjhWYRwCLlxyNBe8MxbG6JnNDiXP4zYBwkgh2uQHel4CWwDdWg80MDjL+m6Z3Z7fLyX1+vyZOuCtNV9WGqH+QkZxhRUbiwNswJ+m2kLNU24mb3LHu1SoDDhPmjIE97yxVx8aZC3e5s3TaeAn+Cs5OWdUj32x3hd/pNxRKwO6JBAJ9Z49LZ8jNfel/5paj+sw+uw3bX9IOnYk/HTpQJhGmXDNeEFlkOn/MWY5Qy3hfJukxLgRiuhJZG7YCsA36RyYfjr/uy08hasRcqv449IH2wieIEsHFnZfQogLlVjrqwI5r6g6hyO+UDCtnGGEjtbg1vobvpxZC6f3doSJqwwodzHV3bJmbG1pxzwu44k7beR4tMe6AtEF6MhWuKhWL4kwPCxvCqGZQBDZT7QvduJE3GT1X4OYKhGiIwEZsp3MVAMxfQ54MVTCr44npI+PqV6ZLcJprIOLhEHCGfCD+xmi1Hfu2A8TDpydmxbryLr+42F7Di2YLe4gTteppPRACJ5chGajeof/r2h8XnFst0ilk/CFr/B9JFoZPMc7y9cRB2gm35U2Zsh5AT3giJGFr0GqE7H7EivqccNdQZ3tu9AzbN+bM/y/ln97r11zEGtxm/20+RPRIdeNk+P3gUmX+f2q0QycVd8/J7cKrgQHILnlsDc/ycDSEP82ky3O01PVy30odS8k6aEeVACKwQKZyuvuiVnhyKf2F90sTW9KYwWsm2xyzJa4m3APAtWaPIV5JsEUz4lL5Qm+6waapzlXa8Tr/WIgP5kv/9KBUPGkGaCWhBOaLIvRWDcx084GMgVxfMlwZVwevDQ9chScvbzvcTGPirfdiQh0ikSf9dAzl4IH53DkOQTeyaWOwyhDqODKSKbXYfEX+LFbrOLLp5dJxW+5O1E/XkjYHma5oKZYdXDI4WvKdItjCKAONKTODDEOeCqhs86+s8z263O1Pb3wq96IoK6dh+5zn3ggZ8CCRZAhkyjpMnpLEvhlFZhQDhghXHsKfwrHgZTGWK2OhoBTo8HS1gT6S2jp77xNWLQ7a7Lzv8Hc1U8YpSluDM0BBq5NOJncngYZ/rT0jNIrKFiOy3/L3VMa9xUv1VvYUGZ+NEnRjOuBl+kc+c3vJdQMO10Xxomwi2Q2creUy3Q+nmjYpPGv6ePSEQ0gj14ETLDoloSEatxgErz1XVCVKKG0DqJboy4NWmP0WxH3FM2zoxZxXqcmdrik7vnhF0dnzYQKFPKP/8W2CP7MwysmS3COgH7phlEzczRfgagfqwTX4jwpGP1rutqzuSf8TKFGuPGzv X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3da7bf8-2943-4f3b-740c-08dab52ddebc 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:24.3436 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 14/17] avcodec/mpeg12enc: Don't initialize unused parts of RLTable 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: xfVGfZRZ0ahd ff_rl_init() initializes RLTable.(max_level|max_run|index_run); max_run is unused by the MPEG-1/2 encoders (as well as SpeedHQ). Furthermore, it initializes these things twice (for two passes), but the second half of this is never used. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 4d10b42bf2..2db1d93d0e 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -49,6 +49,7 @@ #include "mpegvideodata.h" #include "mpegvideoenc.h" #include "profiles.h" +#include "rl.h" #if CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER static const uint8_t svcd_scan_offset_placeholder[] = { @@ -62,6 +63,9 @@ static uint8_t fcode_tab[MAX_MV * 2 + 1]; static uint8_t uni_mpeg1_ac_vlc_len[64 * 64 * 2]; static uint8_t uni_mpeg2_ac_vlc_len[64 * 64 * 2]; +static uint8_t mpeg12_max_level[MAX_LEVEL + 1]; +static uint8_t mpeg12_index_run[MAX_RUN + 1]; + /* simple include everything table for dc, first byte is bits * number next 3 are code */ static uint32_t mpeg1_lum_dc_uni[512]; @@ -757,8 +761,8 @@ next_coef: MASK_ABS(sign, alevel); sign &= 1; - if (alevel <= ff_rl_mpeg1.max_level[0][run]) { - code = ff_rl_mpeg1.index_run[0][run] + alevel - 1; + if (alevel <= mpeg12_max_level[run]) { + code = mpeg12_index_run[run] + alevel - 1; /* store the VLC & sign at once */ put_bits(&s->pb, table_vlc[code][1] + 1, (table_vlc[code][0] << 1) + sign); @@ -1076,13 +1080,12 @@ 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*MAX_RUN + MAX_LEVEL + 3]; - - ff_rl_init(&ff_rl_mpeg1, mpeg12_static_rl_table_store); + ff_rl_init_level_run(mpeg12_max_level, mpeg12_index_run, + ff_mpeg12_run, ff_mpeg12_level, MPEG12_RL_NB_ELEMS); - ff_mpeg1_init_uni_ac_vlc(ff_rl_mpeg1.max_level[0], ff_rl_mpeg1.index_run[0], + ff_mpeg1_init_uni_ac_vlc(mpeg12_max_level, mpeg12_index_run, ff_mpeg1_vlc_table, uni_mpeg1_ac_vlc_len); - ff_mpeg1_init_uni_ac_vlc(ff_rl_mpeg1.max_level[0], ff_rl_mpeg1.index_run[0], + ff_mpeg1_init_uni_ac_vlc(mpeg12_max_level, mpeg12_index_run, ff_mpeg2_vlc_table, uni_mpeg2_ac_vlc_len); /* build unified dc encoding tables */