diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 23:29:32 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 19:46:41 +0400 |
| commit | 1a6218954a35a7a30e1d7910af30e0bf3f1c55dd (patch) | |
| tree | 50e0480a5ba10a1b7883ce68157033db4932767f | |
| parent | 1f8e0f7e06aff959d3567be910db0def919ae538 (diff) | |
avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0e51be8d0273679d379a95de14727b982b9549f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 1905f6067a..e263bb9f31 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -940,7 +940,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int slice_hdr_size = 2 + 2 * (ctx->num_planes - 1); int frame_size, picture_size, slice_size; int pkt_size, ret; - int max_slice_size = (ctx->frame_size_upper_bound - 200) / ctx->pictures_per_frame / ctx->slices_per_picture; + int max_slice_size = (ctx->frame_size_upper_bound - 200) / (ctx->pictures_per_frame * ctx->slices_per_picture + 1); uint8_t frame_flags; *avctx->coded_frame = *pic; @@ -1029,9 +1029,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint8_t *start = pkt->data; // Recompute new size according to max_slice_size // and deduce delta - int delta = 200 + ctx->pictures_per_frame * - ctx->slices_per_picture * max_slice_size - - pkt_size; + int delta = 200 + (ctx->pictures_per_frame * + ctx->slices_per_picture + 1) * + max_slice_size - pkt_size; delta = FFMAX(delta, 2 * max_slice_size); ctx->frame_size_upper_bound += delta; @@ -1248,16 +1248,16 @@ static av_cold int encode_init(AVCodecContext *avctx) ctx->bits_per_mb += ls * 4; } - ctx->frame_size_upper_bound = ctx->pictures_per_frame * - ctx->slices_per_picture * + ctx->frame_size_upper_bound = (ctx->pictures_per_frame * + ctx->slices_per_picture + 1) * (2 + 2 * ctx->num_planes + (mps * ctx->bits_per_mb) / 8) + 200; if (ctx->alpha_bits) { // The alpha plane is run-coded and might exceed the bit budget. - ctx->frame_size_upper_bound += ctx->pictures_per_frame * - ctx->slices_per_picture * + ctx->frame_size_upper_bound += (ctx->pictures_per_frame * + ctx->slices_per_picture + 1) * /* num pixels per slice */ (ctx->mbs_per_slice * 256 * /* bits per pixel */ (1 + ctx->alpha_bits + 1) + 7 >> 3); } |