From: Manuel Lauss <manuel.lauss@gmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Manuel Lauss <manuel.lauss@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 08/13] avcodec/sanm: codec21 decoder Date: Sat, 15 Mar 2025 10:32:15 +0100 Message-ID: <20250315093220.2565-9-manuel.lauss@gmail.com> (raw) In-Reply-To: <20250315093220.2565-1-manuel.lauss@gmail.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".
next prev parent reply other threads:[~2025-03-15 9:34 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-03-15 9:32 [FFmpeg-devel] [PATCH v2 00/13] avcodec/sanm: various improvements Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 01/13] avcodec/sanm: disable left/top for fullscreen codecs Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 02/13] avcodec/sanm: FOBJ left/top are signed values Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 03/13] avcodec/sanm: better frame size detection for old codecs Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 04/13] avcodec/sanm: better ANIMv1 engine support Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 05/13] avcodec/sanm: fix codec3 Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 06/13] avcodec/sanm: codec2 decoder Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 07/13] avcodec/sanm: codec23 decoder Manuel Lauss 2025-03-15 9:32 ` Manuel Lauss [this message] 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 09/13] avcodec/sanm: codec4/5/33/34 decoder Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 10/13] avcodec/sanm: codec37: reimplement comp4 Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 11/13] avcodec/sanm: implement STOR/FTCH for ANIMv1 Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 12/13] avcodec/sanm: ignore codec45 Manuel Lauss 2025-03-15 9:32 ` [FFmpeg-devel] [PATCH v2 13/13] MAINTAINERS: add Manuel Lauss as sanm.c/smush.c Maintainer Manuel Lauss 2025-03-16 14:27 ` Michael Niedermayer
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=20250315093220.2565-9-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