ffmpeg | branch: release/2.2 | Christophe Gisquet <christophe.gisq...@gmail.com> | Mon Aug 18 14:15:24 2014 +0000| [f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735] | committer: Luca Barbato
proresenc: Properly account for alpha plane The packet buffer allocation considers the alpha channel as DCT-coded, while it is actually run-coded and thus requires a larger buffer. CC: libav-sta...@libav.org Signed-off-by: Diego Biurrun <di...@biurrun.de> Signed-off-by: Luca Barbato <lu_z...@gentoo.org> (cherry picked from commit 41e1354c101004ccd46dc08d3dd6e956e83a6b51) Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735 --- libavcodec/proresenc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c index 570a73c..a43612c 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc.c @@ -1231,8 +1231,6 @@ static av_cold int encode_init(AVCodecContext *avctx) ctx->bits_per_mb = ls * 8; if (ctx->chroma_factor == CFACTOR_Y444) ctx->bits_per_mb += ls * 4; - if (ctx->num_planes == 4) - ctx->bits_per_mb += ls * 4; } ctx->frame_size_upper_bound = ctx->pictures_per_frame * @@ -1241,6 +1239,14 @@ static av_cold int encode_init(AVCodecContext *avctx) (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 * + /* num pixels per slice */ (ctx->mbs_per_slice * 256 * + /* bits per pixel */ (1 + ctx->alpha_bits + 1) + 7 >> 3); + } + avctx->codec_tag = ctx->profile_info->tag; av_log(avctx, AV_LOG_DEBUG, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
