virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flashsvenc: improve some variable names and fix corresponding comments

Browse Source
This commit is contained in:
Diego Biurrun 2011-07-15 15:55:19 +02:00
parent 59ef6bded5
commit 0686515cb4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/flashsvenc.c
View File

@ -156,25 +156,27 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
/* loop over all block columns */ /* loop over all block columns */
for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) { for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) {
int hp = j * block_height; // horizontal position in frame int y_pos = j * block_height; // vertical position in frame
int hs = (j < v_blocks) ? block_height : v_part; // size of block int cur_blk_height = (j < v_blocks) ? block_height : v_part;
/* loop over all block rows */ /* loop over all block rows */
for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) { for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) {
int wp = i * block_width; // vertical position in frame int x_pos = i * block_width; // horizontal position in frame
int ws = (i < h_blocks) ? block_width : h_part; // size of block int cur_blk_width = (i < h_blocks) ? block_width : h_part;
int ret = Z_OK; int ret = Z_OK;
uint8_t *ptr = buf + buf_pos; uint8_t *ptr = buf + buf_pos;
/* copy the block to the temp buffer before compression /* copy the block to the temp buffer before compression
* (if it differs from the previous frame's block) */ * (if it differs from the previous frame's block) */
res = copy_region_enc(p->data[0], s->tmpblock, res = copy_region_enc(p->data[0], s->tmpblock,
s->image_height - (hp + hs + 1), s->image_height - (y_pos + cur_blk_height + 1),
wp, hs, ws, p->linesize[0], previous_frame); x_pos, cur_blk_height, cur_blk_width,
p->linesize[0], previous_frame);
if (res || *I_frame) { if (res || *I_frame) {
unsigned long zsize = 3 * block_width * block_height; unsigned long zsize = 3 * block_width * block_height;
ret = compress2(ptr + 2, &zsize, s->tmpblock, 3 * ws * hs, 9); ret = compress2(ptr + 2, &zsize, s->tmpblock,
3 * cur_blk_width * cur_blk_height, 9);
//ret = deflateReset(&s->zstream); //ret = deflateReset(&s->zstream);
if (ret != Z_OK) if (ret != Z_OK)