ffmpeg | branch: master | Rostislav Pehlivanov <atomnu...@gmail.com> | Sat Feb 27 18:38:09 2016 +0000| [6e5c6d61bddab12b1d9002ac422cbd2506a30177] | committer: Rostislav Pehlivanov
vc2enc: clip and warn when user bitrate set too low The encoder crashed on verly low bitrates since there wasn't enough space allocated. Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e5c6d61bddab12b1d9002ac422cbd2506a30177 --- libavcodec/vc2enc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 5e11aa1..27db6c0 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1008,12 +1008,24 @@ static av_cold int vc2_encode_end(AVCodecContext *avctx) return 0; } +static int minimum_frame_bits(VC2EncContext *s) +{ + int slice_x, slice_y, bits = 0; + s->size_scaler = 64; + for (slice_y = 0; slice_y < s->num_y; slice_y++) { + for (slice_x = 0; slice_x < s->num_x; slice_x++) { + bits += count_hq_slice(s, NULL, NULL, slice_x, slice_y, s->q_ceil); + } + } + return bits; +} static av_cold int vc2_encode_init(AVCodecContext *avctx) { Plane *p; SubBand *b; int i, j, level, o, shift; + int64_t bits_per_frame, min_bits_per_frame; VC2EncContext *s = avctx->priv_data; s->picture_number = 0; @@ -1161,6 +1173,17 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) } } + bits_per_frame = av_rescale(avctx->bit_rate, avctx->time_base.num, + avctx->time_base.den); + min_bits_per_frame = minimum_frame_bits(s) + 8*sizeof(LIBAVCODEC_IDENT) + 8*40 + 8*20000; + if (bits_per_frame < min_bits_per_frame) { + avctx->bit_rate = av_rescale(min_bits_per_frame, avctx->time_base.den, + avctx->time_base.num); + av_log(avctx, AV_LOG_WARNING, + "Bitrate too low, clipping to minimum = %.2lf Mbps!\n", + (double)avctx->bit_rate/1000000.0f); + } + return 0; alloc_fail: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
