[FFmpeg-cvslog] iff: support ExtraHalfBrite (EHB) palette mode
Peter Ross
git at videolan.org
Sat Dec 3 03:46:59 CET 2011
ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Dec 3 13:01:58 2011 +1100| [52b7ed4f6ea72219fb38905ea44b9ef730c20764] | committer: Michael Niedermayer
iff: support ExtraHalfBrite (EHB) palette mode
Fixes ticket #663.
Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52b7ed4f6ea72219fb38905ea44b9ef730c20764
---
libavcodec/iff.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 2836d2f..7a11d43 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -137,6 +137,7 @@ static av_always_inline uint32_t gray2rgb(const uint32_t x) {
*/
static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
{
+ IffContext *s = avctx->priv_data;
int count, i;
const uint8_t *const palette = avctx->extradata + AV_RB16(avctx->extradata);
int palette_size = avctx->extradata_size - AV_RB16(avctx->extradata);
@@ -153,6 +154,10 @@ static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
for (i=0; i < count; i++) {
pal[i] = 0xFF000000 | AV_RB24(palette + i*3);
}
+ if (s->flags && count >= 32) { // EHB
+ for (i = 0; i < 32; i++)
+ pal[i + 32] = 0xFF000000 | (AV_RB24(palette + i*3) & 0xFEFEFE) >> 1;
+ }
} else { // Create gray-scale color palette for bps < 8
count = 1 << avctx->bits_per_coded_sample;
@@ -266,9 +271,6 @@ static int extract_header(AVCodecContext *const avctx,
s->ham_palbuf[(i+count*2)*2+1] = tmp;
s->ham_palbuf[(i+count*3)*2+1] = tmp << 8;
}
- } else if (s->flags & 1) { // EHB (ExtraHalfBrite) color palette
- av_log(avctx, AV_LOG_ERROR, "ExtraHalfBrite (EHB) mode not supported\n");
- return AVERROR_PATCHWELCOME;
}
}
More information about the ffmpeg-cvslog
mailing list