|
|
@ -58,24 +58,30 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt |
|
|
|
AV_PIX_FMT_NV12, |
|
|
|
AV_PIX_FMT_NV12, |
|
|
|
AV_PIX_FMT_NONE }; |
|
|
|
AV_PIX_FMT_NONE }; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ret = ff_get_format(avctx, pix_fmts); |
|
|
|
|
|
|
|
if (ret < 0) |
|
|
|
|
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
avctx->pix_fmt = ret; |
|
|
|
|
|
|
|
|
|
|
|
q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY; |
|
|
|
q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY; |
|
|
|
if (!q->session) { |
|
|
|
if (avctx->hwaccel_context) { |
|
|
|
if (avctx->hwaccel_context) { |
|
|
|
AVQSVContext *qsv = avctx->hwaccel_context; |
|
|
|
AVQSVContext *qsv = avctx->hwaccel_context; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
q->session = qsv->session; |
|
|
|
q->session = qsv->session; |
|
|
|
q->iopattern = qsv->iopattern; |
|
|
|
q->iopattern = qsv->iopattern; |
|
|
|
q->ext_buffers = qsv->ext_buffers; |
|
|
|
q->ext_buffers = qsv->ext_buffers; |
|
|
|
q->nb_ext_buffers = qsv->nb_ext_buffers; |
|
|
|
q->nb_ext_buffers = qsv->nb_ext_buffers; |
|
|
|
} |
|
|
|
} |
|
|
|
if (!q->session) { |
|
|
|
if (!q->session) { |
|
|
|
|
|
|
|
if (!q->internal_qs.session) { |
|
|
|
ret = ff_qsv_init_internal_session(avctx, &q->internal_qs, |
|
|
|
ret = ff_qsv_init_internal_session(avctx, &q->internal_qs, |
|
|
|
q->load_plugins); |
|
|
|
q->load_plugins); |
|
|
|
if (ret < 0) |
|
|
|
if (ret < 0) |
|
|
|
return ret; |
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
|
|
q->session = q->internal_qs.session; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
q->session = q->internal_qs.session; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (avpkt->size) { |
|
|
|
if (avpkt->size) { |
|
|
@ -123,11 +129,6 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt |
|
|
|
return ff_qsv_error(ret); |
|
|
|
return ff_qsv_error(ret); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ret = ff_get_format(avctx, pix_fmts); |
|
|
|
|
|
|
|
if (ret < 0) |
|
|
|
|
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
avctx->pix_fmt = ret; |
|
|
|
|
|
|
|
avctx->profile = param.mfx.CodecProfile; |
|
|
|
avctx->profile = param.mfx.CodecProfile; |
|
|
|
avctx->level = param.mfx.CodecLevel; |
|
|
|
avctx->level = param.mfx.CodecLevel; |
|
|
|
avctx->coded_width = param.mfx.FrameInfo.Width; |
|
|
|
avctx->coded_width = param.mfx.FrameInfo.Width; |
|
|
|