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 422364E43F for ; Tue, 11 Mar 2025 15:04:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35DEA68E12A; Tue, 11 Mar 2025 17:04:00 +0200 (EET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D7F968E100 for ; Tue, 11 Mar 2025 17:03:50 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso30983715e9.2 for ; Tue, 11 Mar 2025 08:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705430; x=1742310230; 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=NPIUsBoB7WPM9zlepTkQBHctsBZXEwSNSflysNTrtVc=; b=VfR/biK+MxXIVTw6MY4eDrupqvYkljgSaCsBQ8DoS0sDlmfeDSNUTNE/rBFZ5i3/Gh XlH7WkyEReHM4A+eu59hlCsLr/llUujn3vfLJtL8uHqzJmmmC17OjnHD7GHLIaM5U3sc dTmuUwF3PQwFd471ew3V5297ZEbqfPdAkUi/IoaVceo3GgjzwLhnypktCuvSfJ3AXxpW 3pKctePgaVJDN3AdIxw1a21NGc8vHuT5hQkGMhjIgdKPec5mcxmYzBNiVVaYZ/XW7etJ 5rCdG4Q3/ssQ+/962Vw9NTqEbZriORHC0emFEVMfBHU6lFlGBZy8pWQGkwlA20X0HZ1r Dk5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705430; x=1742310230; 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=NPIUsBoB7WPM9zlepTkQBHctsBZXEwSNSflysNTrtVc=; b=V/y7yuM8zqjsIAf4qMBUW6UH9xgfqk9FHOiNMrjURSnmRCpWI/5yBGwpENboqviO0R zQhXJtlSU09yMPyo+wpWdojViWhknm+HOTbBjd75qFM5aiwFNMQlQA6/VlSLnBOJz4Yv RTftt+jJLkUeSr/QjsB0NdvXHdmkzfmQ/80x+/BbzLM9VC79deWFrVcmnNJVrYdxmBdb cbUGEdYjEz/gNvYjbBPvuFZIguSiycfbNJiKlqCDQyG5OMeMKtUKodZ6ihnRXZgIaCpQ rbKPoQCDFTbca1Vk4/6nZydWTF7LXYnCrlD02oIcnvSS3b9Qpp6R81edi7ZJVqmm+Bvb cjAw== X-Gm-Message-State: AOJu0Yw3ZRdXX0HJknmJICNWsb4qtWSSjQn5JBZkPDy+P0c3+WONnXqa 1U11dGihg4kM3+Q4+q1TxALosakJE5FTO8YYkwSxQ67bf2dXDqIlSKrP+A== X-Gm-Gg: ASbGncs4KA84Q2dkvzPv1q9llb4kFM1QCrhXkuH1dFFyWEZ+3W/MpoortgjgNu56B9X W5H97vgOBABRCkTALtgjPhGOpI5CJEvI5YPFoXCUYFhSX4i1oXn/S6xs+wNSNUC2Mj6QLmdcNw2 6LscvT1pACNo16qapOvGlgO3IG3/EbnELnyGhamyNsgPu4UjlPD3HqwepmitMJMmsR1QLaPb5u4 6t2oq3HAUDZX+GHyMXa5+G6DmPDIEenrQTKwSMUIu8KY/1eS5rTCwnXQLgwamahZKPm8JAN/iji 1RPX6Qy5kH9vMEEjLOn4XuXgPK1Tc3HU93ck9V2QXnAJqypcZdIEBYjDJmgOwGTZeQmqyOj0m5j FCLwhgHfaYYsuAaJTbj6B/4XrCiluvOFH2g3bSbsXVtjzu3tUN7wCPio= X-Google-Smtp-Source: AGHT+IGAG7bU/MgZxrxhoiG+MtxpFxSqdZ1HkXqj2GV8fAQs253WWkEK1yC3bFbbo0tAfRGYAE9UzQ== X-Received: by 2002:a05:600c:4751:b0:43c:fffc:7855 with SMTP id 5b1f17b1804b1-43cfffc7c36mr89218905e9.15.1741705429506; Tue, 11 Mar 2025 08:03:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 08:03:49 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 16:03:36 +0100 Message-ID: <20250311150341.348678-4-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311150341.348678-1-manuel.lauss@gmail.com> References: <20250311150341.348678-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/sanm: fix codec3 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: codec3 is codec1 which writes zero values instead of skipping them. This fixes a lot of RA1 videos. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index b2923515b1..a512810987 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -556,7 +556,7 @@ static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size) } static int old_codec1(SANMVideoContext *ctx, int top, - int left, int width, int height) + int left, int width, int height, int opaque) { uint8_t *dst = ((uint8_t *)ctx->frm0) + left + top * ctx->pitch; int i, j, len, flag, code, val, pos, end; @@ -581,7 +581,7 @@ static int old_codec1(SANMVideoContext *ctx, int top, return AVERROR_INVALIDDATA; if (flag) { val = bytestream2_get_byteu(&ctx->gb); - if (val) + if (val || opaque) memset(dst + pos, val, code); pos += code; } else { @@ -589,7 +589,7 @@ static int old_codec1(SANMVideoContext *ctx, int top, return AVERROR_INVALIDDATA; for (j = 0; j < code; j++) { val = bytestream2_get_byteu(&ctx->gb); - if (val) + if (val || opaque) dst[pos] = val; pos++; } @@ -1300,7 +1300,7 @@ static int process_frame_obj(SANMVideoContext *ctx) switch (codec) { case 1: case 3: - return old_codec1(ctx, top, left, w, h); + return old_codec1(ctx, top, left, w, h, codec != 1); case 37: return old_codec37(ctx, w, h); case 47: -- 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".