From patchwork Fri Oct 21 20:12:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp956525pzb; Fri, 21 Oct 2022 13:14:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4DTWn/O0U/DzzqGgOEIzRstA578WwhP6gtaKCX5H7VYnQ7QS89rSetpoS++yN52GzY+P5p X-Received: by 2002:a05:6402:847:b0:45b:d50c:b9aa with SMTP id b7-20020a056402084700b0045bd50cb9aamr18841628edz.289.1666383289475; Fri, 21 Oct 2022 13:14:49 -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 dm10-20020a170907948a00b0078de8d119d8si6989819ejc.853.2022.10.21.13.14.49; Fri, 21 Oct 2022 13:14:49 -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=m3lfgjdy; 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 0D1F468BF27; Fri, 21 Oct 2022 23:13:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073083.outbound.protection.outlook.com [40.92.73.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6A2D68BF24 for ; Fri, 21 Oct 2022 23:13:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSeZazcCOWskzeovpholQL3CoBhOO2Hroa30CQBPwOvEzjZk6Y2KK2RGjcHxqyTxbHaJu0fOGGaH/pwbWsIm0MqTKLNSqvn72KSistitAUS14dHdLrKMuOkX+cLdbdgI44cFaEWJT8W+DRV7MTPPmt91aPCY30skuV/DDTHVeEdkcSSHxn/l64+gU0so1rhuox5gxTz+pMv2QvZTDt1AhjxUBmg0BYlPMcEn8z5P03mer6T3ZdmDiKXtMJJ8uNe4SoBNZF6cE8OcjmQGzGqeQqf5FPhuEhReuD+Vkk5wHzw2yCspnA4IDdsR6YjUTOjrqOwm7wAcyEMaT0FbSnin+A== 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=bpFTuP3G2zlppZ8HYfm8+FTHUAzy1owmdHW1uKoTScU=; b=mjw7c/sb9fbXSGoAZPqm/FLOtCHsklX4dK/+Naw0wkD8v5GEWXof20CtrtKqsugqPmrUh6s+Koww7dnbsA7wgQO1eRPpB3jF/szmzdG21sVMa2q+mNFP1hJ2wNBV3+E2Px2rr42AEmzggT9KDdTAZBoiH5PxDeiNNaZX6ADoLZbKvef6Y1DfrglidE0fT8JtjcnJ1tvTaopwxBjkuhFHfmnPzubqao2NhQgpHzsIhh/742r4hnNI+Nk734RMaoIYxXRlWdDbs58qxaO4dVuohgCxsC6KbNT0/n0WwFLavQV4+cxWPi7bLn+49PIgpHUbQm7mKd5uq/wY5p95i7f6yw== 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=bpFTuP3G2zlppZ8HYfm8+FTHUAzy1owmdHW1uKoTScU=; b=m3lfgjdyK3GF7UA8955G2L3/c7aztRJt4k2hax6x8JnuFHul0sbEHKkNgK+NRKn8hlTMx+SjQ1SSPzdVVmrqH3QKUdzzL/KAkJadP1Y3Wt33JLzWZZMBJaJ4en4rsAQwY5LmmNYuPM2eo6eKm+GnILQYEYr9xVyXdZOBk8YtLipPY2DAwr1Rm7qs/rfCaUNO99EhsUmapMIjn+/mhy4GAxB4bDKrDufpftCj8GTR4V3WrEOPhIn81Ct5PtjZs/SowOaZAGwpSq1qXrL74GrKhjfajX/TMnRShyzDea3m6NaZk0wWV2BthLXJ65ZNvVZmU+iFeND2c1GdvD7BDQEpvQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0818.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Fri, 21 Oct 2022 20:13:45 +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; Fri, 21 Oct 2022 20:13:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sYvjs+fgnLCt71NmvASS3OT4GUJVgUGfwjQmd4iiGQI=] X-ClientProxiedBy: AM5PR0101CA0027.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::40) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221021201300.3565913-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0818:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fe791cb-f70d-4b85-c2d5-08dab3a0c17d X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732ZAE5assxEuU/fNPiASwg/53vo4oZPGaCrlN1k7tw3NY99lCZV4lhK81T1vMP6jfCVco/tPL7xpukgGJ1iHzg/qkLmsSA84teaRz7YXOJWN3BMTLvHSXtUwKPRMix1yxgeMhGNq38bCFGi1u3xBdXesUxNeVfJvg5A4v6BYPaNrkuiZIOk7wHzcrz8G6DMmfH9+Heo3HsEv4joSpLfFg50R5bGUBt+8M16xrLiKevL9BQVdhAesnJccG7QlC/WRutUuN5xrtC5GkNms77pbmEaJwYn3uXZ0a80q2dXhXKe6IPaiPOHouos1X/r9qim+V3gIChAhv26tv10yQHnAL1udtzyz1mCpHQlY41Boq7S0x+h3pzyh60QIEKaoW0v7x5HZiJwQSctuttK54vsEW4ozXg8Vq+ue3QYP8fWwioMF1bC1JqvZePeM4+41vnWl6BkrSikdl8VU4lHo75H33L7y/FWhKgjljTRVFJ2PW18aMIa0a2BjpyQA94EmyrD6ADQK6ELg7ZzenbfFGi1XI73LDqbCffflGLMjQoRNaT4uJJ8XAmkSBK8fs9dFrvVP1TEfJnXl/m4dZzTmcBrDApNKnVKJ2Qb6j1+yvPx08J0WKJRxb6EAJYY8Gy8CaGVV003iPgJ+lbJufiuTfkt2Ea6WWV9dyljX+DNFTbEmCY1ZjTAwkejyMLvJV+5+A1q35pXVYpWSaGPqtjX6jwvTGUQdlKfhkhzp5i5vZB8bY/Ok3piR92Nbw1DCUwy0KwRKT7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zm9bONCpb4QwlHnPjQ39ry2giRrnVmTGnrRZ7zD+iy9WF675u9h+SWmOQyyLNW259uJbspglbf4/iPkHghR1qXpJEx1vbowF1GQUBogXFb/D/IoixjSBPecw1cY64HByHr9yY5WcEMA54bMuzPfVT4cv5HSB2CJNly9ubtQ6XuGkcm8528JG6EVWDZsv6gAKfzbdka8IWKWMmfHIBznjiURiOQZoYbmhO/N6zUKiZDPg/D4gdCsKTGBJQLYZ0SdT0Qt2E5NAnDGrGulA0vVSw1aZDiJAMHSJZun3cEmB/KcwW9Tt6AZvKU4Yz2CZDPuhuzuZ3U/VS7Ee3RDjCqZv4ftXCyIb5+xUKG8u8RLEHyJpBPVkdOnV26uQOeKZ0x1LNVOBSM4zXQgyg0sN0RCzpraYiBP25lwwNbbjH0gt6yWmQ5RdqcD+9J4XKCUsmvogqE0/BDRdEyGxM9PWmvtS2sXLG2qSCXNeUQ0hW7Tml7IMT8BKROQy6OkExEtd3E56p9kpxMRjG3AQNh5O4TS2f5ryoTyW6LeLGL3o+uCOdqF8v8zVoGaoZJH08xnk9iKEmuTot282OUkfbYaCnTMSpYFqW4Xv/TGuhRrFHRJIhEItKfLys83GESyjAjiihh/XZTQAz35mVDGkpdz1BwF0D5+Z5llGGrpAL2aDVKqPCp6x6+3M3vs3uhDPCldg+TIH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YOcEtx3+sE8x/XPFQOpL5YNCh+elkGcoIfuz/Nrdf85TUensc/9D3v489coUdPNFAXI4M6ukQj4aRX8OLm2McMUewDudiS8VvTMTQubVA1CY4q6T1wJUouWzc2ZZllMZA3IfKm0SN6aU1Wl8iy+Jc974UyjFoUxqgZr8dF0UBaGUZAUh+MygHJEIjSADhBUay2HB3uDKCRJpNF1SO4iKCj2HjVG9BdLT+VWoC/niHyrH9Pl/ISjGz6oKiZ6YGvQ+RFDsLQkxl9gO5+MCu+9gqdjUz2L4lLD3u6hi5IGpf+jOsyMTjDWEOvHIcXpfb7kT10fNR72nhBES9MpxvVwcZTFd5UZjoxEBERqxYNk1n21vGlmK/6Vbv6TVR8myt8kC5F+PHNtD4WkN8nCUTB2AXJ4xD7dgP3Q+veWy2hcGV4ZOyO3EFg+c8sxWOQ+kqiDAvKGMzLSq1tVkIliE+nNccazTjxFYoDFcgsOis8E7h77f5wS//+lbUjPZymydkt/pv9LARLWRIBVp8mmR0VqMicQEB+JV3Nd46DmDgSu9OOfxFioHmKaU9e75S4W6qh6gAs5TL7J6bY5od3Wk1cfLp4trtCWdXpNle/vdIsQNEgOXancUC3DrDMozAPzZarcelrkqxjlfD6rVAzriXl3IArt/nZDJhrdPrU8/kxoItP4EXnoVSZViyW9k/2GQH9NWkk77f11EaFxD7tsZvUaNevT2Schxgy15XPA3yUBpJvhZRwYQ89hGGk8LifI9RJ60JF/BzVkBbRDLLIQad786Xy1a+XS1EmYS9KawuPGXk3shNoQtbIY62DVxKtWDgl1IwSbvBx0x4eChAskI67RKmWUek6PDDlmKZyai/zgtK9xRx8w4DNuihkj3fgAgKZhbgTrVqAFdtwNWgxOw1U2N8X3DNZ6P66o0xiz4m6EQVKwn2tHfztcLdpfAZhRW5Mlx18UrlwLn9pKAN6VNcErUvxWtBtXDTVtccjds4yVEHN+oOAzIoxCDvw6+g6sTHe1Q2TjoKxC4Zm0nTAxxKy7hxXL6m9X27sg9H9ETarsPB5uBNSsJKVERlhb/3UnB/S4izuBSTua0UKxCxtwOTxin6BfPz3qRIfdFF1/Yjq6pTcajw0QKFALCQflgWgT03FWmhnQl07UQgmn+kELlzpAiQ9QdCOjuS4PxX7OZ91zowg0teeFj0/uwN7mFP6wO6CwFpSjZa1r6oYjnNt3DCzkkyyHUDEBvjpT61fTWKOi/02y0DcKKww6n0ZcFGRSqR149RhSQzNvziAoPzAwNsDYBGUtPcj+ARp6ZkHBDRLOzjCESMC/0Q2ud2RdD5pinOFGG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fe791cb-f70d-4b85-c2d5-08dab3a0c17d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 20:13:45.0448 (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: DU0P250MB0818 Subject: [FFmpeg-devel] [PATCH v2 12/24] 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: RdbYDUgE4qlV 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..1973ed0741 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 permutated_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->permutated_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->permutated_scantable[pos]] = val; } } return 0;