diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index f8d81fd4e7..fcfdb98577 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -133,9 +133,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) case 8 : avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 15 : avctx->pix_fmt = AV_PIX_FMT_RGB555; break; case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break; - case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but no files to test with */ - avpriv_request_sample(avctx, "24Bpp FLC/FLX"); - return AVERROR_PATCHWELCOME; + case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; break; default : av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth); return AVERROR_INVALIDDATA; @@ -767,8 +765,274 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, void *data, int *got_frame, const uint8_t *buf, int buf_size) { - av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); - return AVERROR_PATCHWELCOME; + FlicDecodeContext *s = avctx->priv_data; + + GetByteContext g2; + int pixel_ptr; + unsigned char palette_idx1; + + unsigned int frame_size; + int num_chunks; + + unsigned int chunk_size; + int chunk_type; + + int i, j, ret; + + int lines; + int compressed_lines; + signed short line_packets; + int y_ptr; + int byte_run; + int pixel_skip; + int pixel_countdown; + unsigned char *pixels; + int pixel; + unsigned int pixel_limit; + + bytestream2_init(&g2, buf, buf_size); + + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) + return ret; + + pixels = s->frame->data[0]; + pixel_limit = s->avctx->height * s->frame->linesize[0]; + + frame_size = bytestream2_get_le32(&g2); + bytestream2_skip(&g2, 2); /* skip the magic number */ + num_chunks = bytestream2_get_le16(&g2); + bytestream2_skip(&g2, 8); /* skip padding */ + if (frame_size > buf_size) + frame_size = buf_size; + + frame_size -= 16; + + /* iterate through the chunks */ + while ((frame_size > 0) && (num_chunks > 0) && + bytestream2_get_bytes_left(&g2) >= 4) { + int stream_ptr_after_chunk; + chunk_size = bytestream2_get_le32(&g2); + if (chunk_size > frame_size) { + av_log(avctx, AV_LOG_WARNING, + "Invalid chunk_size = %u > frame_size = %u\n", chunk_size, frame_size); + chunk_size = frame_size; + } + stream_ptr_after_chunk = bytestream2_tell(&g2) - 4 + chunk_size; + + chunk_type = bytestream2_get_le16(&g2); + + + switch (chunk_type) { + case FLI_256_COLOR: + case FLI_COLOR: + /* For some reason, it seems that non-palettized flics do + * include one of these chunks in their first frame. + * Why I do not know, it seems rather extraneous. */ + ff_dlog(avctx, + "Unexpected Palette chunk %d in non-palettized FLC\n", + chunk_type); + bytestream2_skip(&g2, chunk_size - 6); + break; + + case FLI_DELTA: + case FLI_DTA_LC: + y_ptr = 0; + compressed_lines = bytestream2_get_le16(&g2); + while (compressed_lines > 0) { + if (bytestream2_tell(&g2) + 2 > stream_ptr_after_chunk) + break; + line_packets = bytestream2_get_le16(&g2); + if (line_packets < 0) { + line_packets = -line_packets; + y_ptr += line_packets * s->frame->linesize[0]; + } else { + compressed_lines--; + pixel_ptr = y_ptr; + CHECK_PIXEL_PTR(0); + pixel_countdown = s->avctx->width; + for (i = 0; i < line_packets; i++) { + /* account for the skip bytes */ + if (bytestream2_tell(&g2) + 2 > stream_ptr_after_chunk) + break; + pixel_skip = bytestream2_get_byte(&g2); + pixel_ptr += (pixel_skip*3); /* Pixel is 3 bytes wide */ + pixel_countdown -= pixel_skip; + byte_run = sign_extend(bytestream2_get_byte(&g2), 8); + if (byte_run < 0) { + byte_run = -byte_run; + pixel = bytestream2_get_le24(&g2); + CHECK_PIXEL_PTR(3 * byte_run); + for (j = 0; j < byte_run; j++, pixel_countdown -= 1) { + AV_WL24(&pixels[pixel_ptr], pixel); + pixel_ptr += 3; + } + } else { + if (bytestream2_tell(&g2) + 2*byte_run > stream_ptr_after_chunk) + break; + CHECK_PIXEL_PTR(2 * byte_run); + for (j = 0; j < byte_run; j++, pixel_countdown--) { + pixel = bytestream2_get_le24(&g2); + AV_WL24(&pixels[pixel_ptr], pixel); + pixel_ptr += 3; + } + } + } + + y_ptr += s->frame->linesize[0]; + } + } + break; + + case FLI_LC: + av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-palettized FLC\n"); + bytestream2_skip(&g2, chunk_size - 6); + break; + + case FLI_BLACK: + /* set the whole frame to 0x00 which is black for 24 bit mode. */ + memset(pixels, 0x00, + s->frame->linesize[0] * s->avctx->height); + break; + + case FLI_BRUN: + y_ptr = 0; + for (lines = 0; lines < s->avctx->height; lines++) { + pixel_ptr = y_ptr; + /* disregard the line packets; instead, iterate through all + * pixels on a row */ + bytestream2_skip(&g2, 1); + pixel_countdown = (s->avctx->width * 3); + + while (pixel_countdown > 0) { + if (bytestream2_tell(&g2) + 1 > stream_ptr_after_chunk) + break; + byte_run = sign_extend(bytestream2_get_byte(&g2), 8); + if (byte_run > 0) { + palette_idx1 = bytestream2_get_byte(&g2); + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + pixels[pixel_ptr++] = palette_idx1; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d) (linea%d)\n", + pixel_countdown, lines); + } + } else { /* copy bytes if byte_run < 0 */ + byte_run = -byte_run; + if (bytestream2_tell(&g2) + byte_run > stream_ptr_after_chunk) + break; + CHECK_PIXEL_PTR(byte_run); + for (j = 0; j < byte_run; j++) { + palette_idx1 = bytestream2_get_byte(&g2); + pixels[pixel_ptr++] = palette_idx1; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d) at line %d\n", + pixel_countdown, lines); + } + } + } + + y_ptr += s->frame->linesize[0]; + } + break; + + case FLI_DTA_BRUN: + y_ptr = 0; + for (lines = 0; lines < s->avctx->height; lines++) { + pixel_ptr = y_ptr; + /* disregard the line packets; instead, iterate through all + * pixels on a row */ + bytestream2_skip(&g2, 1); + pixel_countdown = s->avctx->width; /* Width is in pixels, not bytes */ + + while (pixel_countdown > 0) { + if (bytestream2_tell(&g2) + 1 > stream_ptr_after_chunk) + break; + byte_run = sign_extend(bytestream2_get_byte(&g2), 8); + if (byte_run > 0) { + pixel = bytestream2_get_le24(&g2); + CHECK_PIXEL_PTR(3 * byte_run); + for (j = 0; j < byte_run; j++) { + AV_WL24(pixels + pixel_ptr, pixel); + pixel_ptr += 3; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } else { /* copy pixels if byte_run < 0 */ + byte_run = -byte_run; + if (bytestream2_tell(&g2) + 3 * byte_run > stream_ptr_after_chunk) + break; + CHECK_PIXEL_PTR(3 * byte_run); + for (j = 0; j < byte_run; j++) { + pixel = bytestream2_get_le24(&g2); + AV_WL24(pixels + pixel_ptr, pixel); + pixel_ptr += 3; + pixel_countdown--; + if (pixel_countdown < 0) + av_log(avctx, AV_LOG_ERROR, "pixel_countdown < 0 (%d)\n", + pixel_countdown); + } + } + } + + y_ptr += s->frame->linesize[0]; + } + break; + + case FLI_COPY: + case FLI_DTA_COPY: + /* copy the chunk (uncompressed frame) */ + if (chunk_size - 6 > (unsigned int)(FFALIGN(s->avctx->width, 2) * s->avctx->height)*3) { + av_log(avctx, AV_LOG_ERROR, "In chunk FLI_COPY : source data (%d bytes) " \ + "bigger than image, skipping chunk\n", chunk_size - 6); + bytestream2_skip(&g2, chunk_size - 6); + } else { + for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height; + y_ptr += s->frame->linesize[0]) { + + pixel_countdown = s->avctx->width; + pixel_ptr = 0; + while (pixel_countdown > 0) { + pixel = bytestream2_get_le24(&g2); + AV_WL24(&pixels[y_ptr + pixel_ptr], pixel); + pixel_ptr += 3; + pixel_countdown--; + } + if (s->avctx->width & 1) + bytestream2_skip(&g2, 3); + } + } + break; + + case FLI_MINI: + /* some sort of a thumbnail? disregard this chunk... */ + bytestream2_skip(&g2, chunk_size - 6); + break; + + default: + av_log(avctx, AV_LOG_ERROR, "Unrecognized chunk type: %d\n", chunk_type); + break; + } + + frame_size -= chunk_size; + num_chunks--; + } + + /* by the end of the chunk, the stream ptr should equal the frame + * size (minus 1, possibly); if it doesn't, issue a warning */ + if ((bytestream2_get_bytes_left(&g2) != 0) && (bytestream2_get_bytes_left(&g2) != 1)) + av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size = %d " \ + "and final chunk ptr = %d\n", buf_size, bytestream2_tell(&g2)); + + if ((ret = av_frame_ref(data, s->frame)) < 0) + return ret; + + *got_frame = 1; + + return buf_size; } static int flic_decode_frame(AVCodecContext *avctx,