From patchwork Sun Oct 23 19:36:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1860137pzb; Sun, 23 Oct 2022 12:37:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6i4tEsh155Y3VoMtc1f6V9E5v9lg3z08R6gJzogwPajBy24lFksGRfcvMM/Oy4qRQdseXe X-Received: by 2002:aa7:c0cf:0:b0:45c:6a06:ea9a with SMTP id j15-20020aa7c0cf000000b0045c6a06ea9amr27205762edp.211.1666553861940; Sun, 23 Oct 2022 12:37: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 y24-20020a50e618000000b0045c240cea74si22393698edm.296.2022.10.23.12.37.41; Sun, 23 Oct 2022 12:37: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=hzgJLRt6; 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 B12DB68BD4C; Sun, 23 Oct 2022 22:36:36 +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-db5eur02olkn2056.outbound.protection.outlook.com [40.92.50.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54C3C68BCDC for ; Sun, 23 Oct 2022 22:36:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d4y5yBXuwmQ7cumL/5vOIVGHn3kOIwta9yBB9PWHdONN2dC+6ekhs+mCoFqeQLIoMyVLrhmOlupHaLO1cna+RdF00yjRnGmAx6N6BE7/3WjITwnKV0XSDbB0Ks8oDdjwVNQnfWQRv3VEcMWRNWP4yEbCS1uetP32yxdiHCndOFsUNtzRGok75VBQ/aFvxBliWCWkzrq2FYVC8RUcBVPT0Hr+s+hGqyokiTmzPGEGiI8gAQuGDYH3SNla3i949bkq7rIzCwZ4aJPVdRVEoWOUDqolOqhtAWJBdwS0h0fsM+a1Qi9gfbVsLXMTfh9cIIzcfiFQ9fW+naxAr2kJBogzmA== 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=QjZOOaN/db61eeLj4HLth0b/tJOyXwFgxXDX9w9D09Y=; b=oF+y44cDt1t2JZG+hIP1GMiZme9Xp9QgbNvkAkAiFum1uE9h4o+tqsvYYWCp0Ah2CkmUsxDAtHRa6WsmX/eyQnp/5J2bALEmNL8uKvkQUJNCidMDdfFbqtrwFu6vtxUfHzXW5WjVZu4Zb+A9gRFnB9cjnGohDXoRB+QP83B2/VmDrMnh40NCKD3vlGIS85ijSO+OjgUsu5q4vcsX0r/gftY4W44plwDskGzzNRvg0v5oEr16qjwmi14iybe59Wpl2zEnU+NZ7kgOMwn8H0Znsymshre7x6B0SVnL2eRDdQ7T9NKUlyrL3AQGIrNPEWgfO+3+P7lKHr/bKttChObSDg== 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=QjZOOaN/db61eeLj4HLth0b/tJOyXwFgxXDX9w9D09Y=; b=hzgJLRt6UYxAjsDGmlFpz0oClFoOPU5/S1fd9SZ/tGcdr+r1Hetw9L+p5jXbC0s7yPAtZ0p2Xbq1auNdwCJURzb+sBLvcinjykyQgfEiu02aKsad/qsvKNPaos2TifkrzWmAk+aOP+yNlz4J67HnsyhtauZYZCRqasCXI3Pap7EktCP036n/81oymvLVOYQFDtwmXj3lNCXrUoeOdOfNg5LqYf1HI3danGqiRM/M7vCQVEs75YyJFtyKndgxuhk6qFqw9ESuuEFX4Uja2L+CKjQ9labMGYYsx1QNsVXxC1vmPfuzqMinjgVoo5FnyyondXQbU5BkaHHPRkBFjKnBog== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 21:36:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DRy9qRHBCLyrjwIEo+UGw8oX5Zwnr8ocgy87GqW3gyY=] 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-11-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: 86354107-effc-4c85-148d-08dab52ddd78 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwtuNlcRaDgURFx8jVPoKbRc63rI/AyzYHL9UyQ3jflt6w91vnbVsTBemiRCRahoHTNmD6Utgml/C0F9qaAi8lfwmPvP84QfBux3+LcJEpec9i89WOzkG/TvikKds1OBm+Twe+HgmDuct8GMeK9Hz2mPYNLGzd+J4Dp7wrjgzAnNH/ZLGhC3Og588TSGutTmEamyC8qGgX9phS6KZEbIRwYEfCjF2n3Ft07BOg0Tq8e+1FC12j7ESdiaI0KW2bhtbU7fgIW3xY9Znain4pHska0haP2xAQebr5wD/fw+QqrqGt7SBJubVfxYE+HdyyC/XAA1jazunILMzkjra2LR1Vnu0w93uu2Jf8HF3+Z8YbYiT+tiu+zQyn4imUcWTmH5t7rgHXXy3mB7Haqxq3N9LTaewT0Ar8uQlvKWW/I9Y6efV57XidaI9o7xJdMRSzX3/fveZ/t9I5uHNnGyh9v74bxBroCw0jwg3clf8jLMyHJhsgJKqxg8ICQOkiDZfxQReBOp0y8/HS8VtNmEO779NQ5MxwbPclgSlKDA5pQnW7JC8YvXEsR4GYemUC+q074D5R6BtpP0eLARLtazPR/1ukBNQHaNnejWdYeLBWC1KHev49bij7/jb3b/yh7h/X5J0CeQ8ul6SCTgOjjwEU+bzxZM+2FFux+/VbH/oj+V6lLLCwfC/FDeO24V7pss/OohXWVZ0mJU/kYx5qSqTONsVMhgYmscbhKhsA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kCiD3ue0NElTgBLhPxwzx4fZilcZtwhhrBuoapLA/tl+GAnaeHcXCEbH6y/CFx45eOl/1aRDUFv65u8ZP2CULaxAQT7k6ZpRmciBfVVaYGWzJBYbhW1glwbXbbRJvQZSc8CNP4RSfQBahiz4dzHfR1r7Bh+Hc0opBfAcexV6M6kITG6L5fRvJ14hhB/W6I1kEA8Bk1qdPo41+oSw/UPAB7GoJHcBq/Juwo1CSPRyJcOjjPmfcZA1y5xwyX9Zxvb0zPejpPSd9OMpjFB+W0a6ZYXih7ojIlDZKcYEvu12loa/y+kIYq4tzZ3ryAXdZYIiA9qInQuMZJhl7qRoyMromgjRqj4O/Pph2UEcrH0wnS2EPlTWTlcId/MygA3KyiJ0JSxHI9lzc+ord0y+aAooIcpOxBoXGRVu9f2rL5q1hU12ev/c9aunFNlqUvatWS/4uSqtJ+AcCrDM8WcLJNmR0C5/mkVWweraJCkB/xhJIoEw6zdfvjSRORA+cAx+cT1WFUu7/NGcPv803b4r6Tt+NUgUno0lAI60N9EJ2bNrhg4A8yiftcMstkDHCDS8SsZNNqOSsZw/jedYUe3pktwwhkglKSnDZOgMkm6d17aMPxUdo9ISJWptAVuR3wPWzkoPTt5tPken1RgQtMFIejZXS/KjEtUUErldmOQv7cG6Sjqk+7aDBjEUrVwI5nQKz7yY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jUu3iZ7atc//z4gFcWB+uig/CEF1KXG/KeYbyoqi6BKEUcDgEwGdHBDeMOEawlb7JnkZPDLpjFNDv+WTU6LKJfR9GkIr8BwvNRBkGDURvZF8mn9JTxHEDZvhX9UKqHLLdXPzostxnEBovTTFzkYGaC4R1ELSxrOe7cG0Db13E+Ogum9baqc5rG78QRqXtH0LrXLPmHyrTpPAu1kx1uv1uLPpLqriWsO4+N1AbZz5KXTixdez5L/BaXF2gAiSAtH2gj75nAY9DRz562q4CWqdrkNEPPPjFX6IhFeU8LaVoNvOGwKV3gN+YqBKolgEVIX1vy8/DQsDV4tmiG6sHeKfSfoQoRvdEaSRPTkGRMil7un2E3wGNtViOX//BfN8i6IOm2M5BLThCjveilQtu+ZpbLn4uGzrwaD9xE6+7s3O2wuZxNgP7fAadLQe3LVVmGxsm0AMaf1r2UOkkqBuZqBRWkkQGpKezk4r7P9L++3D5dXu8FO2E/f1muOjO9jQNZkISOVWVJ/iASNdmEYohCv8sle1GUBVVlCCVZ4a7EelVXzyPr58bqYYRvo8u6QvTR0Ld2uPlDpW+c891fJq+TIzeE+3rSMi88l/PjWYiHGbAQcNG5S+eF384/TSPyMPuwvweG0NvEI+80D4UzZfyrh0nEwzdb3aCGJ3xmrtUlevjQtyJwLjLmL6ux7Da1UW9AKsvU0GeyOMQmjFNIRmLsP/Z4/mrhbWFznAUX9qjICw2UXlvAcKK6tST2Wrz5g3j/Y/7K91rxmzMCS60uF5nKnmFqECPBHujgofBR0InpSXV1fsYU3XSvbn/SQsnDMuEeVmWlXTA3m2WbOqb6vHKuI6XDz5djkVniNRnqHtWsQnPELFCQVNG/WtialxiNWv4zA0wIGyI71tJTj4ghjDfUiho1SUqDMgMcRkZ7dcsQoxmAsEC3KMrkZS9qJfDHgekCc9SQR0OH+lXiU0zT3ujo2CkuBIGRXHPO7lY0OLOdHoNQUsGA8cYwlLw1QhZ1G06n50Ht80cZnj5A+JrIoclO2vpqZ2hmEHDjg+VbhDjgDuR+5m91DOWksHTxPsdZQquUYpV/k2uj7GgqUYl2CT6UJ6RClyzitHtF8aAC+R8ZW/CcAFd9HmmLp11viJVIMvahLPo9xxCYSIN/5c2P0+TkUPuyk4A/wzoUKUqvTBxS71JwXMJfEesiR2RUDuOP3UAELfBDtBVOtRsFhEXUKK1Idw2YItycf7Yp+uFA+W73uPLkLSJKMbrQkmofCRaFXjOWee1yAySsia2nJuEE3rmw0qo9a1Uwd2VVsBeeVN/awMaoCPYDmDz3sucq7MX0bEUCyR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86354107-effc-4c85-148d-08dab52ddd78 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:22.2011 (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 12/17] avcodec/speedhqdec: Use ff_rl_speedhq.table_(run|level) directly 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: 5yk0wyPAyScZ Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhq.c | 8 ++++---- libavcodec/speedhq.h | 2 ++ libavcodec/speedhqdec.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 2d6e8ca949..46ff0cfc53 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -60,7 +60,7 @@ const uint16_t ff_speedhq_vlc_table[SPEEDHQ_RL_NB_ELEMS + 2][2] = { {0x0006, 4} /* EOB */ }; -static const uint8_t speedhq_level[121] = { +const uint8_t ff_speedhq_level[121] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, @@ -79,7 +79,7 @@ static const uint8_t speedhq_level[121] = { 1, }; -static const uint8_t speedhq_run[121] = { +const uint8_t ff_speedhq_run[121] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -102,6 +102,6 @@ RLTable ff_rl_speedhq = { 121, 121, ff_speedhq_vlc_table, - speedhq_run, - speedhq_level, + ff_speedhq_run, + ff_speedhq_level, }; diff --git a/libavcodec/speedhq.h b/libavcodec/speedhq.h index 78f11ac6ab..8bc22ab0d7 100644 --- a/libavcodec/speedhq.h +++ b/libavcodec/speedhq.h @@ -28,6 +28,8 @@ #define SPEEDHQ_RL_NB_ELEMS 121 FF_VISIBILITY_PUSH_HIDDEN +extern const uint8_t ff_speedhq_run[SPEEDHQ_RL_NB_ELEMS]; +extern const uint8_t ff_speedhq_level[SPEEDHQ_RL_NB_ELEMS]; extern const uint16_t ff_speedhq_vlc_table[SPEEDHQ_RL_NB_ELEMS + 2][2]; extern RLTable attribute_visibility_hidden ff_rl_speedhq; diff --git a/libavcodec/speedhqdec.c b/libavcodec/speedhqdec.c index 3a5b0eab05..0c5942e677 100644 --- a/libavcodec/speedhqdec.c +++ b/libavcodec/speedhqdec.c @@ -566,8 +566,8 @@ static av_cold void speedhq_static_init(void) ff_mpeg12_vlc_dc_chroma_code, 2, 2, INIT_VLC_OUTPUT_LE, 514); - ff_init_2d_vlc_rl(ff_speedhq_vlc_table, speedhq_rl_vlc, ff_rl_speedhq.table_run, - ff_rl_speedhq.table_level, ff_rl_speedhq.n, + ff_init_2d_vlc_rl(ff_speedhq_vlc_table, speedhq_rl_vlc, ff_speedhq_run, + ff_speedhq_level, SPEEDHQ_RL_NB_ELEMS, FF_ARRAY_ELEMS(speedhq_rl_vlc), INIT_VLC_LE); compute_alpha_vlcs();