From: Manuel Lauss <manuel.lauss@gmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Manuel Lauss <manuel.lauss@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/sanm: add smush codec23 decoder Date: Mon, 10 Feb 2025 19:12:47 +0100 Message-ID: <20250210181247.144548-3-manuel.lauss@gmail.com> (raw) In-Reply-To: <20250210181247.144548-1-manuel.lauss@gmail.com> This codec alternatingly skips and changes existing pixels. A second 16bit parameter in the FOBJ header indicates how to do the pixel changes: either by specifying a LUT in the codec datastream or by adding a constant value to the pixel. Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com> --- Videos showing the before/after state (Rebel Assault II LEV09/09PLAY.SAN file) http://mlau.at/ffmpeg_c23_before.mp4 http://mlau.at/ffmpeg_c23_after.mp4 notice the blue transparent forcefields. libavcodec/sanm.c | 62 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 0e7cd292d0..fb055b61c7 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -292,6 +292,7 @@ typedef struct SANMVideoContext { int8_t p4x4glyphs[NGLYPHS][16]; int8_t p8x8glyphs[NGLYPHS][64]; uint8_t c47itbl[0x10000]; + uint8_t c23lut[256]; } SANMVideoContext; typedef struct SANMFrameHeader { @@ -555,6 +556,58 @@ 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) +{ + const uint32_t maxpxo = ctx->width * ctx->pitch; + uint8_t *dst, lut[256], c; + int i, j, k, pc, sk; + int32_t pxoff; + + if (param2 == 256) { + if (bytestream2_get_bytes_left(&ctx->gb) < 256) + return AVERROR_INVALIDDATA; + bytestream2_get_bufferu(&ctx->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) + 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) + 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) < 1) + return AVERROR_INVALIDDATA; + j = bytestream2_get_byteu(&ctx->gb); + if (sk) { + pxoff += j; + pc += j; + } else { + while (j--) { + if (pxoff >=0 && pxoff < maxpxo) { + c = *(dst + pxoff); + *(dst + pxoff) = lut[c]; + } + pxoff++; + pc++; + } + } + sk ^= 1; + } + } + return 0; +} + static int old_codec1(SANMVideoContext *ctx, int top, int left, int width, int height) { @@ -1237,11 +1290,15 @@ static int old_codec48(SANMVideoContext *ctx, int width, int height) static int process_frame_obj(SANMVideoContext *ctx) { - uint16_t codec = bytestream2_get_le16u(&ctx->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); if (!w || !h) { av_log(ctx->avctx, AV_LOG_ERROR, "Dimensions are invalid.\n"); @@ -1260,12 +1317,13 @@ static int process_frame_obj(SANMVideoContext *ctx) return AVERROR(ENOMEM); } } - bytestream2_skip(&ctx->gb, 4); switch (codec) { case 1: case 3: return old_codec1(ctx, top, left, w, h); + case 23: + return old_codec23(ctx, top, left, w, h, param, parm2); case 37: return old_codec37(ctx, top, left, 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-02-10 18:13 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-02-10 18:12 [FFmpeg-devel] [PATCH 1/3] avcodec/sanm: ignore unknown codecs in FOBJs Manuel Lauss 2025-02-10 18:12 ` [FFmpeg-devel] [PATCH 2/3] avcodec/sanm: fobj left/top are signed Manuel Lauss 2025-02-10 18:12 ` Manuel Lauss [this message] 2025-02-10 19:42 ` [FFmpeg-devel] [PATCH 1/3] avcodec/sanm: ignore unknown codecs in FOBJs Marton Balint 2025-02-10 20:48 ` 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=20250210181247.144548-3-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