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 B54DF4E444 for ; Tue, 11 Mar 2025 15:04:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7238F68E11B; Tue, 11 Mar 2025 17:03:57 +0200 (EET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFF5168DDBD for ; Tue, 11 Mar 2025 17:03:49 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43cf257158fso16382535e9.2 for ; Tue, 11 Mar 2025 08:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705429; x=1742310229; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eN//ZuP1y8attQc4/SAPP4+2EEJZwJ+eShDw5s9UiH0=; b=NiZOKyJ8ZN5RUQJUpBOQAiYje9nKiC+MtHdZP2f0eT056F0X3fechP7pg0zGr9Zjsl pEZ+7Fl6e66dKLHz899KpfCkDi4f2eMrCnmG3OVBcFFCDsgPl9rIAlSqtkqO4Hi5i6yR 8zyqoonwpVdNm86+ujPxLrUcUTWGmSN5grVJbA5pyajkX84YutLWmAw2E0R4CjMuBK+7 akInsqZnhalJouwcLuH8srRhlg+nO+YDTi2A/0hrz4zIU0f8vJSZf4yd0HyR8swx5hdQ pYXOsgfjIsTlekefTx5uzu3SDtExUeTc7oT01F7BmPhRiv+kGPsDwz6A7Ivo+NmdYJ/g qRAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705429; x=1742310229; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eN//ZuP1y8attQc4/SAPP4+2EEJZwJ+eShDw5s9UiH0=; b=eLbBuFuN89kN1xyKyLTJQuOjMsAREOHKWWZl29QawqTYQeuwp3JIg3SzaNLIbhaS6K Vz8+yuBWLDpG2oJOIz6rGrcWWPIllHLFCxUii6dLQp8fXx1hrFxd2LXTmHxKMKUYB2F3 ydyDPK6N5kYFs243mpiH756jW9FkTIT3NMWj5VYDdt/paues3CR5XxH1n6rpKXY/rNi2 3p+lOJr4DwgZd+nj/EVAqz6qfrGt65Q8PdbePLrjmVnPlJOWnKlx/b/PkR7jHMdWg7uk AITyOYNbf1xSmoA1a26AJl8cEP/AR0RrAd4lSmq2g7W4pyXXjef9p62ez3SOkJw5E4fL sezA== X-Gm-Message-State: AOJu0Yy2EaUUMlhCZWJj3iCAp7HPy+YxzLsg5yG5NnKGP5J8zRgBkzz2 7NJ+hjzyCVNqUx/pJCgoCAnUUu1at0DFpZ9Ygr7LtJ93R4Ti9ohChH+mog== X-Gm-Gg: ASbGncudCoUwbEaqeADReQ0SZWSLPez7DT129zAf/4j0A1eZFQ67VUArZBP9e19noNT zBwcoBD0auArfoxUAEBYFkrRCPPSQw0df+pR9sQW8u8DJ6JB035U4mrj3wohjg8WlPRNRgYcZ+P AQeuIXer+IgnxL+cWBjMyM3M6OJ0syYCHyjecRa+w90H8r4TEUdGa9y6wCfYiL6bWCqcSHDr3Xm FQpuEAVgZzh9qzQR6O0U/LBCUTwptp7rLkfKpGVbFOTURnOka1nc0rJBEiF5a4iKLy61W64ggLN /NU7rDypzlqO/2TGKX1o/TjwS3e8OonNGplMVBSCnRUrUlPEpuyqXJyp3zxvhlewj9aDqwDn5zB GTjC3QPZiVBhGg+oQE9KPgZwR+ctAtEFZyqT/1vfEGUSllBHTRwW0fQk= X-Google-Smtp-Source: AGHT+IHX7M8C44VU4XdbreyCdaJgbsW6OyRQafQdV31OKVT+4pGOm2y3UniEOnasvs5fCURGNq5ZhQ== X-Received: by 2002:a05:6000:1448:b0:391:4608:e7be with SMTP id ffacd0b85a97d-3914608e99amr8833801f8f.14.1741705427247; Tue, 11 Mar 2025 08:03:47 -0700 (PDT) Received: from flagship3.deu.mlau.at (p200300c0271f29004c5623f045c27bca.dip0.t-ipconnect.de. [2003:c0:271f:2900:4c56:23f0:45c2:7bca]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ceaac390bsm115259215e9.35.2025.03.11.08.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 08:03:46 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 16:03:33 +0100 Message-ID: <20250311150341.348678-1-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/sanm: codec37: reimplement comp4 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: Manuel Lauss 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: Compression 4 code 0 means copy from delta buffer without mv, AND start of a skip run. This change gets rid of the extra case and column index manipulation and implements this the same way it is implemented in the original game exe, i.e. as a special case after mv copy. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index a4f0a28c7c..cbf78f33b9 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -760,16 +760,14 @@ static int old_codec37(SANMVideoContext *ctx, int top, t = bytestream2_get_byteu(&ctx->gb); for (k = 0; k < 4; k++) memset(dst + i + k * stride, t, 4); - } else if ((compr == 4) && (code == 0)) { - if (bytestream2_get_bytes_left(&ctx->gb) < 1) - return AVERROR_INVALIDDATA; - skip_run = bytestream2_get_byteu(&ctx->gb) + 1; - i -= 4; } else { mx = c37_mv[(mvoff * 255 + code) * 2]; my = c37_mv[(mvoff * 255 + code) * 2 + 1]; codec37_mv(dst + i, prev + i + mx + my * stride, ctx->height, stride, i + mx, j + my); + + if ((compr == 4) && (code == 0)) + skip_run = bytestream2_get_byteu(&ctx->gb); } } dst += stride * 4; -- 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".