From patchwork Fri Oct 21 20:12:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp956320pzb; Fri, 21 Oct 2022 13:14:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vHKkmmEIZLnhBek5RY0oVS4wfr2r3PNTlwvGcl1FBUjN+rGao2DZ6qXN/JhjgEL3LCmE3 X-Received: by 2002:a17:907:7245:b0:78d:ec9c:e743 with SMTP id ds5-20020a170907724500b0078dec9ce743mr17408376ejc.466.1666383253401; Fri, 21 Oct 2022 13:14:13 -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 g12-20020a1709065d0c00b007707ab4be23si22394678ejt.560.2022.10.21.13.14.10; Fri, 21 Oct 2022 13:14:13 -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=MYE+3siB; 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 1129A68BF13; Fri, 21 Oct 2022 23:13:35 +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-oln040092073097.outbound.protection.outlook.com [40.92.73.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 198C768BEF3 for ; Fri, 21 Oct 2022 23:13:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=efkyTg4f3fqbyxC5KWr8YjDQZ+oIym0isaSGH0sQ0QOdI7cXHwFQcXpXwTYYONoTC34m+OnQ4Uc7MKozsVMvNU8hgeNHkNIKzrvBUGkOAa6rdjnacf+VVxEztuxa7UiyKjzDbP++MCvf/KKtwXDSgia5sWDPwgkoPZ+tQZI6tKH7XAEVnqs6m5AK/Jje0wNhhXTNeFkXwOizTwSeFM8TKv7znNuc6NTwcM1X6GFvJbxoLFPxK/IrX3QZTnhMCH6wNwLa0lA97FCzEPF/YXKDrcTt/p1BZjXUbLH5k5Cv8tLAfErZrMLrkoTsGM3PKwb44F0PIT60aUqTH4K3/tFNoQ== 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=D87HpbzrVclG4nPHaJtV1J3JEXB7yuPNF3NkZ9Km2wk=; b=oGc1uDvgz8fXe1Cl7TZFZTP7n196DVCwhB6d0h298s83Vm8SOJhHyoqGZ5zaN5MQBV+i0k5aB/UPu8D9hvu+3mTS3N2NkKuKwaBQ86k3E8KcY4g3sRsxWN92hP69Qxx/yMrkPXx0zOgrUqhY45TpiglKCytLv6+OJ/g21AbyiRnJgdz6BDkNhHa9wCY03G996iclyWBTtIP9dr67Ik+6I890SS408Pc/Yc+Ofw5GcMIgeoZCLq51W7310zcSe34BYg3YYDN7tzD/aV6iWz0UiomjvmSVpMsyEeFKj/0yz7SXX4eqaCT/GCpHjjLhpwwYs4jhbjnx6YyteASI7x5Kvg== 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=D87HpbzrVclG4nPHaJtV1J3JEXB7yuPNF3NkZ9Km2wk=; b=MYE+3siBldm5+NGZhD49pTaxWJI/ZwuyA+fdG0LdeodcMwk2qnKZ+OPfPSJ5tcoMbApevF764DlO5EHb2mY2V4k3LjPZziMpHYfVHem2kNpLWQC5GP0NdEi5W/e7vMsBZwoaqbESlq5iwzkNcBucBSyeaUOz0ALDN7pMze438+kyI4YHWCBtaiOiM0jZpIQzMP/aztIKxfHUYaQRaaVfh4rlpKCHIIy6tEfeLPLVwJXYjTBQX8neLdvSUqh8Y1MGtkrZapQLzIvpVVa0vN6H7XMcZJRSYpjwgowB+q/23vdepnvymX7Cr0JT+WMx/FoZYk4y9sEo70XwTLHZod0POg== 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:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 22:12:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YvNpH9cjSSFPChMAt0cCEXBd5O7LJskTLSbLje9cL/c=] 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-7-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: 2c2f4ef4-ff0d-4746-8ed7-08dab3a0b6b8 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nnHDnbJ910YUAai4EXr732ZAE5assxEuU/fNPiASwg/xx3F3RNhA47Oa6sSG29r+1Rju1bJax69uSJaVn9VxcOHR9LnsLrnmGax+//1Fqh/evwwj2uAhPiGuGLke4tkipY7ws+QawDiH+Vo0qJUYoqajeD83Y9cF/cfqwVwvppZHaR/rltaua77NG2nuq+QkIt3HyR8NHZeLJAc6rWlu42zeXZO9r85RGv8zQLFj6OVE+nGhTy6fayFL/Id76jpOFsR5LKvHLuzmLX171oM3LGVGfgVF5EReA4Kea8KcdelT/z0gz2XDfti5xAwXPILZhpqT8PWs8S+2r47CFIiYbZtt8IyCCzO6wAIt/6/zlS17+E5ffxporERphIUZS1lDzrGQn1bLfv38tqFZwsmqLXycOTiRYzwEttIJVcTfvqsbtiY05FKn/2plmM0TJru0mm3uOmT54Dwuoi0gWlwBjegfM49s+XWQSiuAnCacpvV00d+PP3IAHCjW4RN2FWP/NCL4pY1wFkCUVSdcCyH+tn1+BNkr9L/+JC18UeWeSF08RvMjf/MOIoCAyI5J4RPz8UO9PZBrT8oMCeqsCr8Z7lV43PxY1rY3QJbIN+/36B3zeKsaqIlhmi7TCAmGPRR7WgrzzPWwFOj/fsiK7ivfqQHOGEENK0++PEBSE3j6ug2W8qSPSeAh6t+3Z0PducOUydnLDyOC8vJOQVhgtKwTkE0qhm3N/Vr+wlIHwnyyIPoTENIXT+P91tNPhKxUh/7AVLrcluxycvZMqsemmQ0uNH X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LEEgazYz1ldpIpIn+1SL8LD50ws70PeLaFMkrHfiVPhn3pgYCgjMrG8fGI5+4XrUvzeLU881MLwwp6yvwUNFpOw7lU5F4g1B4qC8co4iF0eCxeZw6LHQBaOTUhkr2httLGNLMEooY83c4bD08M4/jIBBvzQKmrluhvQdWH1boeakb2WUdv4F243eER5NX+xmOCW3Xp/WHxpf87U77ASiM951Mvq1kJvROPpfp5aexAeAxLJw/2xhD83+dtRZo/Bd3U9wku08U0isXd0uefp/5ptDHT4MrjtDXVLHeAoJeX5wBMRyBOqUxxiWtZOV/uPI84MOclgunYXdrsRFsSJmoHwfcbXS0V13oyful3zsZV2gyjVygEQqwpdSVdibPv4Cf51LwWPlyr92G/fZQJzOP7oFIZEfyUSZCuxF4lFxhDlaHP2ES0e09kFae28tITy88hl4PXGF/1oKItUjlg5AWQxyW6qUseIB+fag03LgNfee8pKHUgxEf1yhmEqlvjms0VbtBsSyARre//lr3svNmXR/s5IRaIa5S3l68VRoqJ3/qDBYEZrnW7peEDEoTlL9OSWxvwLV0x1EnMqaP4LbDxJZRSpnnZz7pY7gHYc9Xm6/+8uPFHy6ggI0nhKAiQU9Etpf4GTnSzH9YZ/ClGKNXbX3mjaW812J41YxhYF+QUU+MgI6Zpb7Dte7LIofkgEI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jZzavm30qqX1EXgv6/s7LLNDrbngAHggxo6+oKO0YzBu+QZk8NaslDQoThViRkXX9Fj3FYn0VVFfsMrSa+Sq86Az2Gviup6bxo8dZSGmp0WaY/XIaRDc7r33k0hwoFKF9p5ENulvSetJ0Yn00mJ7+HNmQUDDhcftBz3XJEsNMHvWX4sQ2GOADnyFuYSibnviF/hPEBk0AHOmwe3uwCcQfGbxZ4zudFuugsPphCEaoNcFq3dTMPxj25izeo+Sz8sIdD6SU1Cb/praQ28HdnAOlNthX4u6M0ux1l00tfY3pQJGJJd3+K/YoejCsgyjXVQ/1O2ct3AJEH1pVHARqbxFeR/rVxJZtus0iECxnBao77DMxbJPdjEPgMKkkYASOTDFobdliRzQgz2Qxe0SQK+9n/glFhX59dqvCN9itJxV/qhs/8IF/8MQzmepToXV1AXpV6Zi0v9E9z/RWaBlgYebzjEr3N4ru0O/NtI3xHYDPqfOajF1fbaSo9Y5Ey5BNKD4+d/3r9uc4ZGTYYNgcvdJkz9XeppzXnpHIFk+wyr8mkIdEbCXp9Lclhm4w9mAMOW8xdKRMkHgfLpNjNWMnpsbz9sV4FX6JrB38Fe6tZrhY7ScKlPQUmv9Q79WEHqv46N9NrbwooyReVhN4z0Ze3dPZ/LCMyihoMI15Soa8BZcfxCs3rfrf3b6zPdde2ospmWOy78ewP2cwfDwsyKezGPR0npYLHIfG8mplQXTJ6gTjD8mQI8QQ1xkBk65XA9n1kBB2d/UjMn5/1RfRN6TCUFBb7qPTFXLirrFJ0yBgONoZe5uPjQrgflYtInuXnQV2xkinyw+JKFAHbLOhSJalodacbNs18YMsudYNTFNXoPEYohWB4Rc3PhUAUeKPclQBYioyowrU18NFSO+NIdDzrCnN+EawAJozU5DRRDkE2s/WOuqlkhkgcabdvK3tKoLotWZ65OlgokXwbnDV1Ec7asJ0fNWpMBsLqwi12tUpiYVS/eJJxqKpnmojBwrifwWB1tu9S3Q7iFxL3ne5bo8etLuoccd3X9l6U/bFyqWt7+uIswshnBl+KWIQGcu/daZFV+GnafzlW/SzrnnZWQOTg8HR0WNWobfMeppe+L0JB6uCLtUW0pbZbG1g1OKq+44JFUjPg3pp+sN/WgR1l4t8MSI0m3WwSzmDeeWBQZTzaf6lBuUsssAn4yn+WpQs1K7gABugeuYS83m1kzTmcBCyHyiyBc1w7pDwqowS+jNWzkXPSdybVnDQN75PQ7aY9/npws2bZ/Nsswxy2wdlPpWnDlOq6N4PVKnldavt+wJ1JCr5vb9p5VYhG83EWM6XPZRYAb1 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c2f4ef4-ff0d-4746-8ed7-08dab3a0b6b8 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:27.0690 (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 08/24] avcodec/agm: 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: dzvEWvS2gL94 Namely ScanTable.permutated. Signed-off-by: Andreas Rheinhardt --- libavcodec/agm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 017aa0e1fa..374e4f4ef2 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -88,7 +88,7 @@ typedef struct AGMContext { int luma_quant_matrix[64]; int chroma_quant_matrix[64]; - ScanTable scantable; + uint8_t permutated_scantable[64]; DECLARE_ALIGNED(32, int16_t, block)[64]; int16_t *wblocks; @@ -195,7 +195,7 @@ static int read_code(GetBitContext *gb, int *oskip, int *level, int *map, int mo static int decode_intra_blocks(AGMContext *s, GetBitContext *gb, const int *quant_matrix, int *skip, int *dc_level) { - const uint8_t *scantable = s->scantable.permutated; + const uint8_t *scantable = s->permutated_scantable; int level, ret, map = 0; memset(s->wblocks, 0, s->wblocks_size); @@ -237,7 +237,7 @@ static int decode_inter_blocks(AGMContext *s, GetBitContext *gb, const int *quant_matrix, int *skip, int *map) { - const uint8_t *scantable = s->scantable.permutated; + const uint8_t *scantable = s->permutated_scantable; int level, ret; memset(s->wblocks, 0, s->wblocks_size); @@ -272,7 +272,7 @@ static int decode_inter_blocks(AGMContext *s, GetBitContext *gb, static int decode_intra_block(AGMContext *s, GetBitContext *gb, const int *quant_matrix, int *skip, int *dc_level) { - const uint8_t *scantable = s->scantable.permutated; + const uint8_t *scantable = s->permutated_scantable; const int offset = s->plus ? 0 : 1024; int16_t *block = s->block; int level, ret, map = 0; @@ -362,7 +362,7 @@ static int decode_inter_block(AGMContext *s, GetBitContext *gb, const int *quant_matrix, int *skip, int *map) { - const uint8_t *scantable = s->scantable.permutated; + const uint8_t *scantable = s->permutated_scantable; int16_t *block = s->block; int level, ret; @@ -1249,7 +1249,8 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->idct_algo = FF_IDCT_SIMPLE; ff_idctdsp_init(&s->idsp, avctx); - ff_init_scantable(s->idsp.idct_permutation, &s->scantable, ff_zigzag_direct); + ff_permute_scantable(s->permutated_scantable, ff_zigzag_direct, + s->idsp.idct_permutation); s->prev_frame = av_frame_alloc(); if (!s->prev_frame)