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 4CB16474A4 for ; Fri, 8 Sep 2023 08:43:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 318AF68C865; Fri, 8 Sep 2023 11:43:30 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2107.outbound.protection.outlook.com [40.92.89.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4557368022B for ; Fri, 8 Sep 2023 11:43:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q9OYBqTbiyD4dEyiunJ0Uw5lXOVWvChhe8k0fFAMMFCD5hrZEQcbR0ZZD4YH52tL6mnVzA8SAhwZnGm8tVehHhPjXE56bX+UAN2xIAwDJynTb8G8CPUOqjC4LHvtVpbWHqkMWQTJdNU365zVrAAv+UY0wAHQS39oPgtEKwpZ/2Mnppa3riJ/3pIeXPLQF4BBUB6EjSJdWU6qlNv/B0PMET1aAyHzftXveYliZl0DmOktDEVFy25d9s+bOmMOz+6lnM3S2ExogUmXOulcXNHicdwSexDcHqep1X5SUcZN6jBjzkRLmT+xP0ryzFgVadmi6dEpbu8rakRo9Lo0AjHGEQ== 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=33ro2md+Cx/ki7fsYHWoy0jbiIat8WXFV/oBmyQuano=; b=YKQESwkqxxRSSzJ5hD0Q35nGSHIEzzjaQevBbAkFN9evHVZORXD8+KVl2JKa7/Xkl2SmkD3CYOqFSAvKPfZ+0E6i1GWS5nntQ8xK2nOIUVYKDr5/dFuGW15IyIVcQCXSk5IUCIcCuzGN3HrSHm/NMk2XRHev6qckNek0yL4e4yfaJ2qrBYUG/Mc7Q/zG2k26O/e9wcyeWdhkPWgc99SkY7NLAOk+Gk6uKrph7MNqr9kr+lBingdDhfNUulVWzAdHc/+uzvXHDMaS977Vvn+OZlBdUTuv82gAJozP2WsxjyzU+oAc2sFV3ip5mLNmkQHBq8ab9FjuPFUi97kK7iHk0Q== 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=33ro2md+Cx/ki7fsYHWoy0jbiIat8WXFV/oBmyQuano=; b=dVkj5URkGWV+vZQ/a4+kQ1dP8LHKadjfIOqe+sKq6qlpaQZcimykvf5LqZViuoWwlErKghmIktbuMqlvJlq8Q2rYXaNFIhTHvC+DVDijZ4+N2nzJOxsvYVMswxh4iyVbHidGz0P5gR+ZBQ9i5ALFI2JrE9ej4ncGYmBYW66ZNpJtrIgMl1oYb4kLmKiKWczEsFJI23UnqmsMJsrGyh/rphtbOr3TliXYoInEhGwMeVo7vG5nuoAk0aPFDZL3Nmsw2sk/LEnfgYweNI57F4nm6HCjAFOs12XNFXSgbt/lnTFDKdxDfajvORIcyn5FZ4/KXYFxlfur0ktouhfutmJ25g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) 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 08:43:20 +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 08:43:19 +0000 Message-ID: Date: Fri, 8 Sep 2023 10:44:38 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230908081508.510-1-christophe.gisquet@gmail.com> <20230908081508.510-3-christophe.gisquet@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230908081508.510-3-christophe.gisquet@gmail.com> X-TMN: [mG3gZpEDhqwZ1mOaKLwkeUsczX+6P2IU] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <43c7039f-b49a-df6e-81a5-abcea6bf87b8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ea203b1-c6d5-4423-01ce-08dbb047a729 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0CcFYikxGfnhXuxfOlQCz0AQxZ4L7J7CXXCoq4xS7U6uSjTTCHVeNjV+hsC+0HcHxDanL9dJI9zGOiY+r3evi9GZLYKeo6t2LOBlnORfsrA3u8qNReKuBwdKZwigkBhayyJCO+PGlDD/OZ6T0nm+4Z0NtfItwkcKc0eIqxf5iVVeKfo9KPHRrJ1JPvyUdEwzTDZk+E42ibuhOGLmbgDkULwBu2RRN85bdJqUZLMuak9KjQ0O63pL010BWenNEDjkdBe3DQwe8q3tkjaUVCVGXgP/t2QygNGJhiBRMRuUYc/aK8KYuH9uXdZ/ZCN2JIxz9/isuJWgo7HN4q64GnFcxw/Mg88go25Nt6gpdabGx7G6BH7Kx9ie3LRJNqZvP6rPO5VxbZzX+CIiJQU5EHcXu6XlZsv1LwQtE8Ck1LsxUEYF/RTDM2HuWY2+2S0qkqNqOaNqMKHDcqJl0NJaiN9raOi2nm4loCpwlg4UNpS6B9ECHCnC6z/dv5rtVT0U0ig2IOM63LURiOE0KnVn8CCcbeZkR83MFmEcCk46XBz2iEorfbh4Id37QWaTDX6T3Jv/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NEhSUDNnbWg4ZU1Pblh4VTdZS3BCelBIeXJXajU1dVBpWFp6bEJIZXQ0ODBs?= =?utf-8?B?ano1U3phMnErZysrZWRpZlhLZXRxNCtyVUYrVE8ydHpRZFZmMWZhV2s0dFQw?= =?utf-8?B?QU1HRzlaVi9TWHlKcGtZanpyS2U5dmZXTE9Lc1JoZVdlTGpUWm4xOWhqb0RC?= =?utf-8?B?V2NCSWRVWGEyeTdrUVVIenNPZm9zTjVTSVgyeHI5QVJsT2VvOGxzQ3Y0V0p4?= =?utf-8?B?Wm9aRUpKSTYzOE9Nd0FEYTBlcVlEQ0R2Vk5ubFRtdmw2eWFObVN5Zm9WY2FH?= =?utf-8?B?ckJubHJvaVZlVFJuVm41TW9lVUJ6VklYWTJMUk9QaS9ucXBMaS85SmxhWDFY?= =?utf-8?B?NXQ4WGcwMjVEdHdRMHUrY1VobGVGakVFSVA2WUhPa2w4REE1cWdXazkvUEpl?= =?utf-8?B?K0IvQ0xaMytDaHZFNHRIS29QR215QzlSUzBnZ0N5Yll4UDFQamt4aFVnOEY5?= =?utf-8?B?VHRORFlNcjRxV0lwRjMvWkFhZmJ4d3JFbUtncjZjZm8yMG9CMFY1eHFGMHFO?= =?utf-8?B?SmZ5bEpmbWZ0UnRMYjVuS2Jodk9FdEhKSWEvYUhEenNLa1RWWkVYVXI1Qkhr?= =?utf-8?B?bW5DMXdOZGk3VnFBeUZOUjdaY3BoTGxna3YvZnBWamtPbmk5TVp1RSswWEF6?= =?utf-8?B?OU9lNSs3K0lvelM5cThVSzNuMUhEanpINVJ3RW5QbE5ra0tDRHBKYUE3Y01x?= =?utf-8?B?TGR0S1B3MEZWOTVUSTF5UmF1VGRrNzNmN2hxd0VlZHhIUHBNNnZxTktVMFYz?= =?utf-8?B?OWQyUm9HbkNQbVhzWTZObW9pTVpncVdicXZRS2hqUXhNekdOZklzeUI4SE5C?= =?utf-8?B?NW9qWW1BYWhGYk01akpyNC8vR0RpbXk2ZXdONFBSZVppYjBMR3VJVUlHWlVm?= =?utf-8?B?SmgzMFZMUW1FZm5jbG1QZEZWa1FUY3VUYjZZL3U0RHZ5NEd1MlljakdjUzFh?= =?utf-8?B?N2p1YUI5OWZhSCtVMi8rQUFyY3ZXK0ZjL05qKzVnek1YamwyVFRzM1RqNEpI?= =?utf-8?B?QSs2dGY2NkhGYUo4V1hublFmQWJCMlplOTRUTmpwUnJoMGJlY3oyZGllTUhG?= =?utf-8?B?b2t0cXF6VmNCWXNqekc1MHVua2pyVUw2ZzlRWjZneU83YTNlM2RsdEV5eHNo?= =?utf-8?B?UVhCOHpVNXBTSkg4cDdzMVlKTmFSdEVCdDNkYUs5YjdoV3FjVzhWeCtwK3dK?= =?utf-8?B?cHU3bWpsSjd2cHRMY2JheGVOUHZDY0VvSWMxQ2ZJTldvajdLb1FpQ1UwaEVN?= =?utf-8?B?d0VrbzRsNi9taWdBYTJuRk4yUlRLaG11ZmovTVU2K0llUUZKcjR0TFlvdEVC?= =?utf-8?B?L01vbnZxR05zUVlsZlZteC9mNExoUytuaHlvZjJ4eFE0WFRidEx5bnhGaXFL?= =?utf-8?B?clhFUkltVUZPMTV5MkRSbFY2bkNPUGVFVGN2ZnRqTzhLUkhjdmd6SjRRak1R?= =?utf-8?B?QXNMd1doSTZ5dE9qdTBUTU9CZlhaMi8rNHRwaThTNm1UTWh1UERtN0xnTEFm?= =?utf-8?B?cTludWc4MURDSlY4S2JEaFNlMFFxTUpCdVB3U3B3Tnh4b0tSYWJnaXlycTRz?= =?utf-8?B?VHpJdVVvdDgwZHpNTC9UaWpJaXMxaHR1VEZKTjZJbWsrRVNLenFFWE0vWVhr?= =?utf-8?B?UCt2RFBhSlBjWGN3T241SmUzS09WQStEckxGUHczQURUbnZlbmJNaWtuMlJX?= =?utf-8?Q?qRwIIFMrCB5RgM2+gsfm?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ea203b1-c6d5-4423-01ce-08dbb047a729 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2023 08:43:19.9243 (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: PAXP250MB0422 Subject: Re: [FFmpeg-devel] [PATCH 3/7] proresdec2: use VLC for level instead of EC switch 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: > x86/x64: 61/52 -> 55/46 > Around 7-10% speedup. > > Run and DC do not lend themselves to such changes, likely because > their distribution is less skewed, and need larger average vlc read > iterations. > --- > libavcodec/proresdec.h | 1 + > libavcodec/proresdec2.c | 77 ++++++++++++++++++++++++++++++++++------- > 2 files changed, 66 insertions(+), 12 deletions(-) > > diff --git a/libavcodec/proresdec.h b/libavcodec/proresdec.h > index 1e48752e6f..7ebacaeb21 100644 > --- a/libavcodec/proresdec.h > +++ b/libavcodec/proresdec.h > @@ -22,6 +22,7 @@ > #ifndef AVCODEC_PRORESDEC_H > #define AVCODEC_PRORESDEC_H > > +#define CACHED_BITSTREAM_READER 1 This should be in the commit switching to the cached bitstream reader. > #include "get_bits.h" > #include "blockdsp.h" > #include "proresdsp.h" > diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c > index 65e8b01755..91c689d9ef 100644 > --- a/libavcodec/proresdec2.c > +++ b/libavcodec/proresdec2.c > @@ -24,17 +24,17 @@ > * Known FOURCCs: 'apch' (HQ), 'apcn' (SD), 'apcs' (LT), 'apco' (Proxy), 'ap4h' (4444), 'ap4x' (4444 XQ) > */ > > -#define CACHED_BITSTREAM_READER 1 > +//#define DEBUG > > #include "config_components.h" > > #include "libavutil/internal.h" > #include "libavutil/mem_internal.h" > +#include "libavutil/thread.h" > > #include "avcodec.h" > #include "codec_internal.h" > #include "decode.h" > -#include "get_bits.h" > #include "hwaccel_internal.h" > #include "hwconfig.h" > #include "idctdsp.h" > @@ -129,8 +129,64 @@ static void unpack_alpha_12(GetBitContext *gb, uint16_t *dst, int num_coeffs, > } > } > > +#define AC_BITS 12 > +#define PRORES_LEV_BITS 9 > + > +static const uint8_t ac_info[] = { 0x04, 0x0A, 0x05, 0x06, 0x28, 0x4C }; > +static VLC ac_vlc[6]; > + > +static av_cold void init_vlcs(void) > +{ > + int i; > + for (i = 0; i < sizeof(ac_info); i++) { FF_ARRAY_ELEMS() is cleaner; also we support and prefer declarations inside for-loops: for (int i = 0; > + uint32_t ac_codes[1< + uint8_t ac_bits[1< + unsigned int rice_order, exp_order, switch_bits, switch_val; > + int ac, max_bits = 0, codebook = ac_info[i]; > + > + /* number of prefix bits to switch between Rice and expGolomb */ > + switch_bits = (codebook & 3); > + rice_order = codebook >> 5; /* rice code order */ > + exp_order = (codebook >> 2) & 7; /* exp golomb code order */ > + > + switch_val = (switch_bits+1) << rice_order; > + > + // Values are actually transformed, but this is more a wrapping > + for (ac = 0; ac <1< + int exponent, bits, val = ac; > + unsigned int code; > + > + if (val >= switch_val) { > + val += (1 << exp_order) - switch_val; > + exponent = av_log2(val); > + bits = exponent+1+switch_bits-exp_order/*0*/ + exponent+1/*val*/; > + code = val; > + } else if (rice_order) { > + bits = (val >> rice_order)/*0*/ + 1/*1*/ + rice_order/*val*/; > + code = (1 << rice_order) | val; > + } else { > + bits = val/*0*/ + 1/*1*/; > + code = 1; > + } > + if (bits > max_bits) max_bits = bits; > + ac_bits [ac] = bits; > + ac_codes[ac] = code; > + } > + > + ff_free_vlc(ac_vlc+i); This is unnecessary, as the VLC is initially blank and is not initialized multiple times. > + > + if (init_vlc(ac_vlc+i, PRORES_LEV_BITS, 1< + ac_bits, 1, 1, ac_codes, 4, 4, 0) < 0) { > + av_log(NULL, AV_LOG_ERROR, "Error for %d(0x%02X), max bits %d\n", > + i, codebook, max_bits); > + break; //return AVERROR_BUG; This is not how you initialize a static table (you miss the INIT_VLC_USE_NEW_STATIC flag and don't set the static store buffer). Search for INIT_VLC_STATIC_OVERLONG for an idea of how to do it. > + } > + } > +} > + > static av_cold int decode_init(AVCodecContext *avctx) > { > + static AVOnce init_static_once = AV_ONCE_INIT; > int ret = 0; > ProresContext *ctx = avctx->priv_data; > uint8_t idct_permutation[64]; > @@ -184,6 +240,9 @@ static av_cold int decode_init(AVCodecContext *avctx) > > ctx->pix_fmt = AV_PIX_FMT_NONE; > > + // init dc_tables > + ff_thread_once(&init_static_once, init_vlcs); > + > if (avctx->bits_per_raw_sample == 10){ > ctx->unpack_alpha = unpack_alpha_10; > } else if (avctx->bits_per_raw_sample == 12){ > @@ -510,7 +569,7 @@ static av_always_inline int decode_dc_coeffs(GetBitContext *gb, int16_t *out, > return 0; > } > > -// adaptive codebook switching lut according to previous run/level values > +// adaptive codebook switching lut according to previous run values > static const char run_to_cb[16][4] = { > { 2, 0, -1, 1 }, { 2, 0, -1, 1 }, { 1, 0, 0, 0 }, { 1, 0, 0, 0 }, { 0, 0, 1, -1 }, > { 1, 1, 1, 0 }, { 1, 1, 1, 0 }, { 1, 1, 1, 0 }, { 1, 1, 1, 0 }, > @@ -518,12 +577,6 @@ static const char run_to_cb[16][4] = { > { 0, 2, 3, -4 } > }; > > -static const char lev_to_cb[10][4] = { > - { 0, 0, 1, -1 }, { 2, 0, 0, -1 }, { 1, 0, 0, 0 }, { 2, 0, -1, 1 }, { 0, 0, 1, -1 }, > - { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, > - { 0, 2, 3, -4 } > -}; > - > static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContext *gb, > int16_t *out, int blocks_per_slice) > { > @@ -540,8 +593,9 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex > block_mask = blocks_per_slice - 1; > > for (pos = block_mask;;) { > + static const uint8_t ctx_to_tbl[] = { 0, 1, 2, 3, 0, 4, 4, 4, 4, 5 }; > + const VLC* tbl = ac_vlc + ctx_to_tbl[FFMIN(level, 9)]; > unsigned int runcb = FFMIN(run, 15); > - unsigned int levcb = FFMIN(level, 9); > bits_rem = get_bits_left(gb); > if (!bits_rem || (bits_rem < 16 && !show_bits(gb, bits_rem))) > break; > @@ -554,8 +608,7 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex > return AVERROR_INVALIDDATA; > } > > - DECODE_CODEWORD2(level, lev_to_cb[levcb][0], lev_to_cb[levcb][1], > - lev_to_cb[levcb][2], lev_to_cb[levcb][3]); > + level = get_vlc2(gb, tbl->table, PRORES_LEV_BITS, 3); > level += 1; > > i = pos >> log2_block_count; _______________________________________________ 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".