virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/qsvvpp: postpone vpp session initialization

Browse Source 
So there is a chance to update vpp parameters per frame

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Haihao Xiang
2023-06-12 16:14:47 +08:00
parent cf21ca9efb
commit bcdea21675
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libavfilter/qsvvpp.c
View File

@@ -835,6 +835,7 @@ int ff_qsvvpp_init(AVFilterContext *avctx, QSVVPPParam *param)
/* Print output memory mode */ /* Print output memory mode */
ff_qsvvpp_print_iopattern(avctx, s->vpp_param.IOPattern & 0xF0, "VPP"); ff_qsvvpp_print_iopattern(avctx, s->vpp_param.IOPattern & 0xF0, "VPP");
/* Validate VPP params, but don't initial VPP session here */
ret = MFXVideoVPP_Query(s->session, &s->vpp_param, &s->vpp_param); ret = MFXVideoVPP_Query(s->session, &s->vpp_param, &s->vpp_param);
if (ret < 0) { if (ret < 0) {
ret = ff_qsvvpp_print_error(avctx, ret, "Error querying VPP params"); ret = ff_qsvvpp_print_error(avctx, ret, "Error querying VPP params");
@@ -842,13 +843,6 @@ int ff_qsvvpp_init(AVFilterContext *avctx, QSVVPPParam *param)
} else if (ret > 0) } else if (ret > 0)
ff_qsvvpp_print_warning(avctx, ret, "Warning When querying VPP params"); ff_qsvvpp_print_warning(avctx, ret, "Warning When querying VPP params");
ret = MFXVideoVPP_Init(s->session, &s->vpp_param);
if (ret < 0) {
ret = ff_qsvvpp_print_error(avctx, ret, "Failed to create a qsvvpp");
goto failed;
} else if (ret > 0)
ff_qsvvpp_print_warning(avctx, ret, "Warning When creating qsvvpp");
return 0; return 0;
failed: failed:
@@ -857,6 +851,31 @@ failed:
return ret; return ret;
} }
static int qsvvpp_init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
{
int ret;
if (s->vpp_initted)
return 0;
/* Query VPP params again, including params for frame */
ret = MFXVideoVPP_Query(s->session, &s->vpp_param, &s->vpp_param);
if (ret < 0)
return ff_qsvvpp_print_error(avctx, ret, "Error querying VPP params");
else if (ret > 0)
ff_qsvvpp_print_warning(avctx, ret, "Warning When querying VPP params");
ret = MFXVideoVPP_Init(s->session, &s->vpp_param);
if (ret < 0)
return ff_qsvvpp_print_error(avctx, ret, "Failed to create a qsvvpp");
else if (ret > 0)
ff_qsvvpp_print_warning(avctx, ret, "Warning When creating qsvvpp");
s->vpp_initted = 1;
return 0;
}
int ff_qsvvpp_close(AVFilterContext *avctx) int ff_qsvvpp_close(AVFilterContext *avctx)
{ {
QSVVPPContext *s = avctx->priv; QSVVPPContext *s = avctx->priv;
@@ -865,6 +884,7 @@ int ff_qsvvpp_close(AVFilterContext *avctx)
MFXVideoVPP_Close(s->session); MFXVideoVPP_Close(s->session);
MFXClose(s->session); MFXClose(s->session);
s->session = NULL; s->session = NULL;
s->vpp_initted = 0;
} }
/* release all the resources */ /* release all the resources */
@@ -920,6 +940,10 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
ret = qsvvpp_init_vpp_session(ctx, s);
if (ret)
return ret;
do { do {
ret = MFXVideoVPP_RunFrameVPPAsync(s->session, &in_frame->surface, ret = MFXVideoVPP_RunFrameVPPAsync(s->session, &in_frame->surface,
&out_frame->surface, NULL, &sync); &out_frame->surface, NULL, &sync);

1
libavfilter/qsvvpp.h
View File

@@ -90,6 +90,7 @@ typedef struct QSVVPPContext {
AVFifo *async_fifo; AVFifo *async_fifo;
mfxVersion ver; mfxVersion ver;
int vpp_initted;
} QSVVPPContext; } QSVVPPContext;
typedef struct QSVVPPCrop { typedef struct QSVVPPCrop {