From: Manuel Lauss <manuel.lauss@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/sanm: codec2 decoder
Date: Tue, 11 Mar 2025 16:03:39 +0100
Message-ID: <20250311150341.348678-7-manuel.lauss@gmail.com> (raw)
In-Reply-To: <20250311150341.348678-1-manuel.lauss@gmail.com>
this codec consists of 4 byte packets: 2bytes delta-x, 1 byte delta-y
and 1 byte color to put at that spot.
Used in Rebel Assault 1 only.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
libavcodec/sanm.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index efed31b70c..8c0b76aed6 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -604,6 +604,24 @@ static int old_codec1(SANMVideoContext *ctx, int top,
return 0;
}
+static int old_codec2(SANMVideoContext *ctx, 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);
+ if (xpos >= 0 && ypos >= 0 &&
+ xpos < ctx->width && ypos < ctx->height) {
+ *(dst + xpos + ypos * ctx->pitch) = col;
+ }
+ }
+ return 0;
+}
+
static inline void codec37_mv(uint8_t *dst, const uint8_t *src,
int height, int stride, int x, int y)
{
@@ -1303,6 +1321,8 @@ static int process_frame_obj(SANMVideoContext *ctx)
case 1:
case 3:
return old_codec1(ctx, top, left, w, h, codec != 1);
+ case 2:
+ return old_codec2(ctx, top, left, w, h);
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".
next prev parent reply other threads:[~2025-03-11 15:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 15:03 [FFmpeg-devel] [PATCH 1/9] avcodec/sanm: codec37: reimplement comp4 Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 2/9] avcodec/sanm: better frame size detection for old codecs Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 3/9] avcodec/sanm: disable left/top for fullscreen codecs Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 4/9] avcodec/sanm: fix codec3 Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 5/9] avcodec/sanm: FOBJ left/top are signed values Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 6/9] avcodec/sanm: misc fixes Manuel Lauss
2025-03-11 15:03 ` Manuel Lauss [this message]
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 8/9] avcodec/sanm: codec23 decoder Manuel Lauss
2025-03-11 15:03 ` [FFmpeg-devel] [PATCH 9/9] avcodec/sanm: codec21 decoder Manuel Lauss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250311150341.348678-7-manuel.lauss@gmail.com \
--to=manuel.lauss@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git