From: Peter Ross <pross@xvid.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/4] mm: decode partial palette
Date: Sat, 8 Jun 2024 19:05:20 +1000
Message-ID: <e721b4d0a464400b233205e15163d33148e1824a.1717837373.git.pross@xvid.org> (raw)
In-Reply-To: <5b83443361479c11a5975c8dd308375a0f101e59.1717837373.git.pross@xvid.org>
---
palette decoding now conforms to description at https://wiki.multimedia.cx/index.php/IBM_PhotoMotion
libavcodec/mmvideo.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 3038d9ea92..b5b6ffd25b 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -79,12 +79,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
static void mm_decode_pal(MmContext *s)
{
int i;
-
- bytestream2_skip(&s->gb, 4);
- for (i = 0; i < 128; i++) {
- s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb);
- s->palette[i+128] = s->palette[i]<<2;
- }
+ int start = bytestream2_get_le16(&s->gb);
+ int count = bytestream2_get_le16(&s->gb);
+ for (i = 0; i < count; i++)
+ s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2);
}
/**
--
2.43.0
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
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:[~2024-06-08 9:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-08 9:03 [FFmpeg-devel] [PATCH 1/4] mm: set audio pts proportionally to audio offset Peter Ross
2024-06-08 9:05 ` Peter Ross [this message]
2024-06-08 13:47 ` [FFmpeg-devel] [PATCH 2/4] mm: decode partial palette Andreas Rheinhardt
2024-06-08 9:05 ` [FFmpeg-devel] [PATCH 3/4] mm: don't fail if x offset exceeds frame width Peter Ross
2024-06-08 9:07 ` [FFmpeg-devel] [PATCH 4/4] mm: decode raw chunk type and skip unknown audio chunk type Peter Ross
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=e721b4d0a464400b233205e15163d33148e1824a.1717837373.git.pross@xvid.org \
--to=pross@xvid.org \
--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