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 D5F154CE6D
for <ffmpegdev@gitmailbox.com>; Sat, 15 Mar 2025 09:35:32 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B51E868E2D8;
Sat, 15 Mar 2025 11:32: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 25B3268E27B
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 11:32:44 +0200 (EET)
Received: by mail-wm1-f42.google.com with SMTP id
5b1f17b1804b1-4394345e4d5so3231875e9.0
for <ffmpeg-devel@ffmpeg.org>; Sat, 15 Mar 2025 02:32:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742031163; x=1742635963; 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=pMDPCgdhtcb0YcwRgw0jeQZbvNkAa9Eb1bn9GKteVBc=;
b=mdcnmGo3SgMsV96ZfqMTQMhQFNsFOx6NIkbwzSIxuevE5rdALoDnbqDugZr7VCXZeB
+9gbLrM2XjAgm8jsP6nd1ReWHF5E1syFucOsCDWkdej6yZ0f/3jTDWuX/NeyCc0+KDss
/YYaxyyIE/mkJf8yvHmD7J6F4oAsCuS4r01WyvBz741bHwrndAqZBKE/CBF8IPzqP7dl
UA+k+l+JAIhtYbkAJpmFKVFqnSS396AuFJ1zCzkoi1LZlsNnNMkkdrwKyY8SJCqfkD0+
86f7d152RK5SFnjG2cqDh55qvKl8fAqxjKMfvLu+nX7gnFBIxVxsxseorn4Hdzs4HOpB
aRrQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742031163; x=1742635963;
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=pMDPCgdhtcb0YcwRgw0jeQZbvNkAa9Eb1bn9GKteVBc=;
b=boJvbkTs2dbSn5ZzyT3RZ+TSTJZsVxuJNOifLSUE1QG5Whhu43rPzq4Lc0sJKuxtAb
48Q4KmEwir8h+N/u+T7xD5nwkFj7AZvqgOOT8YjGQKPySFb1jh69CGFdiLgGbZYQwHbi
bKeLpIK+Cbt+FgaWN1rE9hkLymWxZzDGuep+iSIlQUqGEumykKjpfxymepf1ZjlPsu6w
FBk87w2srlXs/I6RWSg+QIC1wWEiAIUQe2rhzC7BD6WLasfJhndh90jPhK4782pSO5Od
kCvJdBvUehGpLftKEm6k8tSHKWKsSA0XKTvjVHQDbRXaBJJDkFcrFD0r0nCpUlguOALS
tPJw==
X-Gm-Message-State: AOJu0Yz2m7VNphWW1i8Bhv+4hWQ6ErayKq/Q162aY/QC2BIeGTI6nT7Y
L77s/zBNsR1/s7PMD10JqQIb+FfT4OVsjT9bqRmYj6AjFimg2oSSK6TMKQ==
X-Gm-Gg: ASbGncu44OncjgVv1itxdH7ccHPy987lLSoo66ZYo4DUD/fIffo3wvGDDYSB3cBNAFv
AdLuiG/jQ+nBszJQ6G7iUWOjSVVV975H4yYCYG66IyTRdOBmkYFn8Vdow2NOGtGgd/htw2XT3p0
C0x3z7uUcl4EU+mdQcxnyx42RGl7ZHv20COnZMNKOuXcbmcC1cKO9LT15d5R4ZcRqWsyk/+zxiv
7arqfO55Jgs3xwnBrFFnGy20xBgE6pI8Md2KcmlWLLPh2hW90Yd0Sc94N2QLdthy2FKBEg6PbJF
dReDz4zE1AqUa/4GCy6cZzTYBE5/OE7WR1fW0Qg7fCiGyE/H5eFu/WUtc4k5gPvb44JKkZX2JH+
jkjANF7F0b69ey+TfpfJvQ5vZHvqZLUdCSP6AnM6UtNwe35nzusR3rYEmmzfI7WiF5g==
X-Google-Smtp-Source: AGHT+IFq/k60+r9hOsdpR1Hw5MGaksvXaA867IhiN5O8H3nGuYsREzCQRiuGDZHTfMrllXWjDRnvmg==
X-Received: by 2002:a05:600c:19cd:b0:43c:ea40:ae4a with SMTP id
5b1f17b1804b1-43d1ecd932fmr73880595e9.31.1742031163143;
Sat, 15 Mar 2025 02:32:43 -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.42
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 15 Mar 2025 02:32:42 -0700 (PDT)
From: Manuel Lauss <manuel.lauss@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 15 Mar 2025 10:32:18 +0100
Message-ID: <20250315093220.2565-12-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 11/13] avcodec/sanm: implement STOR/FTCH
for ANIMv1
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-12-manuel.lauss@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Handle STOR/FTCH the same way the RA1 game engine does:
On STOR, save the next following FOBJ (not the decoded image)
in a buffer; decode it on FTCH.
The RA1 codecs and the fobj handler now take an explicit
GetByteContext in order to be able to replay stored data.
Used extensively by Rebel Assault 1 for e.g. backgrounds and
the cockpit overlay.
For ANIMv2 keep the current system to store the decoded image, as
replaying a FOBJ would not work with codecs37/47/48 due to sequence
violations.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
v2: reimplemented by giving the RA1 codecs an explicit GetByteContext*
to support the replay of data from different memory.
libavcodec/sanm.c | 226 +++++++++++++++++++++++++++++++---------------
1 file changed, 154 insertions(+), 72 deletions(-)
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 2d7a0eeb32..b86f67c3bf 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -598,7 +598,8 @@ static void codec4_gen_tiles(SANMVideoContext *ctx, uint16_t param1)
}
-static int codec4_load_tiles(SANMVideoContext *ctx, uint16_t param2, uint8_t clr)
+static int codec4_load_tiles(SANMVideoContext *ctx, GetByteContext *gb,
+ uint16_t param2, uint8_t clr)
{
uint8_t c, *dst = (uint8_t *)&(ctx->c4tbl[1][0][0]);
uint32_t loop = param2 * 8;
@@ -606,11 +607,11 @@ static int codec4_load_tiles(SANMVideoContext *ctx, uint16_t param2, uint8_t clr
if (param2 > 256)
return AVERROR_INVALIDDATA;
- if (bytestream2_get_bytes_left(&ctx->gb) < loop)
+ if (bytestream2_get_bytes_left(gb) < loop)
return AVERROR_INVALIDDATA;
while (loop--) {
- c = bytestream2_get_byteu(&ctx->gb);
+ c = bytestream2_get_byteu(gb);
*dst++ = (c >> 4) + clr;
*dst++ = (c & 0xf) + clr;
}
@@ -671,8 +672,8 @@ static av_cold int decode_end(AVCodecContext *avctx)
return 0;
}
-static int old_codec4(SANMVideoContext *ctx, int top, int left, int w, int h,
- uint8_t param, uint16_t param2, int codec)
+static int old_codec4(SANMVideoContext *ctx, GetByteContext *gb, int top, int left,
+ int w, int h, uint8_t param, uint16_t param2, int codec)
{
const uint16_t p = ctx->pitch;
const uint32_t maxpxo = ctx->height * p;
@@ -688,7 +689,7 @@ static int old_codec4(SANMVideoContext *ctx, int top, int left, int w, int h,
ctx->c4param = param;
}
if (param2 > 0) {
- ret = codec4_load_tiles(ctx, param2, param);
+ ret = codec4_load_tiles(ctx, gb, param2, param);
if (ret)
return ret;
}
@@ -702,9 +703,9 @@ static int old_codec4(SANMVideoContext *ctx, int top, int left, int w, int h,
pxoff = j + left + ((top + i) * p);
if (param2 > 0) {
if (bits == 0) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 1)
+ if (bytestream2_get_bytes_left(gb) < 1)
return AVERROR_INVALIDDATA;
- mask = bytestream2_get_byteu(&ctx->gb);
+ mask = bytestream2_get_byteu(gb);
bits = 8;
}
bit = !!(mask & 0x80);
@@ -714,9 +715,9 @@ static int old_codec4(SANMVideoContext *ctx, int top, int left, int w, int h,
bit = 0;
}
- if (bytestream2_get_bytes_left(&ctx->gb) < 1)
+ if (bytestream2_get_bytes_left(gb) < 1)
return AVERROR_INVALIDDATA;
- idx = bytestream2_get_byteu(&ctx->gb);
+ idx = bytestream2_get_byteu(gb);
if ((bit == 0) && (idx == 0x80) && (codec != 5))
continue;
@@ -756,23 +757,23 @@ static int old_codec4(SANMVideoContext *ctx, int top, int left, int w, int h,
return 0;
}
-static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size)
+static int rle_decode(SANMVideoContext *ctx, GetByteContext *gb, uint8_t *dst, const int out_size)
{
int opcode, color, run_len, left = out_size;
while (left > 0) {
- opcode = bytestream2_get_byte(&ctx->gb);
+ opcode = bytestream2_get_byte(gb);
run_len = (opcode >> 1) + 1;
- if (run_len > left || bytestream2_get_bytes_left(&ctx->gb) <= 0)
+ if (run_len > left || bytestream2_get_bytes_left(gb) <= 0)
return AVERROR_INVALIDDATA;
if (opcode & 1) {
- color = bytestream2_get_byte(&ctx->gb);
+ color = bytestream2_get_byte(gb);
memset(dst, color, run_len);
} else {
- if (bytestream2_get_bytes_left(&ctx->gb) < run_len)
+ if (bytestream2_get_bytes_left(gb) < run_len)
return AVERROR_INVALIDDATA;
- bytestream2_get_bufferu(&ctx->gb, dst, run_len);
+ bytestream2_get_bufferu(gb, dst, run_len);
}
dst += run_len;
@@ -782,8 +783,8 @@ static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size)
return 0;
}
-static int old_codec23(SANMVideoContext *ctx, int top, int left, int width,
- int height, uint8_t param, uint16_t param2)
+static int old_codec23(SANMVideoContext *ctx, GetByteContext *gb, int top, int left,
+ int width, int height, uint8_t param, uint16_t param2)
{
const uint32_t maxpxo = ctx->height * ctx->pitch;
uint8_t *dst, lut[256], c;
@@ -795,30 +796,30 @@ static int old_codec23(SANMVideoContext *ctx, int top, int left, int width,
for (i = 0; i < 256; i++)
lut[i] = (i + param + 0xd0) & 0xff;
} else if (param2 == 256) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 256)
+ if (bytestream2_get_bytes_left(gb) < 256)
return AVERROR_INVALIDDATA;
- bytestream2_get_bufferu(&ctx->gb, ctx->c23lut, 256);
+ bytestream2_get_bufferu(gb, ctx->c23lut, 256);
} else if (param2 < 256) {
for (i = 0; i < 256; i++)
lut[i] = (i + param2) & 0xff;
} else {
memcpy(lut, ctx->c23lut, 256);
}
- if (bytestream2_get_bytes_left(&ctx->gb) < 1)
+ if (bytestream2_get_bytes_left(gb) < 1)
return 0; /* some c23 frames just set up the LUT */
dst = (uint8_t *)ctx->frm0;
for (i = 0; i < height; i++) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ if (bytestream2_get_bytes_left(gb) < 2)
return 0;
pxoff = left + ((top + i) * ctx->pitch);
- k = bytestream2_get_le16u(&ctx->gb);
+ k = bytestream2_get_le16u(gb);
sk = 1;
pc = 0;
while (k > 0 && pc <= width) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 1)
+ if (bytestream2_get_bytes_left(gb) < 1)
return AVERROR_INVALIDDATA;
- j = bytestream2_get_byteu(&ctx->gb);
+ j = bytestream2_get_byteu(gb);
if (sk) {
pxoff += j;
pc += j;
@@ -838,8 +839,8 @@ 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)
+static int old_codec21(SANMVideoContext *ctx, GetByteContext *gb, int top, int left,
+ int width, int height)
{
const uint32_t maxpxo = ctx->height * ctx->pitch;
uint8_t *dst = (uint8_t *)ctx->frm0, c;
@@ -847,25 +848,25 @@ static int old_codec21(SANMVideoContext *ctx, int top, int left, int width,
dst = (uint8_t *)ctx->frm0;
for (i = 0; i < height; i++) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ if (bytestream2_get_bytes_left(gb) < 2)
return 0;
pxoff = left + ((top + i) * ctx->pitch);
- k = bytestream2_get_le16u(&ctx->gb);
+ k = bytestream2_get_le16u(gb);
sk = 1;
pc = 0;
while (k > 0 && pc <= width) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
- j = bytestream2_get_le16u(&ctx->gb);
+ j = bytestream2_get_le16u(gb);
k -= 2;
if (sk) {
pxoff += j;
pc += j;
} else {
- if (bytestream2_get_bytes_left(&ctx->gb) < (j + 1))
+ if (bytestream2_get_bytes_left(gb) < (j + 1))
return AVERROR_INVALIDDATA;
do {
- c = bytestream2_get_byteu(&ctx->gb);
+ c = bytestream2_get_byteu(gb);
if (pxoff >=0 && pxoff < maxpxo) {
*(dst + pxoff) = c;
}
@@ -881,7 +882,7 @@ static int old_codec21(SANMVideoContext *ctx, int top, int left, int width,
return 0;
}
-static int old_codec1(SANMVideoContext *ctx, int top,
+static int old_codec1(SANMVideoContext *ctx, GetByteContext *gb, int top,
int left, int width, int height, int opaque)
{
int i, j, len, flag, code, val, end, pxoff;
@@ -889,22 +890,22 @@ static int old_codec1(SANMVideoContext *ctx, int top,
uint8_t *dst = (uint8_t *)ctx->frm0;
for (i = 0; i < height; i++) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
- len = bytestream2_get_le16u(&ctx->gb);
- end = bytestream2_tell(&ctx->gb) + len;
+ len = bytestream2_get_le16u(gb);
+ end = bytestream2_tell(gb) + len;
pxoff = left + ((top + i) * ctx->pitch);
- while (bytestream2_tell(&ctx->gb) < end) {
- if (bytestream2_get_bytes_left(&ctx->gb) < 2)
+ while (bytestream2_tell(gb) < end) {
+ if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
- code = bytestream2_get_byteu(&ctx->gb);
+ code = bytestream2_get_byteu(gb);
flag = code & 1;
code = (code >> 1) + 1;
if (flag) {
- val = bytestream2_get_byteu(&ctx->gb);
+ val = bytestream2_get_byteu(gb);
if (val || opaque) {
for (j = 0; j < code; j++) {
if (pxoff >= 0 && pxoff < maxpxo)
@@ -915,10 +916,10 @@ static int old_codec1(SANMVideoContext *ctx, int top,
pxoff += code;
}
} else {
- if (bytestream2_get_bytes_left(&ctx->gb) < code)
+ if (bytestream2_get_bytes_left(gb) < code)
return AVERROR_INVALIDDATA;
for (j = 0; j < code; j++) {
- val = bytestream2_get_byteu(&ctx->gb);
+ val = bytestream2_get_byteu(gb);
if ((pxoff >= 0) && (pxoff < maxpxo) && (val || opaque))
*(dst + pxoff) = val;
pxoff++;
@@ -931,16 +932,16 @@ static int old_codec1(SANMVideoContext *ctx, int top,
return 0;
}
-static int old_codec2(SANMVideoContext *ctx, int top,
+static int old_codec2(SANMVideoContext *ctx, GetByteContext *gb, int top,
int left, int width, int height)
{
uint8_t *dst = (uint8_t *)ctx->frm0, col;
int16_t xpos = left, ypos = top;
- while (bytestream2_get_bytes_left(&ctx->gb) > 3) {
- xpos += bytestream2_get_le16u(&ctx->gb);
- ypos += bytestream2_get_byteu(&ctx->gb);
- col = bytestream2_get_byteu(&ctx->gb);
+ while (bytestream2_get_bytes_left(gb) > 3) {
+ xpos += bytestream2_get_le16u(gb);
+ ypos += bytestream2_get_byteu(gb);
+ col = bytestream2_get_byteu(gb);
if (xpos >= 0 && ypos >= 0 &&
xpos < ctx->width && ypos < ctx->height) {
*(dst + xpos + ypos * ctx->pitch) = col;
@@ -1073,7 +1074,7 @@ static int old_codec37(SANMVideoContext *ctx, int width, int height)
}
break;
case 2:
- if (rle_decode(ctx, dst, decoded_size))
+ if (rle_decode(ctx, &ctx->gb, dst, decoded_size))
return AVERROR_INVALIDDATA;
memset(ctx->frm2, 0, ctx->frm2_size);
break;
@@ -1340,7 +1341,7 @@ static int old_codec47(SANMVideoContext *ctx, int width, int height)
memcpy(ctx->frm0, ctx->frm1, ctx->pitch * ctx->height);
break;
case 5:
- if (rle_decode(ctx, dst, decoded_size))
+ if (rle_decode(ctx, &ctx->gb, dst, decoded_size))
return AVERROR_INVALIDDATA;
break;
default:
@@ -1547,7 +1548,7 @@ static int old_codec48(SANMVideoContext *ctx, int width, int height)
}
break;
case 2:
- if (rle_decode(ctx, dst, decoded_size))
+ if (rle_decode(ctx, &ctx->gb, dst, decoded_size))
return AVERROR_INVALIDDATA;
break;
case 3:
@@ -1578,17 +1579,23 @@ static int old_codec48(SANMVideoContext *ctx, int width, int height)
return 0;
}
-static int process_frame_obj(SANMVideoContext *ctx)
+static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
{
- uint16_t parm2;
- uint8_t codec = bytestream2_get_byteu(&ctx->gb);
- uint8_t param = bytestream2_get_byteu(&ctx->gb);
- int16_t left = bytestream2_get_le16u(&ctx->gb);
- int16_t top = bytestream2_get_le16u(&ctx->gb);
- uint16_t w = bytestream2_get_le16u(&ctx->gb);
- uint16_t h = bytestream2_get_le16u(&ctx->gb);
- bytestream2_skip(&ctx->gb, 2);
- parm2 = bytestream2_get_le16u(&ctx->gb);
+ uint16_t w, h, parm2;
+ uint8_t codec, param;
+ int16_t left, top;
+
+ if (gb == NULL)
+ gb = &ctx->gb;
+
+ codec = bytestream2_get_byteu(gb);
+ param = bytestream2_get_byteu(gb);
+ left = bytestream2_get_le16u(gb);
+ top = bytestream2_get_le16u(gb);
+ w = bytestream2_get_le16u(gb);
+ h = bytestream2_get_le16u(gb);
+ bytestream2_skip(gb, 2);
+ parm2 = bytestream2_get_le16u(gb);
if (w < 1 || h < 1 || w > 800 || h > 600 || left > 800 || top > 600) {
av_log(ctx->avctx, AV_LOG_WARNING,
@@ -1655,18 +1662,18 @@ static int process_frame_obj(SANMVideoContext *ctx)
switch (codec) {
case 1:
case 3:
- return old_codec1(ctx, top, left, w, h, codec == 3);
+ return old_codec1(ctx, gb, top, left, w, h, codec == 3);
case 2:
- return old_codec2(ctx, top, left, w, h);
+ return old_codec2(ctx, gb, top, left, w, h);
case 4:
case 5:
case 33:
case 34:
- return old_codec4(ctx, top, left, w, h, param, parm2, codec);
+ return old_codec4(ctx, gb, top, left, w, h, param, parm2, codec);
case 21:
- return old_codec21(ctx, top, left, w, h);
+ return old_codec21(ctx, gb, top, left, w, h);
case 23:
- return old_codec23(ctx, top, left, w, h, param, parm2);
+ return old_codec23(ctx, gb, top, left, w, h, param, parm2);
case 37:
return old_codec37(ctx, w, h);
case 47:
@@ -1680,6 +1687,55 @@ static int process_frame_obj(SANMVideoContext *ctx)
}
}
+static int process_ftch(SANMVideoContext *ctx, int size)
+{
+ uint8_t *sf = ctx->stored_frame;
+ int xoff, yoff, left, top, ret;
+ GetByteContext gb;
+ uint32_t sz;
+
+ /* FTCH defines additional x/y offsets */
+ if (size != 12) {
+ if (bytestream2_get_bytes_left(&ctx->gb) < 6)
+ return AVERROR_INVALIDDATA;
+ bytestream2_skip(&ctx->gb, 2);
+ xoff = bytestream2_get_le16u(&ctx->gb);
+ yoff = bytestream2_get_le16u(&ctx->gb);
+ } else {
+ if (bytestream2_get_bytes_left(&ctx->gb) < 12)
+ return AVERROR_INVALIDDATA;
+ bytestream2_skip(&ctx->gb, 4);
+ xoff = bytestream2_get_be32u(&ctx->gb);
+ yoff = bytestream2_get_be32u(&ctx->gb);
+ }
+
+ sz = *(uint32_t *)(sf + 0);
+ if ((sz > 0) && (sz <= ctx->stored_frame_size - 4)) {
+ /* add the FTCH offsets to the left/top values of the stored FOBJ */
+ left = av_le2ne16(*(int16_t *)(sf + 4 + 2));
+ top = av_le2ne16(*(int16_t *)(sf + 4 + 4));
+ *(int16_t *)(sf + 4 + 2) = av_le2ne16(left + xoff);
+ *(int16_t *)(sf + 4 + 4) = av_le2ne16(top + yoff);
+
+ /* decode the stored FOBJ */
+ bytestream2_init(&gb, sf + 4, sz);
+ ret = process_frame_obj(ctx, &gb);
+
+ /* now restore the original left/top values again */
+ *(int16_t *)(sf + 4 + 2) = av_le2ne16(left);
+ *(int16_t *)(sf + 4 + 4) = av_le2ne16(top);
+ } else {
+ /* this happens a lot in RA1: The individual files are meant to
+ * be played in sequence, with some referencing objects STORed
+ * by previous files, e.g. the cockpit codec21 object in RA1 LVL8.
+ * But spamming the log with errors is also not helpful, so
+ * here we simply ignore this case.
+ */
+ ret = 0;
+ }
+ return ret;
+}
+
static int process_xpal(SANMVideoContext *ctx, int size)
{
int16_t *dp = ctx->delta_pal;
@@ -1990,7 +2046,7 @@ static int decode_5(SANMVideoContext *ctx)
#endif
uint8_t *dst = (uint8_t*)ctx->frm0;
- if (rle_decode(ctx, dst, ctx->buf_size))
+ if (rle_decode(ctx, &ctx->gb, dst, ctx->buf_size))
return AVERROR_INVALIDDATA;
#if HAVE_BIGENDIAN
@@ -2033,7 +2089,7 @@ static int decode_8(SANMVideoContext *ctx)
}
rsrc = ctx->rle_buf;
- if (rle_decode(ctx, rsrc, npixels))
+ if (rle_decode(ctx, &ctx->gb, rsrc, npixels))
return AVERROR_INVALIDDATA;
while (npixels--)
@@ -2160,9 +2216,32 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
case MKBETAG('F', 'O', 'B', 'J'):
if (size < 16)
return AVERROR_INVALIDDATA;
- if (ret = process_frame_obj(ctx))
+ if (ret = process_frame_obj(ctx, NULL))
return ret;
have_img = 1;
+
+ /* STOR: for ANIMv0/1 store the whole FOBJ datablock, as it
+ * needs to be replayed on FTCH, since none of the codecs
+ * it uses work on the full buffer.
+ * For ANIMv2, it's enough to store the current framebuffer.
+ */
+ if (to_store) {
+ to_store = 0;
+ if (ctx->subversion < 2) {
+ if (size + 4 <= ctx->stored_frame_size) {
+ int pos2 = bytestream2_tell(&ctx->gb);
+ bytestream2_seek(&ctx->gb, pos, SEEK_SET);
+ *(uint32_t *)(ctx->stored_frame) = size;
+ bytestream2_get_bufferu(&ctx->gb, ctx->stored_frame + 4, size);
+ bytestream2_seek(&ctx->gb, pos2, SEEK_SET);
+ } else {
+ av_log(avctx, AV_LOG_ERROR, "FOBJ too large for STOR\n");
+ ret = AVERROR(ENOMEM);
+ }
+ } else {
+ memcpy(ctx->stored_frame, ctx->frm0, ctx->buf_size);
+ }
+ }
break;
case MKBETAG('X', 'P', 'A', 'L'):
if (ret = process_xpal(ctx, size))
@@ -2172,7 +2251,12 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
to_store = 1;
break;
case MKBETAG('F', 'T', 'C', 'H'):
- memcpy(ctx->frm0, ctx->stored_frame, ctx->buf_size);
+ if (ctx->subversion < 2) {
+ if (ret = process_ftch(ctx, size))
+ return ret;
+ } else {
+ memcpy(ctx->frm0, ctx->stored_frame, ctx->buf_size);
+ }
have_img = 1;
break;
default:
@@ -2193,8 +2277,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
bytestream2_seek(&ctx->gb, pos + size, SEEK_SET);
}
}
- if (to_store)
- memcpy(ctx->stored_frame, ctx->frm0, ctx->buf_size);
if (have_img && ctx->have_dimensions) {
if ((ret = copy_output(ctx, NULL)))
--
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".