From patchwork Thu Oct 20 08:45:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38846 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45919pzb; Thu, 20 Oct 2022 01:47:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5WPsr1LdkWBzOnRsbP6wrypVUIy8TMDJPjHRRhetg2erl/lBxDxHCtLYpDrtFYikB0mDEp X-Received: by 2002:a17:907:3f07:b0:797:4463:e1e with SMTP id hq7-20020a1709073f0700b0079744630e1emr2406072ejc.139.1666255641965; Thu, 20 Oct 2022 01:47:21 -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 ga8-20020a1709070c0800b0077a5733ac08si6919434ejc.601.2022.10.20.01.47.21; Thu, 20 Oct 2022 01:47:21 -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=PI1NOluL; 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 CC83468BE80; Thu, 20 Oct 2022 11:46:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2107.outbound.protection.outlook.com [40.92.91.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E569E68BE77 for ; Thu, 20 Oct 2022 11:46:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dns7mzPw3VO/8H9x88v2qwXfY5HGTD1IvhC+3GpujT3OWHApMuJrsbXLF+t+uJVYsJeWzHQl912weietjhrwBORr9Lvc9WXPN8AG7RQ9yV1G2HJQj0SQSsYfulzaWYeqW9BwOBUMDeL6D+D54FEFc15c55IUWuCX3YHBmZkz7aNUNMSEWGJRacA/BIb3cX5R2GqJsFQwJMvR1nEr+w1leDne9SL0BDI3W+BjVL8unuqPSB+QduZI53ZVKU8gdjvRMzTcvkcOh0bgnTJ+JWBrH6XR7kEqx5DjeYLyY9pkT/kZt3Axcsb2EmjxeKA2cSylp4GJHoR/MlLZE2j1vEBDfQ== 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=HlVwK9J1MAjfuMbKBsRqa9/rOm8Nu9j1g8BdRQTk5hE=; b=XgEjUiukAqBbSYWRcA6sxUsJi9T0W0RLWf0HkgngA1Lb4YGonKv/N1hEp2LmrY8NVOESR/qeeACs4jCYCUiECHLu5hKepy37RSYhy29penhdL/pM1ZDmTtAbkBa6K/A1l2JKN74WOuvbwAhlNXT+W3YXI+7HwCiryzfopCpU/7JaRl+kOf+uAekKT3JHjGgpKfIuHmfsk7bp0Opps2qZzXnARZBo4knhvbZSgQUXMp7nYEISLY8h8Gld+BBuyLMlSKo+vzz/vJyNWQUNh7tmb0tBfFyOxefHSbcSa1IOSzjDKHCmOx32a1dUsLlNDsB3Rm7snFPs9XpQhWW1yQtBQg== 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=HlVwK9J1MAjfuMbKBsRqa9/rOm8Nu9j1g8BdRQTk5hE=; b=PI1NOluLUrz1rnuWDzIkiZiQjCXDdwTvU8hgrrSYvUg+MJktLJHpAPT7+JWRpO+B7hEQbT07QPWm47JjKMlFTUtc3qsxKrjvTXRfXCIAQnxRA4YxB9svkHU+083Tzudv6rUkndftyg4iI47YhywW/dBKQPGeiEYFys/fK9g6h+fH1S6wqc8+gFUp8GjOSR+LFMgGcOhWqcyJEqNCDIxRNKg3DZe2g7FC+CpC30NDd376a2KniN1QJusbRh6UUAolTFqceinkio9uQpdnAkbB4Z/5hVYgAKTMhrKd0hRtHF9Sni+NZSog7Y03MZKEG0Pgf3wXRnioPIlFwwW8M2saog== 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.5723.34; Thu, 20 Oct 2022 08:46:38 +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; Thu, 20 Oct 2022 08:46:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5QUH5ye7yRuD1oTt22K+D2fb2jrCHQrYnoXFFCA8qqI=] X-ClientProxiedBy: AS9PR06CA0774.eurprd06.prod.outlook.com (2603:10a6:20b:484::29) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221020084540.2378553-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: d3acbe17-6fc7-4803-0951-08dab2779a15 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7q7DWNiKYGeXDbQ/GFOChYu2towxpXWphyZDSZc17dP7Jbe7xK9k9CW/iryJkGwMYIsNnqPP9PcKF9D5gO1RtwA0Rh4QrWSFoYujGVsFXCFqK50tfHtexPgcNJxr/bV3N0T0v2/gjq4BGEn6A1qV6UUMvrAKENwH56qa8ix52/UcEA8f0GvOJhGKOrWwCsjIxnEe0wjuvuWNJq8ATVNL6H0A1TIGE/8j0jFGlowGMHeoYdCYlyza4ZJEtVdO6bWCydMEDI7u45fKZ5FqSZ7FJHmBxpc39+EM6mSJZKZrjAJjJ/LuHrlE/746j24ZOHb9lV7ab5kumthLKLiI3f21O2RLhdX6BpDvXVvJY5+rmUjeeixWOrzXFwS0wVVRzhcz1V5D7Xyt3e7anKuLnpH1mo65R0S1+mWfWtDGJnuFt3AkrO5erX2GM10VrzW73QP9BkZk6zkU8Xs9XRfkcxzahos911r9OlZ5Y0wtNLLC0uf4QBvVdbxuQmvdMj/H/d0Q1xd3+Hzw1G43NTanEoVU6+4w9nfwxQSFJIEMOFFvUISTwFMrW/2INFOFMdAPF1Sl/A4R4yIQC59Rtly9ItPyeCyMGp3h5dvRF5ew6LKbWx70QGG4qo59iyUUP2wiRycpD0YVzDZOwk3fBTRK3r5TxoPsU09I56mgFCtvPJrxPHe8oer/OJkKNR/d5ph6MVDpA5fOjD2/SxbPAlLpMjoLFTyxm6ExJ8fBXEl07l1RXoCVMpO/j/l9L93C3GtVJDGC2j X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uECT/uZFMnsZbFPsxloyJrlQIBd67acs1CPd5IC7DQzcJ2jnVAO9kRbFVPzycGHWjnrR1uBusy7fNMfTQ/KwOx2tI9EpuSZbKULvBALBnlLakrPBbTEC9j361vHl5oSHG8qxTMhjG9EKusXcyDhe1N0oOPcBfAi6LI00apPvuEfAzt6mNH2N5R0IfsTGNrzDCtJfoWxrfU3o9Yu7gk8I0xWCwfGDuGSPWnqndR48mn0H2ZGKoe6O/8eOLdUV/NN1lGOZ7tc5+8X9+FyiJ7iEA9K927sxM9AGKsIoCu0pF9chzU/qMoXinSEiwNFvN8tK9F6Bv3a/BeaYo8ARb2bELQRBV8bgk4YehsADysfZ9COIGcWVFkuA31qQe7k92dAirRBD07qK7gNvvALBjlpE3xHnNP95F+RGLjh6J2i4/nYltALU9WJuwZaWB5ZPNT3bvnq5BrIAwlCr6wcLOD2RXx5JmiOywD0fYnZWJnk3/ox/MQ8igKO/typ3nuhlmdCPJSzwUOlRMK5tcwHz1mSgmSRJ+1LBrHpdatBzmL723NJp1ELRX25XlJDHvmIL6jij8Yn0iDzQjlQFcpS/02KZ/GM5yLSpkJ1ZIAXv8sHZ2aW8cBV++TMIlIsD4pwMu7di+yZp/qsXnKFaVB6YwSDypmekOjm2TPv8NMSAmcVSN7a0/1Pd/GQsSZoVJi4VlQLe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4roo0obTqR9NWr2qCcHlbxkDYbpbi6a0iLUHTasCNjVjQZaPreidc1GcCKuoAygenhAWtvvm01cMIBLdIauQzuytJgy4WUAwK4C+ZjPfmoNQG803yjl/h+aSq2uXiBV0P/N8loq3l2xogJ77OE0rCam4fSS8+amnXR0vHOSNfZ1ZsW8DkYsxhzeTnEUdouTTZvCCl+hVK/GtTRv/C7WdjCFiLWOmpwritkInNa7dHBgQSpVg0C+olk7lnM5pPqTu148Sg0q2+fAQrJ1upe4z4yCveibymh6MSI2Y6VLiaL+2M5isTdtt63bMwZMQjXPVBTsUGYxI+9cCnZZ3qeMprH2LDSxXKaY4OdZcIQFr64eFvF11HoKG614GjKD+I5AQc1zpaP7877xp9D1RUkI85As5f2swPDY/KoZThJJ3R/BKskf6ub+hVDF0GBvpPgkh9JYsSrDAmkxclxXZmgLnrWkRLBE2sUBGoyi7elRrSLoxmjLS6tJ8zO7/+KXyvOAkzPX1zLEQpRNaL9Oz3LVg8qimn91Je3Ibai7MmO9j4aqZ4MBliscNMAHYJDOhY4OzupERiDAFbILYcJ8fuUBRH8Ay7EJi/KQZ02EuzdQRD36kzr2HKvYR8MeX+GzjCIYV1Lw89pW+XYQRiX4kKsycNZ5F74dcV8V3Km80hHOy6G2sZtmt1jIf3v5Inv7o1on5WouEbSOunbqxqkHALvkNGf364UzIHCkwWBAYTSxPzE77w/NmCOfUlrVfoeG74gDq6GxoxiAwxmExZQr/vrqe0RxySQFnuYPEmZnqiyf1ZbQIdxTiHTi6bLFEIrygKJP5wysIr7EbweVUEZoOLAP/Qp09y5ayjL06nvC5GZHLd6/bu/eGdwfUiyoi9ZlWODI3GdaJEpWDtebHn1obj4C+o6e5ZyFlGrmbesLuPn2OM6J+Lo9dIyTaoZ1LXcvkcjVBWV/A2mElzeCVKz94njhfpRvOuNjrtamn4SY7Civ+aplo56FSUIbcD7aCYJDoA5aNpW3ZZXue2vEI4b1AW0geh+ezjswQND1KL9zQltkcsyHAoEY0iWBjkppMRZw64GMTqw1fiamC90lGjtRfmE3wuNp9ZduY4FzA1suCDCnqpE+5Z6SzfOkFzQjrgIv4zcym1UDHauBfZ/RFQPnrxgMYbr+1/kyzVTn34hS/WCpVqVzkd4s8jT+q6KnRpzuvHNf6lbCptaIbRlKHHcw7jLBWRM1/jY4QvuxpnvlSy52wofx/T1mINbmjX2BuaqgWme5w2AWuBUjtiucc5MlUD1XaTYoqdapE9SU2M6JltMZH8rbKVOLeBXrdEnbbu36rsw12 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3acbe17-6fc7-4803-0951-08dab2779a15 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 08:46:38.3987 (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/22] avcodec/g2meet: Only keep what is used from ScanTable 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: l4zjyh4Fs2lE Namely ScanTable.permutated. Signed-off-by: Andreas Rheinhardt --- libavcodec/g2meet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 4367af3dc0..7c1f8325c4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -120,7 +120,7 @@ typedef struct ePICContext { typedef struct JPGContext { BlockDSPContext bdsp; IDCTDSPContext idsp; - ScanTable scantable; + uint8_t scantable[64]; VLC dc_vlc[2], ac_vlc[2]; int prev_dc[3]; @@ -182,8 +182,8 @@ static av_cold int jpg_init(AVCodecContext *avctx, JPGContext *c) ff_blockdsp_init(&c->bdsp); ff_idctdsp_init(&c->idsp, avctx); - ff_init_scantable(c->idsp.idct_permutation, &c->scantable, - ff_zigzag_direct); + ff_permute_scantable(c->scantable, ff_zigzag_direct, + c->idsp.idct_permutation); return 0; } @@ -251,7 +251,7 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb, val = get_xbits(gb, nbits); val *= qmat[ff_zigzag_direct[pos]]; - block[c->scantable.permutated[pos]] = val; + block[c->scantable[pos]] = val; } } return 0;