From patchwork Thu Oct 20 08:45:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp45955pzb; Thu, 20 Oct 2022 01:47:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6zJAWzBv5KZxAQhLfmfZiApjlcGLvl6PagWp/e21SfurCVofPZPH6jCWKmo9RoPNPR98OB X-Received: by 2002:a17:907:6e0e:b0:78e:1385:c06 with SMTP id sd14-20020a1709076e0e00b0078e13850c06mr10297652ejc.485.1666255650334; Thu, 20 Oct 2022 01:47:30 -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 ht15-20020a170907608f00b00781599eb7dbsi17103017ejc.573.2022.10.20.01.47.29; Thu, 20 Oct 2022 01:47:30 -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=rYKPyYzG; 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 51DE468BE82; Thu, 20 Oct 2022 11:46:44 +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-am6eur05olkn2088.outbound.protection.outlook.com [40.92.91.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43FD668BE82 for ; Thu, 20 Oct 2022 11:46:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HlkHYVzOQv2YZu5q1uK6A6jfQlSax4MP/5WuG+BZ8OUZVgK5JWG5VDXKuXOTV+jr42zo6nYxUF5k0H+oFD056ez1s7hC/jbx1YaU9RvKXIBA9dljGK84U+Oz5ej4s4XwPXL5Pm17v++vBOMeVPue+tFSyB+COqoUhgxAp7zovW+JflxSNPskde1qTaoKm6YJogYodTERDf8Gh7YW4L4GvZGrE9qYCq/qVU0vH9dlApH0sYAzQ1RmquqtOapw6L2KB58t+UUodEMLgpcQisLwL1HU1qZ4/oQH0xU2qaiRzXEdWnWgfiuH8ZHf7XhvVD+eK/kOl/zyP3wI2v8a/ofK6Q== 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=k0RMbnYFRHFnaZqqhg/GedqjRdexvc6Ox3BvCbCL82I=; b=PEC6l08/T1Y3oEw8Jpaxlja+P1+E9/dlomxgw9dTGqzoear9mPfaQWyHMPWwT/PUCA5QJ+jMwISgQAz8WhKkCq2G5fOJqQ+CoQitCq8DOrDRSOHCae5nO8NlGWX0G1ZoJ9+pjaQQypG3Mnokfl3C92vF0p7BKlW/pJxnLngAR0g2Gz+/Lh3yP4V+Iz/AsKrHNrDnRNWoIBCJTQs+MA1mPU3b2muu24dpkDayw64D5RBIwONetP7eS8zYSx/f9PXVcOhIAyEtJA2V8rGRVbAa39K/1YOlJY1nsljhRxWFD23HuJTO7y4Ru9UyU80YgpkwXl+6O2bhrFBaY9dQ6BuvZA== 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=k0RMbnYFRHFnaZqqhg/GedqjRdexvc6Ox3BvCbCL82I=; b=rYKPyYzGGVFtGB8MP2tAIP/2W+8u6ReR06vMLDNoKDuKIhSWrPHtl1kxyTQWRfIB5/VNjtEHuE+FrrxREgUOeiqhX05qq+kBnHOwVn+BwMbyzrSzlj+tgsmTw+KxMW4qkM9VEaiqhZ4LBjcwnMLUlp/tTnAwBd78/ikKeNVElm9K8by9FNtOAtXuPiM50bVQzI8q53N5drENSFg4wN4EhbUvxXMZ6CeeoOnD3skw9RLsbowPyO9OuBjL8luQBoDE25k5OAeKuCs411/MPhAN9+cy1ja3JX4Wuu/jayiN8ycVdCw3qt8+kTEJp7Q1Fl9PmwrfDHz6kG41LfTFZLDsuQ== 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:40 +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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7eVjc+pdTDQ3zseAgKV6WkiIFDvGJo+/GwYDh4AtfZQ=] 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-12-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: f1381e00-3d64-49b9-d393-08dab2779b75 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyDv2LNnQUxpADcJjPAOPhz3KWX2n/gpBxHfUZndz0iLoqTsJje2pL0dEhi7wyBa1GFWumM8Pr0WIU6D9bKbJEJxZEQW/kEwGFWnsvBUYZFY6cAnE5/vL9WqJJ593GKfwwAuMdia65Hft4ZPbbi7DjrrEQ11qysPJqrXMDf7w8Hs0dB0h2mU+bTPHhAzNA/djRLmgwbvEw6H+pqQxg+nmABYI2EYQldQyTttXLdNB0+p6Ui/NV0HOV0oLZmhjbc002ZznUQxQZJ2m0YsrhA388nARVLzW7CGjUkrhWyvlb5ebvCYZ1AG3IOPH+NIiw0IeiXaAIWLqQ5YmN6l/y3bCubG92HZzXb/DutMjIJ14TiPKEGxRqjnHkniDdiIGLT1qGKFcLkf4ZcByCf4V9bwMwVjMts+DCmPOfE+O11jxVjZaUTEXh5kFeHoSov4iHG+LO3NnpG0MzobyKlokE6+TJJo0ehqs1e4Yc2Dbs2xVJpWh5D3pYblY/GqXwiuzXkdnQVYRidumQF3C8jYiV6WXWcgflIsrPxZvryA44573OgCcUD4zPL10wAbpqW+s/XhxI5O34x/tokt15wB0FvDRAfdZRhbXUWAjBJDm3f4ZFNJ60V5ylUGmlCj3Pn4ircuQxDYbC0JPK8OwOvxzLM0QvkYcQz2hTMOryEQSPs+fq+BM4nQ7iwXCBkCVL5ghxcXXu2zV8A4jIwl7XFqsxKhvjv9SeoTify+CA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rbQk9bSS7baovPvbRh0ccclQlqN8ndcFUAT4rjcvMpK2h5PLB8puyaM3fui6I+z7yQ4ZysnyatrDwNgPIPEYVT0EpD7EBSA4YIQur5e17JrA1IoLf4C2cjeC6GJL1zIo/DFeI21zfJAHyzXuXHLISrxqyHVy9pX9E7XxQaqE5MXvKECYoEeiklOA+BXsMZHvhdQUYK5DDLgBsa/EZY481+05L0tgx0rMfBhzJe9/drevhqVuXssJuJpq46N4yxqmOYzCkKXzw4hT5V50dxYgHlefqfCuSWTAnLkhdTBQeXD+Zw2zFsYFiLzPd9E7ZglMvkHj/f2irCv6+QLzP9a2QcrFA8om/Vse1EddsWofb4pYoNqrcZEnkurrTbs++Ndksm7zCuGA33PfcKvAr/iVmEJefdtx1x/drg0hAdx+zQGe55rYktvUiptlvAaLZYwJf41aUW5WpF/yNh0/lQmUZgpG8sB9AfEHv642ppcsVajuyJer+rG4erJ9ySO4XsSX0hqQOpA033j2fJWhXYOZm+P8v4m4vQnjtZQeB8eclkFuiGGivSziV7SsZbg80r0MKcW/a/wl8jfLV0S6D1qRkIHcJtGp0xnklJw0aCVjfj4MaAHLcqZXWcj5xNRJ+3yl6mD1sAVbPKkfqrE+pDx0DI0QwBfkWeFyIUvPbfJlFH1nJ13LjbfgklLv58En8AnF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jlr8wf+cZcg9N5tInjssVyh8vrH7556qCvCD1IEUTXTMKnDCVkAXWu6wbPWKw7tGV7hdjDV5joi+UjfxZ2uJ8SM4ZrbcBgFoGn5An3JATcdoA7u5zP/z71ima+EM2Ktiu/OZACT39alxFxALWk7peOutpvZCMvcex9zpEDfB43IvBbsT995ECsKlTKH9Wfge/URptpjj2MDwjtH/n/bj2zHH+cgtbo3vEHT/XO6HOUDa2Ve8IJ1CxMWIkxjlf6Pm3ReqspklOBZuoMNOJm1PdeWlqfU1veHupE6HrsRAWmeH7jQk1KmnJnzFleq9//H36efAbyss2Llp0VMg+2VwefZR/LgPF+0uc9uXMpAy/3IHzs+J0txOHMs4Xs1Qr6vW9aI7zTDE92HJD7ds06KmOfihuhDXgLn0x4FQTqV+1H90FBN7787OnZCW4ZiCpFKsI25xnTdUER24BbokVLBo2q8k/tmkkg5XHN+LEG8sUBj85Jg0YOJHH1rbv9bP0DjXOvsEQbyPuvjxG1R2143kxsRGDUyF2Har27bW+uZdPu0Qr23qOFfnx+T8V8pItxHDZLfH74ZHz1UapTZSBPiHzgLehl4JEwaQ7otDIwbc2p2CfPBZye4l0nLcbS4W4BbTWboVB4QIkkGoK2WLNkqrg6QwlqmEW0v3zOWz5yfmYTi5NyfMTLAoM7wWc6zJGQ9kLsNuTsTtiCFAclcg+TL0L9PaLF2DOHhUj/PzQHqjZ/hJphMzySWsQZv8/DdpM+Vx+B9Reg8GvcOQpDhYDgoQgUq/WdnVPRfGztlHXkTmXWLfH/JYpzxgYCWofbJ9BX7FFKk95ODsGeLTUxONyLt0tQHP0Qv1VmbRnxFDyUANUwGr4pvZWoDFZNo1Brk0wT7jeNWvL5vJhMLe35r6TJu++QidpqEHa8GRbY3PYNuAR3d1iziZXKR+r8YOal8K0oXGhecT5OWSso1DeX8NvPQBLju1j3t2CKLNTAMP23v9Cl/OrqNcuWYMKN4fZv6VD3w4HCcN8csUA/DT2PX2aSTTT0Fe1xpM8t3YzW/eiRqW5DMuM1+QVxmtiyxa5ps57apOKHrxKqvWYTWZS7hZKWHMcD5meSqmeayJE4nZ+yzbXjPXM7uGxOa3WIz95RV4h5P25ChOtPIxSqBfVoVn8rkB3yR3saq1/y7c2MfRzHu+OA4o12V9AagjKjbmTV9VCgjw+b2QnbDWIKAg73kbgA6NHpyb/JMpR+wHA0rhWMhOVscJKpIKX09To1gSUYQAf19hzSdWgit4qcl/krhhPT89qf/D6HcoQzWFX3f4JrsnR/yIO1gCwaKKzuyRi3Wsb6Xn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1381e00-3d64-49b9-d393-08dab2779b75 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:40.7107 (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 13/22] avcodec/g2meet: Pre-permute quantization tables 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: vm+Zx12r8Wtv Allows to avoid a permutation lateron. Signed-off-by: Andreas Rheinhardt --- libavcodec/g2meet.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 7c1f8325c4..db427322cd 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -59,22 +59,23 @@ enum Compression { COMPR_KEMPF_J_B, }; +/* These tables are already permuted according to ff_zigzag_direct */ static const uint8_t luma_quant[64] = { - 8, 6, 5, 8, 12, 20, 26, 31, - 6, 6, 7, 10, 13, 29, 30, 28, - 7, 7, 8, 12, 20, 29, 35, 28, - 7, 9, 11, 15, 26, 44, 40, 31, - 9, 11, 19, 28, 34, 55, 52, 39, - 12, 18, 28, 32, 41, 52, 57, 46, - 25, 32, 39, 44, 52, 61, 60, 51, - 36, 46, 48, 49, 56, 50, 52, 50 + 8, 6, 6, 7, 6, 5, 8, 7, + 7, 7, 9, 9, 8, 10, 12, 20, + 13, 12, 11, 11, 12, 25, 18, 19, + 15, 20, 29, 26, 31, 30, 29, 26, + 28, 28, 32, 36, 46, 39, 32, 34, + 44, 35, 28, 28, 40, 55, 41, 44, + 48, 49, 52, 52, 52, 31, 39, 57, + 61, 56, 50, 60, 46, 51, 52, 50, }; static const uint8_t chroma_quant[64] = { - 9, 9, 12, 24, 50, 50, 50, 50, - 9, 11, 13, 33, 50, 50, 50, 50, - 12, 13, 28, 50, 50, 50, 50, 50, - 24, 33, 50, 50, 50, 50, 50, 50, + 9, 9, 9, 12, 11, 12, 24, 13, + 13, 24, 50, 33, 28, 33, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, @@ -250,7 +251,7 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb, int nbits = val; val = get_xbits(gb, nbits); - val *= qmat[ff_zigzag_direct[pos]]; + val *= qmat[pos]; block[c->scantable[pos]] = val; } }