From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id AAEF6474A2
for <ffmpegdev@gitmailbox.com>; Fri, 8 Sep 2023 08:38:02 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B434868C88B;
Fri, 8 Sep 2023 11:37:59 +0300 (EEST)
Received: from EUR04-HE1-obe.outbound.protection.outlook.com
(mail-he1eur04olkn2051.outbound.protection.outlook.com [40.92.73.51])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DED568C7D9
for <ffmpeg-devel@ffmpeg.org>; Fri, 8 Sep 2023 11:37:53 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=FjvqE5caOYU547+IkC51jT3p3cLO/ZdFVjZ69Xz9VWGjWxJ7Mm+HlmGa30Y23PeYC3JtfI3/Y3wMK/y1gt6oTncGRcsGFApnhtkHJPKCMKji7xN1DQKBL64w8djWkArw0gr/C5GHq1gKnmaUVHE73S85PKY4sIb9hKkzAxqe53gFh9VuMOAXE1nkHEhdfonpAa5D9xpF5EGZ4cKGrHSnDqlewfjg6zChcesoFXvBCMoVemEgpFnWiIDpg+FL0SVOp4TNBBhMSCUJHKKF6gr7+U/S5XcYgzom9kY9yAJHTRKl4zySfJ5mHMEANBZpRBfpRQblyra5vAjWd4YzWb7XwA==
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=0mQOaYkKaCva8SDNNFh4Ps3vgsdve3D/lKmRJOL9xlU=;
b=imEH6ssdBIuPffSHeWo5B5pEXX8GPXQ8ZaMIGeSJpKatU312OKvPWzDKZ+IgXtuBTmJtAlJLbBSPQmk7YoNdPo7ynmJezZ3RiVbOPAFEwU3Nuqof8116csj2aguYz+renAXnTC7UysRMkE2u44bdKh7kGWRHHefnOkjF3eqNSmMC9RJeWbFHVeMwXq+sPMgROC+guXZbRkCpGDZstR3JfwdlWvaRrr3/DB2/QuETjdyu+PZQzHA1n4SP/ZPmxcGU1PQUfRxBd73XOoGwwdngEO6Htxj8B6x7vA04kCOiZTzoBiSlXf8tzwBxOdbojhK3mWoKLYWIgBjupaxCHlJAUQ==
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=0mQOaYkKaCva8SDNNFh4Ps3vgsdve3D/lKmRJOL9xlU=;
b=r8UgSRxT31mxo70WHSaszLokQd/pcT0rzjOiS5WkmceBe9uEmBFPm4t3dJ4g2pYquDABDOL4kW2zqa5Xy+uVP8o4giZ4FuYhzIpQDMandLGJIz/ZWlWqO/BnmndfVwifcOJbujqr2vjyJcrDeuaqnasOTZXKvhLWpbzJzwzLhTFo/QBc2wrnNaF4Nf57U0M9VTQOoYC6rPKqmcvPq3Ve4r+Y1FcY53roHsOS+/vTJWammR0NRUhjDOflddXaofywNUS6fYlTsufWl5es3YwQxTwnmYyIE3NVWGyMDzl5bT8dAB8e0rpx6flJRGgP1Eu6y+6MLVH+BRC22fNXMTCbSQ==
Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14)
by DU2P250MB0255.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::19) 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:37:51 +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:37:51 +0000
Message-ID: <AS8P250MB0744FD6F67618303F8378D648FEDA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Date: Fri, 8 Sep 2023 10:39:10 +0200
Content-Language: en-US
To: ffmpeg-devel@ffmpeg.org
References: <20230908081508.510-1-christophe.gisquet@gmail.com>
<20230908081508.510-2-christophe.gisquet@gmail.com>
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <20230908081508.510-2-christophe.gisquet@gmail.com>
X-TMN: [y709GHNeu+jpwaCM6gbyJUAU3QaQ/Py7]
X-ClientProxiedBy: FR0P281CA0252.DEUP281.PROD.OUTLOOK.COM
(2603:10a6:d10:af::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
(2603:10a6:20b:541::14)
X-Microsoft-Original-Message-ID: <29673db3-bec0-c154-edd7-d3184496585e@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0255:EE_
X-MS-Office365-Filtering-Correlation-Id: b2ce32a7-d455-46f9-9535-08dbb046e38f
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: RPYNg13FzVvjAz5e8YD3hXc8rMABlubqA3RNUIei0pFn6qeHpkjQvTWaRgetqt9HcBP/1TnrGmASwYsU2s1kq2fE0XngxWAmLnpCUKgmURx7X2xCnCRcqx8aLFZfeYIGE42LhnlpGTPg+iNKqA3FJI7/Ga9Q0aSRaRWjNH5JTwzOzZzGchu1jJs8HEFqODCiUKFTgvAzSFYXLScWpdOAIFdvJrsyJcFXT/SLQvXnTG4xCCtjYgBZMwVLPdGWh9gtvnZZbH8r7RZAaE/+GRsurl2SVomH6g9k+jWnJJUBnABnvr9f4VenW1wWZbU/dN4wMAM1Q5Pz1A7PGbC1YY1oxHhe28qeIUrs+E+ybM0nd9AacI+elAa4XJ2OV2uOh52UGh4a2Joj1iKw8J8vuLDihaI0g2AJc6zhQBFSnoed5nTi2h66iqe0rjd9QeqRMF66z1FLbqheMA/y4kwVQkvNFuNUPgT7vg9I0n9Cno+k8w8Ks74S0RG6s34UcCAbEVKjTaf1AUSm16AQUSYzuy4hlABuwN4467g0HAX0k2ei+CKg0hQ5noqQH6KmqTjC6BBg
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MkRCNDRrbnhsazJOM0EydFZxbHJCWmF2enpFZXIwS0xsMUxXSm9GbkNiaWor?=
=?utf-8?B?MGs3RGtSeVhhbWo1K3Z5R1N6WGI0RGpHM0VYTzFDaXBsSmhadUQweElDdU1z?=
=?utf-8?B?MlIzbTQvRDE2OVZHWHNWN3VGZU9JN2xnL3lPdkFKK3pDZjNRWnM4eUVNaC9k?=
=?utf-8?B?QlNVM3o1aEpxK2N0NXBLYXUrYjd6MDN5QXpiS2lIbmppTWRaOTMza29HUHJ6?=
=?utf-8?B?SzY4QXE2NlkwcDlLeW5HTE5QSTIwZy9NazUrWWJCVVpIeThPeE9MUklJTTZ4?=
=?utf-8?B?K21MM2M0VW1sbWozTVI4SVJ6RE8wSHAxREcybEN1MHlaaTVTSkt2QUx1Q3c1?=
=?utf-8?B?RUZ0MEZUM0I5eWtQVEFKdElTazNLbkxPNUV0WU44T3RpNUFLelg3T2YzeW1w?=
=?utf-8?B?WjgrMGhXMU5panRXZDJrL3NyOHFlQ0NMU2ZyUThGVC81VWxicEFEL0lWZ0FY?=
=?utf-8?B?aWxuL2N2TDhJUHRRU2JyTTNQNGtWL0FUNTNVRHJwQWpYWDNGcFFKVm8zYUo5?=
=?utf-8?B?dThuQkZMc3Z5L3JYOElWUkxJa3FhSE5iZjRMaTd4Wlh2WHRTU2lXZWYrUUpV?=
=?utf-8?B?YzV2SDNoRDFycnluclVmc1RPbVUxNXV5WktXcEZWQU4xWThyVnFac2l0WlA1?=
=?utf-8?B?L09uVXdyZ3pJTkUwWks4c1FKcEdPY1lwNFZ2aEtrZVdjMXVxREJwSnRIVWl2?=
=?utf-8?B?RndBOWhoMTkyTlJ2ZHBpSHZ1S1ZPL0tZT2FzTHpiWklQWUx4K2VQbks2OGwr?=
=?utf-8?B?a0pkWm41WlN6elh6dGlpTTIwSGpqYkJWclVIQ09UbFkvamJZWVFmNUI0Ryt5?=
=?utf-8?B?M3h6WG5vaHZRYk8zTEo3TEJaQ3g1empUbXdrbWJIWVpsWWJWUDJ6WVliYmpI?=
=?utf-8?B?UU5OMjZ0dmovYzQyV1htTk8xbFlONUlBbGNYU2E2U010WjBuRTh6MGlrNXEx?=
=?utf-8?B?T2RDcUlaV1VDZVdzWjV1em9UVGtDeWNyRGNLZjg1Ym9pTDlXVnV6VGtCcDNS?=
=?utf-8?B?NkVFVGptNDRqeis2cjhaOHdIOGp2aUUrN2IxbHc2V2RrNGhWUzhZL0JVTFU2?=
=?utf-8?B?anZLWXowZjBZbmhLa2h3NGl1Z0FhQVE0Ri9EOHZ4T0RiaFc4bERUanRyOEt6?=
=?utf-8?B?ek51eHZnakNWK3h2a3Y2UzdPcUZvTVh3QnBqYWFUVWdmRXp3WGZCWkZmM01s?=
=?utf-8?B?QkJIR2M3ZWdONU1nV1FwTXdPdzFiY3pBZE9STFpodGM0aDNjYkErL0htTlJT?=
=?utf-8?B?ak1EUU5wQlBlejU4dDlVdTExNDUzTFJqcVZ0SGxjcE11TG1MTnFtNjNhYVhL?=
=?utf-8?B?eVlRNDg1WUorM3k3OXl3T281aCtuNXJQbXlUc2xJWGZyYS9taHNKSkFrQnN3?=
=?utf-8?B?WUt6d0hCbWpZOXZwcTNZcVNSZ3NZaWpZWEJKSTZzSjNmYmQ4bE1waitYOEZE?=
=?utf-8?B?VElVcGpIckdOMzFlcWFGTm9pS0lDMC9MVTUxNGFFeitLbzVyS2Iyc3pBNzZr?=
=?utf-8?B?b1FxME52OWtpcVhFd3RKWkx1T0FiSnl0cmNXM2lJQ2w5VXpwMVViZG03Ty82?=
=?utf-8?B?RFpLb1JJQ3BJM3YvWDJOK0t5bkVDWUV6cVZyMHFkcWMrMkZ5ME5WZXRMSzlv?=
=?utf-8?B?RWhyZDUvckxYWEJ4MjhDZmZYcUxWeTFxOHB0VjA0b2lnUW9UMVE4NVZHUnVu?=
=?utf-8?Q?eG4n7tawogRi3l36oo0E?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b2ce32a7-d455-46f9-9535-08dbb046e38f
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:37:51.7596 (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: DU2P250MB0255
Subject: Re: [FFmpeg-devel] [PATCH 2/7] proresdec2: store precomputed EC
parameters
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/AS8P250MB0744FD6F67618303F8378D648FEDA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Christophe Gisquet:
> Having the various orders and offsets stored in a codebook is compact
> but causes additional computations. Using instead a table for the
> precomputed results achieve some speedups at the cost of ~132 bytes.
>
> Around 5% speedup.
> ---
> libavcodec/proresdec2.c | 54 +++++++++++++++++++++++++++++++++++------
> 1 file changed, 47 insertions(+), 7 deletions(-)
>
> diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
> index 6e243cfc17..65e8b01755 100644
> --- a/libavcodec/proresdec2.c
> +++ b/libavcodec/proresdec2.c
> @@ -427,6 +427,7 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
> # define READ_BITS get_bits
> #endif
>
> +/* Kept for reference and because clearer for first DC */
> #define DECODE_CODEWORD(val, codebook) \
> do { \
> unsigned int rice_order, exp_order, switch_bits; \
> @@ -454,18 +455,41 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
> } \
> } while (0)
>
> +/* number of bits to switch between rice and exp golomb */
> +#define DECODE_CODEWORD2(val, switch_bits, rice_order, diff, offset) \
> + do { \
> + unsigned int q, buf, bits; \
> + \
> + buf = show_bits(gb, 14); \
> + q = 13 - av_log2(buf); \
> + \
> + if (q > switch_bits) { /* exp golomb */ \
> + bits = (q<<1) + (int)diff; \
> + val = READ_BITS(gb, bits) + (int)offset; \
> + } else if (rice_order) { \
> + skip_remaining(gb, q+1); \
> + val = (q << rice_order) + get_bits(gb, rice_order); \
> + } else { \
> + val = q; \
> + skip_remaining(gb, q+1); \
> + } \
> + } while (0)
> +
> +
> #define TOSIGNED(x) (((x) >> 1) ^ (-((x) & 1)))
>
> #define FIRST_DC_CB 0xB8
>
> -static const uint8_t dc_codebook[7] = { 0x04, 0x28, 0x28, 0x4D, 0x4D, 0x70, 0x70};
> +static const char dc_codebook[7][4] = {
> + { 0, 0, 1, -1 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 },
> + { 1, 2, 2, 0 }, { 1, 2, 2, 0 }, { 0, 3, 4, -8 }, { 0, 3, 4, -8 }
> +};
>
> static av_always_inline int decode_dc_coeffs(GetBitContext *gb, int16_t *out,
> int blocks_per_slice)
> {
> int16_t prev_dc;
> int code, i, sign;
> -
> DECODE_CODEWORD(code, FIRST_DC_CB);
> prev_dc = TOSIGNED(code);
> out[0] = prev_dc;
> @@ -475,7 +499,9 @@ static av_always_inline int decode_dc_coeffs(GetBitContext *gb, int16_t *out,
> code = 5;
> sign = 0;
> for (i = 1; i < blocks_per_slice; i++, out += 64) {
> - DECODE_CODEWORD(code, dc_codebook[FFMIN(code, 6U)]);
> + unsigned int dccb = FFMIN(code, 6U);
> + DECODE_CODEWORD2(code, dc_codebook[dccb][0], dc_codebook[dccb][1],
> + dc_codebook[dccb][2], dc_codebook[dccb][3]);
> if(code) sign ^= -(code & 1);
> else sign = 0;
> prev_dc += (((code + 1) >> 1) ^ sign) - sign;
> @@ -485,8 +511,18 @@ static av_always_inline int decode_dc_coeffs(GetBitContext *gb, int16_t *out,
> }
>
> // adaptive codebook switching lut according to previous run/level values
> -static const uint8_t run_to_cb[16] = { 0x06, 0x06, 0x05, 0x05, 0x04, 0x29, 0x29, 0x29, 0x29, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x4C };
> -static const uint8_t lev_to_cb[10] = { 0x04, 0x0A, 0x05, 0x06, 0x04, 0x28, 0x28, 0x28, 0x28, 0x4C };
> +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 },
> + { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 }, { 0, 1, 2, -2 },
> + { 0, 2, 3, -4 }
> +};
> +
> +static const char lev_to_cb[10][4] = {
You seem to require signed chars here, but this is not a given on many
platforms. Better use int8_t.
> + { 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)
> @@ -504,18 +540,22 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex
> block_mask = blocks_per_slice - 1;
>
> for (pos = block_mask;;) {
> + 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;
>
> - DECODE_CODEWORD(run, run_to_cb[FFMIN(run, 15)]);
> + DECODE_CODEWORD2(run, run_to_cb[runcb][0], run_to_cb[runcb][1],
> + run_to_cb[runcb][2], run_to_cb[runcb][3]);
> pos += run + 1;
> if (pos >= max_coeffs) {
> av_log(avctx, AV_LOG_ERROR, "ac tex damaged %d, %d\n", pos, max_coeffs);
> return AVERROR_INVALIDDATA;
> }
>
> - DECODE_CODEWORD(level, lev_to_cb[FFMIN(level, 9)]);
> + DECODE_CODEWORD2(level, lev_to_cb[levcb][0], lev_to_cb[levcb][1],
> + lev_to_cb[levcb][2], lev_to_cb[levcb][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".