From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8AE4C4749E for ; Fri, 8 Sep 2023 09:19:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AD1868C7FE; Fri, 8 Sep 2023 12:19:44 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2074.outbound.protection.outlook.com [40.92.91.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CA8D68C75E for ; Fri, 8 Sep 2023 12:19:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dO7IAte3wNXNMoqcvwmeBslppzU0EGcxOSoigs3UYcBM/RP1RtWceGCAHMYXA7AoQ7OS86kDNNYJIDy88y4pcdKJbidVbiUEAcHP2LdrJbNKR1K/PcRQaC2QAvH+RFHw2Cq0xux7TIqARwThQKIlwOHc9zNAxwYm18iaf54SIH55WYS922+wPIa5Qh0FUxQ6XN8Atd7u5O7sNdRJ3AMXJHuRB5JVj5AVi/AaPJVjBJrGn0wMA8AgpZ+l+JfYlTNT67Q6ODB97yPyjm0/lrZU91pQr3BIA7t4HcNrLR0kE9Lwr41RZmLfH2Z4bKOhfvA+hXm2qiY2+KgYIBzx1m72pg== 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=T6tMorROE5nlcQfE5MVCBFbkzPRzw4XXLUYLD+TumZw=; b=EZaojDqO5a3jRg3DDeUN7mYyTpiSxkIfxevn6ma1F2B6WqZloIowrrSw7EsdMJN7BP2i51GJ4OtM6lVqHvAqsKaY9l83q5JlYIFFaSaH40ZRBVmz3jq7Upuq4GJo8Cjf06PrmWBSJtWyD1HLoFYWbsfwnPe8d62CIKweylmZZTpn8XsQHevzvwcnOsYmihDCRL3F/08R6+I8VvwDMUIWvHvSticfq87M3ka2xmV4AXPtzToD3ZL2Wl6OAqAmxfbrlRWfxse8GBf8xUzt0BQ4V4PBsK56QuiDB9AYTCm8r1rckI2r7Rhcji6iHa44oBbmiFCmN5pMY+7g9JR9XQXYNg== 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=T6tMorROE5nlcQfE5MVCBFbkzPRzw4XXLUYLD+TumZw=; b=MhLOB0QLXN9kEP/RWqQWcvv/6vZWfkwJW5cULDUtUheijksh6TYXxx6bd5Bwul1bXTMQL9a1P4t4J3IDTRVKXyFydOjvUa9VUsYtRwooHgsX19T/NHCrjrRZRI+lhM7lSLFAoynQSj/1aV9CD6z38FVU8Jb2oDjpyuQrHCFqnjcdD63YQmric60trhjPEz2mFRcd3l9fCCLtbpXlMYXALb+oVe9Tk/3E0ML/yDZJ1EVbJ18wj7f6YwKMBhx61ZxclTg5JTbitHVP6P9kLORIzheksavgOMbFIGDW5bHXpJp3uzr0uDoIr0fU0BgNvAPez6ZGl1e7fhwtR9fdZwXE7Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0350.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30; Fri, 8 Sep 2023 09:19:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Fri, 8 Sep 2023 09:19:34 +0000 Message-ID: Date: Fri, 8 Sep 2023 11:20:54 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230908081508.510-1-christophe.gisquet@gmail.com> <20230908081508.510-7-christophe.gisquet@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230908081508.510-7-christophe.gisquet@gmail.com> X-TMN: [+M9jNqmzs2wkDgj9JRwHo6x5lDK7I+JT] X-ClientProxiedBy: FR0P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0350:EE_ X-MS-Office365-Filtering-Correlation-Id: f5711c25-ed6b-4f14-19da-08dbb04cb790 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fDGAlZ4k8XZj/0M3Zjo1tAzx8HduGQSCwcj04GT1E2n5nKRG7zND3fT2vn8IycOe5TJ+zQ0nold+4kmoRvbgoAMht8Uji375JYTYJveas7/zQutnUmIBVM3onya92HPhoR60iq2/dRhGqM4rxeCVvK6YPNKPbPk4WgsSJaCGwDqDiWivkuqB3OJB8WN7YbAmlLZOeLIGx7x80BjicuFFczsX6H/9raYZhGZ54NiGAkouSTDshC9inMrx4wEEoZ9suRuwvIDHI3KyT3WzvWoATJf4/zV7IFVxzCrMSYgqU/MRr0GtBDVwoSV0k9Mt+uPq2HikzX83rc361eErObTEPdAEBh3ua3uKUMjjYdcGTF+hEkrid0Rl/7maRDZZX3g3FjfG1XytStGfNGDg+dbo+FdTz8fLFs4P3Ixcf4jZPpVh6O3xWCdSEXHzLILZkqHIgCkhr8schToOx24gRWk+r212gCoQAYmtGKPx2U3DXDClETjwvNFhhriXTSOJwk8vguYZn02dVpQNnBEP00nTz2/21O9LTeByfkPTrP2fudtr+PWkePz4QkM1lsw9FpW6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SzI1cTZkWkk3cmNMQm5DMFJ3bmt6RWQrV002RWVPYlkxdkhySVI0WUM3Q2d0?= =?utf-8?B?K01WbXVrY0E1dXZXNVVKZUgvVkVyMkhSNnE2MTFtdWhVWlZIOTQ4L3c5akZL?= =?utf-8?B?TEFNUGwzRG5zMFhxYUJlWWVlbHBwTnZxamFEa2F0TEVzWk10NjM5T05lbnZF?= =?utf-8?B?Vjc2cFlrd2ExUzBadjJmMzJ6dDNwckQxcnBPNzB5ZkU5Ym9iaVlQd0x6d2xo?= =?utf-8?B?RXJyY1pMZDRnbGhOTnR4a3d0eWNtUGUzaWN0RVhaTllRbjhlSmxSbWlIOWhT?= =?utf-8?B?WVFVVWJleHJkS2gzOEJpbDRaekZydlV1anV6dDlSczh4L2xmOUhOOGltMkcx?= =?utf-8?B?RFJINml2cE5EbGF2YXAvbHh5TWxaSGFsRFhZWlAzVkpZZFBDYUVML0xCRmtm?= =?utf-8?B?bWRkTkViaW96L282anlvTllVUythbWYzZUFCTk94d0t4YUExRU41L0xFUDB2?= =?utf-8?B?ZjVRSzdxeWYwUWJOVkxhUmMrb3dsVnlXQ00zNkZjS0cxMjFpM3JCTmJHVERo?= =?utf-8?B?Z1JTSTBLc3hFekZKNGQzY2dYWmdpU3NmUEMvcVZmUVp2ZXN0VFp1cStITW9a?= =?utf-8?B?TTBDOWJnYXF0V3gxMElnTzdEQXRxL3BKQWR4aG9WTVZMTnNHc2dTZjJBUWdQ?= =?utf-8?B?MElzOEE4a2FPVGVsMjVkdWpvVnkvd3ZhUnJOQXpVZUFtSk82MEJXSWF2TFVI?= =?utf-8?B?eGhlSng3amJzaUhEVWcrV1RtTXRDdHVIbEljc1VObTMrS2Q3SDg0TXN6d1Vv?= =?utf-8?B?UVZEdmp1eG5GdWVieWdWOUp6QUptRmgvZWcrVUtyRkJmRTNhREhKNFhzOHJh?= =?utf-8?B?TEdla3MzTE4zQm85UWFORkJHMmxzWEswenNtNWVWYzJyZlR5TWxoTlhiV2VX?= =?utf-8?B?cDA5NGNkdDFrdG5ZeHhmZnJiNldCOG5HS3VCN1ZZUUJ5eUlhdGRGVHJVaEVx?= =?utf-8?B?WUpneExTbFBUME95VHlQSHdVM1BWd1NsNktFZXFlditKRis3VmhMSVFDU2VD?= =?utf-8?B?SjVuRjJHbThKaWVZU2V5eEcrb2xQSmpZakxUSE5ibmlCQVlSV1NDNE13Y3ZY?= =?utf-8?B?b1hhQWh3NmFuR2JnYVBXajMxUElrekt4VGxpblp4NndKYXZNV21nYUZvdzMy?= =?utf-8?B?enNpcGZDdW9palFSdlJjN0lMdmlxZ0M3TWRja2FRbGpqSnR1d0ZteWcvYVV6?= =?utf-8?B?eWwvZ1U4TTdxTytsVmxNS2hrWldCNlA1Nk9xQW5PSmYrV2JPWVlZV3NqaHht?= =?utf-8?B?VWRENHRlWjloZExFbStFSzk5R1JFMU5OMjExQ3NKckJVcmhVU0VIaFVRUExE?= =?utf-8?B?dVlEWElDU0pDZEdZVUZzcWZkWmNRRUpRQUNEYTI0aDlEZWk3UkxvNGo2NGdL?= =?utf-8?B?c1F4OEFwMUQ1Y1RzYTdET1czYytNRHFNK2tucDRpZDFmMVM3d0tKM2swNmJ1?= =?utf-8?B?a01qRzdGS1o2SjJGVitZTHExazJFeXp1TXRxMGNkamt1RFpQdWNaM24wUkFT?= =?utf-8?B?WGNQSXp2dk01aHVzK2xaU2NNc1hIWGFYai8zanRlMTNYdUJoMDExTnhpVFZ4?= =?utf-8?B?dnpmWXcxUDdHemp1cWlkdXd2My9TOUZpYjQrK1JxSWY1eTZsZGpmMU5xd0RT?= =?utf-8?B?V0VpbTIvaFFobVhBNm50NjkvWnNpUkU3SWJ6ZFN6M3Y5Q2dJVno0UWhDVUdk?= =?utf-8?Q?z+Ke1P+RaEbwGhTy5T0j?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5711c25-ed6b-4f14-19da-08dbb04cb790 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2023 09:19:34.9146 (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: DU2P250MB0350 Subject: Re: [FFmpeg-devel] [PATCH 7/7] prores: use VLC LUTs 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Christophe Gisquet: > One indirection less, around 1% speedup. > --- > libavcodec/proresdec2.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c > index b20021c622..85f81d92d3 100644 > --- a/libavcodec/proresdec2.c > +++ b/libavcodec/proresdec2.c > @@ -561,12 +561,18 @@ static av_always_inline int decode_dc_coeffs(GetBitContext *gb, int16_t *out, > prev_dc += (((code + 1) >> 1) ^ sign) - sign; > out[0] = prev_dc; > } > - return 0; > + return 0; You are adding trailing whitespace. > } > > +#include "libavutil/timer.h" You really need to look over your patches once more before you send them. Both of these changes are obviously not ok to commit. > + > + > static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContext *gb, > int16_t *out, int blocks_per_slice) > { > + static VLC* lvl_vlc[9] = { &ac_vlc[0], &ac_vlc[1], &ac_vlc[2], &ac_vlc[3], &ac_vlc[0], &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], }; > + static VLC* run_vlc[15] = { &ac_vlc[3], &ac_vlc[3], &ac_vlc[2], &ac_vlc[2], &ac_vlc[0], &ac_vlc[5], &ac_vlc[5], &ac_vlc[5], &ac_vlc[5], > + &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], &ac_vlc[4], }; This still incurs an unnecessary indirection. The LUT should not point to the VLC's, but rather to the VLC tables (as this is the only thing needed from them lateron given that the number of bits is a compile-time constant. The LUT should be initialized when the VLCs are initialized. In fact, this is so common that I always pondered adding an explicit function for it. Will probably do so soon. (Apart from that: This could be "static const VLC *const run_vlc[15]".) > const ProresContext *ctx = avctx->priv_data; > int block_mask, sign; > unsigned pos, run, level; > @@ -585,9 +591,7 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex > break; > > if (run < 15) { > - static const uint8_t ctx_to_tbl[] = { 3, 3, 2, 2, 0, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4 }; > - const VLC* tbl = ac_vlc + ctx_to_tbl[run]; > - run = get_vlc2(gb, tbl->table, PRORES_LEV_BITS, 3); > + run = get_vlc2(gb, run_vlc[run]->table, PRORES_LEV_BITS, 3); > } else { > unsigned int bits = 21 - 2*av_log2(show_bits(gb, 10)); > run = READ_BITS(gb, bits) - 4; // up to 17 bits > @@ -599,9 +603,7 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex > } > > if (level < 9) { > - static const uint8_t ctx_to_tbl[] = { 0, 1, 2, 3, 0, 4, 4, 4, 4 }; > - const VLC* tbl = ac_vlc + ctx_to_tbl[level]; > - level = 1+get_vlc2(gb, tbl->table, PRORES_LEV_BITS, 3); > + level = 1+get_vlc2(gb, lvl_vlc[level]->table, PRORES_LEV_BITS, 3); Seems like these VLCs should be offset by 1 to avoid the "1+". > } else { > unsigned int bits = 25 - 2*av_log2(show_bits(gb, 12)); > level = READ_BITS(gb, bits) - 4 + 1; // up to 21 bits _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".