diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-10-29 17:02:42 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-11-01 19:38:53 +0100 |
| commit | 4a64e67988dd01005efb1ae831bff14c1656b573 (patch) | |
| tree | 50c831fb31c2e6d7f9ca4cd81a7d0c3552395f56 /libavcodec/flashsv.c | |
| parent | 50aef03b24d949249b020226dffa3a78077f1056 (diff) | |
flashsv: Refactor a little
Diffstat (limited to 'libavcodec/flashsv.c')
| -rw-r--r-- | libavcodec/flashsv.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index e9749fec33..f0a8036a25 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -197,12 +197,15 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt, s->blocks[blk_idx].pos = s->keyframedata + (get_bits_count(gb) / 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], + (s->image_height - y_pos - k) * s->frame.linesize[0], line, width * 3); /* advance source pointer to next line */ line += width * 3; @@ -210,7 +213,7 @@ static int flashsv_decode_block(AVCodecContext *avctx, AVPacket *avpkt, } 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), + s->image_height - (y_pos + 1 + s->diff_height), x_pos, s->diff_height, width, s->frame.linesize[0], s->pal); } @@ -409,10 +412,11 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, int k; 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 */ |