#include <zlib.h>
#include "libavutil/intreadwrite.h"
+
#include "avcodec.h"
+#include "bitstream.h"
#include "bytestream.h"
-#include "get_bits.h"
+#include "internal.h"
typedef struct BlockInfo {
uint8_t *pos;
int size;
- int unp_size;
} BlockInfo;
typedef struct FlashSVContext {
AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
int image_width, image_height;
int block_width, block_height;
uint8_t *tmpblock;
int diff_start, diff_height;
} FlashSVContext;
-
static int decode_hybrid(const uint8_t *sptr, uint8_t *dptr, int dx, int dy,
int h, int w, int stride, const uint32_t *pal)
{
int x, y;
const uint8_t *orig_src = sptr;
- for (y = dx+h; y > dx; y--) {
+ for (y = dx + h; y > dx; y--) {
uint8_t *dst = dptr + (y * stride) + dy * 3;
for (x = 0; x < w; x++) {
if (*sptr & 0x80) {
return sptr - orig_src;
}
+static av_cold int flashsv_decode_end(AVCodecContext *avctx)
+{
+ FlashSVContext *s = avctx->priv_data;
+ inflateEnd(&s->zstream);
+ /* release the frame if needed */
+ av_frame_free(&s->frame);
+
+ /* free the tmpblock */
+ av_free(s->tmpblock);
+
+ return 0;
+}
+
static av_cold int flashsv_decode_init(AVCodecContext *avctx)
{
FlashSVContext *s = avctx->priv_data;
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
return 1;
}
- avctx->pix_fmt = PIX_FMT_BGR24;
- s->frame.data[0] = NULL;
+ avctx->pix_fmt = AV_PIX_FMT_BGR24;
+
+ s->frame = av_frame_alloc();
+ if (!s->frame) {
+ flashsv_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
return 0;
}
-
-static void flashsv2_prime(FlashSVContext *s, uint8_t *src,
- int size, int unp_size)
+static int flashsv2_prime(FlashSVContext *s, uint8_t *src, int size)
{
z_stream zs;
+ int zret; // Zlib return code
zs.zalloc = NULL;
zs.zfree = NULL;
deflate(&zs, Z_SYNC_FLUSH);
deflateEnd(&zs);
- inflateReset(&s->zstream);
+ if ((zret = inflateReset(&s->zstream)) != Z_OK) {
+ av_log(s->avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
+ return AVERROR_UNKNOWN;
+ }
s->zstream.next_in = s->deflate_block;
s->zstream.avail_in = s->deflate_block_size - zs.avail_out;
s->zstream.next_out = s->tmpblock;
s->zstream.avail_out = s->block_size * 3;
inflate(&s->zstream, Z_SYNC_FLUSH);
+
+ return 0;
}
static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt,
- GetBitContext *gb, int block_size,
+ BitstreamContext *bc, int block_size,
int width, int height, int x_pos, int y_pos,
int blk_idx)
{
int k;
int ret = inflateReset(&s->zstream);
if (ret != Z_OK) {
- //return -1;
+ av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
+ return AVERROR_UNKNOWN;
}
if (s->zlibprime_curr || s->zlibprime_prev) {
- flashsv2_prime(s, s->blocks[blk_idx].pos, s->blocks[blk_idx].size,
- s->blocks[blk_idx].unp_size);
+ ret = flashsv2_prime(s,
+ s->blocks[blk_idx].pos,
+ s->blocks[blk_idx].size);
+ if (ret < 0)
+ return ret;
}
- s->zstream.next_in = avpkt->data + get_bits_count(gb) / 8;
+ s->zstream.next_in = avpkt->data + bitstream_tell(bc) / 8;
s->zstream.avail_in = block_size;
s->zstream.next_out = s->tmpblock;
s->zstream.avail_out = s->block_size * 3;
}
if (s->is_keyframe) {
- s->blocks[blk_idx].pos = s->keyframedata + (get_bits_count(gb) / 8);
- s->blocks[blk_idx].size = block_size;
- s->blocks[blk_idx].unp_size = s->block_size * 3 - s->zstream.avail_out;
+ s->blocks[blk_idx].pos = s->keyframedata + (bitstream_tell(bc) / 8);
+ s->blocks[blk_idx].size = block_size;
}
+
+ y_pos += s->diff_start;
+
if (!s->color_depth) {
/* Flash Screen Video stores the image upside down, so copy
* lines to destination in reverse order. */
for (k = 1; k <= s->diff_height; k++) {
- memcpy(s->frame.data[0] + x_pos * 3 +
- (s->image_height - y_pos - s->diff_start - k) * s->frame.linesize[0],
+ memcpy(s->frame->data[0] + x_pos * 3 +
+ (s->image_height - y_pos - k) * s->frame->linesize[0],
line, width * 3);
/* advance source pointer to next line */
line += width * 3;
}
} else {
/* hybrid 15-bit/palette mode */
- decode_hybrid(s->tmpblock, s->frame.data[0],
- s->image_height - (y_pos + 1 + s->diff_start + s->diff_height),
+ decode_hybrid(s->tmpblock, s->frame->data[0],
+ s->image_height - (y_pos + 1 + s->diff_height),
x_pos, s->diff_height, width,
- s->frame.linesize[0], s->pal);
+ s->frame->linesize[0], s->pal);
}
- skip_bits_long(gb, 8 * block_size); /* skip the consumed bits */
+ bitstream_skip(bc, 8 * block_size); /* skip the consumed bits */
return 0;
}
}
static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt)
+ int *got_frame, AVPacket *avpkt)
{
- int buf_size = avpkt->size;
- FlashSVContext *s = avctx->priv_data;
- int h_blocks, v_blocks, h_part, v_part, i, j;
- GetBitContext gb;
+ int buf_size = avpkt->size;
+ FlashSVContext *s = avctx->priv_data;
+ int h_blocks, v_blocks, h_part, v_part, i, j, ret;
+ BitstreamContext bc;
/* no supplementary picture */
if (buf_size == 0)
if (buf_size < 4)
return -1;
- init_get_bits(&gb, avpkt->data, buf_size * 8);
+ bitstream_init(&bc, avpkt->data, buf_size * 8);
/* start to parse the bitstream */
- s->block_width = 16 * (get_bits(&gb, 4) + 1);
- s->image_width = get_bits(&gb, 12);
- s->block_height = 16 * (get_bits(&gb, 4) + 1);
- s->image_height = get_bits(&gb, 12);
+ s->block_width = 16 * (bitstream_read(&bc, 4) + 1);
+ s->image_width = bitstream_read(&bc, 12);
+ s->block_height = 16 * (bitstream_read(&bc, 4) + 1);
+ s->image_height = bitstream_read(&bc, 12);
if (s->ver == 2) {
- skip_bits(&gb, 6);
- if (get_bits1(&gb)) {
- av_log_missing_feature(avctx, "iframe", 1);
+ bitstream_skip(&bc, 6);
+ if (bitstream_read_bit(&bc)) {
+ avpriv_request_sample(avctx, "iframe");
return AVERROR_PATCHWELCOME;
}
- if (get_bits1(&gb)) {
- av_log_missing_feature(avctx, "custom palette", 1);
+ if (bitstream_read_bit(&bc)) {
+ avpriv_request_sample(avctx, "Custom palette");
return AVERROR_PATCHWELCOME;
}
}
/* the block size could change between frames, make sure the buffer
* is large enough, if not, get a larger one */
if (s->block_size < s->block_width * s->block_height) {
- int tmpblock_size = 3 * s->block_width * s->block_height;
+ int tmpblock_size = 3 * s->block_width * s->block_height, err;
- s->tmpblock = av_realloc(s->tmpblock, tmpblock_size);
- if (!s->tmpblock) {
- av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp(&s->tmpblock, tmpblock_size)) < 0) {
+ s->block_size = 0;
+ av_log(avctx, AV_LOG_ERROR,
+ "Cannot allocate decompression buffer.\n");
+ return err;
}
if (s->ver == 2) {
s->deflate_block_size = calc_deflate_block_size(tmpblock_size);
if (s->deflate_block_size <= 0) {
- av_log(avctx, AV_LOG_ERROR, "Can't determine deflate buffer size.\n");
+ av_log(avctx, AV_LOG_ERROR,
+ "Cannot determine deflate buffer size.\n");
return -1;
}
- s->deflate_block = av_realloc(s->deflate_block, s->deflate_block_size);
- if (!s->deflate_block) {
- av_log(avctx, AV_LOG_ERROR, "Can't allocate deflate buffer.\n");
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp(&s->deflate_block, s->deflate_block_size)) < 0) {
+ s->block_size = 0;
+ av_log(avctx, AV_LOG_ERROR, "Cannot allocate deflate buffer.\n");
+ return err;
}
}
}
/* we care for keyframes only in Screen Video v2 */
s->is_keyframe = (avpkt->flags & AV_PKT_FLAG_KEY) && (s->ver == 2);
if (s->is_keyframe) {
- s->keyframedata = av_realloc(s->keyframedata, avpkt->size);
+ int err;
+ int nb_blocks = (v_blocks + !!v_part) *
+ (h_blocks + !!h_part) * sizeof(s->blocks[0]);
+ if ((err = av_reallocp(&s->keyframedata, avpkt->size)) < 0)
+ return err;
memcpy(s->keyframedata, avpkt->data, avpkt->size);
- s->blocks = av_realloc(s->blocks,
- (v_blocks + !!v_part) * (h_blocks + !!h_part)
- * sizeof(s->blocks[0]));
+ if ((err = av_reallocp(&s->blocks, nb_blocks)) < 0)
+ return err;
+ memset(s->blocks, 0, nb_blocks);
}
- av_dlog(avctx, "image: %dx%d block: %dx%d num: %dx%d part: %dx%d\n",
+ ff_dlog(avctx, "image: %dx%d block: %dx%d num: %dx%d part: %dx%d\n",
s->image_width, s->image_height, s->block_width, s->block_height,
h_blocks, v_blocks, h_part, v_part);
- s->frame.reference = 3;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
}
/* loop over all block columns */
int has_diff = 0;
/* get the size of the compressed zlib chunk */
- int size = get_bits(&gb, 16);
+ int size = bitstream_read(&bc, 16);
s->color_depth = 0;
s->zlibprime_curr = 0;
s->diff_start = 0;
s->diff_height = cur_blk_height;
- if (8 * size > get_bits_left(&gb)) {
- avctx->release_buffer(avctx, &s->frame);
- s->frame.data[0] = NULL;
+ if (8 * size > bitstream_bits_left(&bc)) {
+ av_frame_unref(s->frame);
return AVERROR_INVALIDDATA;
}
if (s->ver == 2 && size) {
- skip_bits(&gb, 3);
- s->color_depth = get_bits(&gb, 2);
- has_diff = get_bits1(&gb);
- s->zlibprime_curr = get_bits1(&gb);
- s->zlibprime_prev = get_bits1(&gb);
+ bitstream_skip(&bc, 3);
+ s->color_depth = bitstream_read(&bc, 2);
+ has_diff = bitstream_read_bit(&bc);
+ s->zlibprime_curr = bitstream_read_bit(&bc);
+ s->zlibprime_prev = bitstream_read_bit(&bc);
if (s->color_depth != 0 && s->color_depth != 2) {
av_log(avctx, AV_LOG_ERROR,
- "%dx%d invalid color depth %d\n", i, j, s->color_depth);
- return -1;
+ "%dx%d invalid color depth %d\n",
+ i, j, s->color_depth);
+ return AVERROR_INVALIDDATA;
}
if (has_diff) {
- s->diff_start = get_bits(&gb, 8);
- s->diff_height = get_bits(&gb, 8);
+ if (!s->keyframe) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Inter frame without keyframe\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->diff_start = bitstream_read(&bc, 8);
+ s->diff_height = bitstream_read(&bc, 8);
+ if (s->diff_start + s->diff_height > cur_blk_height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Block parameters invalid: %d + %d > %d\n",
+ s->diff_start, s->diff_height, cur_blk_height);
+ return AVERROR_INVALIDDATA;
+ }
av_log(avctx, AV_LOG_DEBUG,
"%dx%d diff start %d height %d\n",
i, j, s->diff_start, s->diff_height);
av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_prev\n", i, j);
if (s->zlibprime_curr) {
- int col = get_bits(&gb, 8);
- int row = get_bits(&gb, 8);
- av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n", i, j, col, row);
+ int col = bitstream_read(&bc, 8);
+ int row = bitstream_read(&bc, 8);
+ av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n",
+ i, j, col, row);
size -= 2;
- av_log_missing_feature(avctx, "zlibprime_curr", 1);
+ avpriv_request_sample(avctx, "zlibprime_curr");
return AVERROR_PATCHWELCOME;
}
+ if (!s->blocks && (s->zlibprime_curr || s->zlibprime_prev)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "no data available for zlib priming\n");
+ return AVERROR_INVALIDDATA;
+ }
size--; // account for flags byte
}
if (has_diff) {
int k;
- int off = (s->image_height - y_pos - 1) * s->frame.linesize[0];
+ int off = (s->image_height - y_pos - 1) * s->frame->linesize[0];
- for (k = 0; k < cur_blk_height; k++)
- memcpy(s->frame.data[0] + off - k*s->frame.linesize[0] + x_pos*3,
- s->keyframe + off - k*s->frame.linesize[0] + x_pos*3,
+ for (k = 0; k < cur_blk_height; k++) {
+ int x = off - k * s->frame->linesize[0] + x_pos * 3;
+ memcpy(s->frame->data[0] + x, s->keyframe + x,
cur_blk_width * 3);
+ }
}
/* skip unchanged blocks, which have size 0 */
if (size) {
- if (flashsv_decode_block(avctx, avpkt, &gb, size,
+ if (flashsv_decode_block(avctx, avpkt, &bc, size,
cur_blk_width, cur_blk_height,
x_pos, y_pos,
i + j * (h_blocks + !!h_part)))
}
if (s->is_keyframe && s->ver == 2) {
if (!s->keyframe) {
- s->keyframe = av_malloc(s->frame.linesize[0] * avctx->height);
+ s->keyframe = av_malloc(s->frame->linesize[0] * avctx->height);
if (!s->keyframe) {
av_log(avctx, AV_LOG_ERROR, "Cannot allocate image data\n");
return AVERROR(ENOMEM);
}
}
- memcpy(s->keyframe, s->frame.data[0], s->frame.linesize[0] * avctx->height);
+ memcpy(s->keyframe, s->frame->data[0],
+ s->frame->linesize[0] * avctx->height);
}
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
+
+ *got_frame = 1;
- if ((get_bits_count(&gb) / 8) != buf_size)
+ if ((bitstream_tell(&bc) / 8) != buf_size)
av_log(avctx, AV_LOG_ERROR, "buffer not fully consumed (%d != %d)\n",
- buf_size, (get_bits_count(&gb) / 8));
+ buf_size, (bitstream_tell(&bc) / 8));
/* report that the buffer was completely consumed */
return buf_size;
}
-
-static av_cold int flashsv_decode_end(AVCodecContext *avctx)
-{
- FlashSVContext *s = avctx->priv_data;
- inflateEnd(&s->zstream);
- /* release the frame if needed */
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- /* free the tmpblock */
- av_free(s->tmpblock);
-
- return 0;
-}
-
-
#if CONFIG_FLASHSV_DECODER
AVCodec ff_flashsv_decoder = {
.name = "flashsv",
+ .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_FLASHSV,
+ .id = AV_CODEC_ID_FLASHSV,
.priv_data_size = sizeof(FlashSVContext),
.init = flashsv_decode_init,
.close = flashsv_decode_end,
.decode = flashsv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
+ .capabilities = AV_CODEC_CAP_DR1,
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};
#endif /* CONFIG_FLASHSV_DECODER */
AVCodec ff_flashsv2_decoder = {
.name = "flashsv2",
+ .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_FLASHSV2,
+ .id = AV_CODEC_ID_FLASHSV2,
.priv_data_size = sizeof(FlashSVContext),
.init = flashsv2_decode_init,
.close = flashsv2_decode_end,
.decode = flashsv_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"),
+ .capabilities = AV_CODEC_CAP_DR1,
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};
#endif /* CONFIG_FLASHSV2_DECODER */
projects / ffmpeg / blobdiff