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 ESMTPS id 962564CE85
for <ffmpegdev@gitmailbox.com>; Sat, 15 Mar 2025 09:33:35 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 358AC68E261;
Sat, 15 Mar 2025 11:32:43 +0200 (EET)
Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com
[209.85.128.41])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 753D268E24D
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 11:32:39 +0200 (EET)
Received: by mail-wm1-f41.google.com with SMTP id
5b1f17b1804b1-43bb6b0b898so4465685e9.1
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 02:32:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742031159; x=1742635959; 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=kGJINcZ5RevDQSb6vibE4jkneqZR4Q+zoU8sWf4V+88=;
b=iaKwvVSEkUaWGAgvjVhsjU340Ot9nh1UM//MKJn8i80IXww5CzUzdMv5XKgthpmFKP
xFot+Ab7n+fIPQDfaRLGWyBRd4hUfg+YvbtFk260Qmsgmg8JNvW4w4oskuYJ0zSqIio0
5CQlJvTPJ/M4kELa7EahgEch6VVKVLon7Jv4CYG2gaC3DcwmVWk/wxAVqj76o6K2MTQY
RWDPvMHkAifzk9B2jFvixCZcLDVGbam2KewE2VtcXM316M6RRoQHhqzZhIOf+bX8fL2s
39zflWjJ6nS+MCE/yhU839cHk1s2XX9PpLbv1Dsq8hkdMf1cqAbjjKb9LzcuI5YrJDdX
WW+Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742031159; x=1742635959;
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=kGJINcZ5RevDQSb6vibE4jkneqZR4Q+zoU8sWf4V+88=;
b=qIeUD01B+1JL46Gwg63MkphSbmlgvqqeUpV4B2/kJqb8NPHW0vuWED6DBosm3XLnCY
kD7/ZJftE5sjucxnxxhntJEpL1KoL/MC0zwDi6PLBiL/+y2hCd1BJUOhDDONrd2ZreVQ
Pf5fw3/G34ZBV84No5PFOz7JIIZQ3GusmRLJubO545zG5SNWs9RG22TOVL6luTNGPRD/
hX8zMy8FHIx7/MljmEqowyMeZDs2YxM4/E9c+htXzjWPGLzBlZ9RBwfs+3bjGTrckEaz
tqGCZRWiLk/Qa+j1E1pK+KPwT/3lvNFkQpDgEk3z1jXjtu4IF1Q3AwfQLMLEfUi7og/1
pVnQ==
X-Gm-Message-State: AOJu0YxfaakVcNZkIl3YS/NRz+OT1cZelbkYJUdtKE6j331t4oeAu/Bq
7C1X1RDbh8wEiweK9gpUVzhL1Mn3cn0GSSXbm+rVVhCxQcNHU7FjeGoo/A==
X-Gm-Gg: ASbGnctpqY+1S5QmyF3yneRBiFtKOupXPOkYJpyiPyaVbatDPSd+O0IRqoSoMoOHvI1
pZf4gJElsUIYZ0rOGgGcRaj2CsBp/eOE/ITjRvK4PzJgCb5mvQfdDvtbpAJQUVrQHMT/1D40G9I
CUGlJJEQVYyyHfUzIjifeGCDn6JlG/lhczs2ge0IaUPco1SmHQzt/FvxOLRcQRUB+CqIdE4Z5Ya
ihZs1dmWGfX1rjaxV5dwIoYcLfY5xfYE19pNrnaRf6WKJEeoSHlgLARsgtqwphEzmAb1+GoTceU
HyNeUHUcVqhtrlRm9Y4IR8VOUP1H/gPiPSjLENTBbdy/besAs52nLRaL0veRfpZZ0nc2wAu18RV
unaLf+zcighgeUiAF7tQnm/pJN5fTEawOSr6+WiXP1/oaHuKaMPSrx2I=
X-Google-Smtp-Source: AGHT+IHcsUpAJZ9vr1860MAOHVpiiIclLFO9fOpDMbwR8D/tVBimom258kY9uGq+jedvOtdEtnx4JQ==
X-Received: by 2002:a05:6000:2ab:b0:391:3110:de46 with SMTP id
ffacd0b85a97d-3971e971f5amr9822119f8f.38.1742031159068;
Sat, 15 Mar 2025 02:32:39 -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-43d1fe659b3sm43302905e9.34.2025.03.15.02.32.36
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 15 Mar 2025 02:32:37 -0700 (PDT)
From: Manuel Lauss <manuel.lauss@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 15 Mar 2025 10:32:12 +0100
Message-ID: <20250315093220.2565-6-manuel.lauss@gmail.com>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250315093220.2565-1-manuel.lauss@gmail.com>
References: <20250315093220.2565-1-manuel.lauss@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2 05/13] 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 <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>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
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/20250315093220.2565-6-manuel.lauss@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
codec3 is codec1 which writes zero values instead of skipping them.
This fixes a lot of RA1 videos.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
libavcodec/sanm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 069bc0400a..0c8ca73508 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -558,7 +558,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)
{
int i, j, len, flag, code, val, end, pxoff;
const int maxpxo = ctx->height * ctx->pitch;
@@ -581,7 +581,7 @@ static int old_codec1(SANMVideoContext *ctx, int top,
code = (code >> 1) + 1;
if (flag) {
val = bytestream2_get_byteu(&ctx->gb);
- if (val) {
+ if (val || opaque) {
for (j = 0; j < code; j++) {
if (pxoff >= 0 && pxoff < maxpxo)
*(dst + pxoff) = val;
@@ -595,7 +595,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 ((pxoff >= 0) && (pxoff < maxpxo) && val)
+ if ((pxoff >= 0) && (pxoff < maxpxo) && (val || opaque))
*(dst + pxoff) = val;
pxoff++;
}
@@ -1312,7 +1312,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 == 3);
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".