AVFrame frame;
int planesize;
uint8_t * planebuf;
+ int init; // 1 if buffer and palette data already initialized, 0 otherwise
} IffContext;
#define LUT8_PART(plane, v) \
LUT32(28), LUT32(29), LUT32(30), LUT32(31),
};
+// Gray to RGB, required for palette table of grayscale images with bpp < 8
+static av_always_inline uint32_t gray2rgb(const uint32_t x) {
+ return x << 16 | x << 8 | x;
+}
+
/**
* Convert CMAP buffer (stored in extradata) to lavc palette format
*/
}
count = 1 << avctx->bits_per_coded_sample;
- if (avctx->extradata_size < count * 3) {
- av_log(avctx, AV_LOG_ERROR, "palette data underflow\n");
- return AVERROR_INVALIDDATA;
- }
- for (i=0; i < count; i++) {
- pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
+ // If extradata is smaller than actually needed, fill the remaining with black.
+ count = FFMIN(avctx->extradata_size / 3, count);
+ if (count) {
+ for (i=0; i < count; i++) {
+ pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
+ }
+ } else { // Create gray-scale color palette for bps < 8
+ count = 1 << avctx->bits_per_coded_sample;
+
+ for (i=0; i < count; i++) {
+ pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample);
+ }
}
return 0;
}
int err;
if (avctx->bits_per_coded_sample <= 8) {
- avctx->pix_fmt = PIX_FMT_PAL8;
+ avctx->pix_fmt = (avctx->bits_per_coded_sample < 8 ||
+ avctx->extradata_size) ? PIX_FMT_PAL8
+ : PIX_FMT_GRAY8;
} else if (avctx->bits_per_coded_sample <= 32) {
avctx->pix_fmt = PIX_FMT_BGR32;
} else {
return AVERROR(ENOMEM);
s->frame.reference = 1;
- if ((err = avctx->get_buffer(avctx, &s->frame) < 0)) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return err;
- }
- return avctx->bits_per_coded_sample <= 8 ?
- ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1]) : 0;
+ return 0;
}
/**
} while (--buf_size);
}
+/**
+ * Decodes one complete byterun1 encoded line.
+ *
+ * @param dst the destination buffer where to store decompressed bitstream
+ * @param dst_size the destination plane size in bytes
+ * @param buf the source byterun1 compressed bitstream
+ * @param buf_end the EOF of source byterun1 compressed bitstream
+ * @return number of consumed bytes in byterun1 compressed bitstream
+*/
+static int decode_byterun(uint8_t *dst, int dst_size,
+ const uint8_t *buf, const uint8_t *const buf_end) {
+ const uint8_t *const buf_start = buf;
+ unsigned x;
+ for (x = 0; x < dst_size && buf < buf_end;) {
+ unsigned length;
+ const int8_t value = *buf++;
+ if (value >= 0) {
+ length = value + 1;
+ memcpy(dst + x, buf, FFMIN3(length, dst_size - x, buf_end - buf));
+ buf += length;
+ } else if (value > -128) {
+ length = -value + 1;
+ memset(dst + x, *buf++, FFMIN(length, dst_size - x));
+ } else { // noop
+ continue;
+ }
+ x += length;
+ }
+ return buf - buf_start;
+}
+
static int decode_frame_ilbm(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
- int y, plane;
+ int y, plane, res;
- if (avctx->reget_buffer(avctx, &s->frame) < 0){
+ if (s->init) {
+ if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+ return res;
+ }
+ } else if ((res = avctx->get_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return res;
+ } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != PIX_FMT_GRAY8) {
+ if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0)
+ return res;
}
+ s->init = 1;
- if (avctx->pix_fmt == PIX_FMT_PAL8) {
- for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
- memset(row, 0, avctx->width);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
- decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
- buf += s->planesize;
+ if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved
+ if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {
+ for(y = 0; y < avctx->height; y++ ) {
+ uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
+ memset(row, 0, avctx->width);
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+ decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+ buf += s->planesize;
+ }
+ }
+ } else { // PIX_FMT_BGR32
+ for(y = 0; y < avctx->height; y++ ) {
+ uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ memset(row, 0, avctx->width << 2);
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+ decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+ buf += s->planesize;
+ }
}
}
- } else { // PIX_FMT_BGR32
+ } else if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) { // IFF-PBM
for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
- memset(row, 0, avctx->width << 2);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
- decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
- buf += s->planesize;
- }
+ uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
+ memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
+ buf += avctx->width;
}
}
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
- int y, plane, x;
+ int y, plane, res;
- if (avctx->reget_buffer(avctx, &s->frame) < 0){
+ if (s->init) {
+ if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
+ return res;
+ }
+ } else if ((res = avctx->get_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return res;
+ } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != PIX_FMT_GRAY8) {
+ if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0)
+ return res;
}
+ s->init = 1;
if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved
- if (avctx->pix_fmt == PIX_FMT_PAL8) {
+ if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {
for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
- for(x = 0; x < s->planesize && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
- } else { //noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
decodeplane8(row, s->planebuf, s->planesize, plane);
}
}
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
memset(row, 0, avctx->width << 2);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
- for(x = 0; x < s->planesize && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(s->planebuf + x, buf, FFMIN3(length, s->planesize - x, buf_end - buf));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(s->planebuf + x, *buf++, FFMIN(length, s->planesize - x));
- } else { // noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane);
}
}
} else {
for(y = 0; y < avctx->height ; y++ ) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
- for(x = 0; x < avctx->width && buf < buf_end; ) {
- int8_t value = *buf++;
- unsigned length;
- if (value >= 0) {
- length = value + 1;
- memcpy(row + x, buf, FFMIN3(length, buf_end - buf, avctx->width - x));
- buf += length;
- } else if (value > -128) {
- length = -value + 1;
- memset(row + x, *buf++, FFMIN(length, avctx->width - x));
- } else { //noop
- continue;
- }
- x += length;
- }
+ buf += decode_byterun(row, avctx->width, buf, buf_end);
}
}