generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated

Browse Source 
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-18 21:29:32 +02:00
parent 76a8cb9d7b
commit f0e51be8d0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/proresenc_kostya.c
View File

@@ -939,7 +939,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int slice_hdr_size = 2 + 2 * (ctx->num_planes - 1); int slice_hdr_size = 2 + 2 * (ctx->num_planes - 1);
int frame_size, picture_size, slice_size; int frame_size, picture_size, slice_size;
int pkt_size, ret; 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; uint8_t frame_flags;
*avctx->coded_frame = *pic; *avctx->coded_frame = *pic;
@@ -1028,9 +1028,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
uint8_t *start = pkt->data; uint8_t *start = pkt->data;
// Recompute new size according to max_slice_size // Recompute new size according to max_slice_size
// and deduce delta // and deduce delta
int delta = 200 + ctx->pictures_per_frame * int delta = 200 + (ctx->pictures_per_frame *
ctx->slices_per_picture * max_slice_size - ctx->slices_per_picture + 1) *
pkt_size; max_slice_size - pkt_size;
delta = FFMAX(delta, 2 * max_slice_size); delta = FFMAX(delta, 2 * max_slice_size);
ctx->frame_size_upper_bound += delta; ctx->frame_size_upper_bound += delta;
@@ -1247,16 +1247,16 @@ static av_cold int encode_init(AVCodecContext *avctx)
ctx->bits_per_mb += ls * 4; ctx->bits_per_mb += ls * 4;
} }
ctx->frame_size_upper_bound = ctx->pictures_per_frame * ctx->frame_size_upper_bound = (ctx->pictures_per_frame *
ctx->slices_per_picture * ctx->slices_per_picture + 1) *
(2 + 2 * ctx->num_planes + (2 + 2 * ctx->num_planes +
(mps * ctx->bits_per_mb) / 8) (mps * ctx->bits_per_mb) / 8)
+ 200; + 200;
if (ctx->alpha_bits) { if (ctx->alpha_bits) {
// The alpha plane is run-coded and might exceed the bit budget. // The alpha plane is run-coded and might exceed the bit budget.
ctx->frame_size_upper_bound += ctx->pictures_per_frame * ctx->frame_size_upper_bound += (ctx->pictures_per_frame *
ctx->slices_per_picture * ctx->slices_per_picture + 1) *
/* num pixels per slice */ (ctx->mbs_per_slice * 256 * /* num pixels per slice */ (ctx->mbs_per_slice * 256 *
/* bits per pixel */ (1 + ctx->alpha_bits + 1) + 7 >> 3); /* bits per pixel */ (1 + ctx->alpha_bits + 1) + 7 >> 3);
} }