#include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
-
-#define RT_OLD 0
-#define RT_STANDARD 1
-#define RT_BYTE_ENCODED 2
-#define RT_FORMAT_RGB 3
-#define RT_FORMAT_TIFF 4
-#define RT_FORMAT_IFF 5
+#include "sunrast.h"
typedef struct SUNRASTContext {
AVFrame picture;
SUNRASTContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame= &s->picture;
+ avctx->coded_frame = &s->picture;
return 0;
}
static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
int *data_size, AVPacket *avpkt) {
- const uint8_t *buf = avpkt->data;
- const uint8_t *buf_end = avpkt->data + avpkt->size;
+ const uint8_t *buf = avpkt->data;
+ const uint8_t *buf_end = avpkt->data + avpkt->size;
SUNRASTContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame *picture = data;
+ AVFrame * const p = &s->picture;
unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
uint8_t *ptr;
const uint8_t *bufstart = buf;
+ int ret;
if (avpkt->size < 32)
return AVERROR_INVALIDDATA;
- if (AV_RB32(buf) != 0x59a66a95) {
+ if (AV_RB32(buf) != RAS_MAGIC) {
av_log(avctx, AV_LOG_ERROR, "this is not sunras encoded data\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- w = AV_RB32(buf+4);
- h = AV_RB32(buf+8);
- depth = AV_RB32(buf+12);
- type = AV_RB32(buf+20);
- maptype = AV_RB32(buf+24);
- maplength = AV_RB32(buf+28);
+ w = AV_RB32(buf + 4);
+ h = AV_RB32(buf + 8);
+ depth = AV_RB32(buf + 12);
+ type = AV_RB32(buf + 20);
+ maptype = AV_RB32(buf + 24);
+ maplength = AV_RB32(buf + 28);
buf += 32;
- if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF) {
- av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n");
- return -1;
+ if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type == RT_EXPERIMENTAL) {
+ av_log_ask_for_sample(avctx, "unsupported (compression) type\n");
+ return AVERROR_PATCHWELCOME;
}
- if (type < RT_OLD || type > RT_FORMAT_IFF) {
+ if (type > RT_FORMAT_IFF) {
av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (av_image_check_size(w, h, 0, avctx)) {
av_log(avctx, AV_LOG_ERROR, "invalid image size\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- if (maptype & ~1) {
+ if (maptype == RMT_RAW) {
+ av_log_ask_for_sample(avctx, "unsupported colormap type\n");
+ return AVERROR_PATCHWELCOME;
+ }
+ if (maptype > RMT_RAW) {
av_log(avctx, AV_LOG_ERROR, "invalid colormap type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
avctx->pix_fmt = PIX_FMT_MONOWHITE;
break;
case 8:
- avctx->pix_fmt = PIX_FMT_PAL8;
+ avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
break;
case 24:
avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid depth\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (p->data[0])
if (w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h);
- if (avctx->get_buffer(avctx, p) < 0) {
+ if ((ret = avctx->get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
p->pict_type = AV_PICTURE_TYPE_I;
if (depth != 8 && maplength) {
av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n");
- } else if (depth == 8) {
+ } else if (maplength) {
unsigned int len = maplength / 3;
- if (!maplength) {
- av_log(avctx, AV_LOG_ERROR, "colormap expected\n");
- return -1;
- }
if (maplength % 3 || maplength > 768) {
av_log(avctx, AV_LOG_WARNING, "invalid colormap length\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
ptr = p->data[1];
- for (x=0; x<len; x++, ptr+=4)
- *(uint32_t *)ptr = (buf[x]<<16) + (buf[len+x]<<8) + buf[len+len+x];
+ for (x = 0; x < len; x++, ptr += 4)
+ *(uint32_t *)ptr = (buf[x] << 16) + (buf[len + x] << 8) + buf[len + len + x];
}
buf += maplength;
/* scanlines are aligned on 16 bit boundaries */
len = (depth * w + 7) >> 3;
- alen = len + (len&1);
+ alen = len + (len & 1);
if (type == RT_BYTE_ENCODED) {
int value, run;
- uint8_t *end = ptr + h*stride;
+ uint8_t *end = ptr + h * stride;
x = 0;
while (ptr != end && buf < buf_end) {
if (buf_end - buf < 1)
return AVERROR_INVALIDDATA;
- if ((value = *buf++) == 0x80) {
+ if ((value = *buf++) == RLE_TRIGGER) {
run = *buf++ + 1;
if (run != 1)
value = *buf++;
}
}
} else {
- for (y=0; y<h; y++) {
+ for (y = 0; y < h; y++) {
if (buf_end - buf < len)
break;
memcpy(ptr, buf, len);
}
}
- *picture = s->picture;
+ *picture = s->picture;
*data_size = sizeof(AVFrame);
return buf - bufstart;
.close = sunrast_end,
.decode = sunrast_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
+ .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
};