CHECK_PIXEL_PTR(0);
while ((rle_code = (int8_t)bytestream2_get_byte(&s->g)) != -1) {
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return;
if (rle_code == 0) {
/* there's another skip code in the stream */
pixel_ptr += (num_pixels * (bytestream2_get_byte(&s->g) - 1));
CHECK_PIXEL_PTR(0);
while ((rle_code = (int8_t)bytestream2_get_byte(&s->g)) != -1) {
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return;
if (rle_code == 0) {
/* there's another skip code in the stream */
pixel_ptr += (4 * (bytestream2_get_byte(&s->g) - 1));
CHECK_PIXEL_PTR(0);
while ((rle_code = (int8_t)bytestream2_get_byte(&s->g)) != -1) {
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return;
if (rle_code == 0) {
/* there's another skip code in the stream */
pixel_ptr += (bytestream2_get_byte(&s->g) - 1) * 2;
static void qtrle_decode_24bpp(QtrleContext *s, int row_ptr, int lines_to_change)
{
- int rle_code;
+ int rle_code, rle_code_half;
int pixel_ptr;
int row_inc = s->frame->linesize[0];
- uint8_t r, g, b;
+ uint8_t b;
+ uint16_t rg;
uint8_t *rgb = s->frame->data[0];
int pixel_limit = s->frame->linesize[0] * s->avctx->height;
CHECK_PIXEL_PTR(0);
while ((rle_code = (int8_t)bytestream2_get_byte(&s->g)) != -1) {
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return;
if (rle_code == 0) {
/* there's another skip code in the stream */
pixel_ptr += (bytestream2_get_byte(&s->g) - 1) * 3;
} else if (rle_code < 0) {
/* decode the run length code */
rle_code = -rle_code;
- r = bytestream2_get_byte(&s->g);
- g = bytestream2_get_byte(&s->g);
+ rg = bytestream2_get_ne16(&s->g);
b = bytestream2_get_byte(&s->g);
CHECK_PIXEL_PTR(rle_code * 3);
while (rle_code--) {
- rgb[pixel_ptr++] = r;
- rgb[pixel_ptr++] = g;
- rgb[pixel_ptr++] = b;
+ AV_WN16A(rgb + pixel_ptr, rg);
+ rgb[pixel_ptr + 2] = b;
+ pixel_ptr += 3;
}
} else {
CHECK_PIXEL_PTR(rle_code * 3);
- /* copy pixels directly to output */
- while (rle_code--) {
- rgb[pixel_ptr++] = bytestream2_get_byte(&s->g);
- rgb[pixel_ptr++] = bytestream2_get_byte(&s->g);
- rgb[pixel_ptr++] = bytestream2_get_byte(&s->g);
+ rle_code_half = rle_code / 2;
+
+ while (rle_code_half--) { /* copy 2 raw rgb value at the same time */
+ AV_WN32A(rgb + pixel_ptr, bytestream2_get_ne32(&s->g)); /* rgbr */
+ AV_WN16A(rgb + pixel_ptr + 4, bytestream2_get_ne16(&s->g)); /* rgbr */
+ pixel_ptr += 6;
+ }
+
+ if (rle_code % 2 != 0){ /* not even raw value */
+ AV_WN16A(rgb + pixel_ptr, bytestream2_get_ne16(&s->g));
+ rgb[pixel_ptr + 2] = bytestream2_get_byte(&s->g);
+ pixel_ptr += 3;
}
}
}
static void qtrle_decode_32bpp(QtrleContext *s, int row_ptr, int lines_to_change)
{
- int rle_code;
+ int rle_code, rle_code_half;
int pixel_ptr;
int row_inc = s->frame->linesize[0];
unsigned int argb;
CHECK_PIXEL_PTR(0);
while ((rle_code = (int8_t)bytestream2_get_byte(&s->g)) != -1) {
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return;
if (rle_code == 0) {
/* there's another skip code in the stream */
pixel_ptr += (bytestream2_get_byte(&s->g) - 1) * 4;
} else if (rle_code < 0) {
/* decode the run length code */
rle_code = -rle_code;
- argb = bytestream2_get_be32(&s->g);
+ argb = bytestream2_get_ne32(&s->g);
CHECK_PIXEL_PTR(rle_code * 4);
CHECK_PIXEL_PTR(rle_code * 4);
/* copy pixels directly to output */
- while (rle_code--) {
- argb = bytestream2_get_be32(&s->g);
- AV_WN32A(rgb + pixel_ptr, argb);
- pixel_ptr += 4;
+ rle_code_half = rle_code / 2;
+ while (rle_code_half--) { /* copy 2 argb raw value at the same time */
+ AV_WN64A(rgb + pixel_ptr, bytestream2_get_ne64(&s->g));
+ pixel_ptr += 8;
+ }
+
+ if (rle_code % 2 != 0){ /* not even raw value */
+ AV_WN32A(rgb + pixel_ptr, bytestream2_get_ne32(&s->g));
+ pixel_ptr += 4;
}
}
}
break;
case 32:
- avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ avctx->pix_fmt = AV_PIX_FMT_ARGB;
break;
default:
int ret;
bytestream2_init(&s->g, avpkt->data, avpkt->size);
- if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
- return ret;
/* check if this frame is even supposed to change */
if (avpkt->size < 8)
- goto done;
+ return avpkt->size;
/* start after the chunk size */
bytestream2_seek(&s->g, 4, SEEK_SET);
/* if a header is present, fetch additional decoding parameters */
if (header & 0x0008) {
if (avpkt->size < 14)
- goto done;
+ return avpkt->size;
start_line = bytestream2_get_be16(&s->g);
bytestream2_skip(&s->g, 2);
height = bytestream2_get_be16(&s->g);
bytestream2_skip(&s->g, 2);
if (height > s->avctx->height - start_line)
- goto done;
+ return avpkt->size;
} else {
start_line = 0;
height = s->avctx->height;
}
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
+ return ret;
+
row_ptr = s->frame->linesize[0] * start_line;
switch (avctx->bits_per_coded_sample) {
memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
}
-done:
if ((ret = av_frame_ref(data, s->frame)) < 0)
return ret;
*got_frame = 1;