Mercurial > libavcodec.hg
changeset 9746:e8421cfcc381 libavcodec
lclenc.c: compress directly into output buffer instead of using a pointless
temporary buffer and then using put_bits to copy the data over.
author | reimar |
---|---|
date | Sun, 31 May 2009 08:49:27 +0000 |
parents | 2b2cf4039589 |
children | 9db25052df0e |
files | lclenc.c |
diffstat | 1 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/lclenc.c Sun May 31 08:41:11 2009 +0000 +++ b/lclenc.c Sun May 31 08:49:27 2009 +0000 @@ -83,8 +83,6 @@ int i; int zret; // Zlib return code - init_put_bits(&c->pb, buf, buf_size); - *p = *pict; p->pict_type= FF_I_TYPE; p->key_frame= 1; @@ -99,8 +97,8 @@ av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret); return -1; } - c->zstream.next_out = c->comp_buf; - c->zstream.avail_out = c->max_comp_size; + c->zstream.next_out = buf; + c->zstream.avail_out = buf_size; for(i = avctx->height - 1; i >= 0; i--) { c->zstream.next_in = p->data[0]+p->linesize[0]*i; @@ -117,10 +115,6 @@ 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; } @@ -175,14 +169,6 @@ 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; }