* and it can be deflated or not. Similarly, pixel data comes after the header
* and a variable size value, and it can be deflated or just raw.
*
- * Supports: BGRA
+ * Supports: BGRA, BGR24, RGB555, RGB8
*/
#include <stdint.h>
AVFrame *reference;
Tile *tiles;
unsigned int tiles_size;
+ int component_size;
/* zlib interaction */
uint8_t *inflated_buf;
if (!ctx->reference)
return AVERROR(ENOMEM);
- if (avctx->codec_tag == MKTAG('I','S','C','C')) {
+ /* Get pixel format and the size of the pixel */
+ if (avctx->codec_tag == MKTAG('I', 'S', 'C', 'C')) {
avctx->pix_fmt = AV_PIX_FMT_BGRA;
+ ctx->component_size = 4;
+ } else if (avctx->codec_tag == MKTAG('R', 'S', 'C', 'C')) {
+ ctx->component_size = avctx->bits_per_coded_sample / 8;
+ switch (avctx->bits_per_coded_sample) {
+ case 8:
+ avpriv_report_missing_feature(avctx, "8 bits per pixel");
+ return AVERROR_PATCHWELCOME;
+ case 16:
+ avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
+ break;
+ case 24:
+ avctx->pix_fmt = AV_PIX_FMT_BGR24;
+ break;
+ case 32:
+ avctx->pix_fmt = AV_PIX_FMT_BGRA;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Invalid bits per pixel value (%d)\n",
+ avctx->bits_per_coded_sample);
+ return AVERROR_INVALIDDATA;
+ }
} else {
avctx->pix_fmt = AV_PIX_FMT_BGR0;
+ ctx->component_size = 4;
+ av_log(avctx, AV_LOG_WARNING, "Invalid codec tag\n");
}
/* Store the value to check for keyframes */
- ctx->inflated_size = avctx->width * avctx->height * 4;
+ ctx->inflated_size = avctx->width * avctx->height * ctx->component_size;
/* Allocate maximum size possible, a full frame */
ctx->inflated_buf = av_malloc(ctx->inflated_size);
ctx->tiles[i].y = bytestream2_get_le16(gbc);
ctx->tiles[i].h = bytestream2_get_le16(gbc);
- pixel_size += ctx->tiles[i].w * ctx->tiles[i].h * 4;
+ pixel_size += ctx->tiles[i].w * ctx->tiles[i].h * ctx->component_size;
ff_dlog(avctx, "tile %d orig(%d,%d) %dx%d.\n", i,
ctx->tiles[i].x, ctx->tiles[i].y,
ff_dlog(avctx, "pixel_size %d packed_size %d.\n", pixel_size, packed_size);
+ if (packed_size < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid tile size %d\n", packed_size);
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
/* Get pixels buffer, it may be deflated or just raw */
if (pixel_size == packed_size) {
if (bytestream2_get_bytes_left(gbc) < pixel_size) {
pixels = gbc->buffer;
} else {
uLongf len = ctx->inflated_size;
+ if (bytestream2_get_bytes_left(gbc) < packed_size) {
+ av_log(avctx, AV_LOG_ERROR, "Insufficient input for %d\n", packed_size);
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size);
if (ret) {
av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret);
for (i = 0; i < tiles_nb; i++) {
uint8_t *dst = ctx->reference->data[0] + ctx->reference->linesize[0] *
(avctx->height - ctx->tiles[i].y - 1) +
- ctx->tiles[i].x * 4;
+ ctx->tiles[i].x * ctx->component_size;
av_image_copy_plane(dst, -1 * ctx->reference->linesize[0],
- raw, ctx->tiles[i].w * 4,
- ctx->tiles[i].w * 4, ctx->tiles[i].h);
- raw += ctx->tiles[i].w * 4 * ctx->tiles[i].h;
+ raw, ctx->tiles[i].w * ctx->component_size,
+ ctx->tiles[i].w * ctx->component_size,
+ ctx->tiles[i].h);
+ raw += ctx->tiles[i].w * ctx->component_size * ctx->tiles[i].h;
}
/* Frame is ready to be output */