diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-12 01:40:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-12 02:00:04 +0100 |
| commit | d2d8ac24b8437121c2a36ca41bb141e9acdeeed7 (patch) | |
| tree | d688f561297635c7a07d93ad27588dca5eca3514 /libavfilter | |
| parent | 327c5292f2fe99d779d53ab332a63c28db071f15 (diff) | |
| download | ffmpeg-d2d8ac24b8437121c2a36ca41bb141e9acdeeed7.tar.gz | |
avfilter/vf_uspp: Allocate qp storage after qp_stride is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_uspp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index dede413be1..fd07eb9a56 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); } |