else if (frames_hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
iopattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
}
-
- frame_width = frames_hwctx->surfaces[0].Info.Width;
- frame_height = frames_hwctx->surfaces[0].Info.Height;
}
if (!iopattern)
uint8_t *dummy_data;
int dummy_size;
int ret;
+ const AVPixFmtDescriptor *desc;
if (!q->avctx_internal) {
q->avctx_internal = avcodec_alloc_context3(NULL);
/* 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 };
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;
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;