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 57F5B4E5F0 for ; Thu, 13 Mar 2025 11:18:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3602068E46D; Thu, 13 Mar 2025 13:15:33 +0200 (EET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E38268B2DD for ; Thu, 13 Mar 2025 13:15:18 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3912c09be7dso506560f8f.1 for ; Thu, 13 Mar 2025 04:15:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864518; x=1742469318; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s2/8vJwR7i2HhEthZ4NjE2UyZ3T2Om0ttF6ZAayOalY=; b=nr/W+xjdtlNjOgfIPhNiUmNBWSxp/6B4YSJWRwsRfBz8qTVFSU/M2amkJ3ZlD1dj6j VsMAOrs0itWMqFo9L+1nhtBDGOKa7M9IMBVlKHACOk8Thwd/yVN9D2iQeCSsOsRIva8u uJaWWAJ3riG128UVXw80MqmhJQyDC5o84Xi+ozcOrDdYDPuhZ28q9iuoMEXh4U3BJNLM 9GYseL77VG0JG5ZwL/evDYZu3MqXby+2/2DN5OxH/8ykdsg2qtjRzyuSzRTJQfLoHEWB LEqWYqD6CW5vK89JTygkjzMop6zZ+RpnCn3X2q2cFD4aUCdkIJMpKk3CiVGpdrR+fyQT WZow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864518; x=1742469318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s2/8vJwR7i2HhEthZ4NjE2UyZ3T2Om0ttF6ZAayOalY=; b=GdYNZbdZHhhNYOHlcVsMrCXWCvHBRfSfaV3wPB6vpUpsSQ8TvMgAoFoFxBRzOCx7fo i1eQ6OiewoLAwZGyGPCZgpCGGzgVIZ/SckMToTCQ9nyVUVpoTcX1GgUW6KpYO/RukSAZ BuQ1nzPf1kqUBBszJ0qix8lnQ+H0MC/zirwE64NT3PF3i4wV6VvayFf/sOorrhhKMtsg 6BTXYtpy8DWgMOyfMemY3dzVXfROLX7d/JFhKJLQrdD8LbGTadIGRwbiWrS/UIO4jmYm nV7rOYTt7p2D/PseuULkMcpSg/+bxfsAGeas2SgJ9jWFgcx6kyyOvglq6/C648dRuq21 F7/Q== X-Gm-Message-State: AOJu0YyzRu8EIZ/z5d4yMan00ne9fxHGzdEJnWH6bL/idbIGEibA3gAk BImYDM0yDMHWyW4n50PhvOLzwo5RJ3CQOizTstZnuNge20tbVzISetXvXA== X-Gm-Gg: ASbGncvGYDZ2C4NwJoKP/0g1132uUBi3dPo3I099DIGBeHvKOvOpDxB3bZlTytS9og/ bpUQt9AY54b7TSZr+l8bsFnrSA6i4x0n6YiUm4LXzk64hYjWo9jFZOQBF4NYrq7O/EED3v5lBlh +6lR3VCCnAbBLegv1hyOHCPF/kv+DAeqZ3Z0oQEq5fnmjfHXv4ExhgRZ6r36LGu5m3cLB55sskg 8h+RZBdCxAAdPPZgIjP2Mh8ofsdFRT9MQka/NfQGyLIR5ChDQlTOdMvJsboKCWrZF/OrWKr83// jTqOsgacZb4xcH8B3tSd2nELZCvJSXbP9N/niEkt19EkhZMyXsdC5nXIiy6qIuCcVze0NybWpIv /ztbP8GfTioLIMNNYXFmz8NokDKEsr0kZNwmNrOQk+L8Q00GQzoMtxsA= X-Google-Smtp-Source: AGHT+IGJ2Szi9EXao1U0Wl+tTcMFVADJM7jvJ49DHxo8hI35H0wN1Lv3vzuJHzVFgWjaOhUa7kctOA== X-Received: by 2002:a5d:5886:0:b0:391:4674:b136 with SMTP id ffacd0b85a97d-3914674b5f1mr13309527f8f.29.1741864517475; Thu, 13 Mar 2025 04:15:17 -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-43d0a75b324sm50153795e9.24.2025.03.13.04.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:17 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:15:03 +0100 Message-ID: <20250313111505.166786-11-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313111505.166786-1-manuel.lauss@gmail.com> References: <20250313111505.166786-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/12] 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 gets rid of the extra case and column index manipulation and implements this as it is implemented in the original game exe, i.e. as a special case for 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 91c8ba658b..a8a3e04156 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1106,16 +1106,14 @@ static int old_codec37(SANMVideoContext *ctx, int width, int height) 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".