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 4FC6F4CE6D
for <ffmpegdev@gitmailbox.com>; Sat, 15 Mar 2025 09:34:40 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2255E68E28B;
Sat, 15 Mar 2025 11:32:52 +0200 (EET)
Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com
[209.85.128.43])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC14E68E276
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 11:32:41 +0200 (EET)
Received: by mail-wm1-f43.google.com with SMTP id
5b1f17b1804b1-43ce70f9afbso5032345e9.0
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 02:32:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742031161; x=1742635961; 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=sG64659pZpHOVgxnuPUUQ6pQdV4mWSx7XCpn6X4/+/A=;
b=kkF7QmVCw2o9ZFrngMNA17Cu1XA+1kMX446YYMk586e8qc+LV+DL/KX+1Q9c8f6+Pe
UPdnk7QrpdPgm1rJRUCoVwUbFtNvBCS7WeZfU8U/wiS4GPbS2M2W0OGlM1CugA63huel
8A32L6FPaL+eT5p5fWqHWAJ3HyEQQ4IaWDhrUmR2ZFqOvERkPtDex+j4TbP9a8+m09Tz
ctMqSHz+0s4ror1gK6YGDUF+ZBjq7bxaKlObI+D6KW6kPkx+oFaqFLOxz5vP6pRvZwIQ
6BJRpxZ9dHArEQhauo8gSv7HnWW7uOZBGi4BxJ/60Tc54FzHI7BbMdAJgLbCG8qsDEal
pkOg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742031161; x=1742635961;
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=sG64659pZpHOVgxnuPUUQ6pQdV4mWSx7XCpn6X4/+/A=;
b=cEJUPC4EYaQM85c8QL4HZzHEQMl2AfPS3zX1KdhoIQIEjP0wlxg9xFXkmj1hmFOvYs
86GfArCS7WjdbdktmbsvrwhWmf6l5WxT6bZ0BJ6jIXA5h+DAx0a3UDKTKB6CwV8vw6oT
xtIVUxah04VYkP4DJuSETopIBgbthEywbxfLQBMl/EbFBfiBbCsytRaLTH5Tc3yrPufK
ShnnKaS5x/kNHj1oKVuUrQ9MWhkfxOA7z6j4CiK/BvaMKYQNH9WXy5zspL9Sqtu/oW/7
bDHS+VXvhec/JQXy66dkUdD0DTf6aXknSQsy0xWkzwIrZRHuPSNT+bYo1OLLh6Zsr4gm
kBOg==
X-Gm-Message-State: AOJu0YwRN/YxpQ2ml5TPlO3SuOKpekraNqWN3bJVeG/yYML2NPaNpIM/
YA5ygaqGx942J+ipfBXhVv060xsXLxEQoZFejbikKXbiKxG7zt8YtMCiTw==
X-Gm-Gg: ASbGnctWlT03pij+k13Sef+3amXzHchXvGZ0K7RQNcDDY1mLg2nlnyvikqOltL5lBiG
x/MSt54WkoPntYRAoEleRlnhLu3IPacOrfyhzzFAX9UY29ionqeO8MWJYiU/TsPqNPAbdKhYbRo
kBVAVuNv4gbR8dmZtvv+9mysMXS62cFe2kXCQhPZxa6dxH3XpPzW5qshvyVD8yIBEptHI/az9O+
lHVHVFjmRe21QYJSfJ4NrYOHlP+XV29J2IedjWZnDj6tZjsIMQZ8kz58y/wOPRdVdCv/rn2ytvB
Dec1693Vb1lLkvQdXwWIVKE3nrzILrxR4cmZk8CTCzvak8xzRwGg+1XzneaShWGPhHVdiEDyHcl
EFePeM3ECjQpwuVpgNDFG1DOmj5P9yHkIVFvv9yNpYKir/79kqiOok6w=
X-Google-Smtp-Source: AGHT+IEnBpD/kkIfQEJ3hXaXHJyKBrs4rCbM6Mfi/GZzqb00J8h07nCz4mIg9om+BALusNfObe98ww==
X-Received: by 2002:a05:600c:4446:b0:43d:ac5:11e8 with SMTP id
5b1f17b1804b1-43d1ecc3729mr62428595e9.21.1742031161034;
Sat, 15 Mar 2025 02:32:41 -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.40
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 15 Mar 2025 02:32:40 -0700 (PDT)
From: Manuel Lauss <manuel.lauss@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 15 Mar 2025 10:32:15 +0100
Message-ID: <20250315093220.2565-9-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 08/13] avcodec/sanm: codec21 decoder
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-9-manuel.lauss@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
similar to codec23, this one alternatingly skips and writes bytes.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
libavcodec/sanm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index aca5bf49ec..6080144235 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -614,6 +614,49 @@ static int old_codec23(SANMVideoContext *ctx, int top, int left, int width,
return 0;
}
+static int old_codec21(SANMVideoContext *ctx, int top, int left, int width,
+ int height)
+{
+ const uint32_t maxpxo = ctx->height * ctx->pitch;
+ uint8_t *dst = (uint8_t *)ctx->frm0, c;
+ int i, j, k, pc, sk, pxoff;
+
+ dst = (uint8_t *)ctx->frm0;
+ for (i = 0; i < height; i++) {
+ if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ return 0;
+ pxoff = left + ((top + i) * ctx->pitch);
+ k = bytestream2_get_le16u(&ctx->gb);
+ sk = 1;
+ pc = 0;
+ while (k > 0 && pc <= width) {
+ if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ return AVERROR_INVALIDDATA;
+ j = bytestream2_get_le16u(&ctx->gb);
+ k -= 2;
+ if (sk) {
+ pxoff += j;
+ pc += j;
+ } else {
+ if (bytestream2_get_bytes_left(&ctx->gb) < (j + 1))
+ return AVERROR_INVALIDDATA;
+ do {
+ c = bytestream2_get_byteu(&ctx->gb);
+ if (pxoff >=0 && pxoff < maxpxo) {
+ *(dst + pxoff) = c;
+ }
+ pxoff++;
+ pc++;
+ j--;
+ k--;
+ } while (j > -1);
+ }
+ sk ^= 1;
+ }
+ }
+ return 0;
+}
+
static int old_codec1(SANMVideoContext *ctx, int top,
int left, int width, int height, int opaque)
{
@@ -1393,6 +1436,8 @@ static int process_frame_obj(SANMVideoContext *ctx)
return old_codec1(ctx, top, left, w, h, codec == 3);
case 2:
return old_codec2(ctx, top, left, w, h);
+ case 21:
+ return old_codec21(ctx, top, left, w, h);
case 23:
return old_codec23(ctx, top, left, w, h, param, parm2);
case 37:
--
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".