ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 12 01:40:26 2014 +0100| [d2d8ac24b8437121c2a36ca41bb141e9acdeeed7] | committer: Michael Niedermayer
avfilter/vf_uspp: Allocate qp storage after qp_stride is known Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2d8ac24b8437121c2a36ca41bb141e9acdeeed7 --- libavfilter/vf_uspp.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index dede413..fd07eb9 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -306,15 +306,6 @@ static int config_input(AVFilterLink *inlink) return AVERROR(EINVAL); } - if (!uspp->use_bframe_qp) { - /* we are assuming here the qp blocks will not be smaller that 16x16 */ - uspp->non_b_qp_alloc_size = FF_CEIL_RSHIFT(width, 4) * FF_CEIL_RSHIFT(height, 4); - uspp->non_b_qp_table = av_calloc(uspp->non_b_qp_alloc_size, sizeof(*uspp->non_b_qp_table)); - - if (!uspp->non_b_qp_table) - return AVERROR(ENOMEM); - } - for (i = 0; i < 3; i++) { int is_chroma = !!i; int w = ((width + 4 * BLOCK-1) & (~(2 * BLOCK-1))) >> is_chroma; @@ -391,6 +382,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) w = FF_CEIL_RSHIFT(qp_stride, 4); h = FF_CEIL_RSHIFT(inlink->h, 4); } + + if (w * h > uspp->non_b_qp_alloc_size) { + int ret = av_reallocp_array(&uspp->non_b_qp_table, w, h); + if (ret < 0) { + uspp->non_b_qp_alloc_size = 0; + return ret; + } + uspp->non_b_qp_alloc_size = w * h; + } + av_assert0(w * h <= uspp->non_b_qp_alloc_size); memcpy(uspp->non_b_qp_table, qp_table, w * h); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
