virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

flashsv: inline copy_region() into flashsv_decode_frame()

Browse Source
This commit is contained in:
Diego Biurrun
2011-06-30 00:59:13 +02:00
parent 4904995652
commit 51915cfa47
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/flashsv.c
View File

@@ -49,18 +49,6 @@ typedef struct FlashSVContext {
} FlashSVContext; } FlashSVContext;
static void copy_region(uint8_t *sptr, uint8_t *dptr,
int dx, int dy, int h, int w, int stride)
{
int i;
for (i = dx + h; i > dx; i--) {
memcpy(dptr + i * stride + dy * 3, sptr, w * 3);
sptr += w * 3;
}
}
static av_cold int flashsv_decode_init(AVCodecContext *avctx) static av_cold int flashsv_decode_init(AVCodecContext *avctx)
{ {
FlashSVContext *s = avctx->priv_data; FlashSVContext *s = avctx->priv_data;
@@ -171,6 +159,8 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
/* skip unchanged blocks, which have size 0 */ /* skip unchanged blocks, which have size 0 */
if (size) { if (size) {
/* decompress block */ /* decompress block */
uint8_t *line = s->tmpblock;
int k;
int ret = inflateReset(&s->zstream); int ret = inflateReset(&s->zstream);
if (ret != Z_OK) { if (ret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@@ -193,10 +183,15 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
"error in decompression of block %dx%d: %d\n", i, j, ret); "error in decompression of block %dx%d: %d\n", i, j, ret);
/* return -1; */ /* return -1; */
} }
copy_region(s->tmpblock, s->frame.data[0], /* Flash Screen Video stores the image upside down, so copy
s->image_height - (y_pos + cur_blk_height + 1), * lines to destination in reverse order. */
x_pos, cur_blk_height, cur_blk_width, for (k = 1; k <= cur_blk_height; k++) {
s->frame.linesize[0]); memcpy(s->frame.data[0] + x_pos * 3 +
(s->image_height - y_pos - k) * s->frame.linesize[0],
line, cur_blk_width * 3);
/* advance source pointer to next line */
line += cur_blk_width * 3;
}
skip_bits_long(&gb, 8 * size); /* skip the consumed bits */ skip_bits_long(&gb, 8 * size); /* skip the consumed bits */
} }
} }