ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Sep 11 13:11:22 2018 -0300| [14fe81b3a88dfe4dbac12e8715f9a3f05b5ef1bf] | committer: James Almer
Merge commit '325aa63dd1a3abc2453914d0bc111d297833d725' * commit '325aa63dd1a3abc2453914d0bc111d297833d725': qsv: enforcing continuous memory layout Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14fe81b3a88dfe4dbac12e8715f9a3f05b5ef1bf --- libavcodec/qsvenc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c4cdebf40d..a8664541c8 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1012,7 +1012,6 @@ static void clear_unused_frames(QSVEncContext *q) while (cur) { if (cur->used && !cur->surface.Data.Locked) { free_encoder_ctrl_payloads(&cur->enc_ctrl); - av_frame_unref(cur->frame); cur->used = 0; } cur = cur->next; @@ -1085,16 +1084,23 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, } } else { /* make a copy if the input is not padded as libmfx requires */ - if (frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) { + /* and to make allocation continious for data[0]/data[1] */ + if ((frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) || + (frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align))) { qf->frame->height = FFALIGN(frame->height, q->height_align); qf->frame->width = FFALIGN(frame->width, q->width_align); - ret = ff_get_buffer(q->avctx, qf->frame, AV_GET_BUFFER_FLAG_REF); - if (ret < 0) - return ret; + qf->frame->format = frame->format; + + if (!qf->frame->data[0]) { + ret = av_frame_get_buffer(qf->frame, q->width_align); + if (ret < 0) + return ret; + } qf->frame->height = frame->height; qf->frame->width = frame->width; + ret = av_frame_copy(qf->frame, frame); if (ret < 0) { av_frame_unref(qf->frame); ====================================================================== diff --cc libavcodec/qsvenc.c index c4cdebf40d,c74b3ae31a..a8664541c8 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@@ -1011,8 -1014,6 +1011,7 @@@ static void clear_unused_frames(QSVEncC QSVFrame *cur = q->work_frames; while (cur) { if (cur->used && !cur->surface.Data.Locked) { + free_encoder_ctrl_payloads(&cur->enc_ctrl); - av_frame_unref(cur->frame); cur->used = 0; } cur = cur->next; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
