[FFmpeg-cvslog] Merge commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8'
Mark Thompson
git at videolan.org
Wed Jan 17 01:33:11 EET 2018
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Tue Jan 16 23:29:36 2018 +0000| [96cf0d8a9cf35f3c49860bf1c000c382dd661607] | committer: Mark Thompson
Merge commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8'
* commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8':
qsv: better to use alignment by 16 and HEVC 10b requires alignment by 32
Merged-by: Mark Thompson <sw at jkqxz.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96cf0d8a9cf35f3c49860bf1c000c382dd661607
---
libavcodec/qsvdec.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 55fe59b531..abbede5d97 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -475,6 +475,7 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
uint8_t *dummy_data;
int dummy_size;
int ret;
+ const AVPixFmtDescriptor *desc;
if (!q->avctx_internal) {
q->avctx_internal = avcodec_alloc_context3(NULL);
@@ -501,8 +502,8 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
/* TODO: flush delayed frames on reinit */
if (q->parser->format != q->orig_pix_fmt ||
- q->parser->coded_width != avctx->coded_width ||
- q->parser->coded_height != avctx->coded_height) {
+ FFALIGN(q->parser->coded_width, 16) != FFALIGN(avctx->coded_width, 16) ||
+ FFALIGN(q->parser->coded_height, 16) != FFALIGN(avctx->coded_height, 16)) {
enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_QSV,
AV_PIX_FMT_NONE,
AV_PIX_FMT_NONE };
@@ -521,8 +522,8 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
avctx->pix_fmt = pix_fmts[1] = qsv_format;
avctx->width = q->parser->width;
avctx->height = q->parser->height;
- avctx->coded_width = q->parser->coded_width;
- avctx->coded_height = q->parser->coded_height;
+ avctx->coded_width = FFALIGN(q->parser->coded_width, 16);
+ avctx->coded_height = FFALIGN(q->parser->coded_height, 16);
avctx->field_order = q->parser->field_order;
avctx->level = q->avctx_internal->level;
avctx->profile = q->avctx_internal->profile;
@@ -533,6 +534,15 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
avctx->pix_fmt = ret;
+ desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ if (!desc)
+ goto reinit_fail;
+
+ if (desc->comp[0].depth > 8) {
+ avctx->coded_width = FFALIGN(q->parser->coded_width, 32);
+ avctx->coded_height = FFALIGN(q->parser->coded_height, 32);
+ }
+
ret = qsv_decode_init(avctx, q);
if (ret < 0)
goto reinit_fail;
======================================================================
More information about the ffmpeg-cvslog
mailing list