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 ESMTPS id 1B2394DF85 for ; Wed, 5 Mar 2025 23:44:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7529268CB89; Thu, 6 Mar 2025 01:44:04 +0200 (EET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02C4168E43E for ; Thu, 6 Mar 2025 01:43:57 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5DD1542EF5 for ; Wed, 5 Mar 2025 23:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1741218237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/iv2zfe7uDszV21NlKNQV6E6KqP+qICJfkpwND6wF90=; b=MkQ22/vRKP/xgYqvFdgdJiC6dpVPPKRopeN2SSxVlw1riw9LJksppw7UqVCRc8GxHKlR9Y /nG8ylziOAURqQuLGGC/FivUL29J49X4N0UA/8do4TRsSzBhdcu5dXo204N2vAYY0109ya xh1ekL7Y/l2IZi4jWymYHc4NKyD1/Wa3H/6C7nCvVxgwqoTxf9Hrm7egnG6yFK3N4BnM6V 1zKxyXXlZqeP2cWAZSzX4Fi4cY4ZuA2/7snDF67oTfraTDSk9Vz4lePkKD0wg5NaMylJDR NxzXHPfUUbk/CIOsOkIBbyvGT4SyXgr+IIPOLhNB1j4ZVAIQqA9TETP3kYaixA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Mar 2025 00:43:56 +0100 Message-ID: <20250305234356.52610-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -70 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddutdeiudelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpefhledvvdehgfettdefueevtdeifffhkeeljeetjeeugfelgfffieduheevvefgvdenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH v2] avcodec/ffv1: Use dual run coder for fltmap 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: This improves compression by 0.1% overall and 44% for the changed table I tried several other things but so far this is the best compromise between complexity and compression This can also be extended to 32 and 64bit floats Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec_template.c | 23 ++++++++++++++++++----- libavcodec/ffv1enc_template.c | 17 ++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index 1fa9933d984..f2c88734fe1 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -159,12 +159,25 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, for (int p= 0; p<3 + transparency; p++) { int j = 0; int lu = 0; - uint8_t state[2] = {128, 128}; + uint8_t state[2][32]; + memset(state, 128, sizeof(state)); + for (int i= 0; i<65536; i++) { - int u = get_rac(&sc->c, state + lu); - sc->fltmap[p][j] = i ^ ((i&0x8000) ? 0 : 0x7FFF); - j+= u; - lu = u; + int run = get_symbol_inline(&sc->c, state[lu], 0); + if (run > 65536U - i) + return AVERROR_INVALIDDATA; + if (lu) { + lu ^= !run; + while (run--) { + sc->fltmap[p][j++] = i ^ ((i&0x8000) ? 0 : 0x7FFF); + i++; + } + } else { + i += run; + if (i != 65536) + sc->fltmap[p][j++] = i ^ ((i&0x8000) ? 0 : 0x7FFF); + lu ^= !run; + } } } } diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 4c7cd2e647c..af3354497ae 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -177,15 +177,26 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, for (int p= 0; p<3 + transparency; p++) { int j = 0; int lu = 0; - uint8_t state[2] = {128, 128}; + uint8_t state[2][32]; + int run = 0; + memset(state, 128, sizeof(state)); for (int i= 0; i<65536; i++) { int ri = i ^ ((i&0x8000) ? 0 : 0x7FFF); int u = sc->fltmap[p][ri]; sc->fltmap[p][ri] = j; j+= u; - put_rac(&sc->c, state + lu, u); - lu = u; + + if (lu == u) { + run ++; + } else { + put_symbol_inline(&sc->c, state[lu], run, 0, NULL, NULL); + if (run == 0) + lu = u; + run = 0; + } } + if (run) + put_symbol(&sc->c, state[lu], run, 0); } } -- 2.48.1 _______________________________________________ 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".