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

lclenc.c: compress directly into output buffer instead of using a pointless

Browse Source 
temporary buffer and then using put_bits to copy the data over.

Originally committed as revision 19030 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-05-31 08:49:27 +00:00
parent 4a01b3c714
commit e786d3cf80
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/lclenc.c
View File

@ -83,8 +83,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
int i; int i;
int zret; // Zlib return code int zret; // Zlib return code
init_put_bits(&c->pb, buf, buf_size);
*p = *pict; *p = *pict;
p->pict_type= FF_I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
@ -99,8 +97,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret);
return -1; return -1;
} }
c->zstream.next_out = c->comp_buf; c->zstream.next_out = buf;
c->zstream.avail_out = c->max_comp_size; c->zstream.avail_out = buf_size;
for(i = avctx->height - 1; i >= 0; i--) { for(i = avctx->height - 1; i >= 0; i--) {
c->zstream.next_in = p->data[0]+p->linesize[0]*i; c->zstream.next_in = p->data[0]+p->linesize[0]*i;
@ -117,10 +115,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
return -1; return -1;
} }
for (i = 0; i < c->zstream.total_out; i++)
put_bits(&c->pb, 8, c->comp_buf[i]);
flush_put_bits(&c->pb);
return c->zstream.total_out; return c->zstream.total_out;
} }
@ -175,14 +169,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
return 1; return 1;
} }
/* Conservative upper bound taken from zlib v1.2.1 source */
c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) +
((c->decomp_size + 63) >> 6) + 11;
if ((c->comp_buf = av_malloc(c->max_comp_size)) == NULL) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
return 1;
}
return 0; return 0;
} }